diff options
Diffstat (limited to 'reportdesign/source/ui')
-rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Formula.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/GroupsSorting.cxx | 8 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/Navigator.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/inspection/DataProviderHandler.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inspection/GeometryHandler.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/misc/RptUndo.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/misc/UITools.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/FixedTextColor.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 10 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportControllerObserver.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 4 | ||||
-rw-r--r-- | reportdesign/source/ui/report/SectionWindow.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/report/propbrw.cxx | 2 |
17 files changed, 34 insertions, 34 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 790c0d700316..e7e8e1b38c18 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -73,7 +73,7 @@ OAddFieldWindow::OAddFieldWindow(weld::Window* pParent, const uno::Reference< be m_xListBox->set_help_id(HID_RPT_FIELD_SEL); m_xListBox->set_selection_mode(SelectionMode::Multiple); m_xHelper.set(new svx::OMultiColumnTransferable); - rtl::Reference<TransferDataContainer> xHelper(m_xHelper.get()); + rtl::Reference<TransferDataContainer> xHelper(m_xHelper); m_xListBox->enable_drag_source(xHelper, DND_ACTION_COPYMOVE | DND_ACTION_LINK); m_xListBox->connect_drag_begin(LINK(this, OAddFieldWindow, DragBeginHdl)); diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index f869ca0f50a7..eb827368b3fe 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -143,7 +143,7 @@ namespace rptui throw IllegalArgumentException(); Reference< XFormatCondition > xCond = m_xCopy->createFormatCondition(); - ::comphelper::copyProperties(m_xCopy.get(),xCond.get()); + ::comphelper::copyProperties(m_xCopy, xCond); m_xCopy->insertByIndex( _nNewCondIndex, makeAny( xCond ) ); auto xCon = std::make_unique<Condition>(m_xConditionPlayground.get(), m_xDialog.get(), *this, m_rController); xCon->setCondition(xCond); @@ -286,7 +286,7 @@ namespace rptui Reference< XFormatCondition > xCond( m_xCopy->getByIndex(i), UNO_QUERY ); m_xConditionPlayground->reorder_child(xCon->get_widget(), i); xCon->setCondition(xCond); - xCon->updateToolbar(xCond.get()); + xCon->updateToolbar(xCond); m_aConditions.push_back(std::move(xCon)); } } @@ -388,13 +388,13 @@ namespace rptui xNewCond.set( m_xFormatConditions->getByIndex(j), UNO_QUERY ); ++j; - ::comphelper::copyProperties(xCond.get(),xNewCond.get()); + ::comphelper::copyProperties(xCond, xNewCond); } for ( sal_Int32 k = m_xFormatConditions->getCount()-1; k >= j; --k ) m_xFormatConditions->removeByIndex(k); - ::comphelper::copyProperties( m_xCopy.get(), m_xFormatConditions.get() ); + ::comphelper::copyProperties( m_xCopy, m_xFormatConditions ); } catch ( const Exception& ) { diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 3f440f3494be..1b51d1998ac5 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -298,7 +298,7 @@ void Condition::setCondition( const uno::Reference< report::XFormatCondition >& DBG_UNHANDLED_EXCEPTION("reportdesign"); } impl_setCondition( sConditionFormula ); - updateToolbar( _rxCondition.get() ); + updateToolbar( _rxCondition ); } diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index 3bdcb2e5b5a0..f1b95f953c62 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -249,7 +249,7 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow& ,_rAddFieldDlg, void) uno::Reference< sheet::XFormulaParser> FormulaDialog::getFormulaParser() const { - return m_xParser.get(); + return m_xParser; } uno::Reference< sheet::XFormulaOpCodeMapper> FormulaDialog::getFormulaOpCodeMapper() const diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 77adb2664252..4548072ccc74 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -204,7 +204,7 @@ OFieldExpressionControl::~OFieldExpressionControl() void OFieldExpressionControl::dispose() { uno::Reference< report::XGroups > xGroups = m_pParent->getGroups(); - xGroups->removeContainerListener(aContainerListener.get()); + xGroups->removeContainerListener(aContainerListener); // delete events from queue if( m_nDeleteEvent ) @@ -384,7 +384,7 @@ void OFieldExpressionControl::lateInit() if( m_pParent->isReadOnly() ) nMode |= BrowserMode::HIDECURSOR; SetMode(nMode); - xGroups->addContainerListener(aContainerListener.get()); + xGroups->addContainerListener(aContainerListener); } else // not the first call @@ -820,7 +820,7 @@ OGroupsSortingDialog::OGroupsSortingDialog(weld::Window* pParent, bool bReadOnly for (size_t i = 0; i < SAL_N_ELEMENTS(pControlsLst) - 1; ++i) dynamic_cast<weld::ComboBox&>(*pControlsLst[i]).connect_changed(LINK(this,OGroupsSortingDialog,LBChangeHdl)); - m_pReportListener = new OPropertyChangeMultiplexer(this,m_pController->getReportDefinition().get()); + m_pReportListener = new OPropertyChangeMultiplexer(this, m_pController->getReportDefinition()); m_pReportListener->addProperty(PROPERTY_COMMAND); m_pReportListener->addProperty(PROPERTY_COMMANDTYPE); @@ -869,7 +869,7 @@ void OGroupsSortingDialog::DisplayData( sal_Int32 _nRow ) { uno::Reference< report::XGroup> xGroup = getGroup(nGroupPos); - m_pCurrentGroupListener = new OPropertyChangeMultiplexer(this,xGroup.get()); + m_pCurrentGroupListener = new OPropertyChangeMultiplexer(this, xGroup); m_pCurrentGroupListener->addProperty(PROPERTY_HEADERON); m_pCurrentGroupListener->addProperty(PROPERTY_FOOTERON); diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index d0a2a0670e81..ccda43cd6e6b 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -214,7 +214,7 @@ NavigatorTree::NavigatorTree(std::unique_ptr<weld::TreeView> xTreeView, OReportC { m_xTreeView->set_size_request(m_xTreeView->get_approximate_digit_width() * 25, m_xTreeView->get_height_rows(18)); - m_pReportListener = new OPropertyChangeMultiplexer(this,m_rController.getReportDefinition().get()); + m_pReportListener = new OPropertyChangeMultiplexer(this,m_rController.getReportDefinition()); m_pReportListener->addProperty(PROPERTY_PAGEHEADERON); m_pReportListener->addProperty(PROPERTY_PAGEFOOTERON); m_pReportListener->addProperty(PROPERTY_REPORTHEADERON); @@ -397,7 +397,7 @@ void NavigatorTree::traverseSection(const uno::Reference<report::XSection>& xSec for (sal_Int32 i = 0; i < nCount; ++i) { uno::Reference< report::XReportComponent> xElement(xSection->getByIndex(i), uno::UNO_QUERY_THROW); - insertEntry(lcl_getName(xElement.get()), xSectionIter.get(), lcl_getImageId(xElement), -1, new UserData(this, xElement), *xScratch); + insertEntry(lcl_getName(xElement), xSectionIter.get(), lcl_getImageId(xElement), -1, new UserData(this, xElement), *xScratch); uno::Reference< report::XReportDefinition> xSubReport(xElement,uno::UNO_QUERY); if ( xSubReport.is() ) { @@ -516,7 +516,7 @@ void NavigatorTree::traverseGroup(const uno::Reference< report::XGroup>& xGroup) if (!bGroups) xGroupsIter.reset(); std::unique_ptr<weld::TreeIter> xScratch = m_xTreeView->make_iterator(); - insertEntry(xGroup->getExpression(), xGroupsIter.get(), RID_SVXBMP_GROUP, rptui::getPositionInIndexAccess(xGroups.get(),xGroup), new UserData(this,xGroup), *xScratch); + insertEntry(xGroup->getExpression(), xGroupsIter.get(), RID_SVXBMP_GROUP, rptui::getPositionInIndexAccess(xGroups,xGroup), new UserData(this,xGroup), *xScratch); } void NavigatorTree::traverseGroupFunctions(const uno::Reference< report::XFunctions>& xFunctions) diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 9f22c4e5ae35..bcc6be58ff29 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -132,7 +132,7 @@ void SAL_CALL DataProviderHandler::inspect(const uno::Reference< uno::XInterface aPropertyMediation.emplace( PROPERTY_MASTERFIELDS, TPropertyConverter(PROPERTY_MASTERFIELDS,aNoConverter) ); aPropertyMediation.emplace( PROPERTY_DETAILFIELDS, TPropertyConverter(PROPERTY_DETAILFIELDS,aNoConverter) ); - m_xMasterDetails = new OPropertyMediator( m_xDataProvider.get(), m_xReportComponent.get(), aPropertyMediation,true ); + m_xMasterDetails = new OPropertyMediator( m_xDataProvider, m_xReportComponent, aPropertyMediation,true ); } } catch(const uno::Exception &) diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 52a2d46320e4..9ac2957f356e 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -128,7 +128,7 @@ void lcl_collectFunctionNames(const uno::Reference< report::XSection>& _xSection sal_Int32 nPos = -1; uno::Reference< report::XGroup> xGroup = _xSection->getGroup(); if ( xGroup.is() ) - nPos = getPositionInIndexAccess(xGroups.get(),xGroup); + nPos = getPositionInIndexAccess(xGroups,xGroup); else if ( _xSection == xReportDefinition->getDetail() ) nPos = xGroups->getCount()-1; @@ -1703,7 +1703,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out sal_Int32 nPos = -1; uno::Reference< report::XGroup> xGroup = xSection->getGroup(); if ( xGroup.is() ) - nPos = getPositionInIndexAccess(xGroups.get(),xGroup); + nPos = getPositionInIndexAccess(xGroups,xGroup); else if ( xSection == xReportDefinition->getDetail() ) nPos = xGroups->getCount()-1; diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index be280a8368f2..c2a07a4d0f92 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -323,7 +323,7 @@ OGroupUndo::OGroupUndo(OReportModel& _rMod ,m_xReportDefinition(_xReportDefinition) ,m_eAction(_eAction) { - m_nLastPosition = getPositionInIndexAccess(m_xReportDefinition->getGroups().get(),m_xGroup); + m_nLastPosition = getPositionInIndexAccess(m_xReportDefinition->getGroups(),m_xGroup); } void OGroupUndo::implReInsert( ) diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 10a7197582d5..3a96710a2a5b 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -695,7 +695,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep new SvxEscapementItem(ITEMID_ESCAPEMENT), new SvxFontListItem(pFontList.get(),ITEMID_FONTLIST), new SvxAutoKernItem(false,ITEMID_AUTOKERN), - new SvxColorListItem(pColorList.get(),ITEMID_COLOR_TABLE), + new SvxColorListItem(pColorList,ITEMID_COLOR_TABLE), new SvxBlinkItem(false,ITEMID_BLINK), new SvxEmphasisMarkItem(FontEmphasisMark::NONE,ITEMID_EMPHASISMARK), new SvxTwoLinesItem(true,0,0,ITEMID_TWOLINES), 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 |