summaryrefslogtreecommitdiff
path: root/reportdesign/source/ui/report/propbrw.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'reportdesign/source/ui/report/propbrw.cxx')
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx26
1 files changed, 13 insertions, 13 deletions
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) );