diff options
| author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-27 17:20:30 +0100 |
|---|---|---|
| committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-27 17:20:30 +0100 |
| commit | 1231e74a6d5c17f91d235b1564251497fa2e3f72 (patch) | |
| tree | 1dc6ef96cb11d39a2461977c584ade730d553ff5 | |
| parent | cppcheck: use prefix form (diff) | |
| download | core-1231e74a6d5c17f91d235b1564251497fa2e3f72.tar.gz core-1231e74a6d5c17f91d235b1564251497fa2e3f72.zip | |
RTL_CONSTASCII_USTRINGPARAM in components 2 (build problem in sal ?)
76 files changed, 371 insertions, 371 deletions
diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index bc1433d3af63..f26250bed987 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -934,7 +934,7 @@ WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference< XWindo WindowDescriptor* pDescriptor = new WindowDescriptor ; pDescriptor->Type = WindowClass_SIMPLE ; - pDescriptor->WindowServiceName = OUString(RTL_CONSTASCII_USTRINGPARAM("window")) ; + pDescriptor->WindowServiceName = OUString::createFromAscii( "window" ) ; pDescriptor->ParentIndex = -1 ; pDescriptor->Parent = xParentPeer ; pDescriptor->Bounds = getPosSize () ; diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx index 62e2e23ccc16..e8f58b8fa7f2 100644 --- a/UnoControls/source/base/registercontrols.cxx +++ b/UnoControls/source/base/registercontrols.cxx @@ -107,9 +107,9 @@ using namespace ::com::sun::star::registry ; { \ AS_DBG_OUT ( "\tCOMPONENT_INFO():\t\txkey is valid ...\n" ) \ /* Build new keyname */ \ - sKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/")) ; \ + sKeyName = OUString::createFromAscii( "/" ) ; \ sKeyName += CLASS::impl_getStaticImplementationName() ; \ - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); \ + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ); \ \ /* Create new key with new name. */ \ xNewKey = xKey->createKey( sKeyName ); \ diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index bf87339cc86b..9987478b7b56 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -509,7 +509,7 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee xOldFrame = m_xFrame ; } - xNewFrame = Reference< XFrame > ( impl_getMultiServiceFactory()->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")) ), UNO_QUERY ) ; + xNewFrame = Reference< XFrame > ( impl_getMultiServiceFactory()->createInstance ( OUString::createFromAscii( "com.sun.star.frame.Frame" ) ), UNO_QUERY ) ; Reference< XDispatchProvider > xDSP ( xNewFrame, UNO_QUERY ) ; if (xDSP.is()) @@ -520,7 +520,7 @@ void FrameControl::impl_createFrame( const Reference< XWindowPeer >& xPee // option //xFrame->setName( "WhatYouWant" ); - Reference< XURLTransformer > xTrans ( impl_getMultiServiceFactory()->createInstance ( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer")) ), UNO_QUERY ) ; + Reference< XURLTransformer > xTrans ( impl_getMultiServiceFactory()->createInstance ( OUString::createFromAscii( "com.sun.star.util.URLTransformer" ) ), UNO_QUERY ) ; if(xTrans.is()) { // load file diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index 2f73787e4bba..bf6dc153a933 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -897,9 +897,9 @@ void ProgressMonitor::impl_rebuildFixedText () { IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject (n) ; aCollectString += pSearchItem->sTopic ; - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ; + aCollectString += OUString::createFromAscii("\n") ; } - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-) + aCollectString += OUString::createFromAscii("\0") ; // It's better :-) m_xTopic_Top->setText ( aCollectString ) ; } @@ -915,9 +915,9 @@ void ProgressMonitor::impl_rebuildFixedText () { IMPL_TextlistItem* pSearchItem = m_pTextlist_Top->GetObject (n) ; aCollectString += pSearchItem->sText ; - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ; + aCollectString += OUString::createFromAscii("\n") ; } - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-) + aCollectString += OUString::createFromAscii("\0") ; // It's better :-) m_xText_Top->setText ( aCollectString ) ; } @@ -935,9 +935,9 @@ void ProgressMonitor::impl_rebuildFixedText () { IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject (n) ; aCollectString += pSearchItem->sTopic ; - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ; + aCollectString += OUString::createFromAscii("\n") ; } - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-) + aCollectString += OUString::createFromAscii("\0") ; // It's better :-) m_xTopic_Bottom->setText ( aCollectString ) ; } @@ -953,9 +953,9 @@ void ProgressMonitor::impl_rebuildFixedText () { IMPL_TextlistItem* pSearchItem = m_pTextlist_Bottom->GetObject (n) ; aCollectString += pSearchItem->sText ; - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) ; + aCollectString += OUString::createFromAscii("\n") ; } - aCollectString += OUString(RTL_CONSTASCII_USTRINGPARAM("\0")) ; // It's better :-) + aCollectString += OUString::createFromAscii("\0") ; // It's better :-) m_xText_Bottom->setText ( aCollectString ) ; } diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx index ffe1c7c3eb05..70b195931c18 100644 --- a/UnoControls/source/controls/statusindicator.cxx +++ b/UnoControls/source/controls/statusindicator.cxx @@ -459,7 +459,7 @@ WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const Reference< XW WindowDescriptor* pDescriptor = new WindowDescriptor ; pDescriptor->Type = WindowClass_SIMPLE ; - pDescriptor->WindowServiceName = OUString(RTL_CONSTASCII_USTRINGPARAM("floatingwindow")) ; + pDescriptor->WindowServiceName = OUString::createFromAscii( "floatingwindow" ) ; pDescriptor->ParentIndex = -1 ; pDescriptor->Parent = xParentPeer ; pDescriptor->Bounds = getPosSize () ; diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index f6ebd088a365..44b33aa9def3 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -190,7 +190,7 @@ sal_Bool KillFile_Impl( const String& rURL ) try { Content aCnt( rURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); - aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) ); } catch( ::com::sun::star::ucb::CommandAbortedException& ) { diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 1a5f7fb0aab6..8144380594ab 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -120,7 +120,7 @@ namespace dbp try { ::rtl::OUString sDataSourceName; - rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSourceName; + rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSourceName; Reference< XConnection > xConnection; bool bEmbedded = ::dbtools::isEmbeddedInDatabase( rContext.xForm, xConnection ); @@ -138,9 +138,9 @@ namespace dbp implFillTables(xConnection); ::rtl::OUString sCommand; - OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")) ) >>= sCommand ); + OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString::createFromAscii("Command") ) >>= sCommand ); sal_Int32 nCommandType = CommandType::TABLE; - OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")) ) >>= nCommandType ); + OSL_VERIFY( rContext.xForm->getPropertyValue( ::rtl::OUString::createFromAscii("CommandType") ) >>= nCommandType ); // search the entry of the given type with the given name XubString sLookup( sCommand ); @@ -175,13 +175,13 @@ namespace dbp xOldConn = getFormConnection(); ::rtl::OUString sDataSource = m_aDatasource.GetSelectEntry(); - rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName")), makeAny( sDataSource ) ); + rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("DataSourceName"), makeAny( sDataSource ) ); } ::rtl::OUString sCommand = m_aTable.GetSelectEntry(); sal_Int32 nCommandType = reinterpret_cast< sal_IntPtr >( m_aTable.GetEntryData( m_aTable.GetSelectEntryPos() ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")), makeAny( sCommand ) ); - rContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")), makeAny( nCommandType ) ); + rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("Command"), makeAny( sCommand ) ); + rContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("CommandType"), makeAny( nCommandType ) ); if ( !rContext.bEmbedded ) setFormConnection( xOldConn, sal_False ); diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 408a45dda260..e490aa8fd58b 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -240,9 +240,9 @@ namespace dbp sal_Int32 nCommandType = CommandType::COMMAND; try { - rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataSourceName"))) >>= sDataSource; - rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command"))) >>= sCommand; - rContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType"))) >>= nCommandType; + rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("DataSourceName")) >>= sDataSource; + rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command")) >>= sCommand; + rContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType")) >>= nCommandType; } catch(const Exception&) { @@ -306,7 +306,7 @@ namespace dbp sal_Int16 nClassId = FormComponentType::CONTROL; try { - getContext().xObjectModel->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassId"))) >>= nClassId; + getContext().xObjectModel->getPropertyValue(::rtl::OUString::createFromAscii("ClassId")) >>= nClassId; } catch(Exception&) { @@ -448,7 +448,7 @@ namespace dbp Reference< XInterface > xContext; if (xORB.is()) - xContext = xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.DatabaseContext"))); + xContext = xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.sdb.DatabaseContext")); DBG_ASSERT(xContext.is(), "OControlWizard::implGetDSContext: invalid database context!"); m_aContext.xDatasourceContext = Reference< XNameAccess >(xContext, UNO_QUERY); @@ -472,7 +472,7 @@ namespace dbp try { if ( !::dbtools::isEmbeddedInDatabase(m_aContext.xForm,xConn) ) - m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) >>= xConn; + m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("ActiveConnection")) >>= xConn; } catch(const Exception&) { @@ -502,7 +502,7 @@ namespace dbp } else { - m_aContext.xForm->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection")), makeAny( _rxConn ) ); + m_aContext.xForm->setPropertyValue( ::rtl::OUString::createFromAscii("ActiveConnection"), makeAny( _rxConn ) ); } } catch(const Exception&) @@ -519,7 +519,7 @@ namespace dbp //--------------------------------------------------------------------- Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const { - const ::rtl::OUString sInteractionHandlerServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")); + const ::rtl::OUString sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler"); Reference< XInteractionHandler > xHandler; try { @@ -572,8 +572,8 @@ namespace dbp if (m_aContext.xForm.is()) { // collect some properties of the form - ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Command")))); - sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CommandType")))); + ::rtl::OUString sObjectName = ::comphelper::getString(m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("Command"))); + sal_Int32 nObjectType = ::comphelper::getINT32(m_aContext.xForm->getPropertyValue(::rtl::OUString::createFromAscii("CommandType"))); // calculate the connection the rowset is working with Reference< XConnection > xConnection; @@ -618,7 +618,7 @@ namespace dbp // not interested in any results, only in the fields Reference< XPropertySet > xStatementProps(xStatement, UNO_QUERY); - xStatementProps->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxRows")), makeAny(sal_Int32(0))); + xStatementProps->setPropertyValue(::rtl::OUString::createFromAscii("MaxRows"), makeAny(sal_Int32(0))); // TODO: think about handling local SQLExceptions here ... Reference< XColumnsSupplier > xSupplyCols(xStatement->executeQuery(), UNO_QUERY); @@ -632,7 +632,7 @@ namespace dbp if (xColumns.is()) { m_aContext.aFieldNames = xColumns->getElementNames(); - static const ::rtl::OUString s_sFieldTypeProperty(RTL_CONSTASCII_USTRINGPARAM("Type")); + static const ::rtl::OUString s_sFieldTypeProperty = ::rtl::OUString::createFromAscii("Type"); const ::rtl::OUString* pBegin = m_aContext.aFieldNames.getConstArray(); const ::rtl::OUString* pEnd = pBegin + m_aContext.aFieldNames.getLength(); for(;pBegin != pEnd;++pBegin) @@ -697,13 +697,13 @@ namespace dbp // the only thing we have at the moment is the label try { - ::rtl::OUString sLabelPropertyName(RTL_CONSTASCII_USTRINGPARAM("Label")); + ::rtl::OUString sLabelPropertyName = ::rtl::OUString::createFromAscii("Label"); Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo(); if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName)) { ::rtl::OUString sControlLabel(_pSettings->sControlLabel); m_aContext.xObjectModel->setPropertyValue( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), + ::rtl::OUString::createFromAscii("Label"), makeAny(sControlLabel) ); } @@ -724,7 +724,7 @@ namespace dbp // initialize some settings from the control model give try { - ::rtl::OUString sLabelPropertyName(RTL_CONSTASCII_USTRINGPARAM("Label")); + ::rtl::OUString sLabelPropertyName = ::rtl::OUString::createFromAscii("Label"); Reference< XPropertySetInfo > xInfo = m_aContext.xObjectModel->getPropertySetInfo(); if (xInfo.is() && xInfo->hasPropertyByName(sLabelPropertyName)) { diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index ebc03de45850..f3bd194a27c3 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -111,10 +111,10 @@ namespace dbp if (!xColumnFactory.is() || !xColumnContainer.is()) return; - static const ::rtl::OUString s_sDataFieldProperty (RTL_CONSTASCII_USTRINGPARAM("DataField")); - static const ::rtl::OUString s_sLabelProperty (RTL_CONSTASCII_USTRINGPARAM("Label")); - static const ::rtl::OUString s_sWidthProperty (RTL_CONSTASCII_USTRINGPARAM("Width")); - static const ::rtl::OUString s_sMouseWheelBehavior (RTL_CONSTASCII_USTRINGPARAM("MouseWheelBehavior")); + static const ::rtl::OUString s_sDataFieldProperty = ::rtl::OUString::createFromAscii("DataField"); + static const ::rtl::OUString s_sLabelProperty = ::rtl::OUString::createFromAscii("Label"); + static const ::rtl::OUString s_sWidthProperty = ::rtl::OUString::createFromAscii("Width"); + static const ::rtl::OUString s_sMouseWheelBehavior = ::rtl::OUString::createFromAscii("MouseWheelBehavior"); static const ::rtl::OUString s_sEmptyString; // collect "descriptors" for the to-be-created (grid)columns @@ -143,14 +143,14 @@ namespace dbp { case DataType::BIT: case DataType::BOOLEAN: - aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CheckBox"))); + aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("CheckBox")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TINYINT: case DataType::SMALLINT: case DataType::INTEGER: - aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumericField"))); + aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("NumericField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; @@ -159,31 +159,31 @@ namespace dbp case DataType::DOUBLE: case DataType::NUMERIC: case DataType::DECIMAL: - aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormattedField"))); + aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("FormattedField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::DATE: - aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateField"))); + aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("DateField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TIME: - aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeField"))); + aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TimeField")); aColumnLabelPostfixes.push_back(s_sEmptyString); break; case DataType::TIMESTAMP: - aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateField"))); + aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("DateField")); aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_DATEPOSTFIX))); aFormFieldNames.push_back(*pSelectedFields); - aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TimeField"))); + aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TimeField")); aColumnLabelPostfixes.push_back(String(ModuleRes(RID_STR_TIMEPOSTFIX))); break; default: - aColumnServiceNames.push_back(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TextField"))); + aColumnServiceNames.push_back(::rtl::OUString::createFromAscii("TextField")); aColumnLabelPostfixes.push_back(s_sEmptyString); } } diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 0a93ad8c22d1..d70fdcb97378 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -187,12 +187,12 @@ namespace dbp } // ListSourceType: SQL - getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSourceType")), makeAny((sal_Int32)ListSourceType_SQL)); + getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSourceType"), makeAny((sal_Int32)ListSourceType_SQL)); if (isListBox()) { // BoundColumn: 1 - getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BoundColumn")), makeAny((sal_Int16)1)); + getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("BoundColumn"), makeAny((sal_Int16)1)); // build the statement to set as list source String sStatement; @@ -204,7 +204,7 @@ namespace dbp sStatement += getSettings().sListContentTable; Sequence< ::rtl::OUString > aListSource(1); aListSource[0] = sStatement; - getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")), makeAny(aListSource)); + getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSource"), makeAny(aListSource)); } else { @@ -214,11 +214,11 @@ namespace dbp sStatement += getSettings().sListContentField; sStatement.AppendAscii(" FROM "); sStatement += getSettings().sListContentTable; - getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")), makeAny(::rtl::OUString(sStatement))); + getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("ListSource"), makeAny(::rtl::OUString(sStatement))); } // the bound field - getContext().xObjectModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataField")), makeAny(::rtl::OUString(getSettings().sLinkedFormField))); + getContext().xObjectModel->setPropertyValue(::rtl::OUString::createFromAscii("DataField"), makeAny(::rtl::OUString(getSettings().sLinkedFormField))); } catch(Exception&) { diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx index e1de8e380b85..13c453243d0f 100644 --- a/extensions/source/dbpilots/optiongrouplayouter.cxx +++ b/extensions/source/dbpilots/optiongrouplayouter.cxx @@ -109,7 +109,7 @@ namespace dbp // shape collection (for grouping the shapes) Reference< XShapes > xButtonCollection(m_xORB->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection"))), + ::rtl::OUString::createFromAscii("com.sun.star.drawing.ShapeCollection")), UNO_QUERY); // first member : the shape of the control xButtonCollection->add(_rContext.xObjectShape.get()); @@ -124,7 +124,7 @@ namespace dbp ::com::sun::star::awt::Point aButtonPosition; aButtonPosition.X = aShapePosition.X + OFFSET; - ::rtl::OUString sElementsName(RTL_CONSTASCII_USTRINGPARAM("RadioGroup")); + ::rtl::OUString sElementsName = ::rtl::OUString::createFromAscii("RadioGroup"); disambiguateName(Reference< XNameAccess >(_rContext.xForm, UNO_QUERY), sElementsName); StringArray::const_iterator aLabelIter = _rSettings.aLabels.begin(); @@ -134,28 +134,28 @@ namespace dbp aButtonPosition.Y = aShapePosition.Y + (i+1) * nTempHeight + nTopSpace; Reference< XPropertySet > xRadioModel( - xDocFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.RadioButton"))), + xDocFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton")), UNO_QUERY); // the label - xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Label")), makeAny(rtl::OUString(*aLabelIter))); + xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("Label"), makeAny(rtl::OUString(*aLabelIter))); // the value - xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RefValue")), makeAny(rtl::OUString(*aValueIter))); + xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("RefValue"), makeAny(rtl::OUString(*aValueIter))); // default selection if (_rSettings.sDefaultField == *aLabelIter) - xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")), makeAny(sal_Int16(1))); + xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("DefaultState"), makeAny(sal_Int16(1))); // the connection to the database field if (0 != _rSettings.sDBField.Len()) - xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DataField")), makeAny(::rtl::OUString(_rSettings.sDBField))); + xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("DataField"), makeAny(::rtl::OUString(_rSettings.sDBField))); // the name for the model - xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), makeAny(sElementsName)); + xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("Name"), makeAny(sElementsName)); // create a shape for the radio button Reference< XControlShape > xRadioShape( - xDocFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape"))), + xDocFactory->createInstance(::rtl::OUString::createFromAscii("com.sun.star.drawing.ControlShape")), UNO_QUERY); Reference< XPropertySet > xShapeProperties(xRadioShape, UNO_QUERY); @@ -170,7 +170,7 @@ namespace dbp // the name of the shape if (xShapeProperties.is()) - xShapeProperties->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), makeAny(sElementsName)); + xShapeProperties->setPropertyValue(::rtl::OUString::createFromAscii("Name"), makeAny(sElementsName)); // add to the page xPageShapes->add(xRadioShape.get()); @@ -179,7 +179,7 @@ namespace dbp // set the GroupBox as "LabelControl" for the RadioButton // (_after_ having inserted the model into the page!) - xRadioModel->setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LabelControl")), makeAny(_rContext.xObjectModel)); + xRadioModel->setPropertyValue(::rtl::OUString::createFromAscii("LabelControl"), makeAny(_rContext.xObjectModel)); } // group the shapes @@ -203,7 +203,7 @@ namespace dbp //--------------------------------------------------------------------- void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps) { - static const ::rtl::OUString s_sAnchorPropertyName(RTL_CONSTASCII_USTRINGPARAM("AnchorType")); + static const ::rtl::OUString s_sAnchorPropertyName = ::rtl::OUString::createFromAscii("AnchorType"); Reference< XPropertySetInfo > xPropertyInfo; if (_rxShapeProps.is()) xPropertyInfo = _rxShapeProps->getPropertySetInfo(); diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx index d6ac0d4765c3..23d0c2b6c80b 100644 --- a/extensions/source/dbpilots/wizardservices.cxx +++ b/extensions/source/dbpilots/wizardservices.cxx @@ -70,14 +70,14 @@ namespace dbp //--------------------------------------------------------------------- ::rtl::OUString OGroupBoxSI::getImplementationName() const { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OGroupBoxWizard")); + return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OGroupBoxWizard"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > OGroupBoxSI::getServiceNames() const { Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupBoxAutoPilot")); + aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GroupBoxAutoPilot"); return aReturn; } @@ -87,14 +87,14 @@ namespace dbp //--------------------------------------------------------------------- ::rtl::OUString OListComboSI::getImplementationName() const { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OListComboWizard")); + return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OListComboWizard"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > OListComboSI::getServiceNames() const { Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ListComboBoxAutoPilot")); + aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ListComboBoxAutoPilot"); return aReturn; } @@ -104,14 +104,14 @@ namespace dbp //--------------------------------------------------------------------- ::rtl::OUString OGridSI::getImplementationName() const { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbp.OGridWizard")); + return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbp.OGridWizard"); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > OGridSI::getServiceNames() const { Sequence< ::rtl::OUString > aReturn(1); - aReturn[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GridControlAutoPilot")); + aReturn[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.GridControlAutoPilot"); return aReturn; } diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx index 00b6978a1e1d..472d844337a3 100644 --- a/extensions/source/oooimprovecore/core.cxx +++ b/extensions/source/oooimprovecore/core.cxx @@ -121,17 +121,17 @@ namespace oooimprovecore OUString help_url; Reference<XCoreController> core_c( - xServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController"))), + xServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.oooimprovement.CoreController")), UNO_QUERY); if(core_c.is()) ::comphelper::ConfigurationHelper::readDirectKey( xServiceFactory, - OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings")), - OUString(RTL_CONSTASCII_USTRINGPARAM("Participation")), - OUString(RTL_CONSTASCII_USTRINGPARAM("HelpUrl")), + OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"), + OUString::createFromAscii("Participation"), + OUString::createFromAscii("HelpUrl"), ::comphelper::ConfigurationHelper::E_READONLY) >>= help_url; else - help_url = OUString(RTL_CONSTASCII_USTRINGPARAM("http://www.libreoffice.org")); + help_url = OUString::createFromAscii("http://www.libreoffice.org"); { SolarMutexGuard aGuard; SfxAllItemSet aSet( SFX_APP()->GetPool() ); @@ -161,12 +161,12 @@ namespace oooimprovecore { return getSupportedServiceNames_static(); } OUString SAL_CALL Core::getImplementationName_static() - { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovecore.Core")); } + { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovecore.Core"); } Sequence<OUString> SAL_CALL Core::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core")); + aServiceNames[0] = OUString::createFromAscii("com.sun.star.oooimprovement.Core"); return aServiceNames; } diff --git a/extensions/source/oooimprovement/config.cxx b/extensions/source/oooimprovement/config.cxx index 3ac3eab604ce..296df200d50d 100644 --- a/extensions/source/oooimprovement/config.cxx +++ b/extensions/source/oooimprovement/config.cxx @@ -43,32 +43,32 @@ namespace { using namespace oooimprovement; - static const OUString CFG_COUNTERS(RTL_CONSTASCII_USTRINGPARAM("Counters")); - static const OUString CFG_ENABLINGALLOWED(RTL_CONSTASCII_USTRINGPARAM("EnablingAllowed")); - static const OUString CFG_EVENTSCOUNT(RTL_CONSTASCII_USTRINGPARAM("LoggedEvents")); - static const OUString CFG_EXTENSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension")); - static const OUString CFG_FAILEDATTEMPTS(RTL_CONSTASCII_USTRINGPARAM("FailedAttempts")); - static const OUString CFG_INVACCEPT(RTL_CONSTASCII_USTRINGPARAM("InvitationAccepted")); - static const OUString CFG_L10N(RTL_CONSTASCII_USTRINGPARAM("L10N")); - static const OUString CFG_LOCALE(RTL_CONSTASCII_USTRINGPARAM("ooLocale")); - static const OUString CFG_LOGGING(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Logging")); - static const OUString CFG_LOGPATH(RTL_CONSTASCII_USTRINGPARAM("LogPath")); - static const OUString CFG_NAME(RTL_CONSTASCII_USTRINGPARAM("ooName")); - static const OUString CFG_OFFICESTARTCOUNTDOWN(RTL_CONSTASCII_USTRINGPARAM("OfficeStartCounterdown")); - static const OUString CFG_OOOIMPROVEMENT(RTL_CONSTASCII_USTRINGPARAM("OOoImprovement")); - static const OUString CFG_OOOIMPROVEMENTPACK(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.OOoImprovement.Settings")); - static const OUString CFG_PARTICIPATION(RTL_CONSTASCII_USTRINGPARAM("Participation")); - static const OUString CFG_PRODUCT(RTL_CONSTASCII_USTRINGPARAM("Product")); - static const OUString CFG_REPORTCOUNT(RTL_CONSTASCII_USTRINGPARAM("UploadedReports")); - static const OUString CFG_REPORTEREMAIL(RTL_CONSTASCII_USTRINGPARAM("ReporterEmail")); - static const OUString CFG_SETUP(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup")); - static const OUString CFG_SHOWEDINV(RTL_CONSTASCII_USTRINGPARAM("ShowedInvitation")); - static const OUString CFG_SOAPIDADD(RTL_CONSTASCII_USTRINGPARAM("SoapIdAdditions")); - static const OUString CFG_SOAPURL(RTL_CONSTASCII_USTRINGPARAM("SoapUrl")); - static const OUString CFG_UPLOAD(RTL_CONSTASCII_USTRINGPARAM("Upload")); - static const OUString CFG_VERSION(RTL_CONSTASCII_USTRINGPARAM("ooSetupVersion")); - - static const OUString SOAPID(RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org Improvement Report - Version 1\n")); + static const OUString CFG_COUNTERS = OUString::createFromAscii("Counters"); + static const OUString CFG_ENABLINGALLOWED = OUString::createFromAscii("EnablingAllowed"); + static const OUString CFG_EVENTSCOUNT = OUString::createFromAscii("LoggedEvents"); + static const OUString CFG_EXTENSION = OUString::createFromAscii("ooSetupExtension"); + static const OUString CFG_FAILEDATTEMPTS = OUString::createFromAscii("FailedAttempts"); + static const OUString CFG_INVACCEPT = OUString::createFromAscii("InvitationAccepted"); + static const OUString CFG_L10N = OUString::createFromAscii("L10N"); + static const OUString CFG_LOCALE = OUString::createFromAscii("ooLocale"); + static const OUString CFG_LOGGING = OUString::createFromAscii("/org.openoffice.Office.Logging"); + static const OUString CFG_LOGPATH = OUString::createFromAscii("LogPath"); + static const OUString CFG_NAME = OUString::createFromAscii("ooName"); + static const OUString CFG_OFFICESTARTCOUNTDOWN = OUString::createFromAscii("OfficeStartCounterdown"); + static const OUString CFG_OOOIMPROVEMENT = OUString::createFromAscii("OOoImprovement"); + static const OUString CFG_OOOIMPROVEMENTPACK = OUString::createFromAscii("/org.openoffice.Office.OOoImprovement.Settings"); + static const OUString CFG_PARTICIPATION = OUString::createFromAscii("Participation"); + static const OUString CFG_PRODUCT = OUString::createFromAscii("Product"); + static const OUString CFG_REPORTCOUNT = OUString::createFromAscii("UploadedReports"); + static const OUString CFG_REPORTEREMAIL = OUString::createFromAscii("ReporterEmail"); + static const OUString CFG_SETUP = OUString::createFromAscii("/org.openoffice.Setup"); + static const OUString CFG_SHOWEDINV = OUString::createFromAscii("ShowedInvitation"); + static const OUString CFG_SOAPIDADD = OUString::createFromAscii("SoapIdAdditions"); + static const OUString CFG_SOAPURL = OUString::createFromAscii("SoapUrl"); + static const OUString CFG_UPLOAD = OUString::createFromAscii("Upload"); + static const OUString CFG_VERSION = OUString::createFromAscii("ooSetupVersion"); + + static const OUString SOAPID = OUString::createFromAscii("OpenOffice.org Improvement Report - Version 1\n"); static sal_Int32 incrementCfgValue( const Reference<XMultiServiceFactory> sm, @@ -183,14 +183,14 @@ namespace oooimprovement MyConfigurationHelper::E_READONLY) >>= value; result.append(value); - value = OUString(RTL_CONSTASCII_USTRINGPARAM("")); + value = OUString::createFromAscii(""); MyConfigurationHelper::readDirectKey( m_ServiceFactory, CFG_SETUP, CFG_PRODUCT, CFG_VERSION, MyConfigurationHelper::E_READONLY) >>= value; if(value.getLength()) result.appendAscii(" ").append(value); - value = OUString(RTL_CONSTASCII_USTRINGPARAM("")); + value = OUString::createFromAscii(""); MyConfigurationHelper::readDirectKey( m_ServiceFactory, CFG_SETUP, CFG_PRODUCT, CFG_EXTENSION, diff --git a/extensions/source/oooimprovement/corecontroller.cxx b/extensions/source/oooimprovement/corecontroller.cxx index 269d947c3e08..8a9bae0f62dd 100644 --- a/extensions/source/oooimprovement/corecontroller.cxx +++ b/extensions/source/oooimprovement/corecontroller.cxx @@ -76,12 +76,12 @@ namespace oooimprovement { return getSupportedServiceNames_static(); } OUString SAL_CALL CoreController::getImplementationName_static() - { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.CoreController")); } + { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.CoreController"); } Sequence<OUString> SAL_CALL CoreController::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.CoreController")); + aServiceNames[0] = OUString::createFromAscii("com.sun.star.oooimprovement.CoreController"); return aServiceNames; } diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx index c62ab07671c0..ba0c8dcbe303 100644 --- a/extensions/source/oooimprovement/invite_job.cxx +++ b/extensions/source/oooimprovement/invite_job.cxx @@ -50,7 +50,7 @@ namespace // [add additional conditions here] static bool lcl_IsInvitationAllowed() { - static OUString sNoFirstStartWizard(RTL_CONSTASCII_USTRINGPARAM("-nofirststartwizard")); + static OUString sNoFirstStartWizard = OUString::createFromAscii("-nofirststartwizard"); sal_Int32 nCount = rtl_getAppCommandArgCount(); for(sal_Int32 nCurrent=0; nCurrent<nCount; nCurrent++) { @@ -87,7 +87,7 @@ namespace oooimprovement if(lcl_IsInvitationAllowed() && !config.getShowedInvitation()) { Reference<XCore> core( - m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.oooimprovement.Core"))), + m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.oooimprovement.Core")), UNO_QUERY); if(core.is()) core->inviteUser(); } @@ -111,12 +111,12 @@ namespace oooimprovement { return getSupportedServiceNames_static(); } OUString SAL_CALL InviteJob::getImplementationName_static() - { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.InviteJob")); } + { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.InviteJob"); } Sequence<OUString> SAL_CALL InviteJob::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.XAsyncJob")); + aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob"); return aServiceNames; } diff --git a/extensions/source/oooimprovement/logpacker.cxx b/extensions/source/oooimprovement/logpacker.cxx index e74b74c31982..4defc2ab2cbe 100644 --- a/extensions/source/oooimprovement/logpacker.cxx +++ b/extensions/source/oooimprovement/logpacker.cxx @@ -74,13 +74,13 @@ namespace oooimprovement sal_Int32 LogPacker::pack(const OUString& fileurl) { Reference<XSimpleFileAccess> file_access( - m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), + m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), UNO_QUERY_THROW); Reference<XStorage> storage; { Reference<XSingleServiceFactory> storage_factory( - m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))), + m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.embed.StorageFactory")), UNO_QUERY_THROW); Sequence<Any> storage_init_args(2); storage_init_args[0] = Any(getZipfileurl(fileurl)); @@ -91,7 +91,7 @@ namespace oooimprovement } Reference<XOutputStream> zipped_stream = storage->openStreamElement( - OUString(RTL_CONSTASCII_USTRINGPARAM("logdata.csv")), + OUString::createFromAscii("logdata.csv"), ElementModes::WRITE)->getOutputStream(); Reference<XInputStream> unzipped_stream = file_access->openFileRead(fileurl); const sal_Int32 bufsize = 1024; diff --git a/extensions/source/oooimprovement/logstorage.cxx b/extensions/source/oooimprovement/logstorage.cxx index 7bf3ef10ff10..7181ed2fdce6 100644 --- a/extensions/source/oooimprovement/logstorage.cxx +++ b/extensions/source/oooimprovement/logstorage.cxx @@ -47,7 +47,7 @@ namespace { using namespace oooimprovement; - static const OUString CSSU_PATHSUB(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSubstitution")); + static const OUString CSSU_PATHSUB = OUString::createFromAscii("com.sun.star.util.PathSubstitution"); static OUString getLogPathFromCfg(const Reference<XMultiServiceFactory>& sf) { @@ -63,14 +63,14 @@ namespace static bool isZipfile(const OUString& fileurl) { - static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".zip")); + static const OUString file_extension = OUString::createFromAscii(".zip"); return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength()); }; static bool isLogfile(const OUString& fileurl) { - static const OUString file_extension(RTL_CONSTASCII_USTRINGPARAM(".csv")); - static const OUString current(RTL_CONSTASCII_USTRINGPARAM("Current.csv")); + static const OUString file_extension = OUString::createFromAscii(".csv"); + static const OUString current = OUString::createFromAscii("Current.csv"); return fileurl.match(file_extension, fileurl.getLength()-file_extension.getLength()) && !fileurl.match(current, fileurl.getLength()-current.getLength()); @@ -84,7 +84,7 @@ namespace static Sequence<OUString> getAllLogStoragefiles(const Reference<XMultiServiceFactory>& sf) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), + sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), UNO_QUERY_THROW); return file_access->getFolderContents( getLogPathFromCfg(sf), @@ -107,7 +107,7 @@ namespace static void assureLogStorageExists(const Reference<XMultiServiceFactory>& sf) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), + sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), UNO_QUERY_THROW); OUString log_path(getLogPathFromCfg(sf)); if(!file_access->isFolder(log_path)) @@ -130,7 +130,7 @@ namespace oooimprovement void LogStorage::clear() { Reference<XSimpleFileAccess> file_access( - m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), + m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), UNO_QUERY_THROW); vector<OUString> files_to_kill = getLogStoragefiles(m_ServiceFactory, &isZipOrLogFile); for(vector<OUString>::iterator item = files_to_kill.begin(); diff --git a/extensions/source/oooimprovement/myconfigurationhelper.cxx b/extensions/source/oooimprovement/myconfigurationhelper.cxx index b211fdb6756c..d9ff3ecd03dc 100644 --- a/extensions/source/oooimprovement/myconfigurationhelper.cxx +++ b/extensions/source/oooimprovement/myconfigurationhelper.cxx @@ -74,28 +74,28 @@ namespace oooimprovement sal_Int32 eMode) { Reference<XMultiServiceFactory> xConfigProvider( - xSMGR->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), + xSMGR->createInstance(OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), UNO_QUERY_THROW); vector<Any> lParams; css::beans::PropertyValue aParam; // set root path - aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); + aParam.Name = OUString::createFromAscii("nodepath"); aParam.Value <<= sPackage; lParams.push_back(makeAny(aParam)); // enable all locales mode if ((eMode & MyConfigurationHelper::E_ALL_LOCALES)==MyConfigurationHelper::E_ALL_LOCALES) { - aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("locale")); - aParam.Value <<= OUString(RTL_CONSTASCII_USTRINGPARAM("*")); + aParam.Name = OUString::createFromAscii("locale"); + aParam.Value <<= OUString::createFromAscii("*"); lParams.push_back(makeAny(aParam)); } // enable lazy writing sal_Bool bLazy = ((eMode & MyConfigurationHelper::E_LAZY_WRITE)==MyConfigurationHelper::E_LAZY_WRITE); - aParam.Name = OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")); + aParam.Name = OUString::createFromAscii("lazywrite"); aParam.Value = makeAny(bLazy); lParams.push_back(makeAny(aParam)); @@ -105,11 +105,11 @@ namespace oooimprovement sal_Bool bReadOnly = ((eMode & MyConfigurationHelper::E_READONLY)==MyConfigurationHelper::E_READONLY); if (bReadOnly) xCFG = xConfigProvider->createInstanceWithArguments( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), + OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"), sequenceFromVector(lParams)); else xCFG = xConfigProvider->createInstanceWithArguments( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess")), + OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"), sequenceFromVector(lParams)); return xCFG; } diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx index 5407c4b6edf0..18108df7629e 100644 --- a/extensions/source/oooimprovement/onlogrotate_job.cxx +++ b/extensions/source/oooimprovement/onlogrotate_job.cxx @@ -74,7 +74,7 @@ namespace { Config config(sf); Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), + sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), UNO_QUERY_THROW); SoapSender sender(sf, config.getSoapUrl()); OUString soap_id = config.getSoapId(); @@ -148,7 +148,7 @@ namespace oooimprovement OnLogRotateJob::OnLogRotateJob(const Reference<XComponentContext>& context) : m_ServiceFactory(Reference<XMultiServiceFactory>( context->getServiceManager()->createInstanceWithContext( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.lang.XMultiServiceFactory")), context), + OUString::createFromAscii("com.sun.star.lang.XMultiServiceFactory"), context), UNO_QUERY)) { } @@ -186,12 +186,12 @@ namespace oooimprovement { return getSupportedServiceNames_static(); } OUString SAL_CALL OnLogRotateJob::getImplementationName_static() - { return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob")); } + { return OUString::createFromAscii("com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob"); } Sequence<OUString> SAL_CALL OnLogRotateJob::getSupportedServiceNames_static() { Sequence<OUString> aServiceNames(1); - aServiceNames[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.XAsyncJob")); + aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob"); return aServiceNames; } diff --git a/extensions/source/oooimprovement/soaprequest.cxx b/extensions/source/oooimprovement/soaprequest.cxx index d4b1c8a2d85b..aad080ed9520 100644 --- a/extensions/source/oooimprovement/soaprequest.cxx +++ b/extensions/source/oooimprovement/soaprequest.cxx @@ -116,7 +116,7 @@ namespace static void writeFile(const Reference<XMultiServiceFactory>& sf, const Reference<XOutputStream>& target, const OUString& fileurl) { Reference<XSimpleFileAccess> file_access( - sf->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), + sf->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), UNO_QUERY); Reference<XInputStream> file = file_access->openFileRead(fileurl); const sal_Int32 bufsize = 3; diff --git a/extensions/source/oooimprovement/soapsender.cxx b/extensions/source/oooimprovement/soapsender.cxx index 8cb9c2e9104f..17a3252fb608 100644 --- a/extensions/source/oooimprovement/soapsender.cxx +++ b/extensions/source/oooimprovement/soapsender.cxx @@ -78,13 +78,13 @@ namespace oooimprovement void SoapSender::send(const SoapRequest& request) const { Reference<XTempFile> temp_file( - m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile"))), + m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.io.TempFile")), UNO_QUERY_THROW); Reference<XSimpleFileAccess> file_access( - m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess"))), + m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.ucb.SimpleFileAccess")), UNO_QUERY_THROW); Reference<XURLTransformer> url_trans( - m_ServiceFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), + m_ServiceFactory->createInstance(OUString::createFromAscii("com.sun.star.util.URLTransformer")), UNO_QUERY_THROW); // writing request to tempfile @@ -109,7 +109,7 @@ namespace oooimprovement oslSocketResult result = socket->connect(addr); if(result != osl_Socket_Ok) throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("unable to connect to SOAP server")), + OUString::createFromAscii("unable to connect to SOAP server"), Reference<XInterface>()); } @@ -121,7 +121,7 @@ namespace oooimprovement const OString header = getHttpPostHeader(path_on_server.makeStringAndClear(), file_access->getSize(temp_file->getUri())); if(socket->write(header.getStr(), header.getLength()) != static_cast<sal_Int32>(header.getLength())) throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("error while sending HTTP header")), + OUString::createFromAscii("error while sending HTTP header"), Reference<XInterface>()); } @@ -140,7 +140,7 @@ namespace oooimprovement buf2[idx] = buf[idx]; if(socket->write(buf2, bytes_read) != bytes_read) throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("error while sending SOAP request")), + OUString::createFromAscii("error while sending SOAP request"), Reference<XInterface>()); } while(bytes_read == bufsize); } @@ -154,7 +154,7 @@ namespace oooimprovement const sal_Int32 returncode_start = answer.indexOf(' '); if(returncode_start==-1 || !answer.copy(returncode_start, 4).equals(OString(" 200"))) throw RuntimeException( - OUString(RTL_CONSTASCII_USTRINGPARAM("SOAP server returns a error")), + OUString::createFromAscii("SOAP server returns a error"), Reference<XInterface>()); } } diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 5f295a13e76b..4d6a109d57e5 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -124,7 +124,7 @@ XPluginContext_Impl::~XPluginContext_Impl() void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const ::rtl::OUString& url, const ::rtl::OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ); + Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ); if( ! xInst.is() ) return; @@ -151,7 +151,7 @@ void XPluginContext_Impl::getURL(const Reference< ::com::sun::star::plugin::XPlu try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); + aValue.Name = ::rtl::OUString::createFromAscii( "Referer" ); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); @@ -186,7 +186,7 @@ void XPluginContext_Impl::getURLNotify(const Reference< ::com::sun::star::plugin ::rtl::OUString XPluginContext_Impl::getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/) throw( ::com::sun::star::plugin::PluginException, RuntimeException ) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Mozilla 3.0")); + return ::rtl::OUString::createFromAscii( "Mozilla 3.0" ); } void XPluginContext_Impl::displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & /*plugin*/, const ::rtl::OUString& /*message*/) @@ -217,7 +217,7 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl } } - Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ); + Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ); if( ! xInst.is() ) return ; @@ -228,10 +228,10 @@ void XPluginContext_Impl::postURL(const Reference< ::com::sun::star::plugin::XPl try { ::com::sun::star::beans::PropertyValue aValues[2]; - aValues[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); + aValues[0].Name = ::rtl::OUString::createFromAscii( "Referer" ); aValues[0].Value <<= pPlugin->getRefererURL(); - aValues[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostString")); + aValues[1].Name = ::rtl::OUString::createFromAscii( "PostString" ); aValues[1].Value <<= ::rtl::OStringToOUString( (char*)( file ? aBuf : buf ).getConstArray(), m_aEncoding ); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( aValues, 2 ); Reference< ::com::sun::star::lang::XComponent > xComp = @@ -302,7 +302,7 @@ void FileSink::closeOutput() throw() if( fp ) fclose( fp ); - Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ); + Reference< XInterface > xInst = m_xSMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ); Reference< ::com::sun::star::frame::XComponentLoader > xLoader( xInst, UNO_QUERY ); XPlugin_Impl* pPlugin = XPluginManager_Impl::getPluginImplementation( m_xPlugin ); @@ -311,7 +311,7 @@ void FileSink::closeOutput() throw() try { ::com::sun::star::beans::PropertyValue aValue; - aValue.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer")); + aValue.Name = ::rtl::OUString::createFromAscii( "Referer" ); aValue.Value <<= pPlugin->getRefererURL(); Sequence< ::com::sun::star::beans::PropertyValue > aArgs( &aValue, 1 ); diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx index 9c0bd7dc1c7d..0ebee37244c9 100644 --- a/extensions/source/plugin/base/manager.cxx +++ b/extensions/source/plugin/base/manager.cxx @@ -129,7 +129,7 @@ Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames(void) Sequence< ::rtl::OUString > XPluginManager_Impl::getSupportedServiceNames_Static(void) throw( ) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")); + aSNS.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ); return aSNS; } diff --git a/extensions/source/plugin/base/plmodel.cxx b/extensions/source/plugin/base/plmodel.cxx index 775e25bd07ff..9cd5cd0e79cc 100644 --- a/extensions/source/plugin/base/plmodel.cxx +++ b/extensions/source/plugin/base/plmodel.cxx @@ -58,7 +58,7 @@ Any PluginModel::queryAggregation( const Type& type ) throw( RuntimeException ) Sequence< ::rtl::OUString > PluginModel::getSupportedServiceNames_Static(void) throw() { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginModel")); + aSNS.getArray()[0] = ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginModel" ); return aSNS; } @@ -190,7 +190,7 @@ void PluginModel::dispose(void) throw() // ::com::sun::star::io::XPersistObject ::rtl::OUString PluginModel::getServiceName() throw() { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginModel")); + return ::rtl::OUString::createFromAscii( "com.sun.star.plugin.PluginModel" ); } void PluginModel::write(const Reference< ::com::sun::star::io::XObjectOutputStream > & OutStream) throw() diff --git a/extensions/source/plugin/base/service.cxx b/extensions/source/plugin/base/service.cxx index 51a79bdbc153..1ce6dcc1a05c 100644 --- a/extensions/source/plugin/base/service.cxx +++ b/extensions/source/plugin/base/service.cxx @@ -69,14 +69,14 @@ extern "C" { { Reference< ::com::sun::star::registry::XRegistryKey > xKey( reinterpret_cast< ::com::sun::star::registry::XRegistryKey* >( pXUnoKey ) ); - ::rtl::OUString aImplName (RTL_CONSTASCII_USTRINGPARAM("/")); + ::rtl::OUString aImplName = ::rtl::OUString::createFromAscii( "/" ); aImplName += XPluginManager_Impl::getImplementationName_Static(); - aImplName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES/com.sun.star.plugin.PluginManager")); + aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginManager" ); xKey->createKey( aImplName ); - aImplName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); + aImplName = ::rtl::OUString::createFromAscii( "/" ); aImplName += PluginModel::getImplementationName_Static(); - aImplName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES/com.sun.star.plugin.PluginModel")); + aImplName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES/com.sun.star.plugin.PluginModel" ); xKey->createKey( aImplName ); return sal_True; diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 7dd600266e41..dc1a4685f58b 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -461,7 +461,7 @@ OUString XPlugin_Impl::getCreationURL() uno::Reference< com::sun::star::beans::XPropertySet > xPS( m_xModel, UNO_QUERY ); if( xPS.is() ) { - Any aValue = xPS->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("URL")) ); + Any aValue = xPS->getPropertyValue( OUString::createFromAscii( "URL" ) ); aValue >>= aRet; } return aRet; @@ -649,9 +649,9 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, { try { - xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("URL")), aAny ); + xPS->setPropertyValue( OUString::createFromAscii( "URL" ), aAny ); aAny <<= mimetype; - xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")), aAny ); + xPS->setPropertyValue( OUString::createFromAscii( "TYPE" ), aAny ); } catch(...) { @@ -713,7 +713,7 @@ sal_Bool XPlugin_Impl::provideNewStream(const OUString& mimetype, { Any aAny; aAny <<= m_aDescription.Mimetype; - xPS->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TYPE")), aAny ); + xPS->setPropertyValue( OUString::createFromAscii( "TYPE" ), aAny ); } catch(...) { @@ -876,7 +876,7 @@ void XPlugin_Impl::setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, PluginDescription XPlugin_Impl::fitDescription( const OUString& rURL ) { - uno::Reference< XPluginManager > xPMgr( m_xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.plugin.PluginManager")) ), UNO_QUERY ); + uno::Reference< XPluginManager > xPMgr( m_xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ) ), UNO_QUERY ); if( !xPMgr.is() ) { m_nProvidingState = PROVIDING_NONE; @@ -1126,7 +1126,7 @@ PluginOutputStream::PluginOutputStream( XPlugin_Impl* pPlugin, sal_uInt32 len, sal_uInt32 lastmod ) : PluginStream( pPlugin, url, len, lastmod ), - m_xStream( pPlugin->getServiceManager()->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream")) ), UNO_QUERY ) + m_xStream( pPlugin->getServiceManager()->createInstance( OUString::createFromAscii( "com.sun.star.io.DataOutputStream" ) ), UNO_QUERY ) { Guard< Mutex > aGuard( m_pPlugin->getMutex() ); diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx index c1ad0151b490..db90cfbf7a45 100644 --- a/extensions/source/plugin/win/winmgr.cxx +++ b/extensions/source/plugin/win/winmgr.cxx @@ -431,7 +431,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo { case ',': case ';': - aExtensions += OUString(RTL_CONSTASCII_USTRINGPARAM(";*.")); + aExtensions += OUString::createFromAscii( ";*." ); case ' ': break; case '*': diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index 2b77ee5833fa..b84319c47ad3 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -74,7 +74,7 @@ namespace pcr //--------------------------------------------------------------------- ::rtl::OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.MasterDetailLinkDialog")); + return ::rtl::OUString::createFromAscii("org.openoffice.comp.form.ui.MasterDetailLinkDialog"); } //--------------------------------------------------------------------- @@ -87,7 +87,7 @@ namespace pcr ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.MasterDetailLinkDialog")); + aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.form.MasterDetailLinkDialog"); return aSupported; } diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx index 508d13ca6552..fbe64bf1bd30 100644 --- a/extensions/source/propctrlr/controlfontdialog.cxx +++ b/extensions/source/propctrlr/controlfontdialog.cxx @@ -97,7 +97,7 @@ namespace pcr //--------------------------------------------------------------------- ::rtl::OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.OControlFontDialog")); + return ::rtl::OUString::createFromAscii("org.openoffice.comp.form.ui.OControlFontDialog"); } //--------------------------------------------------------------------- @@ -110,7 +110,7 @@ namespace pcr ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.ControlFontDialog")); + aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.form.ControlFontDialog"); return aSupported; } diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index 1cf3c9dc86e2..3fd14196537a 100644 --- a/extensions/source/propctrlr/defaultforminspection.cxx +++ b/extensions/source/propctrlr/defaultforminspection.cxx @@ -102,14 +102,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString DefaultFormComponentInspectorModel::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel")); + return ::rtl::OUString::createFromAscii( "org.openoffice.comp.extensions.DefaultFormComponentInspectorModel"); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.DefaultFormComponentInspectorModel")); + aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.form.inspection.DefaultFormComponentInspectorModel" ); return aSupported; } diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx index 179eef90a819..f9d9fd8f5967 100644 --- a/extensions/source/propctrlr/defaulthelpprovider.cxx +++ b/extensions/source/propctrlr/defaulthelpprovider.cxx @@ -90,14 +90,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString DefaultHelpProvider::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DefaultHelpProvider")); + return ::rtl::OUString::createFromAscii( "org.openoffice.comp.extensions.DefaultHelpProvider"); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DefaultHelpProvider::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.inspection.DefaultHelpProvider")); + aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.inspection.DefaultHelpProvider" ); return aSupported; } diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index 92eb90251607..08aaa69b37cb 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -447,9 +447,9 @@ namespace pcr Any aRet; Sequence< PropertyValue > aScriptDescriptor( 2 ); - aScriptDescriptor[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EventType")); + aScriptDescriptor[0].Name = ::rtl::OUString::createFromAscii( "EventType" ); aScriptDescriptor[0].Value <<= aDescriptor.ScriptType; - aScriptDescriptor[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script")); + aScriptDescriptor[1].Name = ::rtl::OUString::createFromAscii( "Script" ); aScriptDescriptor[1].Value <<= aDescriptor.ScriptCode; return makeAny( aScriptDescriptor ); diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index a9094c8ecf78..3c97a71a7a72 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -383,8 +383,8 @@ namespace pcr // StringItemList? else if( eType == TypeClass_SEQUENCE ) { - static ::rtl::OUString aDot(RTL_CONSTASCII_USTRINGPARAM(".")); - static ::rtl::OUString aEsc(RTL_CONSTASCII_USTRINGPARAM("&")); + static ::rtl::OUString aDot = ::rtl::OUString::createFromAscii( "." ); + static ::rtl::OUString aEsc = ::rtl::OUString::createFromAscii( "&" ); // Put strings into resource using new ids Sequence< ::rtl::OUString > aNewStrings; diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx index 9e6667baf5ff..14a4d6465bfc 100644 --- a/extensions/source/propctrlr/formcontroller.cxx +++ b/extensions/source/propctrlr/formcontroller.cxx @@ -145,14 +145,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString FormController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.FormController")); + return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.FormController"); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > FormController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.PropertyBrowserController")); + aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.form.PropertyBrowserController" ); return aSupported; } @@ -273,14 +273,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString DialogController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.DialogController")); + return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.DialogController"); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > DialogController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.PropertyBrowserController")); + aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.awt.PropertyBrowserController" ); return aSupported; } diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index 20470e4ef802..f02be18b2f3b 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -97,7 +97,7 @@ namespace pcr //--------------------------------------------------------------------- ::rtl::OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.form.ui.OTabOrderDialog")); + return ::rtl::OUString::createFromAscii( "org.openoffice.comp.form.ui.OTabOrderDialog" ); } //--------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 657b1f2e9955..50a6ed66bd65 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -375,7 +375,7 @@ namespace pcr ::osl::MutexGuard aGuard( m_aMutex ); if (_rxFrame.is() && haveView()) - throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Unable to attach to a second frame.")),*this); + throw RuntimeException(::rtl::OUString::createFromAscii("Unable to attach to a second frame."),*this); // revoke as focus listener from the old container window stopContainerWindowListening(); @@ -391,7 +391,7 @@ namespace pcr VCLXWindow* pContainerWindow = VCLXWindow::GetImplementation(xContainerWindow); Window* pParentWin = pContainerWindow ? pContainerWindow->GetWindow() : NULL; if (!pParentWin) - throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("The frame is invalid. Unable to extract the container window.")),*this); + throw RuntimeException(::rtl::OUString::createFromAscii("The frame is invalid. Unable to extract the container window."),*this); if ( Construct( pParentWin ) ) { @@ -597,14 +597,14 @@ namespace pcr //------------------------------------------------------------------------ ::rtl::OUString OPropertyBrowserController::getImplementationName_static( ) throw(RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.extensions.ObjectInspector")); + return ::rtl::OUString::createFromAscii("org.openoffice.comp.extensions.ObjectInspector"); } //------------------------------------------------------------------------ Sequence< ::rtl::OUString > OPropertyBrowserController::getSupportedServiceNames_static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.inspection.ObjectInspector")); + aSupported[0] = ::rtl::OUString::createFromAscii( "com.sun.star.inspection.ObjectInspector" ); return aSupported; } diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx index 8ebea6dc85d3..e5a61e69e376 100644 --- a/extensions/source/resource/resource.cxx +++ b/extensions/source/resource/resource.cxx @@ -172,7 +172,7 @@ Reference< XInvocation > ResourceService::getDefaultInvocation() const /* f�hrt zur Zeit noch zu einer rekursion if( xSMgr.is() ) { - Reference< XSingleServiceFactory > xFact( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Invocation")) ), UNO_QUERY ); + Reference< XSingleServiceFactory > xFact( xSMgr->createInstance( OUString::createFromAscii("com.sun.star.script.Invocation") ), UNO_QUERY ); if( xFact.is() ) { Sequence< Any > aArgs( 1 ); diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index 3b26c18afe52..7043c3d9a971 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -268,7 +268,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw() if( Sane::IsSane() ) { SEQ( ScannerContext ) aRet(1); - aRet.getArray()[0].ScannerName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SANE")); + aRet.getArray()[0].ScannerName = ::rtl::OUString::createFromAscii( "SANE" ); aRet.getArray()[0].InternalData = 0; return aRet; } @@ -289,7 +289,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), + ::rtl::OUString::createFromAscii( "Scanner does not exist" ), REF( XScannerManager )( this ), ScanError_InvalidContext ); @@ -297,7 +297,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner is busy")), + ::rtl::OUString::createFromAscii( "Scanner is busy" ), REF( XScannerManager )( this ), ScanError_ScanInProgress ); @@ -324,14 +324,14 @@ void ScannerManager::startScan( const ScannerContext& scanner_context, if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), + ::rtl::OUString::createFromAscii( "Scanner does not exist" ), REF( XScannerManager )( this ), ScanError_InvalidContext ); boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData]; if( pHolder->m_bBusy ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner is busy")), + ::rtl::OUString::createFromAscii( "Scanner is busy" ), REF( XScannerManager )( this ), ScanError_ScanInProgress ); @@ -350,7 +350,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), + ::rtl::OUString::createFromAscii( "Scanner does not exist" ), REF( XScannerManager )( this ), ScanError_InvalidContext ); @@ -369,7 +369,7 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() ) throw ScannerException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scanner does not exist")), + ::rtl::OUString::createFromAscii( "Scanner does not exist" ), REF( XScannerManager )( this ), ScanError_InvalidContext ); diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index f1fd8b69c8af..74a94760d2b5 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -579,7 +579,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame() { // query desktop instance uno::Reference< frame::XDesktop > xDesktop( xMgr->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), uno::UNO_QUERY ); + OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), uno::UNO_QUERY ); if( xDesktop.is() ) { @@ -593,7 +593,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame() try { aActiveFrame = xDesktopProps->getPropertyValue( - OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveFrame")) ); + OUString::createFromAscii( "ActiveFrame" ) ); } catch( const beans::UnknownPropertyException& ) { diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx index 97e1921542c2..14cd09c7fa20 100644 --- a/extensions/source/svg/svgaction.cxx +++ b/extensions/source/svg/svgaction.cxx @@ -842,19 +842,19 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText, { String aTransform; - aTransform = NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM("translate")); + aTransform = NMSP_RTL::OUString::createFromAscii( "translate" ); aTransform += '('; aTransform += String( GetValueString( aPt.X(), mbDoublePoints ) ); aTransform += ','; aTransform += String( GetValueString( aPt.Y(), mbDoublePoints ) ); aTransform += ')'; - aTransform += String( NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(" rotate")) ); + aTransform += String( NMSP_RTL::OUString::createFromAscii( " rotate" ) ); aTransform += '('; aTransform += String( NMSP_RTL::OUString::valueOf( rFont.GetOrientation() * -0.1 ) ); aTransform += ')'; - aTransform += String( NMSP_RTL::OUString(RTL_CONSTASCII_USTRINGPARAM(" translate")) ); + aTransform += String( NMSP_RTL::OUString::createFromAscii( " translate" ) ); aTransform += '('; aTransform += String( GetValueString( -aPt.X(), mbDoublePoints ) ); aTransform += ','; diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx index f897eb668b3e..881fe2572d67 100644 --- a/extensions/source/update/check/updatecheckconfig.cxx +++ b/extensions/source/update/check/updatecheckconfig.cxx @@ -211,7 +211,7 @@ rtl::OUString UpdateCheckConfig::getDesktopDirectory() // This should become a desktop specific setting in some system backend .. rtl::OUString aHomeDir; osl::Security().getHomeDir( aHomeDir ); - aRet = aHomeDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Desktop")); + aRet = aHomeDir + rtl::OUString::createFromAscii("/Desktop"); // Set path to home directory when there is no /Desktop directory osl::Directory aDocumentsDir( aRet ); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 1ef024d7e3dd..e43a1e6d13d4 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -337,12 +337,12 @@ Image UpdateCheckUI::GetBubbleImage( ::rtl::OUString &rURL ) { uno::Reference< graphic::XGraphicProvider > xGraphProvider( xServiceManager->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")) ), + ::rtl::OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ), uno::UNO_QUERY ); if ( xGraphProvider.is() ) { uno::Sequence< beans::PropertyValue > aMediaProps( 1 ); - aMediaProps[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")); + aMediaProps[0].Name = ::rtl::OUString::createFromAscii( "URL" ); aMediaProps[0].Value <<= rURL; uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps ); diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 68dbd633c85f..abf2e33ae11b 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -89,7 +89,7 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit> // (formerly this switch-off was done in the toolkit - but the correct place is here ...) // Reference< XVclWindowPeer > xVclWindowPeer( getPeer(), UNO_QUERY ); // if (xVclWindowPeer.is()) -// xVclWindowPeer->setProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoToggle")), ::cppu::bool2any(sal_False)); +// xVclWindowPeer->setProperty(::rtl::OUString::createFromAscii("AutoToggle"), ::cppu::bool2any(sal_False)); // new order: do _not_ switch off the auto toggle because: // * today, it is not necessary anymore to handle the toggling ourself (everything works fine without it) // * without auto toggle, the AccessibleEvents as fired by the radio buttons are diff --git a/xmlsecurity/source/component/certificatecontainer.cxx b/xmlsecurity/source/component/certificatecontainer.cxx index 378f7a7d3fba..7759ad731686 100644 --- a/xmlsecurity/source/component/certificatecontainer.cxx +++ b/xmlsecurity/source/component/certificatecontainer.cxx @@ -135,7 +135,7 @@ CertificateContainer::impl_getStaticSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { Sequence< ::rtl::OUString > aRet(1); - *aRet.getArray() = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.security.CertificateContainer")); + *aRet.getArray() = ::rtl::OUString::createFromAscii("com.sun.star.security.CertificateContainer"); return aRet; } @@ -145,7 +145,7 @@ CertificateContainer::impl_getStaticSupportedServiceNames( ) CertificateContainer::impl_getStaticImplementationName() throw(::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.security.CertificateContainer")); + return ::rtl::OUString::createFromAscii("com.sun.star.security.CertificateContainer"); } //------------------------------------------------------------------------- diff --git a/xmlsecurity/source/component/registerservices.cxx b/xmlsecurity/source/component/registerservices.cxx index 9dc442ef490a..c9f7475abb83 100644 --- a/xmlsecurity/source/component/registerservices.cxx +++ b/xmlsecurity/source/component/registerservices.cxx @@ -59,7 +59,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr uno::Reference< registry::XRegistryKey > xNewKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( DocumentDigitalSignatures::GetImplementationName() ) ); - xNewKey = xNewKey->createKey( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); + xNewKey = xNewKey->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) ); const uno::Sequence< rtl::OUString >& rSNL = DocumentDigitalSignatures::GetSupportedServiceNames(); const rtl::OUString* pArray = rSNL.getConstArray(); @@ -70,7 +70,7 @@ sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistr nPos = 0; uno::Reference< registry::XRegistryKey > xNewKeyCertificateContainer( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey )->createKey( CertificateContainer::impl_getStaticImplementationName() ) ); - xNewKeyCertificateContainer = xNewKeyCertificateContainer->createKey( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); + xNewKeyCertificateContainer = xNewKeyCertificateContainer->createKey( rtl::OUString::createFromAscii( "/UNO/SERVICES" ) ); const uno::Sequence< rtl::OUString >& rSNLCertificateContainer = CertificateContainer::impl_getStaticSupportedServiceNames(); const rtl::OUString* pArrayCertificateContainer = rSNLCertificateContainer.getConstArray(); diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx index 56d69f2558d9..86e19756b9d6 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.cxx @@ -121,12 +121,12 @@ Sequence< OUString > SAL_CALL XMLEncryptionTemplateImpl :: getSupportedServiceNa Sequence< OUString > XMLEncryptionTemplateImpl :: impl_getSupportedServiceNames() { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; Sequence< OUString > seqServiceNames( 1 ) ; - seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")) ; + seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLEncryptionTemplate" ) ; return seqServiceNames ; } OUString XMLEncryptionTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl")) ; + return OUString::createFromAscii( "com.sun.star.xml.security.framework.XMLEncryptionTemplateImpl" ) ; } //Helper for registry diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx index 46d5b6f84226..c03ef50243e0 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx @@ -146,12 +146,12 @@ Sequence< OUString > SAL_CALL XMLSignatureTemplateImpl :: getSupportedServiceNam Sequence< OUString > XMLSignatureTemplateImpl :: impl_getSupportedServiceNames() { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; Sequence< OUString > seqServiceNames( 1 ) ; - seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) ; + seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignatureTemplate" ) ; return seqServiceNames ; } OUString XMLSignatureTemplateImpl :: impl_getImplementationName() throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.framework.XMLSignatureTemplateImpl")) ; + return OUString::createFromAscii( "com.sun.star.xml.security.framework.XMLSignatureTemplateImpl" ) ; } //Helper for registry diff --git a/xmlsecurity/source/framework/xsec_framework.cxx b/xmlsecurity/source/framework/xsec_framework.cxx index 39b206cb3904..3a03e3738d53 100644 --- a/xmlsecurity/source/framework/xsec_framework.cxx +++ b/xmlsecurity/source/framework/xsec_framework.cxx @@ -71,7 +71,7 @@ sal_Bool SAL_CALL component_writeInfo( sal_Int32 nPos = 0; Reference< XRegistryKey > xNewKey( reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( DecryptorImpl_getImplementationName() ) ); - xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); + xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); const Sequence< OUString > & rSNL = DecryptorImpl_getSupportedServiceNames(); const OUString * pArray = rSNL.getConstArray(); @@ -80,7 +80,7 @@ sal_Bool SAL_CALL component_writeInfo( //Encryptor xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( EncryptorImpl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); + xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); const Sequence< OUString > & rSNL2 = EncryptorImpl_getSupportedServiceNames(); pArray = rSNL2.getConstArray(); for ( nPos = rSNL2.getLength(); nPos--; ) @@ -88,7 +88,7 @@ sal_Bool SAL_CALL component_writeInfo( //SignatureCreator xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureCreatorImpl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); + xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); const Sequence< OUString > & rSNL3 = SignatureCreatorImpl_getSupportedServiceNames(); pArray = rSNL3.getConstArray(); for ( nPos = rSNL3.getLength(); nPos--; ) @@ -96,7 +96,7 @@ sal_Bool SAL_CALL component_writeInfo( //SignatureVerifier xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SignatureVerifierImpl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); + xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); const Sequence< OUString > & rSNL4 = SignatureVerifierImpl_getSupportedServiceNames(); pArray = rSNL4.getConstArray(); for ( nPos = rSNL4.getLength(); nPos--; ) @@ -104,7 +104,7 @@ sal_Bool SAL_CALL component_writeInfo( //SAXEventKeeper xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SAXEventKeeperImpl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); + xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); const Sequence< OUString > & rSNL5 = SAXEventKeeperImpl_getSupportedServiceNames(); pArray = rSNL5.getConstArray(); for ( nPos = rSNL5.getLength(); nPos--; ) @@ -112,7 +112,7 @@ sal_Bool SAL_CALL component_writeInfo( //XMLSignatureTemplateImpl xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLSignatureTemplateImpl::impl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); + xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); const Sequence< OUString > & rSNL6 = XMLSignatureTemplateImpl::impl_getSupportedServiceNames(); pArray = rSNL6.getConstArray(); for ( nPos = rSNL6.getLength(); nPos--; ) @@ -120,7 +120,7 @@ sal_Bool SAL_CALL component_writeInfo( // XMLEncryptionTemplateImpl xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( XMLEncryptionTemplateImpl::impl_getImplementationName() ); - xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ); + xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) ); const Sequence< OUString > & rSNL7 = XMLEncryptionTemplateImpl::impl_getSupportedServiceNames(); pArray = rSNL7.getConstArray(); for ( nPos = rSNL7.getLength(); nPos--; ) diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx b/xmlsecurity/source/helper/documentsignaturehelper.cxx index 82c4d6398dcd..eb0ba0c85459 100644 --- a/xmlsecurity/source/helper/documentsignaturehelper.cxx +++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx @@ -216,7 +216,7 @@ DocumentSignatureHelper::CreateElementList( ImplFillElementList(aElements, rxStore, ::rtl::OUString(), false, mode); // 2) Pictures... - rtl::OUString aSubStorageName( RTL_CONSTASCII_USTRINGPARAM("Pictures") ); + rtl::OUString aSubStorageName( rtl::OUString::createFromAscii( "Pictures" ) ); try { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); @@ -227,7 +227,7 @@ DocumentSignatureHelper::CreateElementList( ; // Doesn't have to exist... } // 3) OLE.... - aSubStorageName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ObjectReplacements")); + aSubStorageName = rtl::OUString::createFromAscii( "ObjectReplacements" ); try { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); @@ -235,7 +235,7 @@ DocumentSignatureHelper::CreateElementList( xSubStore.clear(); // Object folders... - rtl::OUString aMatchStr( RTL_CONSTASCII_USTRINGPARAM("Object ") ); + rtl::OUString aMatchStr( rtl::OUString::createFromAscii( "Object " ) ); Reference < css::container::XNameAccess > xElements( rxStore, UNO_QUERY ); Sequence< ::rtl::OUString > aElementNames = xElements->getElementNames(); sal_Int32 nElements = aElementNames.getLength(); @@ -264,7 +264,7 @@ DocumentSignatureHelper::CreateElementList( case SignatureModeMacros: { // 1) Macros - rtl::OUString aSubStorageName( RTL_CONSTASCII_USTRINGPARAM("Basic") ); + rtl::OUString aSubStorageName( rtl::OUString::createFromAscii( "Basic" ) ); try { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); @@ -276,7 +276,7 @@ DocumentSignatureHelper::CreateElementList( } // 2) Dialogs - aSubStorageName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Dialogs")) ; + aSubStorageName = rtl::OUString::createFromAscii( "Dialogs") ; try { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); @@ -287,7 +287,7 @@ DocumentSignatureHelper::CreateElementList( ; // Doesn't have to exist... } // 3) Scripts - aSubStorageName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Scripts")) ; + aSubStorageName = rtl::OUString::createFromAscii( "Scripts") ; try { Reference < css::embed::XStorage > xSubStore = rxStore->openStorageElement( aSubStorageName, css::embed::ElementModes::READ ); diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index 693f89bb97fc..5e466ab471a5 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -204,12 +204,12 @@ Sequence< OUString > SAL_CALL SecurityEnvironment_MSCryptImpl :: getSupportedSer Sequence< OUString > SecurityEnvironment_MSCryptImpl :: impl_getSupportedServiceNames() { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; Sequence< OUString > seqServiceNames( 1 ) ; - seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.SecurityEnvironment")) ; + seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.SecurityEnvironment" ) ; return seqServiceNames ; } OUString SecurityEnvironment_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")) ; + return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl" ) ; } //Helper for registry @@ -1213,7 +1213,7 @@ X509Certificate_MSCryptImpl* MswcryCertContextToXCert( PCCERT_CONTEXT cert ) ::rtl::OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() throw( ::com::sun::star::uno::RuntimeException ) { - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Microsoft Crypto API")); + return rtl::OUString::createFromAscii("Microsoft Crypto API"); } /* Native methods */ diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx index 7e04922939e2..ab800b40b376 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx @@ -363,12 +363,12 @@ Sequence< OUString > SAL_CALL XMLEncryption_MSCryptImpl :: getSupportedServiceNa Sequence< OUString > XMLEncryption_MSCryptImpl :: impl_getSupportedServiceNames() { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; Sequence< OUString > seqServiceNames( 1 ) ; - seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryption")) ; + seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLEncryption" ) ; return seqServiceNames ; } OUString XMLEncryption_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl")) ; + return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl" ) ; } //Helper for registry diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index c9fed3227f0b..52f3cc3b983d 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -282,12 +282,12 @@ Sequence< OUString > SAL_CALL XMLSecurityContext_MSCryptImpl :: getSupportedServ Sequence< OUString > XMLSecurityContext_MSCryptImpl :: impl_getSupportedServiceNames() { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; Sequence< OUString > seqServiceNames( 1 ) ; - seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSecurityContext")) ; + seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSecurityContext" ) ; return seqServiceNames ; } OUString XMLSecurityContext_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")) ; + return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl" ) ; } //Helper for registry diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index 4d8569525701..e7fa7f96aa68 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -307,12 +307,12 @@ Sequence< OUString > SAL_CALL XMLSignature_MSCryptImpl :: getSupportedServiceNam Sequence< OUString > XMLSignature_MSCryptImpl :: impl_getSupportedServiceNames() { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; Sequence< OUString > seqServiceNames( 1 ) ; - seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignature")) ; + seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignature" ) ; return seqServiceNames ; } OUString XMLSignature_MSCryptImpl :: impl_getImplementationName() throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")) ; + return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl" ) ; } //Helper for registry diff --git a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx index d8ec2db95384..c9ba623d2140 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xsec_mscrypt.cxx @@ -66,7 +66,7 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void* // XMLSignature_MSCryptImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLSignature_MSCryptImpl::impl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { @@ -78,7 +78,7 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void* // XMLEncryption_MSCryptImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLEncryption_MSCryptImpl::impl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { @@ -90,7 +90,7 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void* // XMLSecurityContext_MSCryptImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLSecurityContext_MSCryptImpl::impl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { @@ -102,7 +102,7 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void* // SecurityEnvironment_MSCryptImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += SecurityEnvironment_MSCryptImpl::impl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { @@ -114,7 +114,7 @@ sal_Bool SAL_CALL mscrypt_component_writeInfo( void* /*pServiceManager*/ , void* // SEInitializer_MSCryptImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += SEInitializer_MSCryptImpl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx index f31de65ff553..0673a2bb8a2e 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx @@ -99,7 +99,7 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ ) if ( xMSF.is() ) { uno::Reference < task::XInteractionHandler > xInteractionHandler( - xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler")) ), uno::UNO_QUERY ); + xMSF->createInstance( rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler") ), uno::UNO_QUERY ); if ( xInteractionHandler.is() ) { @@ -191,12 +191,12 @@ Sequence< OUString > SAL_CALL SecurityEnvironment_NssImpl :: getSupportedService Sequence< OUString > SecurityEnvironment_NssImpl :: impl_getSupportedServiceNames() { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; Sequence< OUString > seqServiceNames( 1 ) ; - seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.SecurityEnvironment")) ; + seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.SecurityEnvironment" ) ; return seqServiceNames ; } OUString SecurityEnvironment_NssImpl :: impl_getImplementationName() throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")) ; + return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl" ) ; } //Helper for registry diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx index 600bc9010d7b..f8f2f1384541 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.cxx @@ -362,12 +362,12 @@ Sequence< OUString > SAL_CALL XMLEncryption_NssImpl :: getSupportedServiceNames( Sequence< OUString > XMLEncryption_NssImpl :: impl_getSupportedServiceNames() { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; Sequence< OUString > seqServiceNames( 1 ) ; - seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryption")) ; + seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLEncryption" ) ; return seqServiceNames ; } OUString XMLEncryption_NssImpl :: impl_getImplementationName() throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")) ; + return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl" ) ; } //Helper for registry diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx index f0dd15c75fac..6f0a0bd1f6c4 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.cxx @@ -179,12 +179,12 @@ Sequence< OUString > SAL_CALL XMLSecurityContext_NssImpl :: getSupportedServiceN Sequence< OUString > XMLSecurityContext_NssImpl :: impl_getSupportedServiceNames() { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; Sequence< OUString > seqServiceNames( 1 ) ; - seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSecurityContext")) ; + seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSecurityContext" ) ; return seqServiceNames ; } OUString XMLSecurityContext_NssImpl :: impl_getImplementationName() throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")) ; + return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl" ) ; } //Helper for registry diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 47e20b7af03b..f799d7977176 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -321,12 +321,12 @@ Sequence< OUString > SAL_CALL XMLSignature_NssImpl :: getSupportedServiceNames() Sequence< OUString > XMLSignature_NssImpl :: impl_getSupportedServiceNames() { ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ) ; Sequence< OUString > seqServiceNames( 1 ) ; - seqServiceNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignature")) ; + seqServiceNames.getArray()[0] = OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignature" ) ; return seqServiceNames ; } OUString XMLSignature_NssImpl :: impl_getImplementationName() throw( RuntimeException ) { - return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")) ; + return OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl" ) ; } //Helper for registry diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx index f661d7e8decf..bce50a11e5d5 100644 --- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx +++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx @@ -66,7 +66,7 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe // XMLSignature_NssImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLSignature_NssImpl::impl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { @@ -78,7 +78,7 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe // XMLEncryption_NssImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLEncryption_NssImpl::impl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { @@ -90,7 +90,7 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe // XMLSecurityContext_NssImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLSecurityContext_NssImpl::impl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { @@ -102,7 +102,7 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe // SecurityEnvironment_NssImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += SecurityEnvironment_NssImpl::impl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { @@ -114,7 +114,7 @@ sal_Bool SAL_CALL nss_component_writeInfo( void* /*pServiceManager*/ , void* pRe // SEInitializer_NssImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += SEInitializer_NssImpl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx index cfac243a851c..f8b12075f639 100644 --- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx +++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx @@ -125,7 +125,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe // XMLElementWrapper_XmlSecImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLElementWrapper_XmlSecImpl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { @@ -137,7 +137,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe // XMLDocumentWrapper_XmlSecImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += XMLDocumentWrapper_XmlSecImpl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { @@ -149,7 +149,7 @@ sal_Bool SAL_CALL component_writeInfo( void* pServiceManager , void* pRegistryKe // SerialNumberAdapterImpl sKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ) ; sKeyName += SerialNumberAdapterImpl_getImplementationName() ; - sKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) ; + sKeyName += OUString::createFromAscii( "/UNO/SERVICES" ) ; xNewKey = xKey->createKey( sKeyName ) ; if( xNewKey.is() ) { diff --git a/xmlsecurity/tools/demo/performance.cxx b/xmlsecurity/tools/demo/performance.cxx index c262ec2377f0..bcf0d203bfad 100644 --- a/xmlsecurity/tools/demo/performance.cxx +++ b/xmlsecurity/tools/demo/performance.cxx @@ -584,13 +584,13 @@ rtl::OUString XSecTester::parseFile( } else { - ouMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("N/A")); + ouMessage += rtl::OUString::createFromAscii( "N/A" ); } } else { - ouMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")); + ouMessage += rtl::OUString::createFromAscii( "-" ); } return ouMessage; @@ -736,7 +736,7 @@ rtl::OUString SAL_CALL XSecTester::transfer_without_sec( xJavaFilterParser, cssu::UNO_QUERY ); if ( !xJavaFilterParser.is() ) - return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NO JAVA")); + return rtl::OUString::createFromAscii( "NO JAVA" ); /* connect the SAX Parser, the Java Flat Filter and the SAX Writer */ xJavaFilterParser->setDocumentHandler( xSaxWriterHandler ); @@ -1772,7 +1772,7 @@ int main( int argc, char **argv ) * export the file with signautre/encryption (C++) */ outputFileName1 = ouInputFileName.copy(0, nPosition) + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex.xml")); + rtl::OUString::createFromAscii("-ex.xml"); ouTime_C = pTester->export_xml(ouInputFileName, outputFileName1, sal_False); nPosition1 = ouTime_C.lastIndexOf('\t'); ouRemark_C = ouTime_C.copy(nPosition1 + 1); @@ -1782,7 +1782,7 @@ int main( int argc, char **argv ) * export the file with signautre/encryption (Java) */ outputFileName1 = ouInputFileName.copy(0, nPosition) + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex2.xml")); + rtl::OUString::createFromAscii("-ex2.xml"); ouTime_Java = pTester->export_xml(ouInputFileName, outputFileName1, sal_True); nPosition1 = ouTime_Java.lastIndexOf('\t'); ouRemark_Java = ouTime_Java.copy(nPosition1 + 1); @@ -1792,14 +1792,14 @@ int main( int argc, char **argv ) * export the file without signautre/encryption */ outputFileName2 = ouInputFileName.copy(0, nPosition) + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex-no.xml")); + rtl::OUString::createFromAscii("-ex-no.xml"); ouTime_NoSecurity = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_False); /* * export the file with Java Flat Filter */ outputFileName2 = ouInputFileName.copy(0, nPosition) + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-ex-jf.xml")); + rtl::OUString::createFromAscii("-ex-jf.xml"); ouTime_JavaForwardOnly = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_True); /* @@ -1822,7 +1822,7 @@ int main( int argc, char **argv ) * import the file with signautre/encryption (C++) */ outputFileName1 = ouInputFileName.copy(0, nPosition) + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im.xml")); + rtl::OUString::createFromAscii("-im.xml"); ouTime_C = pTester->import_xml(ouInputFileName, outputFileName1, sal_False); nPosition1 = ouTime_C.lastIndexOf('\t'); ouRemark_C = ouTime_C.copy(nPosition1 + 1); @@ -1832,7 +1832,7 @@ int main( int argc, char **argv ) * import the file with signautre/encryption (Java) */ outputFileName1 = ouInputFileName.copy(0, nPosition) + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im2.xml")); + rtl::OUString::createFromAscii("-im2.xml"); ouTime_Java = pTester->import_xml(ouInputFileName, outputFileName1, sal_True); nPosition1 = ouTime_Java.lastIndexOf('\t'); ouRemark_Java = ouTime_Java.copy(nPosition1 + 1); @@ -1842,7 +1842,7 @@ int main( int argc, char **argv ) * import the file without signautre/encryption */ outputFileName2 = ouInputFileName.copy(0, nPosition) + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im-no.xml")); + rtl::OUString::createFromAscii("-im-no.xml"); ouTime_NoSecurity = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_False); /* @@ -1850,7 +1850,7 @@ int main( int argc, char **argv ) */ outputFileName2 = ouInputFileName.copy(0, nPosition) + - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-im-jf.xml")); + rtl::OUString::createFromAscii("-im-jf.xml"); ouTime_JavaForwardOnly = pTester->transfer_without_sec(ouInputFileName, outputFileName2, sal_True); /* diff --git a/xmlsecurity/tools/demo/util.cxx b/xmlsecurity/tools/demo/util.cxx index 32fbc60a28ec..b81724f15c4e 100644 --- a/xmlsecurity/tools/demo/util.cxx +++ b/xmlsecurity/tools/demo/util.cxx @@ -61,7 +61,7 @@ cssu::Reference< cssl::XMultiServiceFactory > CreateDemoServiceFactory() "serviceManager - " "Cannot create simple registry" ) ; - xSimpleRegistry->open(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("demo.rdb")), sal_True, sal_False); + xSimpleRegistry->open(rtl::OUString::createFromAscii( "demo.rdb" ), sal_True, sal_False); OSL_ENSURE( xSimpleRegistry->isValid() , "serviceManager - " "Cannot open xml security registry rdb" ) ; diff --git a/xmlsecurity/tools/demo/util2.cxx b/xmlsecurity/tools/demo/util2.cxx index 5b71f6108e6a..d40506bc498e 100644 --- a/xmlsecurity/tools/demo/util2.cxx +++ b/xmlsecurity/tools/demo/util2.cxx @@ -170,68 +170,68 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer, rtl::OUString result; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Security Id : ")) + result += rtl::OUString::createFromAscii( "Security Id : " ) +rtl::OUString::valueOf(infor.nSecurityId) - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Status : [")) + +rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString::createFromAscii( "Status : [" ) +rtl::OUString::valueOf((sal_Int32)(infor.nStatus)) - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("] ")) + +rtl::OUString::createFromAscii( "] " ) +rtl::OUString::createFromAscii(status[infor.nStatus]) - +rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + +rtl::OUString::createFromAscii( "\n" ); const SignatureReferenceInformations& rInfors = infor.vSignatureReferenceInfors; int i; int size = rInfors.size(); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--References :\n")); + result += rtl::OUString::createFromAscii( "--References :\n" ); for (i=0; i<size; i++) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("---URI : ")); + result += rtl::OUString::createFromAscii( "---URI : " ); result += rInfors[i].ouURI; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("---DigestValue : ")); + result += rtl::OUString::createFromAscii( "\n" ); + result += rtl::OUString::createFromAscii( "---DigestValue : " ); result += rInfors[i].ouDigestValue; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } if (infor.ouX509IssuerName.getLength()>0) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509IssuerName :\n")); + result += rtl::OUString::createFromAscii( "--X509IssuerName :\n" ); result += infor.ouX509IssuerName; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } if (infor.ouX509SerialNumber.getLength()>0) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509SerialNumber :\n")); + result += rtl::OUString::createFromAscii( "--X509SerialNumber :\n" ); result += infor.ouX509SerialNumber; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } if (infor.ouX509Certificate.getLength()>0) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--X509Certificate :\n")); + result += rtl::OUString::createFromAscii( "--X509Certificate :\n" ); result += infor.ouX509Certificate; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } if (infor.ouSignatureValue.getLength()>0) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--SignatureValue :\n")); + result += rtl::OUString::createFromAscii( "--SignatureValue :\n" ); result += infor.ouSignatureValue; - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--Date :\n")); + result += rtl::OUString::createFromAscii( "--Date :\n" ); ::rtl::OUStringBuffer buffer; convertDateTime( buffer, infor.stDateTime ); result += buffer.makeStringAndClear(); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); if (infor.ouX509IssuerName.getLength()>0 && infor.ouX509SerialNumber.getLength()>0 && xSecurityEnvironment.is()) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--Certificate Path :\n")); + result += rtl::OUString::createFromAscii( "--Certificate Path :\n" ); cssu::Reference< ::com::sun::star::security::XCertificate > xCert = xSecurityEnvironment->getCertificate( infor.ouX509IssuerName, numericStringToBigInteger(infor.ouX509SerialNumber) ); cssu::Sequence < cssu::Reference< ::com::sun::star::security::XCertificate > > xCertPath; if(! xCert.is() ) @@ -247,68 +247,68 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer, for( int i = 0; i < xCertPath.getLength(); i++ ) { result += xCertPath[i]->getSubjectName(); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Subject public key algorithm : ")); + result += rtl::OUString::createFromAscii( "\n Subject public key algorithm : " ); result += xCertPath[i]->getSubjectPublicKeyAlgorithm(); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Signature algorithm : ")); + result += rtl::OUString::createFromAscii( "\n Signature algorithm : " ); result += xCertPath[i]->getSignatureAlgorithm(); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Subject public key value : ")); + result += rtl::OUString::createFromAscii( "\n Subject public key value : " ); cssu::Sequence< sal_Int8 > keyValue = xCertPath[i]->getSubjectPublicKeyValue(); result += printHexString(keyValue); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Thumbprint (SHA1) : ")); + result += rtl::OUString::createFromAscii( "\n Thumbprint (SHA1) : " ); cssu::Sequence< sal_Int8 > SHA1Thumbprint = xCertPath[i]->getSHA1Thumbprint(); result += printHexString(SHA1Thumbprint); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Thumbprint (MD5) : ")); + result += rtl::OUString::createFromAscii( "\n Thumbprint (MD5) : " ); cssu::Sequence< sal_Int8 > MD5Thumbprint = xCertPath[i]->getMD5Thumbprint(); result += printHexString(MD5Thumbprint); - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n <<\n")); + result += rtl::OUString::createFromAscii( "\n <<\n" ); } - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n Key Usage : ")); + result += rtl::OUString::createFromAscii( "\n Key Usage : " ); sal_Int32 usage = xCert->getCertificateUsage(); if (usage & ::com::sun::star::security::KeyUsage::DIGITAL_SIGNATURE) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DIGITAL_SIGNATURE ")); + result += rtl::OUString::createFromAscii( "DIGITAL_SIGNATURE " ); } if (usage & ::com::sun::star::security::KeyUsage::NON_REPUDIATION) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NON_REPUDIATION ")); + result += rtl::OUString::createFromAscii( "NON_REPUDIATION " ); } if (usage & ::com::sun::star::security::KeyUsage::KEY_ENCIPHERMENT) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_ENCIPHERMENT ")); + result += rtl::OUString::createFromAscii( "KEY_ENCIPHERMENT " ); } if (usage & ::com::sun::star::security::KeyUsage::DATA_ENCIPHERMENT) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATA_ENCIPHERMENT ")); + result += rtl::OUString::createFromAscii( "DATA_ENCIPHERMENT " ); } if (usage & ::com::sun::star::security::KeyUsage::KEY_AGREEMENT) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_AGREEMENT ")); + result += rtl::OUString::createFromAscii( "KEY_AGREEMENT " ); } if (usage & ::com::sun::star::security::KeyUsage::KEY_CERT_SIGN) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEY_CERT_SIGN ")); + result += rtl::OUString::createFromAscii( "KEY_CERT_SIGN " ); } if (usage & ::com::sun::star::security::KeyUsage::CRL_SIGN) { - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CRL_SIGN ")); + result += rtl::OUString::createFromAscii( "CRL_SIGN " ); } - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); } - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); return result; } @@ -326,7 +326,7 @@ void convertDateTime( ::rtl::OUStringBuffer& rBuffer, result += getSignatureInformation( infor, xSecurityEnvironment ); } - result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")); + result += rtl::OUString::createFromAscii( "\n" ); return result; } diff --git a/xmlsecurity/tools/standalone/csfit/certmngr.cxx b/xmlsecurity/tools/standalone/csfit/certmngr.cxx index d0096a9c284e..5c6d78c89d9a 100644 --- a/xmlsecurity/tools/standalone/csfit/certmngr.cxx +++ b/xmlsecurity/tools/standalone/csfit/certmngr.cxx @@ -106,7 +106,7 @@ int SAL_CALL main( int argc, char **argv ) Reference< XMultiComponentFactory > xManager = NULL ; Reference< XComponentContext > xContext = NULL ; - xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[2] ) ) ; + xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[2] ) ) ; OSL_ENSURE( xManager.is() , "ServicesManager - " "Cannot get service manager" ) ; @@ -114,7 +114,7 @@ int SAL_CALL main( int argc, char **argv ) //Create security environment //Build Security Environment Reference< XInterface > xsecenv = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Signer - " "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; diff --git a/xmlsecurity/tools/standalone/csfit/decrypter.cxx b/xmlsecurity/tools/standalone/csfit/decrypter.cxx index fb65f5fcf098..b1177efe58d1 100644 --- a/xmlsecurity/tools/standalone/csfit/decrypter.cxx +++ b/xmlsecurity/tools/standalone/csfit/decrypter.cxx @@ -136,11 +136,11 @@ int SAL_CALL main( int argc, char **argv ) Reference< XMultiComponentFactory > xManager = NULL ; Reference< XComponentContext > xContext = NULL ; - xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ; + xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[4] ) ) ; //Create encryption template Reference< XInterface > tplElement = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ; OSL_ENSURE( tplElement.is() , "Decryptor - " "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; @@ -164,7 +164,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Encryption template Reference< XInterface > enctpl = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ; OSL_ENSURE( enctpl.is() , "Decryptor - " "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ; @@ -180,7 +180,7 @@ int SAL_CALL main( int argc, char **argv ) //Create security environment //Build Security Environment Reference< XInterface > xsecenv = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Decryptor - " "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; @@ -207,7 +207,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Security Context Reference< XInterface > xmlsecctx = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ; OSL_ENSURE( xmlsecctx.is() , "Decryptor - " "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ; @@ -222,7 +222,7 @@ int SAL_CALL main( int argc, char **argv ) //Get encrypter Reference< XInterface > xmlencrypter = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"), xContext ) ; OSL_ENSURE( xmlencrypter.is() , "Decryptor - " "Cannot get service instance of \"xsec.XMLEncryption\"" ) ; diff --git a/xmlsecurity/tools/standalone/csfit/encrypter.cxx b/xmlsecurity/tools/standalone/csfit/encrypter.cxx index 63b2b4a6703e..ce6e4c15ccdf 100644 --- a/xmlsecurity/tools/standalone/csfit/encrypter.cxx +++ b/xmlsecurity/tools/standalone/csfit/encrypter.cxx @@ -144,11 +144,11 @@ int SAL_CALL main( int argc, char **argv ) Reference< XMultiComponentFactory > xManager = NULL ; Reference< XComponentContext > xContext = NULL ; - xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[6] ) ) ; + xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[6] ) ) ; //Create encryption template Reference< XInterface > tplElement = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ; OSL_ENSURE( tplElement.is() , "Encryptor - " "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; @@ -172,7 +172,7 @@ int SAL_CALL main( int argc, char **argv ) //Create encryption target element Reference< XInterface > tarElement = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ; OSL_ENSURE( tarElement.is() , "Encryptor - " "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; @@ -197,7 +197,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Encryption template Reference< XInterface > enctpl = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ; OSL_ENSURE( enctpl.is() , "Encryptor - " "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ; @@ -214,7 +214,7 @@ int SAL_CALL main( int argc, char **argv ) //Create security environment //Build Security Environment Reference< XInterface > xsecenv = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Encryptor - " "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; @@ -242,7 +242,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Security Context Reference< XInterface > xmlsecctx = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ; OSL_ENSURE( xmlsecctx.is() , "Encryptor - " "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ; @@ -256,7 +256,7 @@ int SAL_CALL main( int argc, char **argv ) //Get encrypter Reference< XInterface > xmlencrypter = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl"), xContext ) ; OSL_ENSURE( xmlencrypter.is() , "Encryptor - " "Cannot get service instance of \"xsec.XMLEncryption\"" ) ; diff --git a/xmlsecurity/tools/standalone/csfit/helper.cxx b/xmlsecurity/tools/standalone/csfit/helper.cxx index 25dc0439650e..fb2b6b0933c5 100644 --- a/xmlsecurity/tools/standalone/csfit/helper.cxx +++ b/xmlsecurity/tools/standalone/csfit/helper.cxx @@ -108,7 +108,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "serviceManager - " "Cannot create simple registry" ) ; - //xSimpleRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity.rdb")), sal_False, sal_False); + //xSimpleRegistry->open(OUString::createFromAscii("xmlsecurity.rdb"), sal_False, sal_False); xSimpleRegistry->open(sRdbUrl, sal_True, sal_False); OSL_ENSURE( xSimpleRegistry->isValid() , "serviceManager - " @@ -140,7 +140,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext args[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ) ; args[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ) ; if( ! ::ucb::ContentBroker::initialize( xSvmg , args ) ) { - throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot inlitialize ContentBroker")) , Reference< XInterface >() , Any() ) ; + throw RuntimeException( OUString::createFromAscii( "Cannot inlitialize ContentBroker" ) , Reference< XInterface >() , Any() ) ; } } ********************************************************************/ @@ -159,7 +159,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "Cannot create intial service manager" ) ; Reference< XInterface > urlResolver = - xLocalServiceManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) , xLocalComponentContext ) ; + xLocalServiceManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.bridge.UnoUrlResolver") , xLocalComponentContext ) ; OSL_ENSURE( urlResolver.is() , "serviceManager - " "Cannot get service instance of \"bridge.UnoUrlResolver\"" ) ; @@ -183,7 +183,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "Cannot get interface of \"XNamingService\" from URL resolver" ) ; Reference< XInterface > serviceManager = - xNamingService->getRegisteredObject( OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) ; + xNamingService->getRegisteredObject( OUString::createFromAscii( "StarOffice.ServiceManager" ) ) ; OSL_ENSURE( serviceManager.is() , "serviceManager - " "Cannot get service instance of \"StarOffice.ServiceManager\"" ) ; @@ -198,7 +198,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "serviceManager - " "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ; + xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ; OSL_ENSURE( xUsedComponentContext.is() , "serviceManager - " "Cannot create remote component context" ) ; @@ -213,7 +213,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "serviceManager - " "Cannot get interface of \"XPropertySet\" from URL resolver" ) ; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ; + xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ; OSL_ENSURE( xUsedComponentContext.is() , "serviceManager - " "Cannot create remote component context" ) ; @@ -237,7 +237,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "serviceManager - " "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ; + xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ; OSL_ENSURE( xUsedComponentContext.is() , "serviceManager - " "Cannot create remote component context" ) ; diff --git a/xmlsecurity/tools/standalone/csfit/signer.cxx b/xmlsecurity/tools/standalone/csfit/signer.cxx index fc4e4d743943..40e6a64a2b78 100644 --- a/xmlsecurity/tools/standalone/csfit/signer.cxx +++ b/xmlsecurity/tools/standalone/csfit/signer.cxx @@ -221,14 +221,14 @@ int SAL_CALL main( int argc, char **argv ) Reference< XMultiComponentFactory > xManager = NULL ; Reference< XComponentContext > xContext = NULL ; - xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ; + xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[4] ) ) ; OSL_ENSURE( xManager.is() , "ServicesManager - " "Cannot get service manager" ) ; //Create signature template Reference< XInterface > element = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ; OSL_ENSURE( element.is() , "Signer - " "Cannot get service instance of \"wrapper.XMLElementWrapper\"" ) ; @@ -253,7 +253,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Signature template Reference< XInterface > signtpl = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignatureTemplate" ) , xContext ) ; OSL_ENSURE( signtpl.is() , "Signer - " "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ; @@ -273,7 +273,7 @@ int SAL_CALL main( int argc, char **argv ) //Create security environment //Build Security Environment Reference< XInterface > xsecenv = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Signer - " "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; @@ -299,7 +299,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Security Context Reference< XInterface > xmlsecctx = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Signer - " "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ; @@ -313,7 +313,7 @@ int SAL_CALL main( int argc, char **argv ) //Generate XML signature Reference< XInterface > xmlsigner = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl"), xContext ) ; OSL_ENSURE( xmlsigner.is() , "Signer - " "Cannot get service instance of \"xsec.XMLSignature\"" ) ; diff --git a/xmlsecurity/tools/standalone/csfit/verifier.cxx b/xmlsecurity/tools/standalone/csfit/verifier.cxx index 43c72a102c30..a109b63931fe 100644 --- a/xmlsecurity/tools/standalone/csfit/verifier.cxx +++ b/xmlsecurity/tools/standalone/csfit/verifier.cxx @@ -208,11 +208,11 @@ int SAL_CALL main( int argc, char **argv ) Reference< XMultiComponentFactory > xManager = NULL ; Reference< XComponentContext > xContext = NULL ; - xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[3] ) ) ; + xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[3] ) ) ; //Create signature template Reference< XInterface > element = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ; OSL_ENSURE( element.is() , "Verifier - " "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; @@ -237,7 +237,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Signature template Reference< XInterface > signtpl = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLSignatureTemplate"), xContext ) ; OSL_ENSURE( signtpl.is() , "Verifier - " "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ; @@ -257,7 +257,7 @@ int SAL_CALL main( int argc, char **argv ) //Create security environment //Build Security Environment Reference< XInterface > xsecenv = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_NssImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Verifier - " "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; @@ -283,7 +283,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Security Context Reference< XInterface > xmlsecctx = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_NssImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Verifier - " "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ; @@ -297,7 +297,7 @@ int SAL_CALL main( int argc, char **argv ) //Generate XML signature Reference< XInterface > xmlsigner = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl"), xContext ) ; OSL_ENSURE( xmlsigner.is() , "Verifier - " "Cannot get service instance of \"xsec.XMLSignature\"" ) ; diff --git a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx index fee83746faff..2856967cbd26 100644 --- a/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx +++ b/xmlsecurity/tools/standalone/mscsfit/certmngr.cxx @@ -63,7 +63,7 @@ int SAL_CALL main( int argc, char **argv ) Reference< XMultiComponentFactory > xManager = NULL ; Reference< XComponentContext > xContext = NULL ; - xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[1] ) ) ; + xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[1] ) ) ; OSL_ENSURE( xManager.is() , "ServicesManager - " "Cannot get service manager" ) ; @@ -71,7 +71,7 @@ int SAL_CALL main( int argc, char **argv ) //Create security environment //Build Security Environment Reference< XInterface > xsecenv = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Signer - " "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; diff --git a/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx b/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx index a481824ad52e..1b0015c6d92e 100644 --- a/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx +++ b/xmlsecurity/tools/standalone/mscsfit/decrypter.cxx @@ -110,11 +110,11 @@ int SAL_CALL main( int argc, char **argv ) Reference< XMultiComponentFactory > xManager = NULL ; Reference< XComponentContext > xContext = NULL ; - xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[4] ) ) ; + xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[4] ) ) ; //Create encryption template Reference< XInterface > tplElement = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLElementWrapper")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.xsec.XMLElementWrapper" ) , xContext ) ; OSL_ENSURE( tplElement.is() , "Decryptor - " "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; @@ -138,7 +138,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Encryption template Reference< XInterface > enctpl = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLEncryptionTemplate")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLEncryptionTemplate"), xContext ) ; OSL_ENSURE( enctpl.is() , "Decryptor - " "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ; @@ -154,7 +154,7 @@ int SAL_CALL main( int argc, char **argv ) //Create security environment //Build Security Environment Reference< XInterface > xsecenv = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.SecurityEnvironment")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.SecurityEnvironment"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Decryptor - " "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; @@ -181,7 +181,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Security Context Reference< XInterface > xmlsecctx = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLSecurityContext")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLSecurityContext"), xContext ) ; OSL_ENSURE( xmlsecctx.is() , "Decryptor - " "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ; @@ -196,7 +196,7 @@ int SAL_CALL main( int argc, char **argv ) //Get encrypter Reference< XInterface > xmlencrypter = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xsec.XMLEncryption")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.xsec.XMLEncryption"), xContext ) ; OSL_ENSURE( xmlencrypter.is() , "Decryptor - " "Cannot get service instance of \"xsec.XMLEncryption\"" ) ; diff --git a/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx b/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx index 3f0e98ca8a50..d580649ed0e6 100644 --- a/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx +++ b/xmlsecurity/tools/standalone/mscsfit/encrypter.cxx @@ -125,11 +125,11 @@ int SAL_CALL main( int argc, char **argv ) Reference< XMultiComponentFactory > xManager = NULL ; Reference< XComponentContext > xContext = NULL ; - xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[5] ) ) ; + xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[5] ) ) ; //Create encryption template Reference< XInterface > tplElement = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ; OSL_ENSURE( tplElement.is() , "Encryptor - " "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; @@ -153,7 +153,7 @@ int SAL_CALL main( int argc, char **argv ) //Create encryption target element Reference< XInterface > tarElement = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ; OSL_ENSURE( tarElement.is() , "Encryptor - " "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; @@ -178,7 +178,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Encryption template Reference< XInterface > enctpl = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLEncryptionTemplate")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLEncryptionTemplate"), xContext ) ; OSL_ENSURE( enctpl.is() , "Encryptor - " "Cannot get service instance of \"xsec.XMLEncryptionTemplate\"" ) ; @@ -195,7 +195,7 @@ int SAL_CALL main( int argc, char **argv ) //Create security environment //Build Security Environment Reference< XInterface > xsecenv = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Encryptor - " "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; @@ -229,7 +229,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Security Context Reference< XInterface > xmlsecctx = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ; OSL_ENSURE( xmlsecctx.is() , "Encryptor - " "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ; @@ -243,7 +243,7 @@ int SAL_CALL main( int argc, char **argv ) //Get encrypter Reference< XInterface > xmlencrypter = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_MSCryptImpl"), xContext ) ; OSL_ENSURE( xmlencrypter.is() , "Encryptor - " "Cannot get service instance of \"xsec.XMLEncryption\"" ) ; diff --git a/xmlsecurity/tools/standalone/mscsfit/helper.cxx b/xmlsecurity/tools/standalone/mscsfit/helper.cxx index 522a8c2d14eb..631ae1c397b7 100644 --- a/xmlsecurity/tools/standalone/mscsfit/helper.cxx +++ b/xmlsecurity/tools/standalone/mscsfit/helper.cxx @@ -76,7 +76,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "serviceManager - " "Cannot create simple registry" ) ; - //xSimpleRegistry->open(OUString(RTL_CONSTASCII_USTRINGPARAM("xmlsecurity.rdb")), sal_False, sal_False); + //xSimpleRegistry->open(OUString::createFromAscii("xmlsecurity.rdb"), sal_False, sal_False); xSimpleRegistry->open(sRdbUrl, sal_True, sal_False); OSL_ENSURE( xSimpleRegistry->isValid() , "serviceManager - " @@ -108,7 +108,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext args[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ) ; args[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ) ; if( ! ::ucb::ContentBroker::initialize( xSvmg , args ) ) { - throw RuntimeException( OUString(RTL_CONSTASCII_USTRINGPARAM("Cannot inlitialize ContentBroker")) , Reference< XInterface >() , Any() ) ; + throw RuntimeException( OUString::createFromAscii( "Cannot inlitialize ContentBroker" ) , Reference< XInterface >() , Any() ) ; } } ********************************************************************/ @@ -130,7 +130,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "Cannot create intial service manager" ) ; Reference< XInterface > urlResolver = - xLocalServiceManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bridge.UnoUrlResolver")) , xLocalComponentContext ) ; + xLocalServiceManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.bridge.UnoUrlResolver") , xLocalComponentContext ) ; OSL_ENSURE( urlResolver.is() , "serviceManager - " "Cannot get service instance of \"bridge.UnoUrlResolver\"" ) ; @@ -154,7 +154,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "Cannot get interface of \"XNamingService\" from URL resolver" ) ; Reference< XInterface > serviceManager = - xNamingService->getRegisteredObject( OUString(RTL_CONSTASCII_USTRINGPARAM("StarOffice.ServiceManager")) ) ; + xNamingService->getRegisteredObject( OUString::createFromAscii( "StarOffice.ServiceManager" ) ) ; OSL_ENSURE( serviceManager.is() , "serviceManager - " "Cannot get service instance of \"StarOffice.ServiceManager\"" ) ; @@ -169,7 +169,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "serviceManager - " "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ; + xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ; OSL_ENSURE( xUsedComponentContext.is() , "serviceManager - " "Cannot create remote component context" ) ; @@ -184,7 +184,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "serviceManager - " "Cannot get interface of \"XPropertySet\" from URL resolver" ) ; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ; + xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ; OSL_ENSURE( xUsedComponentContext.is() , "serviceManager - " "Cannot create remote component context" ) ; @@ -208,7 +208,7 @@ Reference< XMultiComponentFactory > serviceManager( Reference< XComponentContext "serviceManager - " "Cannot get interface of \"XPropertySet\" from service \"StarOffice.ServiceManager\"" ) ; - xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")) ) >>= xUsedComponentContext ; + xPropSet->getPropertyValue( OUString::createFromAscii( "DefaultContext" ) ) >>= xUsedComponentContext ; OSL_ENSURE( xUsedComponentContext.is() , "serviceManager - " "Cannot create remote component context" ) ; diff --git a/xmlsecurity/tools/standalone/mscsfit/signer.cxx b/xmlsecurity/tools/standalone/mscsfit/signer.cxx index 270fb23bf076..ffa88577444a 100644 --- a/xmlsecurity/tools/standalone/mscsfit/signer.cxx +++ b/xmlsecurity/tools/standalone/mscsfit/signer.cxx @@ -178,14 +178,14 @@ int SAL_CALL main( int argc, char **argv ) Reference< XMultiComponentFactory > xManager = NULL ; Reference< XComponentContext > xContext = NULL ; - xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[3] ) ) ; + xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[3] ) ) ; OSL_ENSURE( xManager.is() , "ServicesManager - " "Cannot get service manager" ) ; //Create signature template Reference< XInterface > element = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ; OSL_ENSURE( element.is() , "Signer - " "Cannot get service instance of \"wrapper.XMLElementWrapper\"" ) ; @@ -210,7 +210,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Signature template Reference< XInterface > signtpl = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.crypto.XMLSignatureTemplate" ) , xContext ) ; OSL_ENSURE( signtpl.is() , "Signer - " "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ; @@ -230,7 +230,7 @@ int SAL_CALL main( int argc, char **argv ) //Create security environment //Build Security Environment Reference< XInterface > xsecenv = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Signer - " "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; @@ -261,7 +261,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Security Context Reference< XInterface > xmlsecctx = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Signer - " "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ; @@ -275,7 +275,7 @@ int SAL_CALL main( int argc, char **argv ) //Generate XML signature Reference< XInterface > xmlsigner = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl"), xContext ) ; OSL_ENSURE( xmlsigner.is() , "Signer - " "Cannot get service instance of \"xsec.XMLSignature\"" ) ; diff --git a/xmlsecurity/tools/standalone/mscsfit/verifier.cxx b/xmlsecurity/tools/standalone/mscsfit/verifier.cxx index 6af44f0975c9..149923742fa6 100644 --- a/xmlsecurity/tools/standalone/mscsfit/verifier.cxx +++ b/xmlsecurity/tools/standalone/mscsfit/verifier.cxx @@ -180,11 +180,11 @@ int SAL_CALL main( int argc, char **argv ) Reference< XMultiComponentFactory > xManager = NULL ; Reference< XComponentContext > xContext = NULL ; - xManager = serviceManager( xContext , OUString(RTL_CONSTASCII_USTRINGPARAM("local")), OUString::createFromAscii( argv[2] ) ) ; + xManager = serviceManager( xContext , OUString::createFromAscii( "local" ), OUString::createFromAscii( argv[2] ) ) ; //Create signature template Reference< XInterface > element = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl")) , xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.xml.security.bridge.xmlsec.XMLElementWrapper_XmlSecImpl" ) , xContext ) ; OSL_ENSURE( element.is() , "Verifier - " "Cannot get service instance of \"xsec.XMLElementWrapper\"" ) ; @@ -209,7 +209,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Signature template Reference< XInterface > signtpl = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.crypto.XMLSignatureTemplate")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.crypto.XMLSignatureTemplate"), xContext ) ; OSL_ENSURE( signtpl.is() , "Verifier - " "Cannot get service instance of \"xsec.XMLSignatureTemplate\"" ) ; @@ -229,7 +229,7 @@ int SAL_CALL main( int argc, char **argv ) //Create security environment //Build Security Environment Reference< XInterface > xsecenv = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.SecurityEnvironment_MSCryptImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Verifier - " "Cannot get service instance of \"xsec.SecurityEnvironment\"" ) ; @@ -260,7 +260,7 @@ int SAL_CALL main( int argc, char **argv ) //Build XML Security Context Reference< XInterface > xmlsecctx = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSecurityContext_MSCryptImpl"), xContext ) ; OSL_ENSURE( xsecenv.is() , "Verifier - " "Cannot get service instance of \"xsec.XMLSecurityContext\"" ) ; @@ -274,7 +274,7 @@ int SAL_CALL main( int argc, char **argv ) //Generate XML signature Reference< XInterface > xmlsigner = - xManager->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl")), xContext ) ; + xManager->createInstanceWithContext( OUString::createFromAscii("com.sun.star.xml.security.bridge.xmlsec.XMLSignature_MSCryptImpl"), xContext ) ; OSL_ENSURE( xmlsigner.is() , "Verifier - " "Cannot get service instance of \"xsec.XMLSignature\"" ) ; |