diff options
Diffstat (limited to 'reportdesign/source/ui/report')
7 files changed, 15 insertions, 15 deletions
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index a73858fcf86a..4815dbbc412a 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -156,7 +156,7 @@ namespace rptui if ( xSection.is() ) { OReportPage *pPage = pModel->getPage(xSection); - const size_t nIndex = pPage->getIndexOf(_xFixedText.get()); + const size_t nIndex = pPage->getIndexOf(_xFixedText); if (nIndex < pPage->GetObjCount() ) { SdrObject *pObject = pPage->GetObj(nIndex); diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index ba6a0f1dd43e..eacd4a83c305 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -91,7 +91,7 @@ namespace rptui sDataField = aFormula.getEqualUndecoratedContent(); } - setPlaceholderText( getVclWindowPeer( xControlModel.get() ), sDataField ); + setPlaceholderText( getVclWindowPeer( xControlModel ), sDataField ); } } catch (const uno::Exception &) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 40cc8421c5d8..46a23a3a4f9a 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1161,7 +1161,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > if ( xFunction.is() ) { uno::Reference< report::XFunctions> xFunctions(xFunction->getParent(),uno::UNO_QUERY_THROW); - sal_Int32 nIndex = getPositionInIndexAccess(xFunctions.get(),xFunction); + sal_Int32 nIndex = getPositionInIndexAccess(xFunctions, xFunction); const OUString sUndoAction = RptResId(RID_STR_UNDO_REMOVE_FUNCTION); UndoContext aUndoContext( getUndoManager(), sUndoAction ); xFunctions->removeByIndex(nIndex); @@ -1558,7 +1558,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > uno::Reference< report::XFormattedField> xFormattedField(getDesignView()->getCurrentControlModel(),uno::UNO_QUERY); if ( xFormattedField.is() ) { - ConditionalFormattingDialog aDlg(getFrameWeld(), xFormattedField.get(), *this); + ConditionalFormattingDialog aDlg(getFrameWeld(), xFormattedField, *this); aDlg.run(); } } @@ -2560,7 +2560,7 @@ void OReportController::openSortingAndGroupingDialog() sal_Int32 OReportController::getGroupPosition(const uno::Reference< report::XGroup >& _xGroup) { - return rptui::getPositionInIndexAccess(m_xReportDefinition->getGroups().get(),_xGroup); + return rptui::getPositionInIndexAccess(m_xReportDefinition->getGroups(),_xGroup); } @@ -2951,7 +2951,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() uno::Reference< frame::XModel > SAL_CALL OReportController::getModel() { - return m_xReportDefinition.get(); + return m_xReportDefinition; } uno::Reference< sdbc::XRowSet > const & OReportController::getRowSet() @@ -2978,7 +2978,7 @@ uno::Reference< sdbc::XRowSet > const & OReportController::getRowSet() aPropertyMediation.emplace( PROPERTY_ESCAPEPROCESSING, TPropertyConverter(PROPERTY_ESCAPEPROCESSING,aNoConverter) ); aPropertyMediation.emplace( PROPERTY_FILTER, TPropertyConverter(PROPERTY_FILTER,aNoConverter) ); - m_xRowSetMediator = new OPropertyMediator( m_xReportDefinition.get(), xRowSetProp, aPropertyMediation ); + m_xRowSetMediator = new OPropertyMediator( m_xReportDefinition, xRowSetProp, aPropertyMediation ); m_xRowSet = xRowSet; } catch(const uno::Exception&) diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 79afb9c042a1..51462438897f 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -166,7 +166,7 @@ void OXReportControllerObserver::AddSection(const uno::Reference< report::XSecti OEnvLock aLock(*this); try { - uno::Reference<container::XChild> xChild = _xSection.get(); + uno::Reference<container::XChild> xChild = _xSection; m_pImpl->m_aSections.push_back(xChild); uno::Reference< uno::XInterface > xInt(_xSection); AddElement(xInt); @@ -183,7 +183,7 @@ void OXReportControllerObserver::RemoveSection(const uno::Reference< report::XSe OEnvLock aLock(*this); try { - uno::Reference<container::XChild> xChild(_xSection.get()); + uno::Reference<container::XChild> xChild(_xSection); m_pImpl->m_aSections.erase(::std::remove(m_pImpl->m_aSections.begin(),m_pImpl->m_aSections.end(), xChild), m_pImpl->m_aSections.end()); uno::Reference< uno::XInterface > xInt(_xSection); diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 313969f191cb..690e40e93892 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -164,7 +164,7 @@ void OReportSection::fill() if ( !m_xSection.is() ) return; - m_pMulti = new comphelper::OPropertyChangeMultiplexer(this,m_xSection.get()); + m_pMulti = new comphelper::OPropertyChangeMultiplexer(this,m_xSection); m_pMulti->addProperty(PROPERTY_BACKCOLOR); m_pReportListener = addStyleListener(m_xSection->getReportDefinition(),this); @@ -433,7 +433,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) return; rtl::Reference<VCLXPopupMenu> xPopupMenu(new VCLXPopupMenu); - xMenuController->setPopupMenu(xPopupMenu.get()); + xMenuController->setPopupMenu(xPopupMenu); Point aPos = _rCEvt.GetMousePosPixel(); m_pView->EndAction(); diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 8d05c77f4c00..660971395694 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -73,7 +73,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep m_aEndMarker->Show(); Show(); - m_pSectionMulti = new OPropertyChangeMultiplexer(this,_xSection.get()); + m_pSectionMulti = new OPropertyChangeMultiplexer(this,_xSection); m_pSectionMulti->addProperty(PROPERTY_NAME); m_pSectionMulti->addProperty(PROPERTY_HEIGHT); @@ -83,7 +83,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep uno::Reference< report::XGroup > xGroup(_xSection->getGroup()); if ( xGroup.is() ) { - m_pGroupMulti = new OPropertyChangeMultiplexer(this,xGroup.get()); + m_pGroupMulti = new OPropertyChangeMultiplexer(this,xGroup); m_pGroupMulti->addProperty(PROPERTY_EXPRESSION); aEvent.Source = xGroup; aEvent.PropertyName = PROPERTY_EXPRESSION; @@ -281,7 +281,7 @@ void OSectionWindow::setCollapsed(bool _bCollapsed) void OSectionWindow::showProperties() { - m_pParent->getView()->showProperties( m_aReportSection->getSection().get() ); + m_pParent->getView()->showProperties( m_aReportSection->getSection() ); } void OSectionWindow::setMarked(bool _bMark) diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 84656ded767f..3b0f4c869451 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -402,7 +402,7 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen xNameCont->insertByName("ReportComponent",uno::makeAny(_xReportComponent)); xNameCont->insertByName("RowSet",uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet()))); - return xNameCont.get(); + return xNameCont; } ::Size PropBrw::getMinimumSize() const |