summaryrefslogtreecommitdiff
path: root/reportdesign/source/filter/xml
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/source/filter/xml')
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx22
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx26
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFormatCondition.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFormattedField.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImage.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlReport.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlReportElement.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlReportElementBase.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlSubDocument.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlTable.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx2
14 files changed, 44 insertions, 44 deletions
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index adfac9d59cc6..431b02ea6da0 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -114,9 +114,9 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLCell::createFastCh
Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
- setComponent(xControl.get());
+ setComponent(xControl);
if ( xControl.is() )
- xContext = new OXMLFormattedField( rImport,xAttrList,xControl.get(),m_pContainer, false);
+ xContext = new OXMLFormattedField( rImport,xAttrList,xControl,m_pContainer, false);
}
break;
case XML_ELEMENT(REPORT, XML_IMAGE):
@@ -125,9 +125,9 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLCell::createFastCh
Reference< XImageControl > xControl(xFactor->createInstance(SERVICE_IMAGECONTROL),uno::UNO_QUERY);
OSL_ENSURE(xControl.is(),"Could not create ImageControl!");
- setComponent(xControl.get());
+ setComponent(xControl);
if ( xControl.is() )
- xContext = new OXMLImage( rImport,xAttrList,xControl.get(),m_pContainer);
+ xContext = new OXMLImage( rImport,xAttrList,xControl,m_pContainer);
}
break;
case XML_ELEMENT(REPORT, XML_SUB_DOCUMENT):
@@ -137,7 +137,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLCell::createFastCh
m_nCurrentCount = m_pContainer->getSection()->getCount();
uno::Reference< uno::XInterface> xInt = xFactor->createInstance(SERVICE_FORMATTEDFIELD);
Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
- xContext = new OXMLSubDocument( rImport,xControl.get(),m_pContainer, this /* give the current cell as parent*/ );
+ xContext = new OXMLSubDocument( rImport,xControl,m_pContainer, this /* give the current cell as parent*/ );
}
break;
@@ -150,7 +150,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLCell::createFastCh
{
if ( !m_bContainsShape )
m_nCurrentCount = m_pContainer->getSection()->getCount();
- uno::Reference< drawing::XShapes > xShapes = m_pContainer->getSection().get();
+ uno::Reference< drawing::XShapes > xShapes = m_pContainer->getSection();
xContext = XMLShapeImportHelper::CreateGroupChildContext(rImport,nElement,xAttrList,xShapes);
m_bContainsShape = true;
}
@@ -175,7 +175,7 @@ void OXMLCell::endFastElement(sal_Int32)
{
uno::Reference<report::XShape> xShape(m_pContainer->getSection()->getByIndex(i),uno::UNO_QUERY);
if ( xShape.is() )
- m_pContainer->addCell(xShape.get());
+ m_pContainer->addCell(xShape);
}
}
if ( m_pCell != this && !m_sText.isEmpty() )
@@ -187,9 +187,9 @@ void OXMLCell::endFastElement(sal_Int32)
xControl->setDataField("rpt:" + m_sText);
OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
- setComponent(xControl.get());
+ setComponent(xControl);
m_xComponent = xControl.get();
- m_pContainer->getSection()->add(m_xComponent.get());
+ m_pContainer->getSection()->add(m_xComponent);
m_pContainer->addCell(m_xComponent);
}
// check if we have a FixedLine
@@ -199,7 +199,7 @@ void OXMLCell::endFastElement(sal_Int32)
Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY);
Reference<XFixedLine> xFixedLine(xFactor->createInstance(SERVICE_FIXEDLINE),uno::UNO_QUERY);
m_xComponent = xFixedLine.get();
- m_pContainer->getSection()->add(m_xComponent.get());
+ m_pContainer->getSection()->add(m_xComponent);
m_pContainer->addCell(m_xComponent);
XMLPropStyleContext* pAutoStyle = const_cast<XMLPropStyleContext*>(dynamic_cast< const XMLPropStyleContext* >(GetImport().GetAutoStyles()->FindStyleChildContext(XmlStyleFamily::TABLE_CELL,m_sStyleName)));
if ( pAutoStyle )
@@ -222,7 +222,7 @@ void OXMLCell::endFastElement(sal_Int32)
}
}
else
- OXMLHelper::copyStyleElements(GetOwnImport().isOldFormat(),m_sStyleName,GetImport().GetAutoStyles(),m_xComponent.get());
+ OXMLHelper::copyStyleElements(GetOwnImport().isOldFormat(),m_sStyleName,GetImport().GetAutoStyles(),m_xComponent);
}
ORptFilter& OXMLCell::GetOwnImport()
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index a830c173b74d..790afe812df1 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -333,7 +333,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini
if ( !_xReportDefinition.is() )
return;
- exportFunctions(_xReportDefinition->getFunctions().get());
+ exportFunctions(_xReportDefinition->getFunctions());
exportGroupsExpressionAsFunction(_xReportDefinition->getGroups());
if ( _xReportDefinition->getReportHeaderOn() )
@@ -432,7 +432,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep
// only export when parent exists
uno::Reference< report::XSection> xParent(_xReportElement->getParent(),uno::UNO_QUERY);
if ( xParent.is() )
- exportComponent(_xReportElement.get());
+ exportComponent(_xReportElement);
}
static void lcl_calculate(const ::std::vector<sal_Int32>& _aPosX,const ::std::vector<sal_Int32>& _aPosY,ORptExport::TGrid& _rColumns)
@@ -657,9 +657,9 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr
if ( xShape.is() )
{
rtl::Reference< XMLShapeExport > xShapeExport = GetShapeExport();
- xShapeExport->seekShapes(_xProp.get());
+ xShapeExport->seekShapes(_xProp);
SolarMutexGuard aGuard;
- xShapeExport->collectShapeAutoStyles(xShape.get());
+ xShapeExport->collectShapeAutoStyles(xShape);
}
else
{
@@ -727,7 +727,7 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader
void ORptExport::exportTableColumns(const Reference< XSection>& _xSection)
{
SvXMLElementExport aColumns(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, true, true);
- TGridStyleMap::const_iterator aColFind = m_aColumnStyleNames.find(_xSection.get());
+ TGridStyleMap::const_iterator aColFind = m_aColumnStyleNames.find(_xSection);
OSL_ENSURE(aColFind != m_aColumnStyleNames.end(),"ORptExport::exportTableColumns: Section not found in m_aColumnStyleNames!");
if ( aColFind == m_aColumnStyleNames.end() )
return;
@@ -745,14 +745,14 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
exportTableColumns(_xSection);
- TSectionsGrid::const_iterator aFind = m_aSectionsGrid.find(_xSection.get());
+ TSectionsGrid::const_iterator aFind = m_aSectionsGrid.find(_xSection);
OSL_ENSURE(aFind != m_aSectionsGrid.end(),"ORptExport::exportContainer: Section not found in grid!");
if ( aFind == m_aSectionsGrid.end() )
return;
TGrid::const_iterator aRowIter = aFind->second.begin();
TGrid::const_iterator aRowEnd = aFind->second.end();
- TGridStyleMap::const_iterator aRowFind = m_aRowStyleNames.find(_xSection.get());
+ TGridStyleMap::const_iterator aRowFind = m_aRowStyleNames.find(_xSection);
auto aHeightIter = aRowFind->second.cbegin();
OSL_ENSURE(aRowFind->second.size() == aFind->second.size(),"Different count for rows");
@@ -1061,7 +1061,7 @@ void ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinit
AddAttribute(XML_NAMESPACE_REPORT, XML_KEEP_TOGETHER,sValue.makeStringAndClear());
SvXMLElementExport aGroup(*this,XML_NAMESPACE_REPORT, XML_GROUP, true, true);
- exportFunctions(xGroup->getFunctions().get());
+ exportFunctions(xGroup->getFunctions());
if ( xGroup->getHeaderOn() )
{
Reference<XSection> xSection = xGroup->getHeader();
@@ -1219,7 +1219,7 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
void ORptExport::exportAutoStyle(const Reference<XSection>& _xProp)
{
- ::std::vector< XMLPropertyState > aPropertyStates( m_xTableStylesExportPropertySetMapper->Filter(_xProp.get()) );
+ ::std::vector< XMLPropertyState > aPropertyStates( m_xTableStylesExportPropertySetMapper->Filter(_xProp) );
if ( !aPropertyStates.empty() )
m_aAutoStyleNames.emplace( _xProp.get(),GetAutoStylePool()->Add( XmlStyleFamily::TABLE_TABLE, aPropertyStates ));
}
@@ -1409,7 +1409,7 @@ XMLShapeExport* ORptExport::CreateShapeExport()
void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph)
{
rtl::Reference< XMLShapeExport > xShapeExport = GetShapeExport();
- xShapeExport->seekShapes(_xSection.get());
+ xShapeExport->seekShapes(_xSection);
const sal_Int32 nCount = _xSection->getCount();
::std::unique_ptr<SvXMLElementExport> pParagraphContent;
if ( _bAddParagraph )
@@ -1427,12 +1427,12 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa
if ( xModel.is() ) // special handling for chart object
{
pSubDocument.reset(new SvXMLElementExport(*this,XML_NAMESPACE_REPORT, XML_SUB_DOCUMENT, false, false));
- exportMasterDetailFields(xShape.get());
- exportReportElement(xShape.get());
+ exportMasterDetailFields(xShape);
+ exportReportElement(xShape);
}
AddAttribute( XML_NAMESPACE_TEXT, XML_ANCHOR_TYPE, XML_PARAGRAPH );
- xShapeExport->exportShape(xShape.get(), SEF_DEFAULT|XMLShapeExportFlags::NO_WS,&aRefPoint);
+ xShapeExport->exportShape(xShape, SEF_DEFAULT|XMLShapeExportFlags::NO_WS,&aRefPoint);
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index b461787b08ae..7bd9e8d1bbe3 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -286,7 +286,7 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >
throw uno::Exception("no active connection", nullptr);
uno::Reference< reflection::XProxyFactory > xProxyFactory = reflection::ProxyFactory::create( m_xContext );
- m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get());
+ m_xProxy = xProxyFactory->createProxy(m_xDelegatee);
::comphelper::query_aggregation(m_xProxy,m_xDelegatee);
m_xTypeProvider.set(m_xDelegatee,uno::UNO_QUERY);
m_xServiceInfo.set(m_xDelegatee,uno::UNO_QUERY);
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index 63aae9301105..2e90c98e2dc2 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -76,7 +76,7 @@ OXMLFormatCondition::~OXMLFormatCondition()
void OXMLFormatCondition::endFastElement(sal_Int32 )
{
- OXMLHelper::copyStyleElements(m_rImport.isOldFormat(),m_sStyleName,GetImport().GetAutoStyles(),m_xComponent.get());
+ OXMLHelper::copyStyleElements(m_rImport.isOldFormat(),m_sStyleName,GetImport().GetAutoStyles(),m_xComponent);
}
} // namespace rptxml
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index b453dbc4da79..ad84810e8cdb 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -35,7 +35,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport
,const uno::Reference< XFormattedField > & _xComponent
,OXMLTable* _pContainer
,bool _bPageCount) :
- OXMLReportElementBase( rImport,_xComponent.get(),_pContainer)
+ OXMLReportElementBase( rImport,_xComponent,_pContainer)
{
OSL_ENSURE(m_xReportComponent.is(),"Component is NULL!");
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index e4b6c4d23bd1..1c8681494217 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -186,7 +186,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLGroup::createFastC
case XML_ELEMENT(REPORT, XML_FUNCTION):
{
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- xContext = new OXMLFunction( rImport,xAttrList,m_xGroup.get());
+ xContext = new OXMLFunction( rImport,xAttrList,m_xGroup);
}
break;
case XML_ELEMENT(REPORT, XML_GROUP_HEADER):
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index c9e1aeea5e8f..c4310d3a8a52 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -40,7 +40,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
const Reference< XFastAttributeList > & _xAttrList
,const Reference< XImageControl > & _xComponent
,OXMLTable* _pContainer) :
- OXMLReportElementBase( rImport,_xComponent.get(),_pContainer)
+ OXMLReportElementBase( rImport,_xComponent,_pContainer)
{
OSL_ENSURE(m_xReportComponent.is(),"Component is NULL!");
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index d9e761c2466c..89e43259f929 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -139,7 +139,7 @@ void SAL_CALL ImportDocumentHandler::endDocument()
aArgs.put( "ColumnDescriptions", uno::makeAny( aColumnNames ) );
}
- xReceiver->attachDataProvider( m_xDatabaseDataProvider.get() );
+ xReceiver->attachDataProvider( m_xDatabaseDataProvider );
xReceiver->setArguments( aArgs.getPropertyValues() );
}
@@ -346,13 +346,13 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >
m_xDatabaseDataProvider->setRowLimit(10);
uno::Reference< chart2::data::XDataReceiver > xReceiver(m_xModel,uno::UNO_QUERY_THROW);
- xReceiver->attachDataProvider(m_xDatabaseDataProvider.get());
+ xReceiver->attachDataProvider(m_xDatabaseDataProvider);
}
m_aArguments = m_xDatabaseDataProvider->detectArguments(nullptr);
uno::Reference< reflection::XProxyFactory > xProxyFactory = reflection::ProxyFactory::create( m_xContext );
- m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get());
+ m_xProxy = xProxyFactory->createProxy(m_xDelegatee);
::comphelper::query_aggregation(m_xProxy,m_xDelegatee);
m_xTypeProvider.set(m_xDelegatee,uno::UNO_QUERY);
m_xServiceInfo.set(m_xDelegatee,uno::UNO_QUERY);
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 86347b1ef2b9..148b56b02e87 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -42,7 +42,7 @@ namespace rptxml
OXMLReport::OXMLReport( ORptFilter& rImport,
const Reference< css::xml::sax::XFastAttributeList > & _xAttrList
,const uno::Reference< report::XReportDefinition >& _xComponent) :
- OXMLReportElementBase( rImport, _xComponent.get(),nullptr)
+ OXMLReportElementBase( rImport, _xComponent,nullptr)
,m_xReportDefinition(_xComponent)
{
OSL_ENSURE(m_xReportDefinition.is(),"No Report definition!");
@@ -131,7 +131,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLReport::createFast
case XML_ELEMENT(REPORT, XML_FUNCTION):
{
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- xContext = new OXMLFunction( m_rImport,xAttrList,m_xReportDefinition.get(),true);
+ xContext = new OXMLFunction( m_rImport,xAttrList,m_xReportDefinition,true);
}
break;
case XML_ELEMENT(REPORT, XML_MASTER_DETAIL_FIELDS):
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index e488fb50a41c..ea1871d7f655 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -85,11 +85,11 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLReportElement::cre
{
case XML_ELEMENT(REPORT, XML_REPORT_COMPONENT):
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- xContext = new OXMLComponent( rImport,xAttrList,m_xComponent.get());
+ xContext = new OXMLComponent( rImport,xAttrList,m_xComponent);
break;
case XML_ELEMENT(REPORT, XML_CONDITIONAL_PRINT_EXPRESSION):
rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- xContext = new OXMLCondPrtExpr( rImport,xAttrList,m_xComponent.get());
+ xContext = new OXMLCondPrtExpr( rImport,xAttrList,m_xComponent);
break;
case XML_ELEMENT(REPORT, XML_FORMAT_CONDITION):
{
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index 590af5a2f687..ff5e17d0b6eb 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -69,7 +69,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLReportElementBase:
break;
case XML_ELEMENT(FORM, XML_PROPERTIES):
m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
- xContext = new OXMLControlProperty( m_rImport,xAttrList,m_xReportComponent.get());
+ xContext = new OXMLControlProperty( m_rImport,xAttrList,m_xReportComponent);
break;
default:
break;
@@ -83,7 +83,7 @@ void OXMLReportElementBase::endFastElement(sal_Int32 )
try
{
if ( m_pContainer && m_pContainer->getSection().is() && m_xReportComponent.is() )
- m_pContainer->getSection()->add(m_xReportComponent.get());
+ m_pContainer->getSection()->add(m_xReportComponent);
}
catch(Exception&)
{
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index f77f1392aad9..ab99212f9697 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -41,7 +41,7 @@ OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport
,const Reference< XReportComponent > & _xComponent
,OXMLTable* _pContainer
,OXMLCell* _pCellParent) :
- OXMLReportElementBase( rImport,_xComponent.get(),_pContainer)
+ OXMLReportElementBase( rImport,_xComponent,_pContainer)
,m_xFake(_xComponent)
,m_pCellParent(_pCellParent)
,m_nCurrentCount(0)
@@ -81,7 +81,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLSubDocument::creat
{
if ( !m_bContainsShape )
m_nCurrentCount = m_pContainer->getSection()->getCount();
- uno::Reference< drawing::XShapes > xShapes = m_pContainer->getSection().get();
+ uno::Reference< drawing::XShapes > xShapes = m_pContainer->getSection();
xContext = XMLShapeImportHelper::CreateGroupChildContext(GetImport(),nElement,xAttrList,xShapes);
m_bContainsShape = true;
if (m_pCellParent)
@@ -128,7 +128,7 @@ void OXMLSubDocument::endFastElement(sal_Int32 )
{
uno::Reference< report::XFormatCondition > xCond(xFakeModel->getByIndex(i),uno::UNO_QUERY);
uno::Reference< report::XFormatCondition > xNewCond = xComponentModel->createFormatCondition();
- ::comphelper::copyProperties(xCond.get(),xNewCond.get());
+ ::comphelper::copyProperties(xCond, xNewCond);
xComponentModel->insertByIndex(xComponentModel->getCount(),uno::makeAny(xNewCond));
}
}
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 719b169f310b..130b5d6b7394 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -135,7 +135,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > OXMLTable::createFastC
xContext = new OXMLRowColumn( rImport,xAttrList,this);
break;
case XML_ELEMENT(REPORT, XML_CONDITIONAL_PRINT_EXPRESSION):
- xContext = new OXMLCondPrtExpr( rImport,xAttrList,m_xSection.get());
+ xContext = new OXMLCondPrtExpr( rImport,xAttrList,m_xSection);
break;
default:
break;
@@ -163,7 +163,7 @@ void OXMLTable::endFastElement(sal_Int32 )
XMLPropStyleContext* pAutoStyle = const_cast<XMLPropStyleContext*>(dynamic_cast< const XMLPropStyleContext *>(pAutoStyles->FindStyleChildContext(XmlStyleFamily::TABLE_TABLE,m_sStyleName)));
if ( pAutoStyle )
{
- pAutoStyle->FillPropertySet(m_xSection.get());
+ pAutoStyle->FillPropertySet(m_xSection);
}
}
}
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 8406723095be..c8b1d764a1ea 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -594,7 +594,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler > RptXMLDocumentBodyCont
XMLPropStyleContext* pAutoStyle = const_cast<XMLPropStyleContext*>(dynamic_cast<const XMLPropStyleContext *>(pAutoStyles->FindStyleChildContext(XmlStyleFamily::PAGE_MASTER, "pm1")));
if (pAutoStyle)
{
- pAutoStyle->FillPropertySet(rImport.getReportDefinition().get());
+ pAutoStyle->FillPropertySet(rImport.getReportDefinition());
}
}
return new OXMLReport(rImport, xAttrList, rImport.getReportDefinition());