diff options
Diffstat (limited to 'reportdesign/source/ui/report')
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 60 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 6 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/dlgedfac.cxx | 10 | ||||
-rw-r--r-- | reportdesign/source/ui/report/dlgedfunc.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/propbrw.cxx | 26 |
6 files changed, 53 insertions, 53 deletions
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 8d1fdd31e75d..c8b4a2c5aba9 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -265,13 +265,13 @@ static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs, //------------------------------------------------------------------------------ ::rtl::OUString OReportController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.comp.ReportDesign")); + return ::rtl::OUString("com.sun.star.report.comp.ReportDesign"); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ReportDesign")); + aSupported.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.ReportDesign"); return aSupported; } //------------------------------------------------------------------------- @@ -314,9 +314,9 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon m_pReportControllerObserver = new OXReportControllerObserver(*this); m_pReportControllerObserver->acquire(); - m_sMode = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal")); + m_sMode = ::rtl::OUString("normal"); DBG_CTOR( rpt_OReportController,NULL); - registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ZoomValue")),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0))); + registerProperty(::rtl::OUString("ZoomValue"),PROPERTY_ID_ZOOMVALUE,beans::PropertyAttribute::BOUND| beans::PropertyAttribute::TRANSIENT,&m_nZoomValue,::getCppuType(static_cast< sal_Int16*>(0))); } // ----------------------------------------------------------------------------- @@ -1368,22 +1368,22 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > switch(_nId) { case SID_DRAWTBX_CS_SYMBOL: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("smiley")); + sType = ::rtl::OUString("smiley"); break; case SID_DRAWTBX_CS_ARROW: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("left-right-arrow")); + sType = ::rtl::OUString("left-right-arrow"); break; case SID_DRAWTBX_CS_FLOWCHART: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("flowchart-internal-storage")); + sType = ::rtl::OUString("flowchart-internal-storage"); break; case SID_DRAWTBX_CS_CALLOUT: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("round-rectangular-callout")); + sType = ::rtl::OUString("round-rectangular-callout"); break; case SID_DRAWTBX_CS_STAR: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("star5")); + sType = ::rtl::OUString("star5"); break; default: - sType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond")); + sType = ::rtl::OUString("diamond"); } } else @@ -1687,7 +1687,7 @@ void OReportController::impl_initialize( ) UndoSuppressor aSuppressUndo( getUndoManager() ); ::comphelper::NamedValueCollection aArgs(getModel()->getArgs()); - setMode(aArgs.getOrDefault("Mode", ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal")))); + setMode(aArgs.getOrDefault("Mode", ::rtl::OUString("normal"))); listen(true); setEditable( !m_aReportModel->IsReadOnly() ); @@ -1696,7 +1696,7 @@ void OReportController::impl_initialize( ) ::comphelper::MediaDescriptor aDescriptor( m_xReportDefinition->getArgs() ); ::rtl::OUString sHierarchicalDocumentName; - sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),sHierarchicalDocumentName); + sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault(::rtl::OUString("HierarchicalDocumentName"),sHierarchicalDocumentName); if ( sHierarchicalDocumentName.isEmpty() && getConnection().is() ) { @@ -1747,7 +1747,7 @@ void OReportController::impl_initialize( ) if ( m_bShowProperties && m_nPageNum == -1 ) { - m_sLastActivePage = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data")); + m_sLastActivePage = ::rtl::OUString("Data"); getDesignView()->setCurrentPage(m_sLastActivePage); uno::Sequence< beans::PropertyValue> aArgs; executeUnChecked(SID_SELECT_REPORT,aArgs); @@ -2111,14 +2111,14 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _ if ( _xLayoutManager.is() ) { static const ::rtl::OUString s_sMenu[] = { - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/statusbar/statusbar")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/reportcontrols")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/drawbar")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/Formatting")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/alignmentbar")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/sectionalignmentbar")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/resizebar")) - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/toolbar/sectionshrinkbar")) + ::rtl::OUString("private:resource/statusbar/statusbar") + ,::rtl::OUString("private:resource/toolbar/reportcontrols") + ,::rtl::OUString("private:resource/toolbar/drawbar") + ,::rtl::OUString("private:resource/toolbar/Formatting") + ,::rtl::OUString("private:resource/toolbar/alignmentbar") + ,::rtl::OUString("private:resource/toolbar/sectionalignmentbar") + ,::rtl::OUString("private:resource/toolbar/resizebar") + ,::rtl::OUString("private:resource/toolbar/sectionshrinkbar") }; for (size_t i = 0; i< sizeof(s_sMenu)/sizeof(s_sMenu[0]); ++i) { @@ -2799,10 +2799,10 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( if ( getView() ) { util::URL aCommand; - aCommand.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ) + *commandName; + aCommand.Complete = ::rtl::OUString( ".uno:" ) + *commandName; Sequence< PropertyValue > aCommandArgs(1); - aCommandArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Value" ) ); + aCommandArgs[0].Name = ::rtl::OUString( "Value" ); aCommandArgs[0].Value = rCommandValue; executeUnChecked( aCommand, aCommandArgs ); @@ -2890,7 +2890,7 @@ uno::Reference<frame::XModel> OReportController::executeReport() if ( !m_bShowProperties ) executeUnChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue>()); - m_sLastActivePage = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data")); + m_sLastActivePage = ::rtl::OUString("Data"); getDesignView()->setCurrentPage(m_sLastActivePage); nCommand = SID_SELECT_REPORT; } @@ -3150,7 +3150,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co xShapeProp.set(pNewControl->getUnoShape(),uno::UNO_QUERY); ::rtl::OUString sCustomShapeType = getDesignView()->GetInsertObjString(); if ( sCustomShapeType.isEmpty() ) - sCustomShapeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diamond")); + sCustomShapeType = ::rtl::OUString("diamond"); pSectionWindow->getReportSection().createDefault(sCustomShapeType,pNewControl); pNewControl->SetLogicRect(Rectangle(3000,500,6000,3500)); // switch height and width } @@ -3334,7 +3334,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) } ::svx::ODataAccessDescriptor aDescriptor(aValue); SequenceAsHashMap aMap(aValue); - uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Section")),xCurrentSection); + uno::Reference<report::XSection> xSection = aMap.getUnpackedValueOrDefault(::rtl::OUString("Section"),xCurrentSection); uno::Reference<report::XReportDefinition> xReportDefinition = xSection->getReportDefinition(); getDesignView()->setMarked(xSection,sal_True); @@ -3346,7 +3346,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) aPos.X = nLeftMargin; // LLA: new feature, add the Label in dependency of the given DND_ACTION one section up, normal or one section down - sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction")), sal_Int8(0)); + sal_Int8 nDNDAction = aMap.getUnpackedValueOrDefault(::rtl::OUString("DNDAction"), sal_Int8(0)); pSectionWindow[1] = pSectionWindow[0]; sal_Bool bLabelAboveTextField = nDNDAction == DND_ACTION_COPY; if ( bLabelAboveTextField || nDNDAction == DND_ACTION_LINK ) @@ -3419,7 +3419,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs) { uno::Reference< beans::XPropertySet > xParamCol( xParams->getByIndex(i), uno::UNO_QUERY_THROW ); ::rtl::OUString sParamName; - OSL_VERIFY( xParamCol->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) ) >>= sParamName ); + OSL_VERIFY( xParamCol->getPropertyValue( ::rtl::OUString( "Name" ) ) >>= sParamName ); if ( sParamName == sColumnName ) { xField = xParamCol; @@ -4066,8 +4066,8 @@ void SAL_CALL OReportController::setMode( const ::rtl::OUString& aMode ) throw ( } ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OReportController::getSupportedModes( ) throw (::com::sun::star::uno::RuntimeException) { - static ::rtl::OUString s_sModes[] = { ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("remote")), - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("normal")) }; + static ::rtl::OUString s_sModes[] = { ::rtl::OUString("remote"), + ::rtl::OUString("normal") }; return uno::Sequence< ::rtl::OUString> (&s_sModes[0],sizeof(s_sModes)/sizeof(s_sModes[0])); } ::sal_Bool SAL_CALL OReportController::supportsMode( const ::rtl::OUString& aMode ) throw (::com::sun::star::uno::RuntimeException) diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 40a8433178c8..13eb3a5e5454 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -492,7 +492,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt ) if ( nId == SID_ATTR_CHAR_COLOR_BACKGROUND ) { aArgs.realloc(1); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Selection")); + aArgs[0].Name = ::rtl::OUString("Selection"); aArgs[0].Value <<= m_xSection; } rController.executeChecked(nId,aArgs); @@ -833,10 +833,10 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt ) aCurrent[nLength].Name = PROPERTY_POSITION; aCurrent[nLength++].Value <<= AWTPoint(aDropPos); // give also the DND Action (Shift|Ctrl) Key to really say what we want - aCurrent[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DNDAction")); + aCurrent[nLength].Name = ::rtl::OUString("DNDAction"); aCurrent[nLength++].Value <<= _rEvt.mnAction; - aCurrent[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Section")); + aCurrent[nLength].Name = ::rtl::OUString("Section"); aCurrent[nLength++].Value <<= getSection(); pIter->Value <<= aCurrent; } diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 5440a78fee2f..39bb7e9a8a0f 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1017,7 +1017,7 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _ if ( &rView != &_rSection ) { - SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText"))); + SdrObject *pNewObj = new SdrUnoObj(::rtl::OUString("com.sun.star.form.component.FixedText")); if (pNewObj) { pNewObj->SetLogicRect(_aRect); diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index b2da2c0ffff1..9d7f52c31f9c 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -54,24 +54,24 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) { case OBJ_DLG_FIXEDTEXT: pObjFactory->pNewObj = new OUnoObject( SERVICE_FIXEDTEXT - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")) + ,::rtl::OUString("com.sun.star.form.component.FixedText") ,OBJ_DLG_FIXEDTEXT); break; case OBJ_DLG_IMAGECONTROL: pObjFactory->pNewObj = new OUnoObject( SERVICE_IMAGECONTROL - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")) + ,::rtl::OUString("com.sun.star.form.component.DatabaseImageControl") ,OBJ_DLG_IMAGECONTROL); break; case OBJ_DLG_FORMATTEDFIELD: pObjFactory->pNewObj = new OUnoObject( SERVICE_FORMATTEDFIELD - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")) + ,::rtl::OUString("com.sun.star.form.component.FormattedField") ,OBJ_DLG_FORMATTEDFIELD); break; case OBJ_DLG_VFIXEDLINE: case OBJ_DLG_HFIXEDLINE: { OUnoObject* pObj = new OUnoObject( SERVICE_FIXEDLINE - ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlFixedLineModel")) + ,::rtl::OUString("com.sun.star.awt.UnoControlFixedLineModel") ,pObjFactory->nIdentifier); pObjFactory->pNewObj = pObj; if ( pObjFactory->nIdentifier == OBJ_DLG_HFIXEDLINE ) @@ -88,7 +88,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) pObjFactory->pNewObj = new OOle2Obj(SERVICE_REPORTDEFINITION,OBJ_DLG_SUBREPORT); break; case OBJ_OLE2: - pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument")),OBJ_OLE2); + pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString("com.sun.star.chart2.ChartDocument"),OBJ_OLE2); break; default: OSL_FAIL("Unknown object id"); diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 3b044fa6d2c1..6805f5e496dc 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -182,7 +182,7 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt ) if ( m_pParent->GetMode() != RPTUI_READONLY ) { uno::Sequence<beans::PropertyValue> aArgs(1); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowProperties")); + aArgs[0].Name = ::rtl::OUString("ShowProperties"); aArgs[0].Value <<= sal_True; m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs); m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView); diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 213a3985cd7a..73bfcd6aba6b 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -107,11 +107,11 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen try { // create a frame wrapper for myself - m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame"))), UNO_QUERY); + m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString("com.sun.star.frame.Frame")), UNO_QUERY); if (m_xMeAsFrame.is()) { m_xMeAsFrame->initialize( VCLUnoHelper::GetInterface ( this ) ); - m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("report property browser"))); // change name! + m_xMeAsFrame->setName(::rtl::OUString("report property browser")); // change name! } } catch (Exception&) @@ -129,9 +129,9 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen { ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( m_pDesignView->getController().getModel() )), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( VCLUnoHelper::GetInterface ( this ) )), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) ), makeAny( m_pDesignView->getController().getConnection() ) ), + ::cppu::ContextEntry_Init( ::rtl::OUString( "ContextDocument" ), makeAny( m_pDesignView->getController().getModel() )), + ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( VCLUnoHelper::GetInterface ( this ) )), + ::cppu::ContextEntry_Init( ::rtl::OUString( "ActiveConnection" ), makeAny( m_pDesignView->getController().getConnection() ) ), }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), @@ -199,9 +199,9 @@ PropBrw::~PropBrw() uno::Reference<container::XNameContainer> xName(m_xInspectorContext,uno::UNO_QUERY); if ( xName.is() ) { - const ::rtl::OUString pProps[] = { ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ) - , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ) - , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ) )}; + const ::rtl::OUString pProps[] = { ::rtl::OUString( "ContextDocument" ) + , ::rtl::OUString( "DialogParentWindow" ) + , ::rtl::OUString( "ActiveConnection" )}; for (size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i) xName->removeByName(pProps[i]); } @@ -348,7 +348,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> aName = String(ModuleRes(RID_STR_BRWTITLE_PROPERTIES)); uno::Reference< container::XNameContainer > xNameCont(_aObjects[0],uno::UNO_QUERY); - Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent"))), UNO_QUERY ); + Reference< lang::XServiceInfo > xServiceInfo( xNameCont->getByName(::rtl::OUString("ReportComponent")), UNO_QUERY ); if ( xServiceInfo.is() ) { sal_uInt16 nResId = 0; @@ -419,9 +419,9 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen ,const uno::Reference< uno::XInterface>& _xReportComponent) { uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL))); - xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormComponent")),uno::makeAny(_xFormComponent)); - xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent")),uno::makeAny(_xReportComponent)); - xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowSet")) + xNameCont->insertByName(::rtl::OUString("FormComponent"),uno::makeAny(_xFormComponent)); + xNameCont->insertByName(::rtl::OUString("ReportComponent"),uno::makeAny(_xReportComponent)); + xNameCont->insertByName(::rtl::OUString("RowSet") ,uno::makeAny(uno::Reference< uno::XInterface>(m_pDesignView->getController().getRowSet()))); return xNameCont.get(); @@ -534,7 +534,7 @@ void PropBrw::Update( OSectionView* pNewView ) uno::Reference< uno::XInterface> xTemp(m_pView->getReportSection()->getSection()); m_xLastSection = xTemp; uno::Reference< container::XNameContainer > xNameCont = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast<Reference<XInterface> * >(NULL))); - xNameCont->insertByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReportComponent")),uno::makeAny(xTemp)); + xNameCont->insertByName(::rtl::OUString("ReportComponent"),uno::makeAny(xTemp)); xTemp = xNameCont; implSetNewObject( uno::Sequence< uno::Reference< uno::XInterface> >(&xTemp,1) ); |