summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.cxx2
-rw-r--r--dbaccess/source/core/inc/definitioncontainer.hxx4
-rw-r--r--oox/source/drawingml/shape.cxx8
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx2
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx2
-rw-r--r--sw/source/ui/dbui/mmresultdialogs.cxx2
-rw-r--r--sw/source/uibase/inc/mailmergewizard.hxx2
10 files changed, 15 insertions, 15 deletions
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index e71b5fe535a9..02e40390ed7f 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -93,8 +93,8 @@ protected:
virtual ~OComponentDefinition() override;
virtual void SAL_CALL disposing() override;
- const OComponentDefinition_Impl& getDefinition() const { return dynamic_cast< const OComponentDefinition_Impl& >( *m_pImpl.get() ); }
- OComponentDefinition_Impl& getDefinition() { return dynamic_cast< OComponentDefinition_Impl& >( *m_pImpl.get() ); }
+ const OComponentDefinition_Impl& getDefinition() const { return dynamic_cast< const OComponentDefinition_Impl& >( *m_pImpl ); }
+ OComponentDefinition_Impl& getDefinition() { return dynamic_cast< OComponentDefinition_Impl& >( *m_pImpl ); }
public:
OComponentDefinition(
const css::uno::Reference< css::uno::XComponentContext >&,
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 9958b6c0e995..2912c625c465 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -511,7 +511,7 @@ namespace
{
bool bSomeDocHasMacros = false;
- const OContentHelper_Impl& rContainerData( *_rModel.getObjectContainer( _eType ).get() );
+ const OContentHelper_Impl& rContainerData( *_rModel.getObjectContainer( _eType ) );
const ODefinitionContainer_Impl& rObjectDefinitions = dynamic_cast< const ODefinitionContainer_Impl& >( rContainerData );
try
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index f93f7d4d3346..4781146f8bed 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -37,7 +37,7 @@ namespace dbaccess
void OCommandDefinition::registerProperties()
{
- OCommandDefinition_Impl& rCommandDefinition = dynamic_cast< OCommandDefinition_Impl& >( *m_pImpl.get() );
+ OCommandDefinition_Impl& rCommandDefinition = dynamic_cast< OCommandDefinition_Impl& >( *m_pImpl );
registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND,
&rCommandDefinition.m_sCommand, cppu::UnoType<decltype(rCommandDefinition.m_sCommand)>::get());
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index e36f90de1eb8..da58ff9daf7d 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -144,12 +144,12 @@ protected:
const ODefinitionContainer_Impl& getDefinitions() const
{
- return dynamic_cast< const ODefinitionContainer_Impl& >( *m_pImpl.get() );
+ return dynamic_cast< const ODefinitionContainer_Impl& >( *m_pImpl );
}
ODefinitionContainer_Impl& getDefinitions()
{
- return dynamic_cast< ODefinitionContainer_Impl& >( *m_pImpl.get() );
+ return dynamic_cast< ODefinitionContainer_Impl& >( *m_pImpl );
}
public:
/** constructs the container.
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index eba300fc89d5..be8153ef155a 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -327,16 +327,16 @@ void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText )
SAL_INFO("oox.drawingml", "Shape::applyShapeReference: apply '" << rReferencedShape.msId << "' to '" << msId << "'");
if ( rReferencedShape.mpTextBody.get() && bUseText )
- mpTextBody = std::make_shared<TextBody>( *rReferencedShape.mpTextBody.get() );
+ mpTextBody = std::make_shared<TextBody>( *rReferencedShape.mpTextBody );
else
mpTextBody.reset();
maShapeProperties = rReferencedShape.maShapeProperties;
mpShapeRefLinePropPtr = std::make_shared<LineProperties>( rReferencedShape.getActualLineProperties(nullptr) );
mpShapeRefFillPropPtr = std::make_shared<FillProperties>( rReferencedShape.getActualFillProperties(nullptr, nullptr) );
- mpCustomShapePropertiesPtr = std::make_shared<CustomShapeProperties>( *rReferencedShape.mpCustomShapePropertiesPtr.get() );
- mpTablePropertiesPtr = table::TablePropertiesPtr( rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties( *rReferencedShape.mpTablePropertiesPtr.get() ) : nullptr );
+ mpCustomShapePropertiesPtr = std::make_shared<CustomShapeProperties>( *rReferencedShape.mpCustomShapePropertiesPtr );
+ mpTablePropertiesPtr = table::TablePropertiesPtr( rReferencedShape.mpTablePropertiesPtr.get() ? new table::TableProperties( *rReferencedShape.mpTablePropertiesPtr ) : nullptr );
mpShapeRefEffectPropPtr = std::make_shared<EffectProperties>( rReferencedShape.getActualEffectProperties(nullptr) );
- mpMasterTextListStyle = std::make_shared<TextListStyle>( *rReferencedShape.mpMasterTextListStyle.get() );
+ mpMasterTextListStyle = std::make_shared<TextListStyle>( *rReferencedShape.mpMasterTextListStyle );
maSize = rReferencedShape.maSize;
maPosition = rReferencedShape.maPosition;
mnRotation = rReferencedShape.mnRotation;
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 166e58eea05f..a051e20ea484 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1988,7 +1988,7 @@ std::shared_ptr<rptui::OReportModel> OReportDefinition::getSdrModel(const uno::R
SdrModel& OReportDefinition::getSdrModelFromUnoModel() const
{
OSL_ENSURE(m_pImpl->m_pReportModel.get(), "No SdrModel in ReportDesign, should not happen");
- return *m_pImpl->m_pReportModel.get();
+ return *m_pImpl->m_pReportModel;
}
uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWithArguments( const OUString& aServiceSpecifier, const uno::Sequence< uno::Any >& _aArgs)
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 6c8b6af013ab..84236084c00d 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -259,7 +259,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
if ( pObject )
{
// Clone to target SdrModel
- SdrObject* pNewObj(pObject->CloneSdrObject(*m_pModel.get()));
+ SdrObject* pNewObj(pObject->CloneSdrObject(*m_pModel));
m_pPage->InsertObject(pNewObj, SAL_MAX_SIZE);
tools::Rectangle aRet(VCLPoint(rCopy->getPosition()),VCLSize(rCopy->getSize()));
aRet.setHeight(aRet.getHeight() + 1);
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 0866ca17a20d..bd88c7e2224c 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -2348,7 +2348,7 @@ void XclImpOptionButtonObj::DoProcessControl( ScfPropertySet& rPropSet ) const
if ( pLeader->HasCellLink() && !pTbxObj->HasCellLink() )
{
// propagate cell link info
- pTbxObj->mxCellLink.reset( new ScAddress( *pLeader->mxCellLink.get() ) );
+ pTbxObj->mxCellLink.reset( new ScAddress( *pLeader->mxCellLink ) );
pTbxObj->ApplySheetLinkProps();
}
pTbxObj = dynamic_cast< XclImpOptionButtonObj* >( GetObjectManager().GetSheetDrawing( GetTab() ).FindDrawObj( pTbxObj->mnNextInGroup ).get() );
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index b55fb24df596..6920fee3fe1c 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -888,7 +888,7 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, SendDocumentsHdl_Impl, weld::Button&, voi
// SwMailConfigDlg writes mail merge email settings only to (global) config,
// so copy them to the existing config item
- lcl_UpdateEmailSettingsFromGlobalConfig(*xConfigItem.get());
+ lcl_UpdateEmailSettingsFromGlobalConfig(*xConfigItem);
}
//add the documents
sal_uInt32 nBegin = 0;
diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx
index cac0942546fc..27fbe4436168 100644
--- a/sw/source/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/uibase/inc/mailmergewizard.hxx
@@ -64,7 +64,7 @@ public:
virtual ~SwMailMergeWizard() override;
SwView* GetSwView() {return m_pSwView;}
- SwMailMergeConfigItem& GetConfigItem() { return *m_xConfigItem.get();}
+ SwMailMergeConfigItem& GetConfigItem() { return *m_xConfigItem;}
void SetReloadDocument(const OUString& rURL) {sDocumentURL = rURL;}
const OUString& GetReloadDocument() const {return sDocumentURL;}
generated by cgit (git 2.34.1) at 2025-02-24 16:07:07 +0000