unotools/inc/unotools/compatibility.hxx | 30 ++++++++++---------- unotools/inc/unotools/dynamicmenuoptions.hxx | 8 ++--- unotools/inc/unotools/fontcfg.hxx | 6 ++-- unotools/inc/unotools/historyoptions.hxx | 8 ++--- ure/source/uretest/cppserver.cc | 14 ++++----- ure/source/uretest/cpptest.cc | 15 ++++------ xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx | 2 - xmloff/source/transform/DocumentTContext.cxx | 2 - xmloff/source/transform/OOo2Oasis.cxx | 9 ++---- xmloff/source/transform/Oasis2OOo.cxx | 7 ++-- xmloff/source/xforms/SchemaRestrictionContext.cxx | 32 +++++++++++----------- xmloff/source/xforms/XFormsInstanceContext.cxx | 6 ++-- xmloff/source/xforms/xformsexport.cxx | 4 +- 13 files changed, 69 insertions(+), 74 deletions(-)
New commits: commit 1e67ecc6569e1c01485471a4c396a63b597a0522 Author: Chr. Rossmanith <[email protected]> Date: Thu Mar 7 16:52:15 2013 +0100 Removed RTL_CONSTASCII_USTRINGPARAM in unotools Change-Id: I516ea0e5457e9dc1cc9ac42f86fa1a5b4641078a diff --git a/unotools/inc/unotools/compatibility.hxx b/unotools/inc/unotools/compatibility.hxx index 34fd9be..16c73db 100644 --- a/unotools/inc/unotools/compatibility.hxx +++ b/unotools/inc/unotools/compatibility.hxx @@ -49,21 +49,21 @@ enum CompatibilityOptions @descr The method GetList() returns a list of property values. Use follow defines to seperate values by names. *//*-*************************************************************************************************************/ -#define COMPATIBILITY_PROPERTYNAME_NAME OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ) -#define COMPATIBILITY_PROPERTYNAME_MODULE OUString( RTL_CONSTASCII_USTRINGPARAM( "Module" ) ) -#define COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS OUString( RTL_CONSTASCII_USTRINGPARAM( "UsePrinterMetrics" ) ) -#define COMPATIBILITY_PROPERTYNAME_ADDSPACING OUString( RTL_CONSTASCII_USTRINGPARAM( "AddSpacing" ) ) -#define COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES OUString( RTL_CONSTASCII_USTRINGPARAM( "AddSpacingAtPages" ) ) -#define COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS OUString( RTL_CONSTASCII_USTRINGPARAM( "UseOurTabStopFormat" ) ) -#define COMPATIBILITY_PROPERTYNAME_NOEXTLEADING OUString( RTL_CONSTASCII_USTRINGPARAM( "NoExternalLeading" ) ) -#define COMPATIBILITY_PROPERTYNAME_USELINESPACING OUString( RTL_CONSTASCII_USTRINGPARAM( "UseLineSpacing" ) ) -#define COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING OUString( RTL_CONSTASCII_USTRINGPARAM( "AddTableSpacing" ) ) -#define COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING OUString( RTL_CONSTASCII_USTRINGPARAM( "UseObjectPositioning" ) ) -#define COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING OUString( RTL_CONSTASCII_USTRINGPARAM( "UseOurTextWrapping" ) ) -#define COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE OUString( RTL_CONSTASCII_USTRINGPARAM( "ConsiderWrappingStyle" ) ) -#define COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE OUString( RTL_CONSTASCII_USTRINGPARAM( "ExpandWordSpace" ) ) - -#define COMPATIBILITY_DEFAULT_NAME OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ) +#define COMPATIBILITY_PROPERTYNAME_NAME OUString( "Name" ) +#define COMPATIBILITY_PROPERTYNAME_MODULE OUString( "Module" ) +#define COMPATIBILITY_PROPERTYNAME_USEPRTMETRICS OUString( "UsePrinterMetrics" ) +#define COMPATIBILITY_PROPERTYNAME_ADDSPACING OUString( "AddSpacing" ) +#define COMPATIBILITY_PROPERTYNAME_ADDSPACINGATPAGES OUString( "AddSpacingAtPages" ) +#define COMPATIBILITY_PROPERTYNAME_USEOURTABSTOPS OUString( "UseOurTabStopFormat" ) +#define COMPATIBILITY_PROPERTYNAME_NOEXTLEADING OUString( "NoExternalLeading" ) +#define COMPATIBILITY_PROPERTYNAME_USELINESPACING OUString( "UseLineSpacing" ) +#define COMPATIBILITY_PROPERTYNAME_ADDTABLESPACING OUString( "AddTableSpacing" ) +#define COMPATIBILITY_PROPERTYNAME_USEOBJECTPOSITIONING OUString( "UseObjectPositioning" ) +#define COMPATIBILITY_PROPERTYNAME_USEOURTEXTWRAPPING OUString( "UseOurTextWrapping" ) +#define COMPATIBILITY_PROPERTYNAME_CONSIDERWRAPPINGSTYLE OUString( "ConsiderWrappingStyle" ) +#define COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE OUString( "ExpandWordSpace" ) + +#define COMPATIBILITY_DEFAULT_NAME OUString( "_default" ) //_________________________________________________________________________________________________________________ // forward declarations diff --git a/unotools/inc/unotools/dynamicmenuoptions.hxx b/unotools/inc/unotools/dynamicmenuoptions.hxx index 19f806b..46a8a21 100644 --- a/unotools/inc/unotools/dynamicmenuoptions.hxx +++ b/unotools/inc/unotools/dynamicmenuoptions.hxx @@ -30,10 +30,10 @@ @descr The method GetList() returns a list of property values. Use follow defines to seperate values by names. *//*-*************************************************************************************************************/ -#define DYNAMICMENU_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL" )) -#define DYNAMICMENU_PROPERTYNAME_TITLE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title" )) -#define DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageIdentifier" )) -#define DYNAMICMENU_PROPERTYNAME_TARGETNAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TargetName" )) +#define DYNAMICMENU_PROPERTYNAME_URL OUString("URL") +#define DYNAMICMENU_PROPERTYNAME_TITLE OUString("Title") +#define DYNAMICMENU_PROPERTYNAME_IMAGEIDENTIFIER OUString("ImageIdentifier") +#define DYNAMICMENU_PROPERTYNAME_TARGETNAME OUString("TargetName") /*-************************************************************************************************************//** @descr You can use these enum values to specify right menu if you call our interface methods. diff --git a/unotools/inc/unotools/fontcfg.hxx b/unotools/inc/unotools/fontcfg.hxx index 21bbb94..39a4fc0 100644 --- a/unotools/inc/unotools/fontcfg.hxx +++ b/unotools/inc/unotools/fontcfg.hxx @@ -207,9 +207,9 @@ public: const FontNameAttr* getSubstInfo( const String& rFontName, const com::sun::star::lang::Locale& rLocale = - com::sun::star::lang::Locale( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) ), - rtl::OUString(), - rtl::OUString() ) + com::sun::star::lang::Locale( OUString( "en" ), + OUString(), + OUString() ) ) const; static void getMapName( const String& rOrgName, String& rShortName, String& rFamilyName, FontWeight& rWeight, FontWidth& rWidth, sal_uLong& rType ); }; diff --git a/unotools/inc/unotools/historyoptions.hxx b/unotools/inc/unotools/historyoptions.hxx index 8be1f81..f69fd17 100644 --- a/unotools/inc/unotools/historyoptions.hxx +++ b/unotools/inc/unotools/historyoptions.hxx @@ -32,10 +32,10 @@ Use follow defines to seperate values by names. *//*-*************************************************************************************************************/ -#define HISTORY_PROPERTYNAME_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL" )) -#define HISTORY_PROPERTYNAME_FILTER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Filter" )) -#define HISTORY_PROPERTYNAME_TITLE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title" )) -#define HISTORY_PROPERTYNAME_PASSWORD ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password" )) +#define HISTORY_PROPERTYNAME_URL OUString("URL") +#define HISTORY_PROPERTYNAME_FILTER OUString("Filter") +#define HISTORY_PROPERTYNAME_TITLE OUString("Title") +#define HISTORY_PROPERTYNAME_PASSWORD OUString("Password") /*-************************************************************************************************************//** @descr You can use these enum values to specify right history if you call ouer interface methods. commit ccce843ab6aa255243485919aefb5336d2c48546 Author: Chr. Rossmanith <[email protected]> Date: Thu Mar 7 16:51:40 2013 +0100 Removed RTL_CONSTASCII_USTRINGPARAM in xmlhelp/ure Change-Id: Ibaf83366e79292bbb6756045e4c82f2650958150 diff --git a/ure/source/uretest/cppserver.cc b/ure/source/uretest/cppserver.cc index 70dfa14..0b5e98b 100644 --- a/ure/source/uretest/cppserver.cc +++ b/ure/source/uretest/cppserver.cc @@ -48,8 +48,7 @@ public: virtual ::test::types::Data SAL_CALL getData() throw (::css::uno::RuntimeException) { - return ::test::types::Data( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hello")), 42); + return ::test::types::Data(OUString("Hello"), 42); } private: @@ -69,18 +68,17 @@ namespace CppServer { return static_cast< ::cppu::OWeakObject * >(new Service); } catch (::std::bad_alloc &) { throw ::css::uno::RuntimeException( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), + OUString("std::bad_alloc"), ::css::uno::Reference< ::css::uno::XInterface >()); } } -::rtl::OUString getImplementationName() { - return ::rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.cpp.cppserver.Component")); +OUString getImplementationName() { + return OUString("test.cpp.cppserver.Component"); } -::css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames() { - return ::css::uno::Sequence< ::rtl::OUString >(); +::css::uno::Sequence< OUString > getSupportedServiceNames() { + return ::css::uno::Sequence< OUString >(); } } diff --git a/ure/source/uretest/cpptest.cc b/ure/source/uretest/cpptest.cc index 30950ec..9fe83e4 100644 --- a/ure/source/uretest/cpptest.cc +++ b/ure/source/uretest/cpptest.cc @@ -47,7 +47,7 @@ public: throw (test::types::TestException, css::uno::RuntimeException) { throw test::types::TestException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("test")), + OUString("test"), static_cast< cppu::OWeakObject * >(this)); } @@ -68,19 +68,18 @@ css::uno::Reference< css::uno::XInterface > create( return static_cast< cppu::OWeakObject * >(new Service); } catch (std::bad_alloc &) { throw css::uno::RuntimeException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("std::bad_alloc")), + OUString("std::bad_alloc"), css::uno::Reference< css::uno::XInterface >()); } } -rtl::OUString getImplementationName() { - return rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM("test.cpp.cpptest.Component")); +OUString getImplementationName() { + return OUString("test.cpp.cpptest.Component"); } -css::uno::Sequence< rtl::OUString > getSupportedServiceNames() { - rtl::OUString s(RTL_CONSTASCII_USTRINGPARAM("test.types.CppTest")); - return css::uno::Sequence< rtl::OUString >(&s, 1); +css::uno::Sequence< OUString > getSupportedServiceNames() { + OUString s("test.types.CppTest"); + return css::uno::Sequence< OUString >(&s, 1); } } diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx index f678a4e..b073149 100644 --- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx @@ -103,7 +103,7 @@ namespace xmlsearch { { if( arrayL_ <= index_ ) throw xmlsearch::excep::XmlSearchException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ByteArrayDecompressor->getNextByte()" )) ); + OUString( "ByteArrayDecompressor->getNextByte()" ) ); return array_[index_++] & 0xFF; } commit a20d634b61c023ae4a08b4eb574d4ce4397c6e10 Author: Chr. Rossmanith <[email protected]> Date: Thu Mar 7 13:32:32 2013 +0100 Removed RTL_CONSTASCII_USTRINGPARAM in xmloff(transform) Change-Id: I3b32ef3bad9700f24c898b6b5bf1a8cd6a97f426 diff --git a/xmloff/source/transform/DocumentTContext.cxx b/xmloff/source/transform/DocumentTContext.cxx index c64112a..164e83f 100644 --- a/xmloff/source/transform/DocumentTContext.cxx +++ b/xmloff/source/transform/DocumentTContext.cxx @@ -112,7 +112,7 @@ void XMLDocumentTransformerContext::StartElement( const Reference< XAttributeLis { Reference< XPropertySetInfo > xPropSetInfo( rPropSet->getPropertySetInfo() ); - OUString aPropName(RTL_CONSTASCII_USTRINGPARAM("Class")); + OUString aPropName("Class"); if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName( aPropName ) ) { Any aAny = rPropSet->getPropertyValue( aPropName ); diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 22be397..59a558d 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1159,7 +1159,7 @@ void XMLDocumentTransformerContext_Impl::StartElement( pMutableAttrList = new XMLMutableAttributeList( xAttrList ); xAttrList = pMutableAttrList; - OUString sMime(RTL_CONSTASCII_USTRINGPARAM("application/vnd.oasis.opendocument.") ); + OUString sMime("application/vnd.oasis.opendocument."); sMime += rValue; pMutableAttrList->SetValueByIndex( i, sMime ); OUString aNewAttrQName( GetTransformer().GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_OFFICE, ::xmloff::token::GetXMLToken( XML_MIMETYPE ) ) ); @@ -1461,7 +1461,7 @@ void XMLTrackedChangesOOoTContext_Impl::StartElement( if( rPropSet.is() ) { const sal_Char sRedlineProtectionKey[] = "RedlineProtectionKey"; - OUString aPropName(RTL_CONSTASCII_USTRINGPARAM(sRedlineProtectionKey)); + OUString aPropName(sRedlineProtectionKey); Reference< XPropertySetInfo > xPropSetInfo( rPropSet->getPropertySetInfo() ); if( xPropSetInfo.is() && @@ -2077,8 +2077,7 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL OUString SAL_CALL OOo2OasisTransformer_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.OOo2OasisTransformer" ) ); + return OUString( "com.sun.star.comp.OOo2OasisTransformer" ); } Sequence< OUString > SAL_CALL OOo2OasisTransformer_getSupportedServiceNames() throw() @@ -2098,7 +2097,7 @@ Reference< XInterface > SAL_CALL OOo2OasisTransformer_createInstance( #define OOO_IMPORTER( className, implName, subServiceName ) \ OUString SAL_CALL className##_getImplementationName() throw() \ { \ - return OUString( RTL_CONSTASCII_USTRINGPARAM( implName ) ); \ + return OUString( implName ); \ } \ \ Sequence< OUString > SAL_CALL className##_getSupportedServiceNames() throw()\ diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index c618bfa..f1e2095 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1553,7 +1553,7 @@ void XMLConfigItemTContext_Impl::EndElement() if( rPropSet.is() ) { const sal_Char sRedlineProtectionKey[] = "RedlineProtectionKey"; - OUString aPropName(RTL_CONSTASCII_USTRINGPARAM(sRedlineProtectionKey)); + OUString aPropName(sRedlineProtectionKey); Reference< XPropertySetInfo > xPropSetInfo( rPropSet->getPropertySetInfo() ); if( xPropSetInfo.is() && @@ -1614,7 +1614,7 @@ void XMLTrackedChangesOASISTContext_Impl::StartElement( if( rPropSet.is() ) { const sal_Char sRedlineProtectionKey[] = "RedlineProtectionKey"; - OUString aPropName(RTL_CONSTASCII_USTRINGPARAM(sRedlineProtectionKey)); + OUString aPropName(sRedlineProtectionKey); Reference< XPropertySetInfo > xPropSetInfo( rPropSet->getPropertySetInfo() ); if( xPropSetInfo.is() && @@ -2045,8 +2045,7 @@ Sequence< OUString > SAL_CALL Oasis2OOoTransformer::getSupportedServiceNames( ) OUString SAL_CALL Oasis2OOoTransformer_getImplementationName() throw() { - return OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.comp.Oasis2OOoTransformer" ) ); + return OUString( "com.sun.star.comp.Oasis2OOoTransformer" ); } Sequence< OUString > SAL_CALL Oasis2OOoTransformer_getSupportedServiceNames() commit 8669ad398a2971706ce22b6e5fe316991977452a Author: Chr. Rossmanith <[email protected]> Date: Thu Mar 7 13:30:26 2013 +0100 Removed RTL_CONSTASCII_USTRINGPARAM in xmloff(xforms) Change-Id: I5a237b22e40c05e31990fc1cfdcfba16ef3db544 diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx index 141e5f8..071a5af 100644 --- a/xmloff/source/xforms/SchemaRestrictionContext.cxx +++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx @@ -244,31 +244,31 @@ SvXMLImportContext* SchemaRestrictionContext::HandleChild( switch( nToken ) { case XML_LENGTH: - sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("Length")); + sPropertyName = "Length"; pConvert = &xforms_int32; break; case XML_MINLENGTH: - sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MinLength")); + sPropertyName = "MinLength"; pConvert = &xforms_int32; break; case XML_MAXLENGTH: - sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MaxLength")); + sPropertyName = "MaxLength"; pConvert = &xforms_int32; break; case XML_TOTALDIGITS: - sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("TotalDigits")); + sPropertyName = "TotalDigits"; pConvert = &xforms_int32; break; case XML_FRACTIONDIGITS: - sPropertyName =OUString(RTL_CONSTASCII_USTRINGPARAM("FractionDigits")); + sPropertyName = "FractionDigits"; pConvert = &xforms_int32; break; case XML_PATTERN: - sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("Pattern")); + sPropertyName = "Pattern"; pConvert = &xforms_string; break; case XML_WHITESPACE: - sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("WhiteSpace")); + sPropertyName = "WhiteSpace"; pConvert = &xforms_whitespace; break; case XML_MININCLUSIVE: @@ -285,16 +285,16 @@ SvXMLImportContext* SchemaRestrictionContext::HandleChild( switch( nToken ) { case XML_MININCLUSIVE: - sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MinInclusive")); + sPropertyName = "MinInclusive"; break; case XML_MINEXCLUSIVE: - sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MinExclusive")); + sPropertyName = "MinExclusive"; break; case XML_MAXINCLUSIVE: - sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MaxInclusive")); + sPropertyName = "MaxInclusive"; break; case XML_MAXEXCLUSIVE: - sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MaxExclusive")); + sPropertyName = "MaxExclusive"; break; } @@ -306,25 +306,25 @@ SvXMLImportContext* SchemaRestrictionContext::HandleChild( case com::sun::star::xsd::DataTypeClass::DECIMAL: case com::sun::star::xsd::DataTypeClass::DOUBLE: case com::sun::star::xsd::DataTypeClass::FLOAT: - sPropertyName += OUString(RTL_CONSTASCII_USTRINGPARAM("Double")); + sPropertyName += "Double"; pConvert = &xforms_double; break; case com::sun::star::xsd::DataTypeClass::DATETIME: - sPropertyName += OUString(RTL_CONSTASCII_USTRINGPARAM("DateTime")); + sPropertyName += "DateTime"; pConvert = &xforms_dateTime; break; case com::sun::star::xsd::DataTypeClass::DATE: - sPropertyName += OUString(RTL_CONSTASCII_USTRINGPARAM("Date")); + sPropertyName += "Date"; pConvert = &xforms_date; break; case com::sun::star::xsd::DataTypeClass::TIME: - sPropertyName += OUString(RTL_CONSTASCII_USTRINGPARAM("Time")); + sPropertyName += "Time"; pConvert = &xforms_time; break; case com::sun::star::xsd::DataTypeClass::gYear: case com::sun::star::xsd::DataTypeClass::gDay: case com::sun::star::xsd::DataTypeClass::gMonth: - sPropertyName += OUString(RTL_CONSTASCII_USTRINGPARAM("Int")); + sPropertyName += "Int"; pConvert = &xforms_int16; break; diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx index abfa932..1e437fa 100644 --- a/xmloff/source/xforms/XFormsInstanceContext.cxx +++ b/xmloff/source/xforms/XFormsInstanceContext.cxx @@ -108,11 +108,11 @@ void XFormsInstanceContext::EndElement() { Sequence<PropertyValue> aSequence( 3 ); PropertyValue* pSequence = aSequence.getArray(); - pSequence[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Instance") ); + pSequence[0].Name = OUString( "Instance" ); pSequence[0].Value <<= mxInstance; - pSequence[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ID") ); + pSequence[1].Name = OUString( "ID" ); pSequence[1].Value <<= msId; - pSequence[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("URL") ); + pSequence[2].Name = OUString( "URL" ); pSequence[2].Value <<= msURL; mxModel->getInstances()->insert( makeAny( aSequence ) ); diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx index 036633a..cda917f 100644 --- a/xmloff/source/xforms/xformsexport.cxx +++ b/xmloff/source/xforms/xformsexport.cxx @@ -804,7 +804,7 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop Reference< XPropertySet > xModelProps( _rXForms->getByName( *pModelName ), UNO_QUERY_THROW ); Sequence< PropertyValue > aModelSettings( 1 ); - aModelSettings[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ); + aModelSettings[0].Name = OUString( "ExternalData" ); aModelSettings[0].Value = xModelProps->getPropertyValue( aModelSettings[0].Name ); xModelSettings->insertByName( *pModelName, makeAny( aModelSettings ) ); @@ -813,7 +813,7 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop if ( xModelSettings->hasElements() ) { _out_rSettings.realloc( 1 ); - _out_rSettings[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XFormModels" ) ); + _out_rSettings[0].Name = OUString( "XFormModels" ); _out_rSettings[0].Value <<= xModelSettings; } } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
