diff options
Diffstat (limited to 'svx/source')
74 files changed, 415 insertions, 416 deletions
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index dcc40f9c2215..81a809263ab0 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -119,7 +119,7 @@ namespace svx try { Reference< XTablesSupplier > xSupTab; - _rxForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SingleSelectQueryComposer"))) >>= xSupTab; + _rxForm->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupTab; if(xSupTab.is()) { diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 8706b5006d01..1f0b1df05096 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -82,7 +82,7 @@ namespace svx Reference<XPropertySet> xProp; m_aDescriptor[daComponent] >>= xProp; if ( xProp.is() ) - xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsForm"))) >>= bForm; + xProp->getPropertyValue(::rtl::OUString("IsForm")) >>= bForm; } catch(Exception) {} diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index dda5a52e74c5..9ea4b1698494 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -337,7 +337,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) // not interested in any results Reference< XPropertySet > xStatProps(xStatement,UNO_QUERY); - xStatProps->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRows")), makeAny(sal_Int32(0))); + xStatProps->setPropertyValue(rtl::OUString("MaxRows"), makeAny(sal_Int32(0))); xResultSet = xStatement->executeQuery(); Reference< XColumnsSupplier > xSupplyCols(xResultSet, UNO_QUERY); diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index a9b315d49429..a8bd7f674f30 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -163,7 +163,7 @@ namespace svx ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext( m_aContext.getUNOContext(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" ) ) + ::rtl::OUString( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" ) ) ); ::rtl::OUString sDatabaseFilter; OSL_VERIFY( aConfig.getNodeValue( "ooSetupFactoryActualFilter" ) >>= sDatabaseFilter ); @@ -195,7 +195,7 @@ namespace svx if ( m_aFilterExtensions.getLength() == 0 ) { m_aFilterExtensions.realloc(1); - m_aFilterExtensions[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.odb" ) ); + m_aFilterExtensions[0] = ::rtl::OUString( "*.odb" ); } } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 816fae4235df..1f104056df5f 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -82,36 +82,36 @@ namespace svxform //............................................................................ // properties of instance - #define PN_INSTANCE_MODEL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Instance" ) ) - #define PN_INSTANCE_ID ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ) ) - #define PN_INSTANCE_URL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) ) + #define PN_INSTANCE_MODEL ::rtl::OUString( "Instance" ) + #define PN_INSTANCE_ID ::rtl::OUString( "ID" ) + #define PN_INSTANCE_URL ::rtl::OUString( "URL" ) // properties of binding - #define PN_BINDING_ID ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BindingID" ) ) - #define PN_BINDING_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BindingExpression" ) ) - #define PN_BINDING_MODEL ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) ) - #define PN_BINDING_NAMESPACES ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ModelNamespaces" ) ) - #define PN_READONLY_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReadonlyExpression" ) ) - #define PN_RELEVANT_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RelevantExpression" ) ) - #define PN_REQUIRED_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RequiredExpression" ) ) - #define PN_CONSTRAINT_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConstraintExpression" ) ) - #define PN_CALCULATE_EXPR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CalculateExpression" ) ) - #define PN_BINDING_TYPE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ) ) + #define PN_BINDING_ID ::rtl::OUString( "BindingID" ) + #define PN_BINDING_EXPR ::rtl::OUString( "BindingExpression" ) + #define PN_BINDING_MODEL ::rtl::OUString( "Model" ) + #define PN_BINDING_NAMESPACES ::rtl::OUString( "ModelNamespaces" ) + #define PN_READONLY_EXPR ::rtl::OUString( "ReadonlyExpression" ) + #define PN_RELEVANT_EXPR ::rtl::OUString( "RelevantExpression" ) + #define PN_REQUIRED_EXPR ::rtl::OUString( "RequiredExpression" ) + #define PN_CONSTRAINT_EXPR ::rtl::OUString( "ConstraintExpression" ) + #define PN_CALCULATE_EXPR ::rtl::OUString( "CalculateExpression" ) + #define PN_BINDING_TYPE ::rtl::OUString( "Type" ) // properties of submission - #define PN_SUBMISSION_ID ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ID" ) ) - #define PN_SUBMISSION_BIND ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Bind" ) ) - #define PN_SUBMISSION_REF ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Ref" ) ) - #define PN_SUBMISSION_ACTION ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Action" ) ) - #define PN_SUBMISSION_METHOD ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Method" ) ) - #define PN_SUBMISSION_REPLACE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Replace" ) ) + #define PN_SUBMISSION_ID ::rtl::OUString( "ID" ) + #define PN_SUBMISSION_BIND ::rtl::OUString( "Bind" ) + #define PN_SUBMISSION_REF ::rtl::OUString( "Ref" ) + #define PN_SUBMISSION_ACTION ::rtl::OUString( "Action" ) + #define PN_SUBMISSION_METHOD ::rtl::OUString( "Method" ) + #define PN_SUBMISSION_REPLACE ::rtl::OUString( "Replace" ) // other const strings #define TRUE_VALUE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true()" ) ) - #define NEW_ELEMENT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "newElement" ) ) - #define NEW_ATTRIBUTE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "newAttribute" ) ) - #define EVENTTYPE_CHARDATA ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DOMCharacterDataModified" ) ) - #define EVENTTYPE_ATTR ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DOMAttrModified" ) ) + #define NEW_ELEMENT ::rtl::OUString( "newElement" ) + #define NEW_ATTRIBUTE ::rtl::OUString( "newAttribute" ) + #define EVENTTYPE_CHARDATA ::rtl::OUString( "DOMCharacterDataModified" ) + #define EVENTTYPE_ATTR ::rtl::OUString( "DOMAttrModified" ) #define MIN_PAGE_COUNT 3 // at least one instance, one submission and one binding page @@ -1683,7 +1683,7 @@ namespace svxform Reference< XPropertySet > xModelProps( xNewModel, UNO_QUERY_THROW ); xModelProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ), + ::rtl::OUString( "ExternalData" ), makeAny( sal_Bool( !bDocumentData ) ) ); sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName ); @@ -1713,7 +1713,7 @@ namespace svxform Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW ); sal_Bool bExternalData = sal_False; OSL_VERIFY( xModelProps->getPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ) ) >>= bExternalData ); + ::rtl::OUString( "ExternalData" ) ) >>= bExternalData ); bDocumentData = ( bExternalData == sal_False ); } catch( const Exception& ) @@ -1733,7 +1733,7 @@ namespace svxform Reference< XNameContainer > xXForms( xFormsSupp->getXForms(), UNO_SET_THROW ); Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW ); xModelProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ), + ::rtl::OUString( "ExternalData" ), makeAny( sal_Bool( !bDocumentData ) ) ); bIsDocModified = true; } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 77ad8ff33801..847e96f2a7b1 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -211,7 +211,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding 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()) { // create an intermediate window, which is to be the container window of the frame @@ -224,7 +224,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow ); m_xMeAsFrame->initialize( m_xFrameContainerWindow ); - m_xMeAsFrame->setName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("form property browser")) ); + m_xMeAsFrame->setName(::rtl::OUString("form property browser") ); if ( _pBindings->GetDispatcher() ) { ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFramesSupplier > @@ -285,10 +285,10 @@ FmPropBrw::~FmPropBrw() Reference<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( "ControlContext" ) ) - , ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlShapeAccess" ) ) }; + const ::rtl::OUString pProps[] = { ::rtl::OUString( "ContextDocument" ) + , ::rtl::OUString( "DialogParentWindow" ) + , ::rtl::OUString( "ControlContext" ) + , ::rtl::OUString( "ControlShapeAccess" ) }; for ( size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i ) xName->removeByName( pProps[i] ); } @@ -567,10 +567,10 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell ) // a ComponentContext for the ::cppu::ContextEntry_Init aHandlerContextInfo[] = { - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ContextDocument" ) ), makeAny( xDocument ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DialogParentWindow" ) ), makeAny( xParentWindow ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlContext" ) ), makeAny( xControlContext ) ), - ::cppu::ContextEntry_Init( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlShapeAccess" ) ), makeAny( xControlMap ) ) + ::cppu::ContextEntry_Init( ::rtl::OUString( "ContextDocument" ), makeAny( xDocument ) ), + ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( xParentWindow ) ), + ::cppu::ContextEntry_Init( ::rtl::OUString( "ControlContext" ), makeAny( xControlContext ) ), + ::cppu::ContextEntry_Init( ::rtl::OUString( "ControlShapeAccess" ), makeAny( xControlMap ) ) }; m_xInspectorContext.set( ::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ), diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 85c9f3f06d4c..754e34e6b465 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -98,24 +98,24 @@ namespace svxform Reference< XServiceInfo > xDocumentSI( _rxDocument, UNO_QUERY ); if ( xDocumentSI.is() ) { - if ( xDocumentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ) ) - || xDocumentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ) ) ) + if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.text.TextDocument" ) ) + || xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.text.WebDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParagraphStyles" ) ); - _rStyleName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Standard" ) ); + _rFamilyName = ::rtl::OUString( "ParagraphStyles" ); + _rStyleName = ::rtl::OUString( "Standard" ); } - else if ( xDocumentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ) ) ) ) + else if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CellStyles" ) ); - _rStyleName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Default" ) ); + _rFamilyName = ::rtl::OUString( "CellStyles" ); + _rStyleName = ::rtl::OUString( "Default" ); } - else if ( xDocumentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ) ) ) - || xDocumentSI->supportsService( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ) ) ) + else if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" ) ) + || xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" ) ) ) { - _rFamilyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "graphics" ) ); - _rStyleName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "standard" ) ); + _rFamilyName = ::rtl::OUString( "graphics" ); + _rStyleName = ::rtl::OUString( "standard" ); } else bSuccess = false; @@ -164,7 +164,7 @@ namespace svxform // fall back to CharLocale property at the style if ( aDocumentCharLocale.Language.isEmpty() ) { - sCharLocalePropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharLocale" ) ); + sCharLocalePropertyName = ::rtl::OUString( "CharLocale" ); if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) ) { OSL_VERIFY( xStyle->getPropertyValue( sCharLocalePropertyName ) >>= aDocumentCharLocale ); @@ -180,7 +180,7 @@ namespace svxform Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, LanguageTag( aDocumentCharLocale ).getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE ); FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor( aFont ); _rxModel->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontDescriptor" ) ), + ::rtl::OUString( "FontDescriptor" ), makeAny( aFontDesc ) ); } @@ -204,7 +204,7 @@ namespace svxform // the names of the family, and the style - depends on the document type we live in ::rtl::OUString sFamilyName, sStyleName; if ( !lcl_getDocumentDefaultStyleAndFamily( xSuppStyleFamilies.get(), sFamilyName, sStyleName ) ) - throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown document type!" ) ), NULL ); + throw RuntimeException( ::rtl::OUString( "unknown document type!" ), NULL ); // the concrete style Reference< XNameAccess > xStyleFamily( xStyleFamilies->getByName( sFamilyName ), UNO_QUERY_THROW ); @@ -232,7 +232,7 @@ namespace svxform // let's see what the configuration says about the visual effect OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aVisualEffect = aConfig.getNodeValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VisualEffect" ) ) ); + Any aVisualEffect = aConfig.getNodeValue( ::rtl::OUString( "VisualEffect" ) ); if ( aVisualEffect.hasValue() ) { ::rtl::OUString sVisualEffect; @@ -283,7 +283,7 @@ namespace svxform //-------------------------------------------------------------------- ::utl::OConfigurationNode ControlLayouter::getLayoutSettings( DocumentType _eDocType ) { - ::rtl::OUString sConfigName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.Common/Forms/ControlLayout/" ) ); + ::rtl::OUString sConfigName = ::rtl::OUString( "/org.openoffice.Office.Common/Forms/ControlLayout/" ); sConfigName += DocumentClassification::getModuleIdentifierForDocumentType( _eDocType ); return OConfigurationTreeRoot::createWithComponentContext( ::comphelper::getProcessComponentContext(), // TODO @@ -294,7 +294,7 @@ namespace svxform bool ControlLayouter::useDynamicBorderColor( DocumentType _eDocType ) { OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aDynamicBorderColor = aConfig.getNodeValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DynamicBorderColors" ) ) ); + Any aDynamicBorderColor = aConfig.getNodeValue( ::rtl::OUString( "DynamicBorderColors" ) ); bool bDynamicBorderColor = false; OSL_VERIFY( aDynamicBorderColor >>= bDynamicBorderColor ); return bDynamicBorderColor; @@ -306,7 +306,7 @@ namespace svxform if ( _eDocType == eUnknownDocumentType ) return false; OConfigurationNode aConfig = getLayoutSettings( _eDocType ); - Any aUseRefDevice = aConfig.getNodeValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseDocumentTextMetrics" ) ) ); + Any aUseRefDevice = aConfig.getNodeValue( ::rtl::OUString( "UseDocumentTextMetrics" ) ); bool bUseRefDevice = false; OSL_VERIFY( aUseRefDevice >>= bUseRefDevice ); return bUseRefDevice; diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 609cb0c2b2d4..9e6c13d23165 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -359,7 +359,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource) Reference< XInterface > xSourceContainer = xSourceAsChild->getParent(); m_xEnvironmentHistory = Reference< XIndexContainer >( - ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.Forms")) ), + ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.form.Forms") ), UNO_QUERY); DBG_ASSERT(m_xEnvironmentHistory.is(), "FmFormObj::clonedFrom : could not create a forms collection !"); @@ -564,7 +564,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > { // create and insert (into the destination) a copy of the form xCurrentDestForm.set( - ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DataForm" )) ), + ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString( "com.sun.star.form.component.DataForm" ) ), UNO_QUERY_THROW ); ::comphelper::copyProperties( xCurrentSourceForm, xCurrentDestForm ); diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 760de57f48d4..2169173729b1 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -200,7 +200,7 @@ namespace svxform Reference< XHierarchicalNameAccess > xTypeDescriptions( aContext.getSingleton( "com.sun.star.reflection.theTypeDescriptionManager" ), UNO_QUERY_THROW ); ::rtl::OUString sMethodDescription( _rListenerType ); - sMethodDescription += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "::" )); + sMethodDescription += ::rtl::OUString( "::" ); sMethodDescription += _rMethodName; Reference< XInterfaceMethodTypeDescription > xMethod( xTypeDescriptions->getByHierarchicalName( sMethodDescription ), UNO_QUERY_THROW ); @@ -413,7 +413,7 @@ namespace svxform { Reference< XControl > xControl( aEvent.Source, UNO_QUERY_THROW ); Reference< XPropertySet > xProps( xControl->getModel(), UNO_QUERY_THROW ); - aCaller = xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ) ); + aCaller = xProps->getPropertyValue( rtl::OUString("Name") ); } catch( Exception& ) {} } @@ -471,9 +471,9 @@ namespace svxform { // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) ) - sMacroLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application" ) ); + sMacroLocation = ::rtl::OUString( "application" ); else - sMacroLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "document" ) ); + sMacroLocation = ::rtl::OUString( "document" ); } ::rtl::OUStringBuffer aScriptURI; diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index e230a3fa4797..dac2e255754e 100644 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx @@ -80,7 +80,7 @@ namespace svxform // ------------------------------------------------------------------------ // FormController REGISTER_SERVICE( FormController, OUString( "com.sun.star.form.runtime.FormController" ) ); - REGISTER_SERVICE( LegacyFormController, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) ) ); + REGISTER_SERVICE( LegacyFormController, ::rtl::OUString( "com.sun.star.form.FormController" ) ); // ------------------------------------------------------------------------ // FormController diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index a4f75b5fe6d9..ca72d6757eaf 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -773,7 +773,7 @@ void FmFormShell::Execute(SfxRequest &rReq) } if ( nRecord != -1 ) - rController->execute( nSlot, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Position" )), makeAny( (sal_Int32)nRecord ) ); + rController->execute( nSlot, ::rtl::OUString( "Position" ), makeAny( (sal_Int32)nRecord ) ); rReq.Done(); } break; diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 2e5edd8354dc..bdd0d75528d9 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -201,8 +201,8 @@ CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckB { switch ((TriState)m_xBox->getState()) { - case STATE_NOCHECK: return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0")); - case STATE_CHECK: return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")); + case STATE_NOCHECK: return rtl::OUString("0"); + case STATE_CHECK: return rtl::OUString("1"); default: break; } return rtl::OUString(); diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 32195c121280..be8046f2498a 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -456,7 +456,7 @@ namespace svx if ( pAsciiUnoName ) { - sSlotUnoName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:" ) ); + sSlotUnoName = ::rtl::OUString( ".uno:" ); sSlotUnoName += ::rtl::OUString::createFromAscii( pAsciiUnoName ); } #if OSL_DEBUG_LEVEL > 0 @@ -534,7 +534,7 @@ namespace svx Reference< XPropertySetInfo > xPSI; if ( xModelProps.is() ) xPSI = xModelProps->getPropertySetInfo(); - ::rtl::OUString sRichTextPropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RichText" ) ); + ::rtl::OUString sRichTextPropertyName = ::rtl::OUString( "RichText" ); if ( xPSI.is() && xPSI->hasPropertyByName( sRichTextPropertyName ) ) { OSL_VERIFY( xModelProps->getPropertyValue( sRichTextPropertyName ) >>= bIsRichText ); @@ -597,7 +597,7 @@ namespace svx if ( SFX_APP() ) sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotId ); else - sUnoSlotName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "<unknown>" ) ); + sUnoSlotName = ::rtl::OUString( "<unknown>" ); ::rtl::OString sUnoSlotNameAscii( "\"" ); sUnoSlotNameAscii += ::rtl::OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US ); sUnoSlotNameAscii += "\""; @@ -732,7 +732,7 @@ namespace svx if ( pBoolItem ) { aArgs.realloc( 1 ); - aArgs[ 0 ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enable" ) ); + aArgs[ 0 ].Name = ::rtl::OUString( "Enable" ); aArgs[ 0 ].Value <<= (sal_Bool)pBoolItem->GetValue(); } } diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 3e9afde78fd9..82e2343d8424 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -121,7 +121,7 @@ private: // SfxObjectShellRef is good here since the model controls the lifetime of the shell SfxObjectShellRef const xObjectShell = m_rModel.GetObjectShell(); ENSURE_OR_THROW( xObjectShell.Is(), "no object shell!" ); - xListenerProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Model" ) ), makeAny( xObjectShell->GetModel() ) ); + xListenerProps->setPropertyValue( ::rtl::OUString( "Model" ), makeAny( xObjectShell->GetModel() ) ); m_vbaListener = xScriptListener; } diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index cc60833cfbc1..ac4be38cbc38 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -216,7 +216,7 @@ namespace svxform if ( !sDataSourceName.isEmpty() ) xDsProperties = xDsProperties.query( OStaticDataAccessTools().getDataSource( sDataSourceName, _rContext.getUNOContext() ) ); if ( xDsProperties.is() ) - xDsProperties->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Info" ) ) ) >>= aInfo; + xDsProperties->getPropertyValue( ::rtl::OUString( "Info" ) ) >>= aInfo; } catch( const Exception& ) { @@ -405,7 +405,7 @@ namespace svxform switch ( nClassId ) { case FormComponentType::SCROLLBAR: - _rxControlModel->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LiveScroll" ) ), makeAny( (sal_Bool)sal_True ) ); + _rxControlModel->setPropertyValue( ::rtl::OUString( "LiveScroll" ), makeAny( (sal_Bool)sal_True ) ); // NO break! case FormComponentType::SPINBUTTON: { diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index 7e98d01b3913..4f0c7c1b5303 100644 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -41,7 +41,7 @@ namespace svxform // the layout manager Reference< XPropertySet > xFrameProps( _rxFrame, UNO_QUERY ); if ( xFrameProps.is() ) - xFrameProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ) >>= m_xLayouter; + xFrameProps->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ) >>= m_xLayouter; } //-------------------------------------------------------------------- diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index b3f0641e9ef8..82347c4a55ae 100644 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx @@ -182,7 +182,7 @@ namespace svxform //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL LegacyFormController::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.svx.LegacyFormController" ) ); + return ::rtl::OUString( "org.openoffice.comp.svx.LegacyFormController" ); } //-------------------------------------------------------------------- @@ -200,8 +200,8 @@ namespace svxform Sequence< ::rtl::OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException) { Sequence< ::rtl::OUString > aServices(2); - aServices.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormController" ) ); - aServices.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.control.TabController") ); + aServices.getArray()[0] = ::rtl::OUString( "com.sun.star.form.FormController" ); + aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.control.TabController"); return aServices; } diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 8ac388c91cf2..a61c849981b9 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -85,10 +85,10 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce ) Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Position" )); + aArgs[0].Name = rtl::OUString( "Position" ); aPositionParam.QueryValue( a ); aArgs[0].Value = a; - m_pController->Dispatch( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AbsoluteRecord" )), + m_pController->Dispatch( rtl::OUString( ".uno:AbsoluteRecord" ), aArgs ); m_pController->updateStatus(); diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 77e1eaa2d31a..3a85aacdb586 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -228,7 +228,7 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa util::DateTime aDateTimeModified; DateTime aDateTime( DateTime::EMPTY ); - aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "DateModified" )) ) >>= aDateTimeModified; + aCnt.getPropertyValue( OUString( "DateModified" ) ) >>= aDateTimeModified; ::utl::typeConvert( aDateTimeModified, aDateTime ); rData.aThemeChangeDate = aDateTime; rData.aThemeChangeTime = aDateTime; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 071ff8aabf2a..94f12a5820c4 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -38,35 +38,35 @@ #include <com/sun/star/lang/XComponent.hpp> -#define RECOVERY_CMDPART_PROTOCOL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:")) - -#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doEmergencySave" )) -#define RECOVERY_CMDPART_DO_RECOVERY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doAutoRecovery" )) -#define RECOVERY_CMDPART_DO_CRASHREPORT rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/doCrashReport" )) - -#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doPrepareEmergencySave")) -#define RECOVERY_CMD_DO_EMERGENCY_SAVE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEmergencySave" )) -#define RECOVERY_CMD_DO_RECOVERY rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doAutoRecovery" )) -#define RECOVERY_CMD_DO_ENTRY_BACKUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryBackup" )) -#define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.autorecovery:/doEntryCleanUp" )) - -#define PROP_STATUSINDICATOR rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "StatusIndicator" )) -#define PROP_DISPATCHASYNCHRON rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DispatchAsynchron")) -#define PROP_SAVEPATH rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SavePath" )) -#define PROP_ENTRYID rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "EntryID" )) - -#define STATEPROP_ID rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ID" )) -#define STATEPROP_STATE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DocumentState")) -#define STATEPROP_ORGURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "OriginalURL" )) -#define STATEPROP_TEMPURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TempURL" )) -#define STATEPROP_FACTORYURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FactoryURL" )) -#define STATEPROP_TEMPLATEURL rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "TemplateURL" )) -#define STATEPROP_TITLE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Title" )) -#define STATEPROP_MODULE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Module" )) - -#define RECOVERY_OPERATIONSTATE_START rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "start" )) -#define RECOVERY_OPERATIONSTATE_STOP rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stop" )) -#define RECOVERY_OPERATIONSTATE_UPDATE rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "update")) +#define RECOVERY_CMDPART_PROTOCOL rtl::OUString( "vnd.sun.star.autorecovery:") + +#define RECOVERY_CMDPART_DO_EMERGENCY_SAVE rtl::OUString( "/doEmergencySave" ) +#define RECOVERY_CMDPART_DO_RECOVERY rtl::OUString( "/doAutoRecovery" ) +#define RECOVERY_CMDPART_DO_CRASHREPORT rtl::OUString( "/doCrashReport" ) + +#define RECOVERY_CMD_DO_PREPARE_EMERGENCY_SAVE rtl::OUString( "vnd.sun.star.autorecovery:/doPrepareEmergencySave") +#define RECOVERY_CMD_DO_EMERGENCY_SAVE rtl::OUString( "vnd.sun.star.autorecovery:/doEmergencySave" ) +#define RECOVERY_CMD_DO_RECOVERY rtl::OUString( "vnd.sun.star.autorecovery:/doAutoRecovery" ) +#define RECOVERY_CMD_DO_ENTRY_BACKUP rtl::OUString( "vnd.sun.star.autorecovery:/doEntryBackup" ) +#define RECOVERY_CMD_DO_ENTRY_CLEANUP rtl::OUString( "vnd.sun.star.autorecovery:/doEntryCleanUp" ) + +#define PROP_STATUSINDICATOR rtl::OUString( "StatusIndicator" ) +#define PROP_DISPATCHASYNCHRON rtl::OUString( "DispatchAsynchron") +#define PROP_SAVEPATH rtl::OUString( "SavePath" ) +#define PROP_ENTRYID rtl::OUString( "EntryID" ) + +#define STATEPROP_ID rtl::OUString( "ID" ) +#define STATEPROP_STATE rtl::OUString( "DocumentState") +#define STATEPROP_ORGURL rtl::OUString( "OriginalURL" ) +#define STATEPROP_TEMPURL rtl::OUString( "TempURL" ) +#define STATEPROP_FACTORYURL rtl::OUString( "FactoryURL" ) +#define STATEPROP_TEMPLATEURL rtl::OUString( "TemplateURL" ) +#define STATEPROP_TITLE rtl::OUString( "Title" ) +#define STATEPROP_MODULE rtl::OUString( "Module" ) + +#define RECOVERY_OPERATIONSTATE_START rtl::OUString( "start" ) +#define RECOVERY_OPERATIONSTATE_STOP rtl::OUString( "stop" ) +#define RECOVERY_OPERATIONSTATE_UPDATE rtl::OUString( "update") #define DLG_RET_UNKNOWN -1 #define DLG_RET_OK 1 diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 62705b641393..9c498f250263 100644 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx @@ -21,55 +21,55 @@ #include <svx/svxdllapi.h> -#define FM_COMPONENT_EDIT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Edit" ) ) -#define FM_COMPONENT_TEXTFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.TextField" ) ) -#define FM_COMPONENT_LISTBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ListBox" ) ) -#define FM_COMPONENT_COMBOBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ComboBox" ) ) -#define FM_COMPONENT_RADIOBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.RadioButton" ) ) -#define FM_COMPONENT_GROUPBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.GroupBox" ) ) -#define FM_COMPONENT_FIXEDTEXT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FixedText" ) ) -#define FM_COMPONENT_COMMANDBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CommandButton" ) ) -#define FM_COMPONENT_CHECKBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CheckBox" ) ) -#define FM_COMPONENT_GRID rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Grid" ) ) -#define FM_COMPONENT_GRIDCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.GridControl" ) ) -#define FM_COMPONENT_IMAGEBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ImageButton" ) ) -#define FM_COMPONENT_FILECONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FileControl" ) ) -#define FM_COMPONENT_TIMEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.TimeField" ) ) -#define FM_COMPONENT_DATEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.DateField" ) ) -#define FM_COMPONENT_NUMERICFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.NumericField" ) ) -#define FM_COMPONENT_CURRENCYFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.CurrencyField" ) ) -#define FM_COMPONENT_PATTERNFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.PatternField" ) ) -#define FM_COMPONENT_FORMATTEDFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.FormattedField" ) ) -#define FM_COMPONENT_HIDDEN rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.Hidden" ) ) -#define FM_COMPONENT_HIDDENCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.HiddenControl" ) ) -#define FM_COMPONENT_IMAGECONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.component.ImageControl" ) ) -#define FM_CONTROL_GRID rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.control.Grid" ) ) -#define FM_CONTROL_GRIDCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.one.form.control.GridControl" ) ) -#define SRV_SDB_CONNECTION rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.Connection" ) ) -#define FM_SUN_COMPONENT_FORM rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.Form" ) ) -#define FM_SUN_COMPONENT_TEXTFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TextField" ) ) -#define FM_SUN_COMPONENT_LISTBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ) ) -#define FM_SUN_COMPONENT_COMBOBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ) ) -#define FM_SUN_COMPONENT_RADIOBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ) ) -#define FM_SUN_COMPONENT_GROUPBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.GroupBox" ) ) -#define FM_SUN_COMPONENT_FIXEDTEXT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FixedText" ) ) -#define FM_SUN_COMPONENT_COMMANDBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CommandButton" ) ) -#define FM_SUN_COMPONENT_CHECKBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CheckBox" ) ) -#define FM_SUN_COMPONENT_GRIDCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.GridControl" ) ) -#define FM_SUN_COMPONENT_IMAGEBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ImageButton" ) ) -#define FM_SUN_COMPONENT_FILECONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FileControl" ) ) -#define FM_SUN_COMPONENT_TIMEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TimeField" ) ) -#define FM_SUN_COMPONENT_DATEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DateField" ) ) -#define FM_SUN_COMPONENT_NUMERICFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.NumericField" ) ) -#define FM_SUN_COMPONENT_CURRENCYFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CurrencyField" ) ) -#define FM_SUN_COMPONENT_PATTERNFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.PatternField" ) ) -#define FM_SUN_COMPONENT_HIDDENCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.HiddenControl" ) ) -#define FM_SUN_COMPONENT_IMAGECONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DatabaseImageControl" ) ) -#define FM_SUN_COMPONENT_FORMATTEDFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FormattedField" ) ) -#define FM_SUN_COMPONENT_SCROLLBAR rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ScrollBar" ) ) -#define FM_SUN_COMPONENT_SPINBUTTON rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.SpinButton" ) ) -#define FM_SUN_COMPONENT_NAVIGATIONBAR rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.NavigationToolBar" ) ) -#define FM_SUN_CONTROL_GRIDCONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.control.GridControl" ) ) +#define FM_COMPONENT_EDIT rtl::OUString( "stardiv.one.form.component.Edit" ) +#define FM_COMPONENT_TEXTFIELD rtl::OUString( "stardiv.one.form.component.TextField" ) +#define FM_COMPONENT_LISTBOX rtl::OUString( "stardiv.one.form.component.ListBox" ) +#define FM_COMPONENT_COMBOBOX rtl::OUString( "stardiv.one.form.component.ComboBox" ) +#define FM_COMPONENT_RADIOBUTTON rtl::OUString( "stardiv.one.form.component.RadioButton" ) +#define FM_COMPONENT_GROUPBOX rtl::OUString( "stardiv.one.form.component.GroupBox" ) +#define FM_COMPONENT_FIXEDTEXT rtl::OUString( "stardiv.one.form.component.FixedText" ) +#define FM_COMPONENT_COMMANDBUTTON rtl::OUString( "stardiv.one.form.component.CommandButton" ) +#define FM_COMPONENT_CHECKBOX rtl::OUString( "stardiv.one.form.component.CheckBox" ) +#define FM_COMPONENT_GRID rtl::OUString( "stardiv.one.form.component.Grid" ) +#define FM_COMPONENT_GRIDCONTROL rtl::OUString( "stardiv.one.form.component.GridControl" ) +#define FM_COMPONENT_IMAGEBUTTON rtl::OUString( "stardiv.one.form.component.ImageButton" ) +#define FM_COMPONENT_FILECONTROL rtl::OUString( "stardiv.one.form.component.FileControl" ) +#define FM_COMPONENT_TIMEFIELD rtl::OUString( "stardiv.one.form.component.TimeField" ) +#define FM_COMPONENT_DATEFIELD rtl::OUString( "stardiv.one.form.component.DateField" ) +#define FM_COMPONENT_NUMERICFIELD rtl::OUString( "stardiv.one.form.component.NumericField" ) +#define FM_COMPONENT_CURRENCYFIELD rtl::OUString( "stardiv.one.form.component.CurrencyField" ) +#define FM_COMPONENT_PATTERNFIELD rtl::OUString( "stardiv.one.form.component.PatternField" ) +#define FM_COMPONENT_FORMATTEDFIELD rtl::OUString( "stardiv.one.form.component.FormattedField" ) +#define FM_COMPONENT_HIDDEN rtl::OUString( "stardiv.one.form.component.Hidden" ) +#define FM_COMPONENT_HIDDENCONTROL rtl::OUString( "stardiv.one.form.component.HiddenControl" ) +#define FM_COMPONENT_IMAGECONTROL rtl::OUString( "stardiv.one.form.component.ImageControl" ) +#define FM_CONTROL_GRID rtl::OUString( "stardiv.one.form.control.Grid" ) +#define FM_CONTROL_GRIDCONTROL rtl::OUString( "stardiv.one.form.control.GridControl" ) +#define SRV_SDB_CONNECTION rtl::OUString( "com.sun.star.sdb.Connection" ) +#define FM_SUN_COMPONENT_FORM rtl::OUString( "com.sun.star.form.component.Form" ) +#define FM_SUN_COMPONENT_TEXTFIELD rtl::OUString( "com.sun.star.form.component.TextField" ) +#define FM_SUN_COMPONENT_LISTBOX rtl::OUString( "com.sun.star.form.component.ListBox" ) +#define FM_SUN_COMPONENT_COMBOBOX rtl::OUString( "com.sun.star.form.component.ComboBox" ) +#define FM_SUN_COMPONENT_RADIOBUTTON rtl::OUString( "com.sun.star.form.component.RadioButton" ) +#define FM_SUN_COMPONENT_GROUPBOX rtl::OUString( "com.sun.star.form.component.GroupBox" ) +#define FM_SUN_COMPONENT_FIXEDTEXT rtl::OUString( "com.sun.star.form.component.FixedText" ) +#define FM_SUN_COMPONENT_COMMANDBUTTON rtl::OUString( "com.sun.star.form.component.CommandButton" ) +#define FM_SUN_COMPONENT_CHECKBOX rtl::OUString( "com.sun.star.form.component.CheckBox" ) +#define FM_SUN_COMPONENT_GRIDCONTROL rtl::OUString( "com.sun.star.form.component.GridControl" ) +#define FM_SUN_COMPONENT_IMAGEBUTTON rtl::OUString( "com.sun.star.form.component.ImageButton" ) +#define FM_SUN_COMPONENT_FILECONTROL rtl::OUString( "com.sun.star.form.component.FileControl" ) +#define FM_SUN_COMPONENT_TIMEFIELD rtl::OUString( "com.sun.star.form.component.TimeField" ) +#define FM_SUN_COMPONENT_DATEFIELD rtl::OUString( "com.sun.star.form.component.DateField" ) +#define FM_SUN_COMPONENT_NUMERICFIELD rtl::OUString( "com.sun.star.form.component.NumericField" ) +#define FM_SUN_COMPONENT_CURRENCYFIELD rtl::OUString( "com.sun.star.form.component.CurrencyField" ) +#define FM_SUN_COMPONENT_PATTERNFIELD rtl::OUString( "com.sun.star.form.component.PatternField" ) +#define FM_SUN_COMPONENT_HIDDENCONTROL rtl::OUString( "com.sun.star.form.component.HiddenControl" ) +#define FM_SUN_COMPONENT_IMAGECONTROL rtl::OUString( "com.sun.star.form.component.DatabaseImageControl" ) +#define FM_SUN_COMPONENT_FORMATTEDFIELD rtl::OUString( "com.sun.star.form.component.FormattedField" ) +#define FM_SUN_COMPONENT_SCROLLBAR rtl::OUString( "com.sun.star.form.component.ScrollBar" ) +#define FM_SUN_COMPONENT_SPINBUTTON rtl::OUString( "com.sun.star.form.component.SpinButton" ) +#define FM_SUN_COMPONENT_NAVIGATIONBAR rtl::OUString( "com.sun.star.form.component.NavigationToolBar" ) +#define FM_SUN_CONTROL_GRIDCONTROL rtl::OUString( "com.sun.star.form.control.GridControl" ) namespace svxform { diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx index 154a090ccf8f..6c0b6a2795d5 100644 --- a/svx/source/inc/fmurl.hxx +++ b/svx/source/inc/fmurl.hxx @@ -20,33 +20,33 @@ #ifndef _SVX_FMURL_HXX #define _SVX_FMURL_HXX -#define FMURL_FORM_POSITION rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/positionForm" ) ) -#define FMURL_FORM_RECORDCOUNT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/RecordCount" ) ) -#define FMURL_RECORD_MOVEFIRST rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToFirst" ) ) -#define FMURL_RECORD_MOVEPREV rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToPrev" ) ) -#define FMURL_RECORD_MOVENEXT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToNext" ) ) -#define FMURL_RECORD_MOVELAST rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToLast" ) ) -#define FMURL_RECORD_MOVETONEW rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/moveToNew" ) ) -#define FMURL_RECORD_UNDO rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/undoRecord" ) ) -#define FMURL_RECORD_SAVE rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/saveRecord" ) ) -#define FMURL_RECORD_DELETE rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/deleteRecord" ) ) -#define FMURL_FORM_REFRESH rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/refreshForm" ) ) -#define FMURL_FORM_REFRESH_CURRENT_CONTROL rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/refreshCurrentControl" ) ) -#define FMURL_FORM_SORT_UP rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sortUp" ) ) -#define FMURL_FORM_SORT_DOWN rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sortDown" ) ) -#define FMURL_FORM_SORT rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/sort" ) ) -#define FMURL_FORM_AUTO_FILTER rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/autoFilter" ) ) -#define FMURL_FORM_FILTER rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/filter" ) ) -#define FMURL_FORM_APPLY_FILTER rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/applyFilter" ) ) -#define FMURL_FORM_REMOVE_FILTER rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormController/removeFilterOrder" ) ) -#define FMURL_CONFIRM_DELETION rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/ConfirmDeletion" ) ) -#define FMURL_COMPONENT_FORMGRIDVIEW rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".component:DB/FormGridView" ) ) -#define FMURL_GRIDVIEW_CLEARVIEW rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/ClearView" ) ) -#define FMURL_GRIDVIEW_ADDCOLUMN rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/AddGridColumn" ) ) -#define FMURL_GRIDVIEW_ATTACHTOFORM rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormSlots/AttachToForm" ) ) -#define FMARG_ATTACHTO_MASTERFORM rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MasterForm" ) ) -#define FMARG_ADDCOL_COLUMNTYPE rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnType" ) ) -#define FMARG_ADDCOL_COLUMNPOS rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ColumnPosition" ) ) +#define FMURL_FORM_POSITION rtl::OUString( ".uno:FormController/positionForm" ) +#define FMURL_FORM_RECORDCOUNT rtl::OUString( ".uno:FormController/RecordCount" ) +#define FMURL_RECORD_MOVEFIRST rtl::OUString( ".uno:FormController/moveToFirst" ) +#define FMURL_RECORD_MOVEPREV rtl::OUString( ".uno:FormController/moveToPrev" ) +#define FMURL_RECORD_MOVENEXT rtl::OUString( ".uno:FormController/moveToNext" ) +#define FMURL_RECORD_MOVELAST rtl::OUString( ".uno:FormController/moveToLast" ) +#define FMURL_RECORD_MOVETONEW rtl::OUString( ".uno:FormController/moveToNew" ) +#define FMURL_RECORD_UNDO rtl::OUString( ".uno:FormController/undoRecord" ) +#define FMURL_RECORD_SAVE rtl::OUString( ".uno:FormController/saveRecord" ) +#define FMURL_RECORD_DELETE rtl::OUString( ".uno:FormController/deleteRecord" ) +#define FMURL_FORM_REFRESH rtl::OUString( ".uno:FormController/refreshForm" ) +#define FMURL_FORM_REFRESH_CURRENT_CONTROL rtl::OUString( ".uno:FormController/refreshCurrentControl" ) +#define FMURL_FORM_SORT_UP rtl::OUString( ".uno:FormController/sortUp" ) +#define FMURL_FORM_SORT_DOWN rtl::OUString( ".uno:FormController/sortDown" ) +#define FMURL_FORM_SORT rtl::OUString( ".uno:FormController/sort" ) +#define FMURL_FORM_AUTO_FILTER rtl::OUString( ".uno:FormController/autoFilter" ) +#define FMURL_FORM_FILTER rtl::OUString( ".uno:FormController/filter" ) +#define FMURL_FORM_APPLY_FILTER rtl::OUString( ".uno:FormController/applyFilter" ) +#define FMURL_FORM_REMOVE_FILTER rtl::OUString( ".uno:FormController/removeFilterOrder" ) +#define FMURL_CONFIRM_DELETION rtl::OUString( ".uno:FormSlots/ConfirmDeletion" ) +#define FMURL_COMPONENT_FORMGRIDVIEW rtl::OUString( ".component:DB/FormGridView" ) +#define FMURL_GRIDVIEW_CLEARVIEW rtl::OUString( ".uno:FormSlots/ClearView" ) +#define FMURL_GRIDVIEW_ADDCOLUMN rtl::OUString( ".uno:FormSlots/AddGridColumn" ) +#define FMURL_GRIDVIEW_ATTACHTOFORM rtl::OUString( ".uno:FormSlots/AttachToForm" ) +#define FMARG_ATTACHTO_MASTERFORM rtl::OUString( "MasterForm" ) +#define FMARG_ADDCOL_COLUMNTYPE rtl::OUString( "ColumnType" ) +#define FMARG_ADDCOL_COLUMNPOS rtl::OUString( "ColumnPosition" ) #endif // _SVX_FMURL_HXX diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx index fe63ea7c6913..90e039a51ef3 100644 --- a/svx/source/inc/gridcols.hxx +++ b/svx/source/inc/gridcols.hxx @@ -23,16 +23,16 @@ namespace rtl { class OUString; } -#define FM_COL_TEXTFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextField" ) ) -#define FM_COL_COMBOBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ) ) -#define FM_COL_CHECKBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CheckBox" ) ) -#define FM_COL_TIMEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TimeField" ) ) -#define FM_COL_DATEFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateField" ) ) -#define FM_COL_NUMERICFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumericField" ) ) -#define FM_COL_CURRENCYFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CurrencyField" ) ) -#define FM_COL_PATTERNFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PatternField" ) ) -#define FM_COL_LISTBOX rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ) ) -#define FM_COL_FORMATTEDFIELD rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormattedField" ) ) +#define FM_COL_TEXTFIELD rtl::OUString( "TextField" ) +#define FM_COL_COMBOBOX rtl::OUString( "ComboBox" ) +#define FM_COL_CHECKBOX rtl::OUString( "CheckBox" ) +#define FM_COL_TIMEFIELD rtl::OUString( "TimeField" ) +#define FM_COL_DATEFIELD rtl::OUString( "DateField" ) +#define FM_COL_NUMERICFIELD rtl::OUString( "NumericField" ) +#define FM_COL_CURRENCYFIELD rtl::OUString( "CurrencyField" ) +#define FM_COL_PATTERNFIELD rtl::OUString( "PatternField" ) +#define FM_COL_LISTBOX rtl::OUString( "ListBox" ) +#define FM_COL_FORMATTEDFIELD rtl::OUString( "FormattedField" ) // column type ids #define TYPE_CHECKBOX 0 diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index c288020bf695..218bb7e92afb 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -47,7 +47,7 @@ SvxClipBoardControl::SvxClipBoardControl( pPopup (0), bDisabled( sal_False ) { - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ClipboardFormatItems" ))); + addStatusListener( rtl::OUString( ".uno:ClipboardFormatItems" )); ToolBox& rBox = GetToolBox(); rBox.SetItemBits( nId, TIB_DROPDOWN | rBox.GetItemBits( nId ) ); rBox.Invalidate(); @@ -95,10 +95,10 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SelectedFormat" )); + aArgs[0].Name = rtl::OUString( "SelectedFormat" ); aItem.QueryValue( a ); aArgs[0].Value = a; - Dispatch( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ClipboardFormatItems" )), + Dispatch( rtl::OUString( ".uno:ClipboardFormatItems" ), aArgs ); } diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index bc8fde868726..41cbcd0327d2 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -137,7 +137,7 @@ namespace sdr if(bUseReducedDisplayQualityForDrag) { uno::Sequence< beans::PropertyValue > xProperties(1); - xProperties[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReducedDisplayQuality")); + xProperties[0].Name = rtl::OUString("ReducedDisplayQuality"); xProperties[0].Value <<= true; maViewInformation2D = drawinglayer::geometry::ViewInformation2D(xProperties); } diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 10bee14db983..7c30defe8801 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -111,7 +111,7 @@ namespace drawinglayer if(!aSeq.getLength()) { aSeq.realloc(1L); - aSeq.getArray()[0L] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.PrimitiveFactory2D")); + aSeq.getArray()[0L] = rtl::OUString("com.sun.star.graphic.PrimitiveFactory2D"); } return aSeq; diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index cc003debd548..c46aa095180a 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -49,7 +49,7 @@ namespace { try { - const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Number")))); + const uno::Any aNumber(xSet->getPropertyValue(::rtl::OUString("Number"))); aNumber >>= nRetval; } catch(const uno::Exception&) diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index a91f8ecfd62a..e6bd31f70556 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -82,7 +82,7 @@ void SvxInsertStatusBarControl::Click() ::com::sun::star::uno::Any a; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InsertMode" )); + aArgs[0].Name = rtl::OUString( "InsertMode" ); aIns.QueryValue( a ); aArgs[0].Value = a; diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 3f3d03f0ce90..de7fd80e8275 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -324,11 +324,11 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) SfxUInt16Item aItem( SID_PSZ_FUNCTION, nSelect ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StatusBarFunc" )); + aArgs[0].Name = rtl::OUString( "StatusBarFunc" ); aItem.QueryValue( a ); aArgs[0].Value = a; - execute( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StatusBarFunc" )), aArgs ); + execute( rtl::OUString( ".uno:StatusBarFunc" ), aArgs ); // GetBindings().GetDispatcher()->Execute( SID_PSZ_FUNCTION, SFX_CALLMODE_RECORD, &aItem, 0L ); } } diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index cb4abbe0c72f..25b0320292d7 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -353,7 +353,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZoomSlider" )); + aArgs[0].Name = rtl::OUString( "ZoomSlider" ); aArgs[0].Value = a; execute( aArgs ); @@ -396,7 +396,7 @@ sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) aZoomSliderItem.QueryValue( a ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZoomSlider" )); + aArgs[0].Name = rtl::OUString( "ZoomSlider" ); aArgs[0].Value = a; execute( aArgs ); diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index a8ed89f8429b..2c55ea66cfe2 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -80,8 +80,8 @@ using namespace ::com::sun::star; uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); if( xFactory.is() ) { - const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlContainer"))), uno::UNO_QUERY); - uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlContainerModel"))), uno::UNO_QUERY); + const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance(rtl::OUString("com.sun.star.awt.UnoControlContainer")), uno::UNO_QUERY); + uno::Reference< awt::XControlModel > xModel(xFactory->createInstance(rtl::OUString("com.sun.star.awt.UnoControlContainerModel")), uno::UNO_QUERY); uno::Reference< awt::XControl > xControl(mxControlContainer, uno::UNO_QUERY); if (xControl.is()) xControl->setModel(xModel); diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index a32cad756868..bd9be1b732a3 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -91,7 +91,7 @@ const Graphic ImpLoadLinkedGraphic( const String aFileName, const String aFilter // As this is a linked graphic the GfxLink is not needed if saving/loading our own format. // But this link is required by some filters to access the native graphic (PDF export/MS export), // there we should create a new service to provide this data if needed - aFilterData[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CreateNativeLink" ) ); + aFilterData[ 0 ].Name = rtl::OUString( "CreateNativeLink" ); aFilterData[ 0 ].Value = Any( true ); rGF.ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); } diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 941af356b444..05699f1e3cb8 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -176,7 +176,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); ::ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DateModified" ) ) ) ); + ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue( ::rtl::OUString( "DateModified" ) ) ); ::com::sun::star::util::DateTime aDateTime; aAny >>= aDateTime; diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 43249d90492c..3f79ca9bd030 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -296,7 +296,7 @@ Reference<XAccessible > SAL_CALL AccessibleCell::getAccessibleAtPoint ( const : // Transform coordinates from internal to pixel. if (maShapeTreeInfo.GetViewForwarder() == NULL) - throw uno::RuntimeException (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleCell has no valid view forwarder")),static_cast<uno::XWeak*>(this)); + throw uno::RuntimeException (::rtl::OUString("AccessibleCell has no valid view forwarder"),static_cast<uno::XWeak*>(this)); ::Size aPixelSize( maShapeTreeInfo.GetViewForwarder()->LogicToPixel(::Size(aCellRect.GetWidth(), aCellRect.GetHeight())) ); ::Point aPixelPosition( maShapeTreeInfo.GetViewForwarder()->LogicToPixel( aCellRect.TopLeft() )); @@ -475,7 +475,7 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc OUString SAL_CALL AccessibleCell::getImplementationName(void) throw (RuntimeException) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleCell")); + return OUString("AccessibleCell"); } // -------------------------------------------------------------------- diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index 0cb973192fb6..66ff42170751 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -315,14 +315,14 @@ Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleCont //----------------------------------------------------------------------------- OUString SAL_CALL AccessibleTableShape::getImplementationName(void) throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.accessibility.AccessibleTableShape" ) ); + return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" ); } //----------------------------------------------------------------------------- OUString AccessibleTableShape::CreateAccessibleBaseName(void) throw (RuntimeException) { - return OUString (RTL_CONSTASCII_USTRINGPARAM("TableShape")); + return OUString("TableShape"); } //-------------------------------------------------------------------- diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 93cf2f45eea7..e46b4865fb50 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -812,7 +812,7 @@ Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) throw (RuntimeExcept OUString SAL_CALL Cell::getImplementationName( ) throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.table.Cell" ) ); + return OUString( "com.sun.star.comp.svx.table.Cell" ); } // ----------------------------------------------------------------------------- @@ -835,8 +835,8 @@ Sequence< OUString > SAL_CALL Cell::getSupportedServiceNames( ) throw (RuntimeE Sequence< OUString > aSeq( SvxUnoTextBase::getSupportedServiceNames() ); sal_Int32 nIndex = aSeq.getLength(); aSeq.realloc( nIndex + 2 ); - aSeq[nIndex++] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.table.cell" ) ); - aSeq[nIndex++] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.cell" ) ); + aSeq[nIndex++] = OUString( "com.sun.star.table.cell" ); + aSeq[nIndex++] = OUString( "com.sun.star.drawing.cell" ); return aSeq; } diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index b454b08502cc..6a68466f2dbc 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -255,32 +255,32 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo() { PropertyVector aProperties(6); - aProperties[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Width" ) ); + aProperties[0].Name = OUString( "Width" ); aProperties[0].Handle = Property_Width; aProperties[0].Type = ::getCppuType((const sal_Int32*)0); aProperties[0].Attributes = 0; - aProperties[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalWidth" ) ); + aProperties[1].Name = OUString( "OptimalWidth" ); aProperties[1].Handle = Property_OptimalWidth; aProperties[1].Type = ::getBooleanCppuType(); aProperties[1].Attributes = 0; - aProperties[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ); + aProperties[2].Name = OUString( "IsVisible" ); aProperties[2].Handle = Property_IsVisible; aProperties[2].Type = ::getBooleanCppuType(); aProperties[2].Attributes = 0; - aProperties[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" ) ); + aProperties[3].Name = OUString( "IsStartOfNewPage" ); aProperties[3].Handle = Property_IsStartOfNewPage; aProperties[3].Type = ::getBooleanCppuType(); aProperties[3].Attributes = 0; - aProperties[4].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ); + aProperties[4].Name = OUString( "Size" ); aProperties[4].Handle = Property_Width; aProperties[4].Type = ::getCppuType((const sal_Int32*)0); aProperties[4].Attributes = 0; - aProperties[5].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalSize" ) ); + aProperties[5].Name = OUString( "OptimalSize" ); aProperties[5].Handle = Property_OptimalWidth; aProperties[5].Type = ::getBooleanCppuType(); aProperties[5].Attributes = 0; diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index f719d363b25e..e97b9b661ce3 100644 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx @@ -194,16 +194,16 @@ const CellStyleNameMap& TableDesignStyle::getCellStyleNameMap() if( aMap.empty() ) { CellStyleNameMap aNewMap; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "first-row" ) ) ] = first_row_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "last-row" ) ) ] = last_row_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "first-column" ) ) ] = first_column_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "last-column" ) ) ] = last_column_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "body" ) ) ] = body_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "even-rows" ) ) ] = even_rows_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "odd-rows" ) ) ] = odd_rows_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "even-columns" ) ) ] = even_columns_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "odd-columns" ) ) ] = odd_columns_style; - aNewMap[ OUString( RTL_CONSTASCII_USTRINGPARAM( "background" ) ) ] = background_style; + aNewMap[ OUString( "first-row" ) ] = first_row_style; + aNewMap[ OUString( "last-row" ) ] = last_row_style; + aNewMap[ OUString( "first-column" ) ] = first_column_style; + aNewMap[ OUString( "last-column" ) ] = last_column_style; + aNewMap[ OUString( "body" ) ] = body_style; + aNewMap[ OUString( "even-rows" ) ] = even_rows_style; + aNewMap[ OUString( "odd-rows" ) ] = odd_rows_style; + aNewMap[ OUString( "even-columns" ) ] = even_columns_style; + aNewMap[ OUString( "odd-columns" ) ] = odd_columns_style; + aNewMap[ OUString( "background" ) ] = background_style; aMap.swap( aNewMap ); } @@ -216,7 +216,7 @@ const CellStyleNameMap& TableDesignStyle::getCellStyleNameMap() OUString SAL_CALL TableDesignStyle::getImplementationName() throw(RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("TableDesignStyle") ); + return OUString("TableDesignStyle"); } // ---------------------------------------------------------- @@ -494,7 +494,7 @@ void SAL_CALL TableDesignStyle::disposing( const ::com::sun::star::lang::EventOb OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("TableDesignFamily") ); + return OUString("TableDesignFamily"); } // ---------------------------------------------------------- @@ -519,7 +519,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames() thro OUString SAL_CALL TableDesignFamily::getName() throw (RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "table" ) ); + return OUString( "table" ); } // ---------------------------------------------------------- @@ -753,7 +753,7 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (U } else { - throw UnknownPropertyException( OUString( RTL_CONSTASCII_USTRINGPARAM("unknown property: ") ) + PropertyName, static_cast<OWeakObject *>(this) ); + throw UnknownPropertyException( OUString("unknown property: ") + PropertyName, static_cast<OWeakObject *>(this) ); } } diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 07a84c00193a..03208ab10889 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -329,32 +329,32 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo() { PropertyVector aProperties(6); - aProperties[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Height" ) ); + aProperties[0].Name = OUString( "Height" ); aProperties[0].Handle = Property_Height; aProperties[0].Type = ::getCppuType((const sal_Int32*)0); aProperties[0].Attributes = 0; - aProperties[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalHeight" ) ); + aProperties[1].Name = OUString( "OptimalHeight" ); aProperties[1].Handle = Property_OptimalHeight; aProperties[1].Type = ::getBooleanCppuType(); aProperties[1].Attributes = 0; - aProperties[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsVisible" ) ); + aProperties[2].Name = OUString( "IsVisible" ); aProperties[2].Handle = Property_IsVisible; aProperties[2].Type = ::getBooleanCppuType(); aProperties[2].Attributes = 0; - aProperties[3].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsStartOfNewPage" ) ); + aProperties[3].Name = OUString( "IsStartOfNewPage" ); aProperties[3].Handle = Property_IsStartOfNewPage; aProperties[3].Type = ::getBooleanCppuType(); aProperties[3].Attributes = 0; - aProperties[4].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ) ); + aProperties[4].Name = OUString( "Size" ); aProperties[4].Handle = Property_Height; aProperties[4].Type = ::getCppuType((const sal_Int32*)0); aProperties[4].Attributes = 0; - aProperties[5].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OptimalSize" ) ); + aProperties[5].Name = OUString( "OptimalSize" ); aProperties[5].Handle = Property_OptimalHeight; aProperties[5].Type = ::getBooleanCppuType(); aProperties[5].Attributes = 0; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 6ce06652e036..a0e64bc3c266 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -247,7 +247,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( ) : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) + OUString( ".uno:ExtrusionDirectionFloater" ) ) { } @@ -265,7 +265,7 @@ ExtrusionDirectionControl::ExtrusionDirectionControl( OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionDirectionController" )); + return OUString( "com.sun.star.comp.svx.ExtrusionDirectionController" ); } // -------------------------------------------------------------------- @@ -273,7 +273,7 @@ OUString SAL_CALL ExtrusionDirectionControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -469,9 +469,9 @@ IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl) Any a; Sequence< PropertyValue > aArgs( 2 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Depth" )); + aArgs[0].Name = rtl::OUString( "Depth" ); aArgs[0].Value <<= mfDepth; - aArgs[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Metric" )); + aArgs[1].Name = rtl::OUString( "Metric" ); aArgs[1].Value <<= static_cast<sal_Int32>( meUnit ); mrController.dispatchCommand( aCommand, aArgs ); @@ -512,7 +512,7 @@ ExtrusionDepthController::ExtrusionDepthController( ) : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthFloater" ) ) + OUString( ".uno:ExtrusionDepthFloater" ) ) { } @@ -531,7 +531,7 @@ ExtrusionDepthController::ExtrusionDepthController( OUString SAL_CALL ExtrusionDepthController_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionDepthController" )); + return OUString( "com.sun.star.comp.svx.ExtrusionDepthController" ); } // -------------------------------------------------------------------- @@ -539,7 +539,7 @@ OUString SAL_CALL ExtrusionDepthController_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.PopupMenuController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.PopupMenuController" ); return aSNS; } @@ -774,7 +774,7 @@ ExtrusionLightingControl::ExtrusionLightingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDirectionFloater" ) ) + OUString( ".uno:ExtrusionDirectionFloater" ) ) { } @@ -792,7 +792,7 @@ ExtrusionLightingControl::ExtrusionLightingControl( OUString SAL_CALL ExtrusionLightingControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionLightingController" )); + return OUString( "com.sun.star.comp.svx.ExtrusionLightingController" ); } // -------------------------------------------------------------------- @@ -800,7 +800,7 @@ OUString SAL_CALL ExtrusionLightingControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -919,7 +919,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( : svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionSurfaceFloater" ) ) + OUString( ".uno:ExtrusionSurfaceFloater" ) ) { } @@ -937,7 +937,7 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl( OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.ExtrusionSurfaceController" )); + return OUString( "com.sun.star.comp.svx.ExtrusionSurfaceController" ); } // -------------------------------------------------------------------- @@ -945,7 +945,7 @@ OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName() Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -1004,7 +1004,7 @@ SfxPopupWindowType ExtrusionColorControl::GetPopupWindowType() const SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow() { SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Extrusion3DColor" )), + rtl::OUString( ".uno:Extrusion3DColor" ), SID_EXTRUSION_3D_COLOR, m_xFrame, SVX_RESSTR( RID_SVXSTR_EXTRUSION_COLOR ), diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 877958250369..cfd9f5b3010e 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -68,14 +68,14 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId bIgnoreStatusUpdate( sal_False ), eLastXFS ( XFILL_NONE ) { - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillGradient" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillHatch" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillBitmap" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GradientListState" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:HatchListState" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BitmapListState" ))); + addStatusListener( rtl::OUString( ".uno:FillColor" )); + addStatusListener( rtl::OUString( ".uno:FillGradient" )); + addStatusListener( rtl::OUString( ".uno:FillHatch" )); + addStatusListener( rtl::OUString( ".uno:FillBitmap" )); + addStatusListener( rtl::OUString( ".uno:ColorTableState" )); + addStatusListener( rtl::OUString( ".uno:GradientListState" )); + addStatusListener( rtl::OUString( ".uno:HatchListState" )); + addStatusListener( rtl::OUString( ".uno:BitmapListState" )); } //======================================================================== @@ -545,7 +545,7 @@ FillControl::~FillControl() IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl) { SelectFillTypeHdl( NULL ); - ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" ))); + ( (SvxFillToolBoxControl*)GetData() )->updateStatus( ::rtl::OUString( ".uno:FillStyle" )); // ( (SvxFillToolBoxControl*)GetData() )->GetBindings().Invalidate( SID_ATTR_FILL_STYLE ); return 0; } @@ -673,12 +673,12 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) Sequence< PropertyValue > aArgs( 1 ); // First set the style - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )); + aArgs[0].Name = ::rtl::OUString( "FillStyle" ); aXFillStyleItem.QueryValue( a ); aArgs[0].Value = a; ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True ); ((SvxFillToolBoxControl*)GetData())->Dispatch( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )), aArgs ); + ::rtl::OUString( ".uno:FillStyle" ), aArgs ); ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False ); switch( eXFS ) @@ -701,10 +701,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XFillColorItem aXFillColorItem( aTmpStr, pLbFillAttr->GetSelectEntryColor() ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )); + aArgs[0].Name = ::rtl::OUString( "FillColor" ); aXFillColorItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" )), + ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillColor" ), aArgs ); } break; @@ -722,10 +722,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XGradient aGradient = aItem.GetGradientList()->GetGradient( nPos )->GetGradient(); XFillGradientItem aXFillGradientItem( pLbFillAttr->GetSelectEntry(), aGradient ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" )); + aArgs[0].Name = ::rtl::OUString( "FillGradient" ); aXFillGradientItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillGradient" )), + ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillGradient" ), aArgs ); } } @@ -745,10 +745,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) XHatch aHatch = aItem.GetHatchList()->GetHatch( nPos )->GetHatch(); XFillHatchItem aXFillHatchItem( pLbFillAttr->GetSelectEntry(), aHatch ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" )); + aArgs[0].Name = ::rtl::OUString( "FillHatch" ); aXFillHatchItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillHatch" )), + ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( ".uno:FillHatch" ), aArgs ); } } @@ -769,10 +769,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos); const XFillBitmapItem aXFillBitmapItem(pLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject()); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillBitmap" )); + aArgs[0].Name = ::rtl::OUString( "FillBitmap" ); aXFillBitmapItem.QueryValue( a ); aArgs[0].Value = a; - ((SvxFillToolBoxControl*)GetData())->Dispatch(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:FillBitmap")), aArgs); + ((SvxFillToolBoxControl*)GetData())->Dispatch(::rtl::OUString(".uno:FillBitmap"), aArgs); } } } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index a35262f020dd..3f94d0ddcf0e 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -420,7 +420,7 @@ public: // ----------------------------------------------------------------------- FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkAlignment" ) ) ) +: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) ) { } @@ -437,7 +437,7 @@ FontWorkAlignmentControl::FontWorkAlignmentControl( const Reference< lang::XMult OUString SAL_CALL FontWorkAlignmentControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkAlignmentController" )); + return OUString( "com.sun.star.comp.svx.FontworkAlignmentController" ); } // -------------------------------------------------------------------- @@ -445,7 +445,7 @@ OUString SAL_CALL FontWorkAlignmentControl_getImplementationName() Sequence< OUString > SAL_CALL FontWorkAlignmentControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -610,7 +610,7 @@ IMPL_LINK_NOARG(FontWorkCharacterSpacingWindow, SelectHdl) aArgs[0].Name = msFontworkCharacterSpacing.copy(5); aArgs[0].Value <<= (sal_Int32)nCharacterSpacing; - mrController.dispatchCommand( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacingDialog" )), aArgs ); + mrController.dispatchCommand( OUString( ".uno:FontworkCharacterSpacingDialog" ), aArgs ); } else if ( nSelection == 6 ) // KernCharacterPairs { @@ -656,7 +656,7 @@ public: FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Reference< lang::XMultiServiceFactory >& rServiceManager ) -: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkCharacterSpacingFloater" ) ) ) +: svt::PopupWindowController( rServiceManager, Reference< frame::XFrame >(), OUString( ".uno:FontworkCharacterSpacingFloater" ) ) { } @@ -673,7 +673,7 @@ FontWorkCharacterSpacingControl::FontWorkCharacterSpacingControl( const Referenc OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName() { - return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FontworkCharacterSpacingController" )); + return OUString( "com.sun.star.comp.svx.FontworkCharacterSpacingController" ); } // -------------------------------------------------------------------- @@ -681,7 +681,7 @@ OUString SAL_CALL FontWorkCharacterSpacingControl_getImplementationName() Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 008d89bf5ff6..6aeb599adab1 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -61,9 +61,9 @@ FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl() void FormatPaintBrushToolBoxControl::impl_executePaintBrush() { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PersistentCopy" )); + aArgs[0].Name = rtl::OUString( "PersistentCopy" ); aArgs[0].Value = makeAny( static_cast<sal_Bool>(m_bPersistentCopy) ); - Dispatch( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FormatPaintbrush" )) + Dispatch( rtl::OUString( ".uno:FormatPaintbrush" ) , aArgs ); } diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 86e5c5e17942..955d2847e71f 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::lang; #define SYMBOL_TO_FIELD_OFFSET 4 #define ITEMVALUE(ItemSet,Id,Cast) ((const Cast&)(ItemSet).Get(Id)).GetValue() -#define TOOLBOX_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "colorbar" ) ) +#define TOOLBOX_NAME ::rtl::OUString( "colorbar" ) TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item ); @@ -355,7 +355,7 @@ void ImplGrafModeControl::Select() if ( !IsTravelSelect() ) { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GrafMode" )); + aArgs[0].Name = rtl::OUString( "GrafMode" ); aArgs[0].Value = makeAny( sal_Int16( GetSelectEntryPos() )); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. @@ -365,7 +365,7 @@ void ImplGrafModeControl::Select() SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GrafMode" )), + OUString( ".uno:GrafMode" ), aArgs ); } } diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 7d26fdcb0a91..76f170f0d21f 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -130,11 +130,11 @@ void SvxLineBox::Select() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineDash" )); + aArgs[0].Name = ::rtl::OUString( "LineDash" ); aLineDashItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )), + ::rtl::OUString( ".uno:LineDash" ), aArgs ); } } @@ -144,11 +144,11 @@ void SvxLineBox::Select() XLineStyleItem aLineStyleItem( eXLS ); Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XLineStyle" )); + aArgs[0].Name = ::rtl::OUString( "XLineStyle" ); aLineStyleItem.QueryValue ( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:XLineStyle" )), + ::rtl::OUString( ".uno:XLineStyle" ), aArgs ); nCurPos = GetSelectEntryPos(); @@ -474,11 +474,11 @@ void SvxMetricField::Modify() Any a; Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )); + aArgs[0].Name = ::rtl::OUString( "LineWidth" ); aLineWidthItem.QueryValue( a ); aArgs[0].Value = a; SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineWidth" )), + ::rtl::OUString( ".uno:LineWidth" ), aArgs ); } diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index cbdbbfa89586..e0adc57f125e 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -294,9 +294,9 @@ SfxPopupWindow* SvxUndoRedoControl::CreatePopupWindow() DBG_ASSERT(( SID_UNDO == GetSlotId() || SID_REDO == GetSlotId() ), "mismatching ids" ); if ( m_aCommandURL == ".uno:Undo" ) - updateStatus( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GetUndoStrings" ))); + updateStatus( rtl::OUString( ".uno:GetUndoStrings" )); else - updateStatus( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:GetRedoStrings" ))); + updateStatus( rtl::OUString( ".uno:GetRedoStrings" )); ToolBox& rBox = GetToolBox(); diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 1827f9408dd3..2f26f7b52cb2 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -65,8 +65,8 @@ SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, pDashItem ( NULL ), bUpdate ( sal_False ) { - addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" ))); - addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DashListState" ))); + addStatusListener( ::rtl::OUString( ".uno:LineDash" )); + addStatusListener( ::rtl::OUString( ".uno:DashListState" )); } //======================================================================== @@ -205,7 +205,7 @@ SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ))); + addStatusListener( rtl::OUString( ".uno:MetricUnit" )); } //======================================================================== @@ -272,7 +272,7 @@ SvxLineColorToolBoxControl::SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" ))); + addStatusListener( rtl::OUString( ".uno:ColorTableState" )); } //======================================================================== @@ -412,7 +412,7 @@ void SvxLineEndWindow::implInit() // ValueSet mit Eintraegen der LineEndList fuellen FillValueSet(); - AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineEndListState" ))); + AddStatusListener( rtl::OUString( ".uno:LineEndListState" )); //ChangeHelpId( HID_POPUP_LINEENDSTYLE ); aLineEndSet.Show(); @@ -464,13 +464,13 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) if ( pLineStartItem ) { - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineStart" )); + aArgs[0].Name = ::rtl::OUString( "LineStart" ); pLineStartItem->QueryValue( a ); aArgs[0].Value = a; } else { - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineEnd" )); + aArgs[0].Name = ::rtl::OUString( "LineEnd" ); pLineEndItem->QueryValue( a ); aArgs[0].Value = a; } @@ -481,7 +481,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl) aLineEndSet.SetNoSelection(); SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( mxFrame->getController(), UNO_QUERY ), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineEndStyle" )), + ::rtl::OUString( ".uno:LineEndStyle" ), aArgs ); delete pLineEndItem; diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index d2c7b9dea304..0968974377fe 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -119,7 +119,7 @@ void SvxFontSizeBox_Impl::Select() float fSelVal = float( nSelVal ) / 10; uno::Sequence< beans::PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontHeight.Height" )); + aArgs[0].Name = ::rtl::OUString( "FontHeight.Height" ); aArgs[0].Value = uno::makeAny( fSelVal ); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() call. @@ -242,10 +242,10 @@ FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< lang::XMultiServiceFactory >& rServiceManager ) : svt::ToolboxController( rServiceManager, uno::Reference< frame::XFrame >(), - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight" )) ), + ::rtl::OUString( ".uno:FontHeight" ) ), m_pBox( NULL ) { - addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" ))); + addStatusListener( ::rtl::OUString( ".uno:CharFontName" )); } FontHeightToolBoxControl::~FontHeightToolBoxControl() @@ -303,7 +303,7 @@ uno::Sequence< ::rtl::OUString > FontHeightToolBoxControl::getSupportedServiceNa throw() { uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" )); + aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -402,7 +402,7 @@ void FontHeightToolBoxControl::dispatchCommand( uno::Reference< frame::XDispatch > xDispatch; uno::Reference< util::XURLTransformer > xURLTransformer = getURLTransformer(); - aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontHeight" )); + aURL.Complete = ::rtl::OUString( ".uno:FontHeight" ); xURLTransformer->parseStrict( aURL ); xDispatch = xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 ); if ( xDispatch.is() ) diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 7a020ed10ffe..4e4cf1fc925b 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -148,7 +148,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent& rNEvt ) if (xPropSet.is()) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (xLayoutManager.is()) { @@ -360,7 +360,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FindTextToolbarController::getSup css::uno::Sequence< ::rtl::OUString > FindTextToolbarController::getSupportedServiceNames_Static() throw() { css::uno::Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ToolbarController" ) ); + aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.frame.ToolbarController" ); return aSNS; } @@ -698,7 +698,7 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) if (xPropSet.is()) { css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) ); + css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (xLayoutManager.is()) { @@ -778,8 +778,8 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FindbarDispatcher::getSupportedSe css::uno::Sequence< ::rtl::OUString > FindbarDispatcher::getSupportedServiceNames_Static() throw() { css::uno::Sequence< ::rtl::OUString > aSNS( 2 ); - aSNS.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svx.FindbarDispatcher" )); - aSNS.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ProtocolHandler" )); + aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.comp.svx.FindbarDispatcher" ); + aSNS.getArray()[1] = ::rtl::OUString( "com.sun.star.frame.ProtocolHandler" ); return aSNS; } @@ -823,7 +823,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css return; css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; - css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" )) ); + css::uno::Any aValue = xPropSet->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ); aValue >>= xLayoutManager; if (!xLayoutManager.is()) return; diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index e877eed176ae..0d353b196d9f 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -34,14 +34,14 @@ SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { SetVert(sal_False); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CTLFontState" ))); + addStatusListener( rtl::OUString( ".uno:CTLFontState" )); } SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { SetVert(sal_True); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:VerticalTextState" ))); + addStatusListener( rtl::OUString( ".uno:VerticalTextState" )); } /* ---------------------------------------------------------------------------*/ diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index cd6d963fd71f..ce9903c53187 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -506,14 +506,14 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) rtl::OUString aNameTo_Simplified( RTL_CONSTASCII_USTRINGPARAM("ChineseT2S") ); rtl::OUString aNameTo_Traditional( RTL_CONSTASCII_USTRINGPARAM("ChineseS2T") ); lang::Locale aLocale; - aLocale.Language = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("zh") ); + aLocale.Language = rtl::OUString("zh"); if( xContainer->hasByName( aNameTo_Simplified ) ) xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xContainer->getByName( aNameTo_Simplified ), UNO_QUERY ); else { - aLocale.Country = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TW") ); + aLocale.Country = rtl::OUString("TW"); xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Simplified , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE @@ -528,7 +528,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) xContainer->getByName( aNameTo_Traditional ), UNO_QUERY ); else { - aLocale.Country = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("CN") ); + aLocale.Country = rtl::OUString("CN"); xDictionary_To_Traditional = Reference< linguistic2::XConversionDictionary >( xDictionaryList->addNewDictionary( aNameTo_Traditional , aLocale, linguistic2::ConversionDictionaryType::SCHINESE_TCHINESE diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 150094dd4650..21cf4d5b43fb 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -193,14 +193,14 @@ namespace svx throw() { Sequence< OUString > aSupportedServiceNames( 1 ); - aSupportedServiceNames[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicExportFilter" ) ); + aSupportedServiceNames[0] = OUString( "com.sun.star.drawing.GraphicExportFilter" ); return aSupportedServiceNames; } SVX_DLLPUBLIC OUString SAL_CALL GraphicExporter_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Draw.GraphicExporter" ) ); + return OUString( "com.sun.star.comp.Draw.GraphicExporter" ); } /** creates a bitmap that is optionaly transparent from a metafile @@ -517,12 +517,12 @@ void GraphicExporter::ParseSettings( const Sequence< PropertyValue >& aDescripto else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Width" ) ) ) // for compatibility reasons, deprecated { pDataValues->Value >>= rSettings.mnWidth; - pDataValues->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PixelWidth" ) ); + pDataValues->Name = OUString( "PixelWidth" ); } else if( pDataValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Height" ) ) ) // for compatibility reasons, deprecated { pDataValues->Value >>= rSettings.mnHeight; - pDataValues->Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "PixelHeight" ) ); + pDataValues->Name = OUString( "PixelHeight" ); } else if ( pDataValues->Name == "ExportOnlyBackground" ) { diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 33c4e811ac30..3be929155bd7 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -82,14 +82,14 @@ namespace svx throw() { Sequence< ::rtl::OUString > aSupportedServiceNames( 1 ); - aSupportedServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.NamespaceMap" ) ); + aSupportedServiceNames[0] = ::rtl::OUString( "com.sun.star.xml.NamespaceMap" ); return aSupportedServiceNames; } ::rtl::OUString SAL_CALL NamespaceMap_getImplementationName() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Svx.NamespaceMap" ) ); + return ::rtl::OUString( "com.sun.star.comp.Svx.NamespaceMap" ); } diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index c6b9063930b4..5258eb8fc86e 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -309,7 +309,7 @@ uno::Type SAL_CALL SvxUnoXColorTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXColorTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXColorTable" ) ); + return OUString( "SvxUnoXColorTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( ) throw( uno::RuntimeException) @@ -383,7 +383,7 @@ uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXLineEndTable" ) ); + return OUString( "SvxUnoXLineEndTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( ) throw( uno::RuntimeException) @@ -465,7 +465,7 @@ uno::Type SAL_CALL SvxUnoXDashTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXDashTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXDashTable" ) ); + return OUString( "SvxUnoXDashTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException) @@ -542,7 +542,7 @@ uno::Type SAL_CALL SvxUnoXHatchTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXHatchTable" ) ); + return OUString( "SvxUnoXHatchTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( ) throw( uno::RuntimeException) @@ -631,7 +631,7 @@ uno::Type SAL_CALL SvxUnoXGradientTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXGradientTable" ) ); + return OUString( "SvxUnoXGradientTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException) @@ -699,7 +699,7 @@ uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType() // XServiceInfo OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( ) throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoXBitmapTable" ) ); + return OUString( "SvxUnoXBitmapTable" ); } uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( ) throw( uno::RuntimeException) diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 72cc07b9ab2f..62af47f7d31a 100644 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star::beans; SvxTableShape::SvxTableShape( SdrObject* pObj ) throw() : SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_TABLE), getSvxMapProvider().GetPropertySet(SVXMAP_TABLE, SdrObject::GetGlobalDrawObjectItemPool()) ) { - SetShapeType( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TableShape" ) ) ); + SetShapeType( rtl::OUString( "com.sun.star.drawing.TableShape" ) ); } //---------------------------------------------------------------------- diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index bc8e7dff52ff..0697b7023959 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -80,14 +80,14 @@ bool SvxUnoBitmapTable::isValid( const NameOrIndex* pItem ) const OUString SAL_CALL SvxUnoBitmapTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoBitmapTable") ); + return OUString("SvxUnoBitmapTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.BitmapTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.BitmapTable" ); return aSNS; } diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 2bfc7db866c1..f80416a134fe 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -51,7 +51,7 @@ public: static OUString getImplementationName_Static() throw() { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SvxUnoColorTable")); + return OUString("com.sun.star.drawing.SvxUnoColorTable"); } static uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(); @@ -98,7 +98,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceNam OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoColorTable") ); + return OUString("SvxUnoColorTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames() @@ -110,7 +110,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames() uno::Sequence< OUString > SvxUnoColorTable::getSupportedServiceNames_Static(void) throw() { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ColorTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.ColorTable" ); return aSNS; } diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 1db5395b8281..e6e89129f06c 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -61,14 +61,14 @@ SvxUnoDashTable::~SvxUnoDashTable() throw() OUString SAL_CALL SvxUnoDashTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoDashTable") ); + return OUString("SvxUnoDashTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DashTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.DashTable" ); return aSNS; } diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index deb2e1d2d656..5cc1f9bf225c 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -60,14 +60,14 @@ SvxUnoGradientTable::~SvxUnoGradientTable() throw() OUString SAL_CALL SvxUnoGradientTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoGradientTable") ); + return OUString("SvxUnoGradientTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GradientTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.GradientTable" ); return aSNS; } diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 8f3f67778999..2e4b1ba7ec73 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -60,14 +60,14 @@ SvxUnoHatchTable::~SvxUnoHatchTable() throw() OUString SAL_CALL SvxUnoHatchTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoHatchTable") ); + return OUString("SvxUnoHatchTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.HatchTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.HatchTable" ); return aSNS; } diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index d3b12680ab85..bd51521aa30b 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -130,23 +130,23 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* pDoc, const SdrHint* // #115423# // case HINT_PAGECHG: // Page geaendert -// aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageModified" ) ); +// aEvent.EventName = OUString( "PageModified" ); // pPage = pSdrHint->GetPage(); // break; case HINT_PAGEORDERCHG: // Reihenfolge der Seiten (Zeichenseiten oder Masterpages) geaendert (Insert/Remove/ChangePos) - aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "PageOrderModified" ) ); + aEvent.EventName = OUString( "PageOrderModified" ); pPage = pSdrHint->GetPage(); break; case HINT_OBJCHG: // Objekt geaendert - aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeModified" ) ); + aEvent.EventName = OUString( "ShapeModified" ); pObj = pSdrHint->GetObject(); break; case HINT_OBJINSERTED: // Neues Zeichenobjekt eingefuegt - aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeInserted" ) ); + aEvent.EventName = OUString( "ShapeInserted" ); pObj = pSdrHint->GetObject(); break; case HINT_OBJREMOVED: // Zeichenobjekt aus Liste entfernt - aEvent.EventName = OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeRemoved" ) ); + aEvent.EventName = OUString( "ShapeRemoved" ); pObj = pSdrHint->GetObject(); break; // HINT_DEFAULTTABCHG, // Default Tabulatorweite geaendert @@ -509,28 +509,28 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames( sal_uInt16 i = 0; - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.DashTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GradientTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.HatchTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.BitmapTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TransparencyGradientTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MarkerTable")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.NumberingRules")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapRectangleObject")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapCircleObject")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.image.ImageMapPolygonObject")); - - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TitleTextShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OutlinerShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SubtitleShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.GraphicObjectShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.ChartShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.PageShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OLE2Shape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.TableShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.OrgChartShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.NotesShape")); - aSNS[i++] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.HandoutShape")); + aSNS[i++] = OUString("com.sun.star.drawing.DashTable"); + aSNS[i++] = OUString("com.sun.star.drawing.GradientTable"); + aSNS[i++] = OUString("com.sun.star.drawing.HatchTable"); + aSNS[i++] = OUString("com.sun.star.drawing.BitmapTable"); + aSNS[i++] = OUString("com.sun.star.drawing.TransparencyGradientTable"); + aSNS[i++] = OUString("com.sun.star.drawing.MarkerTable"); + aSNS[i++] = OUString("com.sun.star.text.NumberingRules"); + aSNS[i++] = OUString("com.sun.star.image.ImageMapRectangleObject"); + aSNS[i++] = OUString("com.sun.star.image.ImageMapCircleObject"); + aSNS[i++] = OUString("com.sun.star.image.ImageMapPolygonObject"); + + aSNS[i++] = OUString("com.sun.star.presentation.TitleTextShape"); + aSNS[i++] = OUString("com.sun.star.presentation.OutlinerShape"); + aSNS[i++] = OUString("com.sun.star.presentation.SubtitleShape"); + aSNS[i++] = OUString("com.sun.star.presentation.GraphicObjectShape"); + aSNS[i++] = OUString("com.sun.star.presentation.ChartShape"); + aSNS[i++] = OUString("com.sun.star.presentation.PageShape"); + aSNS[i++] = OUString("com.sun.star.presentation.OLE2Shape"); + aSNS[i++] = OUString("com.sun.star.presentation.TableShape"); + aSNS[i++] = OUString("com.sun.star.presentation.OrgChartShape"); + aSNS[i++] = OUString("com.sun.star.presentation.NotesShape"); + aSNS[i++] = OUString("com.sun.star.presentation.HandoutShape"); DBG_ASSERT( i == aSNS.getLength(), "Sequence overrun!" ); @@ -541,7 +541,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames( OUString SAL_CALL SvxUnoDrawingModel::getImplementationName() throw(uno::RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoDrawingModel")); + return OUString("SvxUnoDrawingModel"); } sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName ) @@ -693,7 +693,7 @@ const char pSvxUnoDrawPagesAccessService[] = "com.sun.star.drawing.DrawPages"; OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName( ) throw(uno::RuntimeException) { - return OUString( RTL_CONSTASCII_USTRINGPARAM( "SvxUnoDrawPagesAccess" ) ); + return OUString( "SvxUnoDrawPagesAccess" ); } sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException) diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index ce70254b0303..1e3d5a16f990 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -143,14 +143,14 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const OUString& ServiceNa OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoMarkerTable") ); + return OUString("SvxUnoMarkerTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.MarkerTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.MarkerTable" ); return aSNS; } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 0ab54524627e..cb13fb859e77 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -847,7 +847,7 @@ SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xS //---------------------------------------------------------------------- OUString SAL_CALL SvxDrawPage::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxDrawPage")); + return OUString("SvxDrawPage"); } sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName ) @@ -859,7 +859,7 @@ sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName ) uno::Sequence< OUString > SAL_CALL SvxDrawPage::getSupportedServiceNames() throw( uno::RuntimeException ) { uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection" )); + aSeq.getArray()[0] = OUString("com.sun.star.drawing.ShapeCollection" ); return aSeq; } diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index bfa37ab3b7a2..48dd8b4a36ac 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -408,14 +408,14 @@ sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const OUString& ServiceName OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoDrawPool") ); + return OUString("SvxUnoDrawPool"); } uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.Defaults" ); return aSNS; } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 1193242b98bf..6a945ba9a195 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -1690,8 +1690,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const if( (pMap->nFlags & beans::PropertyAttribute::READONLY ) != 0 ) throw beans::PropertyVetoException( ( rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "Readonly property can't be set: " ) ) + "Readonly property can't be set: " ) + rPropertyName ), uno::Reference< drawing::XShape >( this ) ); diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 485dd16a7294..1c8102129b55 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -220,7 +220,7 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException ::rtl::OUString SvxShapeCollection::getImplementationName_Static() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SvxShapeCollection") ); + return ::rtl::OUString("com.sun.star.drawing.SvxShapeCollection"); } sal_Bool SAL_CALL SvxShapeCollection::supportsService( const ::rtl::OUString& ServiceName ) @@ -237,8 +237,8 @@ uno::Sequence< ::rtl::OUString > SAL_CALL SvxShapeCollection::getSupportedServic uno::Sequence< ::rtl::OUString > SvxShapeCollection::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aSeq(2); - aSeq.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shapes") ); - aSeq.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection") ); + aSeq.getArray()[0] = ::rtl::OUString("com.sun.star.drawing.Shapes"); + aSeq.getArray()[1] = ::rtl::OUString("com.sun.star.drawing.ShapeCollection"); return aSeq; } diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index d76c6375ed8b..26c532f7e7e3 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -60,14 +60,14 @@ SvxUnoTransGradientTable::~SvxUnoTransGradientTable() throw() OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName() throw( uno::RuntimeException ) { - return OUString( RTL_CONSTASCII_USTRINGPARAM("SvxUnoTransGradientTable") ); + return OUString("SvxUnoTransGradientTable"); } uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException ) { uno::Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.TransparencyGradientTable" )); + aSNS.getArray()[0] = OUString("com.sun.star.drawing.TransparencyGradientTable" ); return aSNS; } diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index da13bf7189cc..54d25ae9cb36 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -128,7 +128,7 @@ void SAL_CALL GalleryItem::release() ::rtl::OUString GalleryItem::getImplementationName_Static() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.gallery.GalleryItem" ) ); + return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryItem" ); } // ------------------------------------------------------------------------------ @@ -138,7 +138,7 @@ uno::Sequence< ::rtl::OUString > GalleryItem::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.gallery.GalleryItem" ) ); + aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryItem" ); return aSeq; } diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 70f465825203..8b6284797017 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -74,7 +74,7 @@ GalleryTheme::~GalleryTheme() ::rtl::OUString GalleryTheme::getImplementationName_Static() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.gallery.GalleryTheme" ) ); + return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryTheme" ); } // ------------------------------------------------------------------------------ @@ -84,7 +84,7 @@ uno::Sequence< ::rtl::OUString > GalleryTheme::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.gallery.GalleryTheme" ) ); + aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryTheme" ); return aSeq; } diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 7ddc9fcbdefa..672ef21ba848 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -80,7 +80,7 @@ GalleryThemeProvider::~GalleryThemeProvider() SVX_DLLPUBLIC ::rtl::OUString GalleryThemeProvider::getImplementationName_Static() throw() { - return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.gallery.GalleryThemeProvider" ) ); + return ::rtl::OUString( "com.sun.star.comp.gallery.GalleryThemeProvider" ); } // ------------------------------------------------------------------------------ @@ -90,7 +90,7 @@ SVX_DLLPUBLIC uno::Sequence< ::rtl::OUString > GalleryThemeProvider::getSupporte { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.gallery.GalleryThemeProvider" ) ); + aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.gallery.GalleryThemeProvider" ); return aSeq; } diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index af61eab983fe..b351b6595893 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -264,7 +264,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( while( nPos >= 0 && nPos < rURLStr.getLength() ) { ::rtl::OUString aToken = rURLStr.getToken( 0, ',', nPos ); - if ( aToken.equalsIgnoreAsciiCase( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "oasis=false" ) ) ) ) + if ( aToken.equalsIgnoreAsciiCase( ::rtl::OUString( "oasis=false" ) ) ) { if ( pOasisFormat ) *pOasisFormat = sal_False; @@ -416,8 +416,8 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( // This is an ole object uno::Reference< beans::XPropertySet > xProps( xStm, uno::UNO_QUERY_THROW ); xProps->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), - uno::makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.oleobject" ) ) ) ); + ::rtl::OUString( "MediaType" ), + uno::makeAny( ::rtl::OUString( "application/vnd.sun.star.oleobject" ) ) ); xStm->getOutputStream()->closeOutput(); } @@ -497,7 +497,7 @@ sal_Bool SvXMLEmbeddedObjectHelper::ImplReadObject( else { // Objects are written using ::comphelper::IEmbeddedHelper::SaveAs - sRetURL = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("./") ); + sRetURL = ::rtl::OUString("./"); if( !aContainerStorageName.isEmpty() ) { sRetURL += aContainerStorageName; @@ -683,7 +683,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( mxTempStorage = comphelper::OStorageHelper::GetTemporaryStorage(); Sequence < beans::PropertyValue > aDummy( 0 ), aEmbDescr( 1 ); - aEmbDescr[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StoreVisualReplacement" ) ); + aEmbDescr[0].Name = ::rtl::OUString( "StoreVisualReplacement" ); aEmbDescr[0].Value <<= (sal_Bool)(!bOasisFormat); if ( !bOasisFormat ) { @@ -691,7 +691,7 @@ Any SAL_CALL SvXMLEmbeddedObjectHelper::getByName( if ( xGrInStream.is() ) { aEmbDescr.realloc( 2 ); - aEmbDescr[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VisualReplacement" ) ); + aEmbDescr[1].Name = ::rtl::OUString( "VisualReplacement" ); aEmbDescr[1].Value <<= xGrInStream; } } diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 8ba2981f7556..afac2c05ea1f 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -180,12 +180,12 @@ static void initializeStreamMetadata( const uno::Reference< uno::XInterface > &x try { xProps->setPropertyValue( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ), - uno::makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "text/xml" ) ) ) ); + rtl::OUString( "MediaType" ), + uno::makeAny( rtl::OUString( "text/xml" ) ) ); // use stock encryption xProps->setPropertyValue( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UseCommonStoragePasswordEncryption" ) ), + rtl::OUString( "UseCommonStoragePasswordEncryption" ), uno::makeAny( sal_True ) ); } catch ( const uno::Exception & ) { @@ -199,7 +199,7 @@ static void createStorageStream( uno::Reference < io::XOutputStream > *xOut, { uno::Reference < io::XStream > xStream; xStream = xSubStorage->openStreamElement( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Content.xml" ) ), + rtl::OUString( "Content.xml" ), embed::ElementModes::WRITE ); *ppGraphicHelper = SvXMLGraphicHelper::Create( xSubStorage, GRAPHICHELPER_MODE_WRITE ); initializeStreamMetadata( xStream ); @@ -272,7 +272,7 @@ bool SvxXMLXTableExportComponent::save( } else { - aPath += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".xml" ) ); + aPath += rtl::OUString( ".xml" ); try { xStream = xStorage->openStreamElement( aPath, eCreate ); if( !xStream.is() ) diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 9a607cb01884..fb7cc13b669d 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -1000,9 +1000,9 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMem aLineDash.Distance = rXD.GetDistance(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )); + aPropSeq[0].Name = rtl::OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineDash" )); + aPropSeq[1].Name = rtl::OUString( "LineDash" ); aPropSeq[1].Value = uno::makeAny( aLineDash ); rVal = uno::makeAny( aPropSeq ); break; @@ -3397,9 +3397,9 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 aGradient2.StepCount = aXGradient.GetSteps(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )); + aPropSeq[0].Name = rtl::OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" )); + aPropSeq[1].Name = rtl::OUString( "FillGradient" ); aPropSeq[1].Value = uno::makeAny( aGradient2 ); rVal = uno::makeAny( aPropSeq ); break; @@ -3985,9 +3985,9 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMe aUnoHatch.Angle = aHatch.GetAngle(); OUString aApiName = SvxUnogetApiNameForItem(Which(), GetName()); - aPropSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )); + aPropSeq[0].Name = rtl::OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aApiName ); - aPropSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" )); + aPropSeq[1].Name = rtl::OUString( "FillHatch" ); aPropSeq[1].Value = uno::makeAny( aUnoHatch ); rVal = uno::makeAny( aPropSeq ); break; diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 1256f43caa3e..17827a321aea 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -543,11 +543,11 @@ bool XFillBitmapItem::QueryValue(::com::sun::star::uno::Any& rVal, sal_uInt8 nMe DBG_ASSERT( nMemberId == 0, "invalid member-id" ); uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); - aPropSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )); + aPropSeq[0].Name = ::rtl::OUString( "Name" ); aPropSeq[0].Value = uno::makeAny( aInternalName ); - aPropSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillBitmapURL" )); + aPropSeq[1].Name = ::rtl::OUString( "FillBitmapURL" ); aPropSeq[1].Value = uno::makeAny( aURL ); - aPropSeq[2].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )); + aPropSeq[2].Name = ::rtl::OUString( "Bitmap" ); aPropSeq[2].Value = uno::makeAny( xBmp ); rVal <<= aPropSeq; |