diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /xmloff/source/forms | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'xmloff/source/forms')
38 files changed, 636 insertions, 636 deletions
diff --git a/xmloff/source/forms/attriblistmerge.cxx b/xmloff/source/forms/attriblistmerge.cxx index 8d74287dd640..37a965967046 100644 --- a/xmloff/source/forms/attriblistmerge.cxx +++ b/xmloff/source/forms/attriblistmerge.cxx @@ -60,7 +60,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OAttribListMerger::seekToName(const ::rtl::OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) + sal_Bool OAttribListMerger::seekToName(const OUString& _rName, Reference< xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex) { for ( ConstAttributeListArrayIterator aLookupSublist = m_aLists.begin(); aLookupSublist != m_aLists.end(); @@ -91,37 +91,37 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getNameByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToIndex(i, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); return xSubList->getNameByIndex(nLocalIndex); } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getTypeByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToIndex(i, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); return xSubList->getTypeByIndex(nLocalIndex); } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getTypeByName( const ::rtl::OUString& _rName ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getTypeByName( const OUString& _rName ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToName(_rName, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); // though we're in getTypeByName here, we reroute this to the getTypeByIndex of the sub list, // assuming that this is faster @@ -129,25 +129,25 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getValueByIndex( sal_Int16 i ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToIndex(i, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); return xSubList->getValueByIndex(nLocalIndex); } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAttribListMerger::getValueByName( const ::rtl::OUString& _rName ) throw(RuntimeException) + OUString SAL_CALL OAttribListMerger::getValueByName( const OUString& _rName ) throw(RuntimeException) { Reference< xml::sax::XAttributeList > xSubList; sal_Int16 nLocalIndex; if (!seekToName(_rName, xSubList, nLocalIndex)) - return ::rtl::OUString(); + return OUString(); // though we're in getValueByName here, we reroute this to the getValueByIndex of the sub list, // assuming that this is faster diff --git a/xmloff/source/forms/attriblistmerge.hxx b/xmloff/source/forms/attriblistmerge.hxx index 8b80bf2638fd..8cdd67642e24 100644 --- a/xmloff/source/forms/attriblistmerge.hxx +++ b/xmloff/source/forms/attriblistmerge.hxx @@ -57,15 +57,15 @@ namespace xmloff // XAttributeList virtual sal_Int16 SAL_CALL getLength( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getNameByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTypeByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getTypeByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValueByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getValueByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getNameByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTypeByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTypeByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getValueByIndex( sal_Int16 i ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getValueByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); protected: sal_Bool seekToIndex(sal_Int16 _nGlobalIndex, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); - sal_Bool seekToName(const ::rtl::OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); + sal_Bool seekToName(const OUString& _rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rSubList, sal_Int16& _rLocalIndex); }; diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx index 77ad6ccfeed1..311846b11131 100644 --- a/xmloff/source/forms/callbacks.hxx +++ b/xmloff/source/forms/callbacks.hxx @@ -48,7 +48,7 @@ namespace xmloff virtual void exportCollectionElements( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxCollection) = 0; - virtual ::rtl::OUString getObjectStyleName( + virtual OUString getObjectStyleName( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ) = 0; protected: diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index 15b96431a2be..d89f2eb23bc6 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -143,9 +143,9 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlTextEmphasisHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlTextEmphasisHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { - ::rtl::OUStringBuffer aReturn; + OUStringBuffer aReturn; sal_Bool bSuccess = sal_False; sal_Int16 nFontEmphasis = sal_Int16(); if (_rValue >>= nFontEmphasis) @@ -170,7 +170,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlTextEmphasisHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlTextEmphasisHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { sal_Bool bSuccess = sal_True; sal_uInt16 nEmphasis = awt::FontEmphasisMark::NONE; @@ -178,7 +178,7 @@ namespace xmloff sal_Bool bBelow = sal_False; sal_Bool bHasPos = sal_False, bHasType = sal_False; - ::rtl::OUString sToken; + OUString sToken; SvXMLTokenEnumerator aTokenEnum(_rStrImpValue); while (aTokenEnum.getNextToken(sToken)) { @@ -228,9 +228,9 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlBorderHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlBorderHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { - ::rtl::OUString sToken; + OUString sToken; SvXMLTokenEnumerator aTokens(_rStrImpValue); sal_uInt16 nStyle = 1; @@ -266,11 +266,11 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OControlBorderHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OControlBorderHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { sal_Bool bSuccess = sal_False; - ::rtl::OUStringBuffer aOut; + OUStringBuffer aOut; switch ( m_eFacet ) { case STYLE: @@ -311,7 +311,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OFontWidthHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OFontWidthHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { sal_Int32 nWidth = 0; bool const bSuccess = ::sax::Converter::convertMeasure( @@ -323,10 +323,10 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool OFontWidthHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool OFontWidthHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { sal_Int16 nWidth = 0; - ::rtl::OUStringBuffer aResult; + OUStringBuffer aResult; if (_rValue >>= nWidth) { ::sax::Converter::convertMeasure(aResult, nWidth, @@ -346,7 +346,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool ORotationAngleHandler::importXML( const ::rtl::OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool ORotationAngleHandler::importXML( const OUString& _rStrImpValue, Any& _rValue, const SvXMLUnitConverter& ) const { double fValue; bool const bSucces = @@ -361,14 +361,14 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool ORotationAngleHandler::exportXML( ::rtl::OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const + sal_Bool ORotationAngleHandler::exportXML( OUString& _rStrExpValue, const Any& _rValue, const SvXMLUnitConverter& ) const { float fAngle = 0; sal_Bool bSuccess = (_rValue >>= fAngle); if (bSuccess) { - rtl::OUStringBuffer sValue; + OUStringBuffer sValue; ::sax::Converter::convertDouble(sValue, ((double)fAngle) / 10); _rStrExpValue = sValue.makeStringAndClear(); } diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 768c76a02158..bc53c1e213bb 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -173,13 +173,13 @@ namespace xmloff return; } - ::rtl::OUString sServiceName = xPersistence->getServiceName(); + OUString sServiceName = xPersistence->getServiceName(); // we don't want to write the old service name directly: it's a name used for compatibility reasons, but // as we start some kind of new file format here (with this xml export), we don't care about // compatibility ... // So we translate the old persistence service name into new ones, if possible - ::rtl::OUString sToWriteServiceName = sServiceName; + OUString sToWriteServiceName = sServiceName; #define CHECK_N_TRANSLATE( name ) \ else if (sServiceName.equals(SERVICE_PERSISTENT_COMPONENT_##name)) \ sToWriteServiceName = SERVICE_##name @@ -247,7 +247,7 @@ namespace xmloff //===================================================================== //--------------------------------------------------------------------- OControlExport::OControlExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, - const ::rtl::OUString& _rControlId, const ::rtl::OUString& _rReferringControls, + const OUString& _rControlId, const OUString& _rReferringControls, const Sequence< ScriptEventDescriptor >& _rEvents) :OElementExport(_rContext, _rxControl, _rEvents) ,m_sControlId(_rControlId) @@ -358,14 +358,14 @@ namespace xmloff const XMLPropertyMapEntry* pCharAttributeProperties = XMLTextPropertySetMapper::getPropertyMapForType( TEXT_PROP_MAP_TEXT ); while ( pCharAttributeProperties->msApiName ) { - exportedProperty( ::rtl::OUString::createFromAscii( pCharAttributeProperties->msApiName ) ); + exportedProperty( OUString::createFromAscii( pCharAttributeProperties->msApiName ) ); ++pCharAttributeProperties; } const XMLPropertyMapEntry* pParaAttributeProperties = XMLTextPropertySetMapper::getPropertyMapForType( TEXT_PROP_MAP_SHAPE_PARA ); while ( pParaAttributeProperties->msApiName ) { - exportedProperty( ::rtl::OUString::createFromAscii( pParaAttributeProperties->msApiName ) ); + exportedProperty( OUString::createFromAscii( pParaAttributeProperties->msApiName ) ); ++pParaAttributeProperties; } @@ -421,7 +421,7 @@ namespace xmloff break; case COMBOBOX: { // a combox box description has sub elements: the items - DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< ::rtl::OUString > ); + DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< OUString > ); // don't export the list entries if the are not provided by the user, but obtained implicitly // from other sources @@ -429,10 +429,10 @@ namespace xmloff if ( controlHasUserSuppliedListEntries() ) { // get the item list - Sequence< ::rtl::OUString > aListItems; + Sequence< OUString > aListItems; m_xProps->getPropertyValue(PROPERTY_STRING_ITEM_LIST) >>= aListItems; // loop through it and write the sub elements - const ::rtl::OUString* pListItems = aListItems.getConstArray(); + const OUString* pListItems = aListItems.getConstArray(); for (sal_Int32 i=0; i<aListItems.getLength(); ++i, ++pListItems) { m_rContext.getGlobalContext().ClearAttrList(); @@ -494,7 +494,7 @@ namespace xmloff continue; } - ::rtl::OUString attributeValue; + OUString attributeValue; if ( propDescription->propertyGroup == NO_GROUP ) { // that's a property which has a direct mapping to an attribute @@ -571,7 +571,7 @@ namespace xmloff CCA_LABEL, CCA_TITLE }; // the names of all properties which are expected to be of type string - static ::rtl::OUString aStringPropertyNames[] = + static OUString aStringPropertyNames[] = { OUString(PROPERTY_LABEL), OUString(PROPERTY_TITLE) }; @@ -746,7 +746,7 @@ namespace xmloff // However, if the model has a property "PersistenceMaxTextLength", then we prefer this // determine the name of the property to export - ::rtl::OUString sTextLenPropertyName( PROPERTY_MAXTEXTLENGTH ); + OUString sTextLenPropertyName( PROPERTY_MAXTEXTLENGTH ); if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_PERSISTENCE_MAXTEXTLENGTH ) ) sTextLenPropertyName = PROPERTY_PERSISTENCE_MAXTEXTLENGTH; @@ -823,7 +823,7 @@ namespace xmloff // don't export the current-value if this value originates from a data binding // #i26944# if ( controlHasActiveDataBinding() ) - exportedProperty( ::rtl::OUString::createFromAscii( pCurrentValuePropertyName ) ); + exportedProperty( OUString::createFromAscii( pCurrentValuePropertyName ) ); else exportGenericPropertyAttribute( nCurrentValueAttributeNamespaceKey, @@ -1078,7 +1078,7 @@ namespace xmloff if ( SCA_STEP_SIZE & m_nIncludeSpecial ) { - ::rtl::OUString sPropertyName; + OUString sPropertyName; if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_LINE_INCREMENT ) ) sPropertyName = PROPERTY_LINE_INCREMENT; else if ( m_xPropertyInfo->hasPropertyByName( PROPERTY_SPIN_INCREMENT ) ) @@ -1152,7 +1152,7 @@ namespace xmloff aDuration.Seconds = aTime.GetSec(); aDuration.MilliSeconds = nRepeatDelay % 1000; - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::sax::Converter::convertDuration(buf, aDuration); AddAttribute(OAttributeMetaData::getSpecialAttributeNamespace( SCA_REPEAT_DELAY ) ,OAttributeMetaData::getSpecialAttributeName( SCA_REPEAT_DELAY ) @@ -1177,7 +1177,7 @@ namespace xmloff m_xProps->getPropertyValue(PROPERTY_ECHO_CHAR) >>= nValue; if (nValue) { - ::rtl::OUString sCharacter(reinterpret_cast<const sal_Unicode*>(&nValue), 1); + OUString sCharacter(reinterpret_cast<const sal_Unicode*>(&nValue), 1); AddAttribute( OAttributeMetaData::getSpecialAttributeNamespace(SCA_ECHO_CHAR), OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR), @@ -1276,13 +1276,13 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OControlExport::getScalarListSourceValue() const + OUString OControlExport::getScalarListSourceValue() const { - ::rtl::OUString sListSource; + OUString sListSource; Any aListSource = m_xProps->getPropertyValue( PROPERTY_LISTSOURCE ); if ( !( aListSource >>= sListSource ) ) { - Sequence< ::rtl::OUString > aListSourceSequence; + Sequence< OUString > aListSourceSequence; aListSource >>= aListSourceSequence; if ( aListSourceSequence.getLength() ) sListSource = aListSourceSequence[ 0 ]; @@ -1296,7 +1296,7 @@ namespace xmloff // DA_LIST_SOURCE needs some special handling DBG_CHECK_PROPERTY_NO_TYPE( PROPERTY_LISTSOURCE ); - ::rtl::OUString sListSource = getScalarListSourceValue(); + OUString sListSource = getScalarListSourceValue(); if ( !sListSource.isEmpty() ) { // the ListSource property needs to be exported as attribute, and it is not empty AddAttribute( @@ -1309,7 +1309,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlExport::getSequenceInt16PropertyAsSet(const ::rtl::OUString& _rPropertyName, Int16Set& _rOut) + void OControlExport::getSequenceInt16PropertyAsSet(const OUString& _rPropertyName, Int16Set& _rOut) { Sequence< sal_Int16 > aValueSequence; DBG_CHECK_PROPERTY(_rPropertyName, Sequence< sal_Int16 >); @@ -1324,11 +1324,11 @@ namespace xmloff void OControlExport::exportListSourceAsElements() { // the string lists - Sequence< ::rtl::OUString > aItems, aValues; - DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< ::rtl::OUString > ); + Sequence< OUString > aItems, aValues; + DBG_CHECK_PROPERTY( PROPERTY_STRING_ITEM_LIST, Sequence< OUString > ); m_xProps->getPropertyValue(PROPERTY_STRING_ITEM_LIST) >>= aItems; - DBG_CHECK_PROPERTY( PROPERTY_LISTSOURCE, Sequence< ::rtl::OUString > ); + DBG_CHECK_PROPERTY( PROPERTY_LISTSOURCE, Sequence< OUString > ); if ( 0 == ( m_nIncludeDatabase & DA_LIST_SOURCE ) ) m_xProps->getPropertyValue(PROPERTY_LISTSOURCE) >>= aValues; // if we exported the list source as attribute, we do not repeat it as sub elements @@ -1339,14 +1339,14 @@ namespace xmloff getSequenceInt16PropertyAsSet(PROPERTY_DEFAULT_SELECT_SEQ, aDefaultSelection); // the string for "true" - ::rtl::OUString sTrue; - ::rtl::OUStringBuffer sBuffer; + OUString sTrue; + OUStringBuffer sBuffer; ::sax::Converter::convertBool(sBuffer, true); sTrue = sBuffer.makeStringAndClear(); // loop through both lists ('til the maximum of both lengths) - const ::rtl::OUString* pItems = aItems.getConstArray(); - const ::rtl::OUString* pValues = aValues.getConstArray(); + const OUString* pItems = aItems.getConstArray(); + const OUString* pValues = aValues.getConstArray(); sal_Int32 nItems = aItems.getLength(); sal_Int32 nValues = aValues.getLength(); @@ -1842,7 +1842,7 @@ namespace xmloff { sal_Int16 nLinkageType = aHelper.isCellIntegerBinding( xBinding ) ? 1 : 0; - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; m_rContext.getGlobalContext().GetMM100UnitConverter().convertEnum( sBuffer, (sal_uInt16)nLinkageType, @@ -1867,19 +1867,19 @@ namespace xmloff //--------------------------------------------------------------------- void OControlExport::exportXFormsBindAttributes() { - rtl::OUString sBindName = getXFormsBindName( m_xProps ); + OUString sBindName = getXFormsBindName( m_xProps ); AddAttribute( XML_NAMESPACE_XFORMS, XML_BIND, sBindName ); } //--------------------------------------------------------------------- void OControlExport::exportXFormsListAttributes() { - rtl::OUString sBindName = getXFormsListBindName( m_xProps ); + OUString sBindName = getXFormsListBindName( m_xProps ); AddAttribute( XML_NAMESPACE_FORM, XML_XFORMS_LIST_SOURCE, sBindName ); } //--------------------------------------------------------------------- void OControlExport::exportXFormsSubmissionAttributes() { - rtl::OUString sSubmission = getXFormsSubmissionName( m_xProps ); + OUString sSubmission = getXFormsSubmissionName( m_xProps ); AddAttribute( XML_NAMESPACE_FORM, XML_XFORMS_SUBMISSION, sSubmission ); } //--------------------------------------------------------------------- @@ -1963,7 +1963,7 @@ namespace xmloff try { // currently exchanging the data with a database column? - ::rtl::OUString sBoundFieldPropertyName( "BoundField" ); + OUString sBoundFieldPropertyName( "BoundField" ); if ( m_xPropertyInfo.is() && m_xPropertyInfo->hasPropertyByName( sBoundFieldPropertyName ) ) { Reference< XPropertySet > xBoundField; @@ -2022,9 +2022,9 @@ namespace xmloff //= OColumnExport //===================================================================== //--------------------------------------------------------------------- - OColumnExport::OColumnExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, const ::rtl::OUString& _rControlId, + OColumnExport::OColumnExport(IFormsExportContext& _rContext, const Reference< XPropertySet >& _rxControl, const OUString& _rControlId, const Sequence< ScriptEventDescriptor >& _rEvents) - :OControlExport(_rContext, _rxControl, _rControlId, ::rtl::OUString(), _rEvents) + :OControlExport(_rContext, _rxControl, _rControlId, OUString(), _rEvents) { } @@ -2038,8 +2038,8 @@ namespace xmloff void OColumnExport::exportServiceNameAttribute() { // the attribute "service name" (which has a slightly different meaning for columns - DBG_CHECK_PROPERTY( PROPERTY_COLUMNSERVICENAME, ::rtl::OUString ); - ::rtl::OUString sColumnServiceName; + DBG_CHECK_PROPERTY( PROPERTY_COLUMNSERVICENAME, OUString ); + OUString sColumnServiceName; m_xProps->getPropertyValue(PROPERTY_COLUMNSERVICENAME) >>= sColumnServiceName; // the service name is a full qualified one (i.e. com.sun.star.form.TextField), but the // real service name for the column (for use with the XGridColumnFactory) is only the last @@ -2077,7 +2077,7 @@ namespace xmloff PROPERTY_LABEL); // the style attribute - ::rtl::OUString sStyleName = m_rContext.getObjectStyleName( m_xProps ); + OUString sStyleName = m_rContext.getObjectStyleName( m_xProps ); if ( !sStyleName.isEmpty() ) { AddAttribute( @@ -2126,7 +2126,7 @@ namespace xmloff if ( m_bCreateConnectionResourceElement && m_xProps.is() ) { m_rContext.getGlobalContext().ClearAttrList(); - ::rtl::OUString sPropValue; + OUString sPropValue; m_xProps->getPropertyValue( PROPERTY_DATASOURCENAME ) >>= sPropValue; // if set it is a file url if ( sPropValue.isEmpty() ) m_xProps->getPropertyValue( PROPERTY_URL ) >>= sPropValue; @@ -2163,7 +2163,7 @@ namespace xmloff { faName, /*faAction,*/ faCommand, faFilter, faOrder }; - static ::rtl::OUString aStringPropertyNames[] = + static OUString aStringPropertyNames[] = { OUString(PROPERTY_NAME), /*OUString(PROPERTY_TARGETURL),*/ OUString(PROPERTY_COMMAND), OUString(PROPERTY_FILTER), OUString(PROPERTY_ORDER) }; @@ -2182,7 +2182,7 @@ namespace xmloff // #i112082# xlink:type is added as part of exportTargetLocationAttribute // now export the data source name or databaselocation or connection resource - ::rtl::OUString sPropValue; + OUString sPropValue; m_xProps->getPropertyValue( PROPERTY_DATASOURCENAME ) >>= sPropValue; m_bCreateConnectionResourceElement = sPropValue.isEmpty(); if ( !m_bCreateConnectionResourceElement ) diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx index 2da6cd91ccd8..d4b3e0a90476 100644 --- a/xmloff/source/forms/elementexport.hxx +++ b/xmloff/source/forms/elementexport.hxx @@ -92,8 +92,8 @@ namespace xmloff DECLARE_STL_STDKEY_SET(sal_Int16, Int16Set); // used below - ::rtl::OUString m_sControlId; // the control id to use when exporting - ::rtl::OUString m_sReferringControls; // list of referring controls (i.e. their id's) + OUString m_sControlId; // the control id to use when exporting + OUString m_sReferringControls; // list of referring controls (i.e. their id's) sal_Int16 m_nClassId; // class id of the control we're representing ElementType m_eType; // (XML) type of the control we're representing sal_Int32 m_nIncludeCommon; // common control attributes to include @@ -118,8 +118,8 @@ namespace xmloff */ OControlExport(IFormsExportContext& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rControlId, - const ::rtl::OUString& _rReferringControls, + const OUString& _rControlId, + const OUString& _rReferringControls, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents); ~OControlExport(); @@ -207,7 +207,7 @@ namespace xmloff @param _rOut out parameter. The set of integers. */ - void getSequenceInt16PropertyAsSet(const ::rtl::OUString& _rPropertyName, Int16Set& _rOut); + void getSequenceInt16PropertyAsSet(const OUString& _rPropertyName, Int16Set& _rOut); /** exports the attribute which descrives a cell value binding of a control in a spreadsheet document @@ -244,7 +244,7 @@ namespace xmloff /** retrieves the string specifying the ListSource of a list or combo box */ - ::rtl::OUString getScalarListSourceValue() const; + OUString getScalarListSourceValue() const; /** determines whether the list entries (of a combo or list box) are supplied by the user @@ -272,7 +272,7 @@ namespace xmloff */ OColumnExport(IFormsExportContext& _rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rControlId, + const OUString& _rControlId, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rxEvents); ~OColumnExport(); diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 7c01677cbb0f..9e2bb7ef6742 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -88,13 +88,13 @@ namespace xmloff }; //===================================================================== - struct PropertyValueCompare : public ::std::binary_function< PropertyValue, ::rtl::OUString, bool> + struct PropertyValueCompare : public ::std::binary_function< PropertyValue, OUString, bool> { - bool operator() (const PropertyValue& lhs, const ::rtl::OUString& rhs) const + bool operator() (const PropertyValue& lhs, const OUString& rhs) const { return lhs.Name == rhs; } - bool operator() (const ::rtl::OUString& lhs, const PropertyValue& rhs) const + bool operator() (const OUString& lhs, const PropertyValue& rhs) const { return lhs == rhs.Name; } @@ -125,12 +125,12 @@ namespace xmloff } //--------------------------------------------------------------------- - OControlElement::ElementType OElementNameMap::getElementType(const ::rtl::OUString& _rName) + OControlElement::ElementType OElementNameMap::getElementType(const OUString& _rName) { if ( s_sElementTranslations.empty() ) { // initialize for (ElementType eType=(ElementType)0; eType<UNKNOWN; ++eType) - s_sElementTranslations[::rtl::OUString::createFromAscii(getElementName(eType))] = eType; + s_sElementTranslations[OUString::createFromAscii(getElementName(eType))] = eType; } ConstMapString2ElementIterator aPos = s_sElementTranslations.find(_rName); if (s_sElementTranslations.end() != aPos) @@ -143,7 +143,7 @@ namespace xmloff //= OElementImport //===================================================================== //--------------------------------------------------------------------- - OElementImport::OElementImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OElementImport::OElementImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OPropertyImport(_rImport, _nPrefix, _rName) ,m_rFormImport(_rImport) @@ -161,9 +161,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OElementImport::determineDefaultServiceName() const + OUString OElementImport::determineDefaultServiceName() const { - return ::rtl::OUString(); + return OUString(); } //--------------------------------------------------------------------- @@ -172,13 +172,13 @@ namespace xmloff ENTER_LOG_CONTEXT( "xmloff::OElementImport - importing one element" ); const SvXMLNamespaceMap& rMap = m_rContext.getGlobalContext().GetNamespaceMap(); - const ::rtl::OUString sImplNameAttribute = rMap.GetQNameByKey( XML_NAMESPACE_FORM, GetXMLToken( XML_CONTROL_IMPLEMENTATION ) ); - const ::rtl::OUString sControlImplementation = _rxAttrList->getValueByName( sImplNameAttribute ); + const OUString sImplNameAttribute = rMap.GetQNameByKey( XML_NAMESPACE_FORM, GetXMLToken( XML_CONTROL_IMPLEMENTATION ) ); + const OUString sControlImplementation = _rxAttrList->getValueByName( sImplNameAttribute ); // retrieve the service name if ( !sControlImplementation.isEmpty() ) { - ::rtl::OUString sOOoImplementationName; + OUString sOOoImplementationName; const sal_uInt16 nImplPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName( sControlImplementation, &sOOoImplementationName ); m_sServiceName = ( nImplPrefix == XML_NAMESPACE_OOO ) ? sOOoImplementationName : sControlImplementation; } @@ -199,7 +199,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OElementImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken(_rLocalName, token::XML_EVENT_LISTENERS) && (XML_NAMESPACE_OFFICE == _nPrefix)) @@ -228,7 +228,7 @@ namespace xmloff new OGridColumnPropertyTranslator( Reference< XMultiPropertySet >( m_xElement, UNO_QUERY ) ); const_cast< XMLTextStyleContext* >( m_pStyleElement )->FillPropertySet( xPropTranslation ); - const ::rtl::OUString sNumberStyleName = const_cast< XMLTextStyleContext* >( m_pStyleElement )->GetDataStyleName( ); + const OUString sNumberStyleName = const_cast< XMLTextStyleContext* >( m_pStyleElement )->GetDataStyleName( ); if ( !sNumberStyleName.isEmpty() ) // the style also has a number (sub) style m_rContext.applyControlNumberStyle( m_xElement, sNumberStyleName ); @@ -266,8 +266,8 @@ namespace xmloff ) { OSL_ENSURE(m_xInfo->hasPropertyByName(aCheck->Name), - ::rtl::OStringBuffer("OElementImport::implApplySpecificProperties: read a property ("). - append(rtl::OUStringToOString(aCheck->Name, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("OElementImport::implApplySpecificProperties: read a property ("). + append(OUStringToOString(aCheck->Name, RTL_TEXTENCODING_ASCII_US)). append(") which does not exist on the element!").getStr()); } } @@ -284,8 +284,8 @@ namespace xmloff ::std::sort( m_aValues.begin(), m_aValues.end(), PropertyValueLess()); // the names - Sequence< ::rtl::OUString > aNames(m_aValues.size()); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames(m_aValues.size()); + OUString* pNames = aNames.getArray(); // the values Sequence< Any > aValues(m_aValues.size()); Any* pValues = aValues.getArray(); @@ -328,8 +328,8 @@ namespace xmloff } catch(Exception&) { - OSL_FAIL(::rtl::OStringBuffer("OElementImport::implApplySpecificProperties: could not set the property \""). - append(rtl::OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OElementImport::implApplySpecificProperties: could not set the property \""). + append(OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). append("\"!").getStr()); } } @@ -362,8 +362,8 @@ namespace xmloff if ( !xDynamicProperties.is() ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString aMessage( "OElementImport::implApplyGenericProperties: encountered an unknown property (" ); - aMessage += ::rtl::OUStringToOString( aPropValues->Name, RTL_TEXTENCODING_ASCII_US ); + OString aMessage( "OElementImport::implApplyGenericProperties: encountered an unknown property (" ); + aMessage += OUStringToOString( aPropValues->Name, RTL_TEXTENCODING_ASCII_US ); aMessage += "), but component is no PropertyBag!"; OSL_FAIL( aMessage.getStr() ); #endif @@ -470,32 +470,32 @@ namespace xmloff } catch(Exception&) { - OSL_FAIL(::rtl::OStringBuffer("OElementImport::EndElement: could not set the property \""). - append(::rtl::OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OElementImport::EndElement: could not set the property \""). + append(OUStringToOString(aPropValues->Name, RTL_TEXTENCODING_ASCII_US)). append("\"!").getStr()); } } } //--------------------------------------------------------------------- - ::rtl::OUString OElementImport::implGetDefaultName() const + OUString OElementImport::implGetDefaultName() const { // no optimization here. If this method gets called, the XML stream did not contain a name for the // element, which is a heavy error. So in this case we don't care for performance - static const ::rtl::OUString sUnnamedName("unnamed"); + static const OUString sUnnamedName("unnamed"); OSL_ENSURE(m_xParentContainer.is(), "OElementImport::implGetDefaultName: no parent container!"); if (!m_xParentContainer.is()) return sUnnamedName; - Sequence< ::rtl::OUString > aNames = m_xParentContainer->getElementNames(); + Sequence< OUString > aNames = m_xParentContainer->getElementNames(); - ::rtl::OUString sReturn; - const ::rtl::OUString* pNames = NULL; - const ::rtl::OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); + OUString sReturn; + const OUString* pNames = NULL; + const OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); for (sal_Int32 i=0; i<32768; ++i) // the limit is nearly arbitrary ... { // assemble the new name (suggestion) sReturn = sUnnamedName; - sReturn += ::rtl::OUString::valueOf(i); + sReturn += OUString::valueOf(i); // check the existence (this is the bad performance part ....) for (pNames = aNames.getConstArray(); pNames<pNamesEnd; ++pNames) { @@ -547,7 +547,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OElementImport::tryGenericAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue ) + bool OElementImport::tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ) { // the generic approach (which I hope all props will be migrated to, on the medium term): property handlers const AttributeDescription attribute( metadata::getAttributeDescription( _nNamespaceKey, _rLocalName ) ); @@ -604,7 +604,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OElementImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OElementImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { if ( token::IsXMLToken( _rLocalName, token::XML_CONTROL_IMPLEMENTATION ) ) // ignore this, it has already been handled in OElementImport::StartElement @@ -645,7 +645,7 @@ namespace xmloff Reference< XComponentContext > xContext = m_rFormImport.getGlobalContext().GetComponentContext(); Reference< XInterface > xPure = xContext->getServiceManager()->createInstanceWithContext(m_sServiceName, xContext); OSL_ENSURE(xPure.is(), - ::rtl::OStringBuffer("OElementImport::createElement: service factory gave me no object (service name: ").append(rtl::OUStringToOString(m_sServiceName, RTL_TEXTENCODING_ASCII_US)).append(")!").getStr()); + OStringBuffer("OElementImport::createElement: service factory gave me no object (service name: ").append(OUStringToOString(m_sServiceName, RTL_TEXTENCODING_ASCII_US)).append(")!").getStr()); xReturn = Reference< XPropertySet >(xPure, UNO_QUERY); } else @@ -662,15 +662,15 @@ namespace xmloff } //--------------------------------------------------------------------- - void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault) + void OElementImport::simulateDefaultedAttribute(const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault) { OSL_ENSURE( m_xInfo.is(), "OPropertyImport::simulateDefaultedAttribute: the component should be more gossipy about it's properties!" ); if ( !m_xInfo.is() || m_xInfo->hasPropertyByName( _rPropertyName ) ) { - ::rtl::OUString sLocalAttrName = ::rtl::OUString::createFromAscii(_pAttributeName); + OUString sLocalAttrName = OUString::createFromAscii(_pAttributeName); if ( !encounteredAttribute( sLocalAttrName ) ) - OSL_VERIFY( handleAttribute( XML_NAMESPACE_FORM, sLocalAttrName, ::rtl::OUString::createFromAscii( _pAttributeDefault ) ) ); + OSL_VERIFY( handleAttribute( XML_NAMESPACE_FORM, sLocalAttrName, OUString::createFromAscii( _pAttributeDefault ) ) ); } } @@ -678,7 +678,7 @@ namespace xmloff //= OControlImport //===================================================================== //--------------------------------------------------------------------- - OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) ,m_eElementType(OControlElement::UNKNOWN) @@ -687,7 +687,7 @@ namespace xmloff } //--------------------------------------------------------------------- - OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OControlImport::OControlImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OElementImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) ,m_eElementType(_eType) @@ -696,7 +696,7 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OControlImport::determineDefaultServiceName() const + OUString OControlImport::determineDefaultServiceName() const { const sal_Char* pServiceName = NULL; switch ( m_eElementType ) @@ -722,8 +722,8 @@ namespace xmloff default: break; } if ( pServiceName != NULL ) - return ::rtl::OUString::createFromAscii( pServiceName ); - return ::rtl::OUString(); + return OUString::createFromAscii( pServiceName ); + return OUString(); } //--------------------------------------------------------------------- @@ -734,7 +734,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* pLinkedCellAttributeName = OAttributeMetaData::getBindingAttributeName(BA_LINKED_CELL); @@ -915,9 +915,9 @@ namespace xmloff // transfer the name if (PROPID_VALUE == aValueProps->Handle) - aValueProps->Name = ::rtl::OUString::createFromAscii(pValueProperty); + aValueProps->Name = OUString::createFromAscii(pValueProperty); else - aValueProps->Name = ::rtl::OUString::createFromAscii(pCurrentValueProperty); + aValueProps->Name = OUString::createFromAscii(pCurrentValueProperty); bSuccess = true; } break; @@ -943,9 +943,9 @@ namespace xmloff // transfer the name if (PROPID_MIN_VALUE == aValueProps->Handle) - aValueProps->Name = ::rtl::OUString::createFromAscii(pMinValueProperty); + aValueProps->Name = OUString::createFromAscii(pMinValueProperty); else - aValueProps->Name = ::rtl::OUString::createFromAscii(pMaxValueProperty); + aValueProps->Name = OUString::createFromAscii(pMaxValueProperty); bSuccess = true; } break; @@ -972,7 +972,7 @@ namespace xmloff // retrieve the type of the property Property aProp = _rxPropInfo->getPropertyByName(_rPropValue.Name); // the untranslated string value as read in handleAttribute - ::rtl::OUString sValue; + OUString sValue; #if OSL_DEBUG_LEVEL > 0 sal_Bool bSuccess = #endif @@ -1063,7 +1063,7 @@ namespace xmloff // found it -> need to remember (and restore) the "value property value", which is not set explicitly try { - aValuePropertyValue = m_xElement->getPropertyValue( ::rtl::OUString::createFromAscii( pValueProperty ) ); + aValuePropertyValue = m_xElement->getPropertyValue( OUString::createFromAscii( pValueProperty ) ); } catch( const Exception& ) { @@ -1080,7 +1080,7 @@ namespace xmloff { try { - m_xElement->setPropertyValue( ::rtl::OUString::createFromAscii( pValueProperty ), aValuePropertyValue ); + m_xElement->setPropertyValue( OUString::createFromAscii( pValueProperty ), aValuePropertyValue ); } catch( const Exception& ) { @@ -1106,7 +1106,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ) + void OControlImport::doRegisterCellValueBinding( const OUString& _rBoundCellAddress ) { OSL_PRECOND( m_xElement.is(), "OControlImport::doRegisterCellValueBinding: invalid element!" ); OSL_PRECOND( !_rBoundCellAddress.isEmpty(), @@ -1116,7 +1116,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterXFormsValueBinding( const ::rtl::OUString& _rBindingID ) + void OControlImport::doRegisterXFormsValueBinding( const OUString& _rBindingID ) { OSL_PRECOND( m_xElement.is(), "need element" ); OSL_PRECOND( !_rBindingID.isEmpty(), "binding ID is not valid" ); @@ -1125,7 +1125,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterXFormsListBinding( const ::rtl::OUString& _rBindingID ) + void OControlImport::doRegisterXFormsListBinding( const OUString& _rBindingID ) { OSL_PRECOND( m_xElement.is(), "need element" ); OSL_PRECOND( !_rBindingID.isEmpty(), "binding ID is not valid" ); @@ -1134,7 +1134,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OControlImport::doRegisterXFormsSubmission( const ::rtl::OUString& _rSubmissionID ) + void OControlImport::doRegisterXFormsSubmission( const OUString& _rSubmissionID ) { OSL_PRECOND( m_xElement.is(), "need element" ); OSL_PRECOND( !_rSubmissionID.isEmpty(), "binding ID is not valid" ); @@ -1164,7 +1164,7 @@ namespace xmloff //===================================================================== //--------------------------------------------------------------------- OImagePositionImport::OImagePositionImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, + sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ) :OControlImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) ,m_nImagePosition( -1 ) @@ -1174,8 +1174,8 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue ) + bool OImagePositionImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, + const OUString& _rValue ) { if ( _rLocalName == GetXMLToken( XML_IMAGE_POSITION ) ) { @@ -1226,7 +1226,7 @@ namespace xmloff //===================================================================== //--------------------------------------------------------------------- OReferredControlImport::OReferredControlImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType ) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) @@ -1244,10 +1244,10 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue) + bool OReferredControlImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, + const OUString& _rValue) { - static const ::rtl::OUString s_sReferenceAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_FOR)); + static const OUString s_sReferenceAttributeName = OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_FOR)); if (_rLocalName == s_sReferenceAttributeName) { m_sReferringControls = _rValue; @@ -1260,16 +1260,16 @@ namespace xmloff //= OPasswordImport //===================================================================== //--------------------------------------------------------------------- - OPasswordImport::OPasswordImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OPasswordImport::OPasswordImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) { } //--------------------------------------------------------------------- - bool OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OPasswordImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { - static const ::rtl::OUString s_sEchoCharAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR)); + static const OUString s_sEchoCharAttributeName = OUString::createFromAscii(OAttributeMetaData::getSpecialAttributeName(SCA_ECHO_CHAR)); if (_rLocalName == s_sEchoCharAttributeName) { // need a special handling for the EchoChar property @@ -1291,14 +1291,14 @@ namespace xmloff //= ORadioImport //===================================================================== //--------------------------------------------------------------------- - ORadioImport::ORadioImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + ORadioImport::ORadioImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OImagePositionImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) { } //--------------------------------------------------------------------- - bool ORadioImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool ORadioImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { // need special handling for the State & CurrentState properties: // they're stored as booleans, but expected to be int16 properties @@ -1329,7 +1329,7 @@ namespace xmloff //===================================================================== //= OURLReferenceImport //===================================================================== - OURLReferenceImport::OURLReferenceImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OURLReferenceImport::OURLReferenceImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OImagePositionImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1337,7 +1337,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OURLReferenceImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* s_pTargetLocationAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCA_TARGET_LOCATION ); static const sal_Char* s_pImageDataAttributeName = OAttributeMetaData::getCommonControlAttributeName( CCA_IMAGE_DATA ); @@ -1356,7 +1356,7 @@ namespace xmloff if ( bMakeAbsolute && !_rValue.isEmpty() ) { // make a global URL out of the local one - ::rtl::OUString sAdjustedValue; + OUString sAdjustedValue; // only resolve image related url // we don't want say form url targets to be resolved // using ResolveGraphicObjectURL @@ -1374,7 +1374,7 @@ namespace xmloff //= OButtonImport //===================================================================== //--------------------------------------------------------------------- - OButtonImport::OButtonImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OButtonImport::OButtonImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OURLReferenceImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1395,7 +1395,7 @@ namespace xmloff //= OValueRangeImport //===================================================================== //--------------------------------------------------------------------- - OValueRangeImport::OValueRangeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OValueRangeImport::OValueRangeImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ) :OControlImport( _rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType ) ,m_nStepSizeValue( 1 ) @@ -1404,7 +1404,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OValueRangeImport::handleAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue ) + bool OValueRangeImport::handleAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ) { if ( _rLocalName.equalsAscii( OAttributeMetaData::getSpecialAttributeName( SCA_STEP_SIZE ) ) ) { @@ -1432,7 +1432,7 @@ namespace xmloff //= OTextLikeImport //===================================================================== //--------------------------------------------------------------------- - OTextLikeImport::OTextLikeImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OTextLikeImport::OTextLikeImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1442,7 +1442,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OTextLikeImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList ) { if ( ( XML_NAMESPACE_TEXT == _nPrefix ) && _rLocalName.equalsIgnoreAsciiCase("p") ) @@ -1553,8 +1553,8 @@ namespace xmloff //--------------------------------------------------------------------- struct EqualName : public ::std::unary_function< PropertyValue, bool > { - const ::rtl::OUString m_sName; - EqualName( const ::rtl::OUString& _rName ) : m_sName( _rName ) { } + const OUString m_sName; + EqualName( const OUString& _rName ) : m_sName( _rName ) { } inline bool operator()( const PropertyValue& _rProp ) { @@ -1571,11 +1571,11 @@ namespace xmloff PropertyValueArray::iterator aDefaultControlPropertyPos = ::std::find_if( m_aValues.begin(), m_aValues.end(), - EqualName( ::rtl::OUString( "DefaultControl" ) ) + EqualName( OUString( "DefaultControl" ) ) ); if ( aDefaultControlPropertyPos != m_aValues.end() ) { - ::rtl::OUString sDefaultControl; + OUString sDefaultControl; OSL_VERIFY( aDefaultControlPropertyPos->Value >>= sDefaultControl ); if ( sDefaultControl == "stardiv.one.form.control.Edit" ) { @@ -1608,7 +1608,7 @@ namespace xmloff // TODO (fs): stole this code somewhere - why don't we fix the text import?? m_xCursor->gotoEnd( sal_False ); m_xCursor->goLeft( 1, sal_True ); - m_xCursor->setString( ::rtl::OUString() ); + m_xCursor->setString( OUString() ); // reset cursor xTextImportHelper->ResetCursor(); @@ -1623,7 +1623,7 @@ namespace xmloff //= OListAndComboImport //===================================================================== //--------------------------------------------------------------------- - OListAndComboImport::OListAndComboImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListAndComboImport::OListAndComboImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OControlImport(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) @@ -1637,16 +1637,16 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OListAndComboImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OListAndComboImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { // is it the "option" sub tag of a listbox ? - static const ::rtl::OUString s_sOptionElementName("option"); + static const OUString s_sOptionElementName("option"); if (s_sOptionElementName == _rLocalName) return new OListOptionImport(GetImport(), _nPrefix, _rLocalName, this); // is it the "item" sub tag of a combobox ? - static const ::rtl::OUString s_sItemElementName("item"); + static const OUString s_sItemElementName("item"); if (s_sItemElementName == _rLocalName) return new OComboItemImport(GetImport(), _nPrefix, _rLocalName, this); @@ -1718,23 +1718,23 @@ namespace xmloff } //--------------------------------------------------------------------- - void OListAndComboImport::doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ) + void OListAndComboImport::doRegisterCellValueBinding( const OUString& _rBoundCellAddress ) { - ::rtl::OUString sBoundCellAddress( _rBoundCellAddress ); + OUString sBoundCellAddress( _rBoundCellAddress ); if ( m_bLinkWithIndexes ) { // This is a HACK. We register a string which is no valid address, but allows // (somewhere else) to determine that a non-standard binding should be created. // This hack is acceptable for OOo 1.1.1, since the file format for value // bindings of form controls is to be changed afterwards, anyway. - sBoundCellAddress += ::rtl::OUString( ":index" ); + sBoundCellAddress += OUString( ":index" ); } OControlImport::doRegisterCellValueBinding( sBoundCellAddress ); } //--------------------------------------------------------------------- - bool OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OListAndComboImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { static const sal_Char* pListSourceAttributeName = OAttributeMetaData::getDatabaseAttributeName(DA_LIST_SOURCE); if ( _rLocalName.equalsAscii(pListSourceAttributeName) ) @@ -1753,7 +1753,7 @@ namespace xmloff // a listbox which has a list-source attribute must have a list-source-type of something // not equal to ValueList. // In this case, the list-source value is simply the one and only element of the ListSource property. - Sequence< ::rtl::OUString > aListSourcePropValue( 1 ); + Sequence< OUString > aListSourcePropValue( 1 ); aListSourcePropValue[0] = _rValue; aListSource.Value <<= aListSourcePropValue; } @@ -1786,7 +1786,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OListAndComboImport::implPushBackLabel(const ::rtl::OUString& _rLabel) + void OListAndComboImport::implPushBackLabel(const OUString& _rLabel) { OSL_ENSURE(!m_nEmptyListItems, "OListAndComboImport::implPushBackValue: label list is already done!"); if (!m_nEmptyListItems) @@ -1794,7 +1794,7 @@ namespace xmloff } //--------------------------------------------------------------------- - void OListAndComboImport::implPushBackValue(const ::rtl::OUString& _rValue) + void OListAndComboImport::implPushBackValue(const OUString& _rValue) { OSL_ENSURE(!m_nEmptyValueItems, "OListAndComboImport::implPushBackValue: value list is already done!"); if (!m_nEmptyValueItems) @@ -1845,7 +1845,7 @@ namespace xmloff //= OListOptionImport //===================================================================== //--------------------------------------------------------------------- - OListOptionImport::OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListOptionImport::OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xListBoxImport(_rListBox) @@ -1857,14 +1857,14 @@ namespace xmloff { // the label and the value const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); - const ::rtl::OUString sLabelAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString("label")); - const ::rtl::OUString sValueAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString("value")); + const OUString sLabelAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString("label")); + const OUString sValueAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString("value")); // ------------------- // the label attribute - ::rtl::OUString sValue = _rxAttrList->getValueByName(sLabelAttribute); + OUString sValue = _rxAttrList->getValueByName(sLabelAttribute); sal_Bool bNonexistentAttribute = sal_False; if (sValue.isEmpty()) if (_rxAttrList->getTypeByName(sLabelAttribute).isEmpty()) @@ -1891,10 +1891,10 @@ namespace xmloff m_xListBoxImport->implPushBackValue( sValue ); // the current-selected and selected - const ::rtl::OUString sSelectedAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_CURRENT_SELECTED))); - const ::rtl::OUString sDefaultSelectedAttribute = rMap.GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED))); + const OUString sSelectedAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_CURRENT_SELECTED))); + const OUString sDefaultSelectedAttribute = rMap.GetQNameByKey( + GetPrefix(), OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_SELECTED))); // propagate the selected flag bool bSelected(false); @@ -1917,7 +1917,7 @@ namespace xmloff //= OComboItemImport //===================================================================== //--------------------------------------------------------------------- - OComboItemImport::OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OComboItemImport::OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xListBoxImport(_rListBox) @@ -1927,8 +1927,8 @@ namespace xmloff //--------------------------------------------------------------------- void OComboItemImport::StartElement(const Reference< XAttributeList >& _rxAttrList) { - const ::rtl::OUString sLabelAttributeName = GetImport().GetNamespaceMap().GetQNameByKey( - GetPrefix(), ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL))); + const OUString sLabelAttributeName = GetImport().GetNamespaceMap().GetQNameByKey( + GetPrefix(), OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_LABEL))); m_xListBoxImport->implPushBackLabel(_rxAttrList->getValueByName(sLabelAttributeName)); SvXMLImportContext::StartElement(_rxAttrList); @@ -1939,7 +1939,7 @@ namespace xmloff //= OColumnWrapperImport //===================================================================== //--------------------------------------------------------------------- - OColumnWrapperImport::OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OColumnWrapperImport::OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName) ,m_xParentContainer(_rxParentContainer) @@ -1948,7 +1948,7 @@ namespace xmloff { } //--------------------------------------------------------------------- - SvXMLImportContext* OColumnWrapperImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OColumnWrapperImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { OControlImport* pReturn = implCreateChildContext(_nPrefix, _rLocalName, OElementNameMap::getElementType(_rLocalName)); @@ -1974,7 +1974,7 @@ namespace xmloff //--------------------------------------------------------------------- OControlImport* OColumnWrapperImport::implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType) { OSL_ENSURE( (OControlElement::TEXT == _eType) @@ -2010,7 +2010,7 @@ namespace xmloff //= OGridImport //===================================================================== //--------------------------------------------------------------------- - OGridImport::OGridImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OGridImport::OGridImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :OGridImport_Base(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, "column") @@ -2019,7 +2019,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OGridImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName) + SvXMLImportContext* OGridImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName) { return new OColumnWrapperImport(m_rFormImport, *this, _nPrefix, _rLocalName, m_xMeAsContainer); } @@ -2028,7 +2028,7 @@ namespace xmloff //= OFormImport //===================================================================== //--------------------------------------------------------------------- - OFormImport::OFormImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormImport::OFormImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const Reference< XNameContainer >& _rxParentContainer) :OFormImport_Base(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, "control") { @@ -2036,7 +2036,7 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OFormImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken(_rLocalName, token::XML_FORM) ) @@ -2072,18 +2072,18 @@ namespace xmloff } //--------------------------------------------------------------------- - SvXMLImportContext* OFormImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName) + SvXMLImportContext* OFormImport::implCreateControlWrapper(sal_uInt16 _nPrefix, const OUString& _rLocalName) { OSL_ENSURE( !this, "illegal call to OFormImport::implCreateControlWrapper" ); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName ); } //--------------------------------------------------------------------- - bool OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) + bool OFormImport::handleAttribute(sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue) { // handle the master/details field attributes (they're way too special to let the OPropertyImport handle them) - static const ::rtl::OUString s_sMasterFieldsAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faMasterFields)); - static const ::rtl::OUString s_sDetailFieldsAttributeName = ::rtl::OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faDetailFiels)); + static const OUString s_sMasterFieldsAttributeName = OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faMasterFields)); + static const OUString s_sDetailFieldsAttributeName = OUString::createFromAscii(OAttributeMetaData::getFormAttributeName(faDetailFiels)); if ( s_sMasterFieldsAttributeName == _rLocalName ) { @@ -2101,19 +2101,19 @@ namespace xmloff } //--------------------------------------------------------------------- - void OFormImport::implTranslateStringListProperty(const ::rtl::OUString& _rPropertyName, const ::rtl::OUString& _rValue) + void OFormImport::implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue) { PropertyValue aProp; aProp.Name = _rPropertyName; - Sequence< ::rtl::OUString > aList; + Sequence< OUString > aList; // split up the value string if (!_rValue.isEmpty()) { // For the moment, we build a vector instead of a Sequence. It's easier to handle because of it's // push_back method - ::std::vector< ::rtl::OUString > aElements; + ::std::vector< OUString > aElements; // estimate the number of tokens sal_Int32 nEstimate = 0, nLength = _rValue.getLength(); const sal_Unicode* pChars = _rValue.getStr(); @@ -2127,7 +2127,7 @@ namespace xmloff sal_Int32 nElementStart = 0; sal_Int32 nNextSep = 0; sal_Int32 nElementLength; - ::rtl::OUString sElement; + OUString sElement; do { // extract the current element @@ -2152,8 +2152,8 @@ namespace xmloff } while (nElementStart < nLength); - ::rtl::OUString *pElements = aElements.empty() ? 0 : &aElements[0]; - aList = Sequence< ::rtl::OUString >(pElements, aElements.size()); + OUString *pElements = aElements.empty() ? 0 : &aElements[0]; + aList = Sequence< OUString >(pElements, aElements.size()); } else { @@ -2171,7 +2171,7 @@ namespace xmloff OXMLDataSourceImport::OXMLDataSourceImport( SvXMLImport& _rImport ,sal_uInt16 nPrfx - , const ::rtl::OUString& _sLocalName + , const OUString& _sLocalName ,const Reference< ::com::sun::star::xml::sax::XAttributeList > & _xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xElement) : SvXMLImportContext( _rImport, nPrfx, _sLocalName ) @@ -2182,15 +2182,15 @@ namespace xmloff sal_Int16 nLength = (_xElement.is() && _xAttrList.is()) ? _xAttrList->getLength() : 0; for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; - ::rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); + OUString sLocalName; + OUString sAttrName = _xAttrList->getNameByIndex( i ); sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName, &sLocalName ); if ( ( nPrefix == OAttributeMetaData::getCommonControlAttributeNamespace( CCA_TARGET_LOCATION ) ) && ( sLocalName.equalsAscii( OAttributeMetaData::getCommonControlAttributeName( CCA_TARGET_LOCATION ) ) ) ) { - ::rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + OUString sValue = _xAttrList->getValueByIndex( i ); INetURLObject aURL(sValue); if ( aURL.GetProtocol() == INET_PROT_FILE ) @@ -2203,7 +2203,7 @@ namespace xmloff } //--------------------------------------------------------------------- OControlImport* OFormImport::implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType ) { switch (_eType) diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx index 61fb2b2f0e82..b9792808b905 100644 --- a/xmloff/source/forms/elementimport.hxx +++ b/xmloff/source/forms/elementimport.hxx @@ -60,7 +60,7 @@ namespace xmloff OElementNameMap() { } public: - static ElementType getElementType(const ::rtl::OUString& _rName); + static ElementType getElementType(const OUString& _rName); }; //===================================================================== @@ -74,8 +74,8 @@ namespace xmloff ,public OStackedLogging { protected: - ::rtl::OUString m_sServiceName; // the service name as extracted from the service-name attribute - ::rtl::OUString m_sName; // the name of the object (redundant, already contained in the base class' array) + OUString m_sServiceName; // the service name as extracted from the service-name attribute + OUString m_sName; // the name of the object (redundant, already contained in the base class' array) OFormLayerXMLImport_Impl& m_rFormImport; // the form import context IEventAttacherManager& m_rEventManager; // the event attacher manager @@ -111,7 +111,7 @@ namespace xmloff */ OElementImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer ); virtual ~OElementImport(); @@ -121,14 +121,14 @@ namespace xmloff virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); // IEventAttacher virtual void registerEvents( @@ -150,12 +150,12 @@ namespace xmloff property value as if the attribute was encountered.</p> @see encounteredAttribute */ - void simulateDefaultedAttribute(const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, const sal_Char* _pAttributeDefault); + void simulateDefaultedAttribute(const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault); /** to be called from within handleAttribute, checks whether the given attribute is covered by our generic attribute handler mechanisms */ - bool tryGenericAttribute( sal_uInt16 _nNamespaceKey, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue ); + bool tryGenericAttribute( sal_uInt16 _nNamespaceKey, const OUString& _rLocalName, const OUString& _rValue ); /** controls whether |handleAttribute| implicitly calls |tryGenericAttribute|, or whether the derived class must do this explicitly at a suitable place in its own |handleAttribute| @@ -163,7 +163,7 @@ namespace xmloff void disableImplicitGenericAttributeHandling() { m_bImplicitGenericAttributeHandling = false; } private: - ::rtl::OUString implGetDefaultName() const; + OUString implGetDefaultName() const; void implApplyGenericProperties(); void implApplySpecificProperties(); @@ -173,7 +173,7 @@ namespace xmloff PropertyGroups::const_iterator impl_matchPropertyGroup( const PropertyGroups& i_propertyGroups ) const; - virtual ::rtl::OUString determineDefaultServiceName() const; + virtual OUString determineDefaultServiceName() const; }; //===================================================================== @@ -186,7 +186,7 @@ namespace xmloff ,public OValuePropertiesMetaData { protected: - ::rtl::OUString m_sControlId; + OUString m_sControlId; OControlElement::ElementType m_eElementType; PropertyValueArray m_aValueProperties; @@ -201,29 +201,29 @@ namespace xmloff /** the address of the calc cell which the control model should be bound to, if applicable */ - ::rtl::OUString m_sBoundCellAddress; + OUString m_sBoundCellAddress; /** name of a value binding (xforms:bind attribute) */ - ::rtl::OUString m_sBindingID; + OUString m_sBindingID; /** name of a list binding (form:xforms-list-source attribute) */ - ::rtl::OUString m_sListBindingID; + OUString m_sListBindingID; /** name of a submission (xforms:submission attribute) */ - ::rtl::OUString m_sSubmissionID; + OUString m_sSubmissionID; protected: // for use by derived classes only OControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer ); public: OControlImport( OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, - sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -235,8 +235,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); void addOuterAttributes(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxOuterAttribs); @@ -248,7 +248,7 @@ namespace xmloff const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, ::com::sun::star::beans::PropertyValue& /* [in/out] */ _rPropValue); - virtual ::rtl::OUString determineDefaultServiceName() const; + virtual OUString determineDefaultServiceName() const; /** registers the given cell address as value binding address for our element @@ -260,16 +260,16 @@ namespace xmloff @precond we have a valid element (m_xElement) */ - virtual void doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ); + virtual void doRegisterCellValueBinding( const OUString& _rBoundCellAddress ); /** register the given XForms binding */ - virtual void doRegisterXFormsValueBinding( const ::rtl::OUString& ); + virtual void doRegisterXFormsValueBinding( const OUString& ); /** register the given XForms list binding */ - virtual void doRegisterXFormsListBinding( const ::rtl::OUString& ); + virtual void doRegisterXFormsListBinding( const OUString& ); /** register the given XForms submission */ - virtual void doRegisterXFormsSubmission( const ::rtl::OUString& ); + virtual void doRegisterXFormsSubmission( const OUString& ); protected: @@ -294,7 +294,7 @@ namespace xmloff public: OImagePositionImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -306,8 +306,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute( sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue + const OUString& _rLocalName, + const OUString& _rValue ); }; @@ -317,11 +317,11 @@ namespace xmloff class OReferredControlImport : public OControlImport { protected: - ::rtl::OUString m_sReferringControls; // the list of ids of controls referring to the one beeing imported + OUString m_sReferringControls; // the list of ids of controls referring to the one beeing imported public: OReferredControlImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -332,8 +332,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -343,15 +343,15 @@ namespace xmloff { public: OPasswordImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -361,7 +361,7 @@ namespace xmloff { public: ORadioImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -369,8 +369,8 @@ namespace xmloff protected: // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -383,7 +383,7 @@ namespace xmloff { public: OURLReferenceImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -391,8 +391,8 @@ namespace xmloff protected: // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); }; //===================================================================== @@ -405,7 +405,7 @@ namespace xmloff { public: OButtonImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -429,7 +429,7 @@ namespace xmloff public: OValueRangeImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -441,8 +441,8 @@ namespace xmloff // OPropertyImport overridables virtual bool handleAttribute( sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue ); + const OUString& _rLocalName, + const OUString& _rValue ); }; //===================================================================== @@ -460,7 +460,7 @@ namespace xmloff public: OTextLikeImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -469,7 +469,7 @@ namespace xmloff virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); @@ -490,9 +490,9 @@ namespace xmloff friend class OComboItemImport; protected: - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aListSource; - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aValueList; ::com::sun::star::uno::Sequence< sal_Int16 > @@ -500,7 +500,7 @@ namespace xmloff ::com::sun::star::uno::Sequence< sal_Int16 > m_aDefaultSelectedSeq; - ::rtl::OUString m_sCellListSource; /// the cell range which acts as list source for the control + OUString m_sCellListSource; /// the cell range which acts as list source for the control sal_Int32 m_nEmptyListItems; /// number of empty list items encountered during reading sal_Int32 m_nEmptyValueItems; /// number of empty value items encountered during reading @@ -512,7 +512,7 @@ namespace xmloff public: OListAndComboImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType ); @@ -521,21 +521,21 @@ namespace xmloff virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); // OControlImport ovrridables - virtual void doRegisterCellValueBinding( const ::rtl::OUString& _rBoundCellAddress ); + virtual void doRegisterCellValueBinding( const OUString& _rBoundCellAddress ); protected: - void implPushBackLabel(const ::rtl::OUString& _rLabel); - void implPushBackValue(const ::rtl::OUString& _rValue); + void implPushBackLabel(const OUString& _rLabel); + void implPushBackValue(const OUString& _rValue); void implEmptyLabelFound(); void implEmptyValueFound(); @@ -556,7 +556,7 @@ namespace xmloff OListAndComboImportRef m_xListBoxImport; public: - OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListOptionImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox); virtual void StartElement( @@ -574,7 +574,7 @@ namespace xmloff OListAndComboImportRef m_xListBoxImport; public: - OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OComboItemImport(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OListAndComboImportRef& _rListBox); protected: @@ -595,20 +595,20 @@ namespace xmloff protected: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xMeAsContainer; - ::rtl::OUString m_sWrapperElementName; + OUString m_sWrapperElementName; protected: - OContainerImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OContainerImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, const sal_Char* _pWrapperElementName) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer) - ,m_sWrapperElementName(::rtl::OUString::createFromAscii(_pWrapperElementName)) + ,m_sWrapperElementName(OUString::createFromAscii(_pWrapperElementName)) { } // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void EndElement(); @@ -619,7 +619,7 @@ namespace xmloff // create the child context for the given control type virtual SvXMLImportContext* implCreateControlWrapper( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName) = 0; + sal_uInt16 _nPrefix, const OUString& _rLocalName) = 0; }; //===================================================================== @@ -638,7 +638,7 @@ namespace xmloff m_xColumnFactory; public: - OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); @@ -662,18 +662,18 @@ namespace xmloff IEventAttacherManager& m_rEventManager; public: - OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OColumnWrapperImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer); // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); protected: OControlImport* implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType); }; @@ -687,14 +687,14 @@ namespace xmloff { public: OGridImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType); protected: // OContainerImport overridables virtual SvXMLImportContext* implCreateControlWrapper( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName); + sal_uInt16 _nPrefix, const OUString& _rLocalName); }; //===================================================================== @@ -707,14 +707,14 @@ namespace xmloff { public: OFormImport( - OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer ); protected: // SvXMLImportContext overridables virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); @@ -722,19 +722,19 @@ namespace xmloff // OContainerImport overridables virtual SvXMLImportContext* implCreateControlWrapper( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName); + sal_uInt16 _nPrefix, const OUString& _rLocalName); // OPropertyImport overridables virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); OControlImport* implCreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, OControlElement::ElementType _eType ); - void implTranslateStringListProperty(const ::rtl::OUString& _rPropertyName, const ::rtl::OUString& _rValue); + void implTranslateStringListProperty(const OUString& _rPropertyName, const OUString& _rValue); }; //===================================================================== @@ -745,7 +745,7 @@ namespace xmloff public: OXMLDataSourceImport( SvXMLImport& _rImport ,sal_uInt16 nPrfx - ,const ::rtl::OUString& rLName + ,const OUString& rLName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xElement); }; diff --git a/xmloff/source/forms/elementimport_impl.hxx b/xmloff/source/forms/elementimport_impl.hxx index 18d2d426f6cc..e9c245c9e5d5 100644 --- a/xmloff/source/forms/elementimport_impl.hxx +++ b/xmloff/source/forms/elementimport_impl.hxx @@ -32,7 +32,7 @@ //------------------------------------------------------------------------- template <class BASE> inline SvXMLImportContext* OContainerImport< BASE >::CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList) { // maybe it's a sub control @@ -88,7 +88,7 @@ inline void OContainerImport< BASE >::EndElement() //========================================================================= //------------------------------------------------------------------------- template <class BASE> -OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OColumnImport< BASE >::OColumnImport(OFormLayerXMLImport_Impl& _rImport, IEventAttacherManager& _rEventManager, sal_uInt16 _nPrefix, const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxParentContainer, OControlElement::ElementType _eType) :BASE(_rImport, _rEventManager, _nPrefix, _rName, _rxParentContainer, _eType) diff --git a/xmloff/source/forms/eventexport.cxx b/xmloff/source/forms/eventexport.cxx index 0cd93ed2b570..c35d201a3321 100644 --- a/xmloff/source/forms/eventexport.cxx +++ b/xmloff/source/forms/eventexport.cxx @@ -43,8 +43,8 @@ namespace xmloff // translate the events const ScriptEventDescriptor* pEvents = _rEvents.getConstArray(); - ::rtl::OUString sName; - ::rtl::OUString sLibrary, sLocalMacroName; + OUString sName; + OUString sLibrary, sLocalMacroName; for (sal_Int32 i=0; i<nEvents; ++i, ++pEvents) { // the name of the event is build from listener interface and listener method name @@ -93,29 +93,29 @@ namespace xmloff } //--------------------------------------------------------------------- - void SAL_CALL OEventDescriptorMapper::replaceByName( const ::rtl::OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + void SAL_CALL OEventDescriptorMapper::replaceByName( const OUString&, const Any& ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { throw IllegalArgumentException( - ::rtl::OUString("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1); + OUString("replacing is not implemented for this wrapper class."), static_cast< ::cppu::OWeakObject* >(this), 1); } //--------------------------------------------------------------------- - Any SAL_CALL OEventDescriptorMapper::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL OEventDescriptorMapper::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); if (m_aMappedEvents.end() == aPos) throw NoSuchElementException( - ::rtl::OUString("There is no element named ") += _rName, + OUString("There is no element named ") += _rName, static_cast< ::cppu::OWeakObject* >(this)); return makeAny(aPos->second); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OEventDescriptorMapper::getElementNames( ) throw(RuntimeException) + Sequence< OUString > SAL_CALL OEventDescriptorMapper::getElementNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aReturn(m_aMappedEvents.size()); - ::rtl::OUString* pReturn = aReturn.getArray(); + Sequence< OUString > aReturn(m_aMappedEvents.size()); + OUString* pReturn = aReturn.getArray(); for ( ConstMapString2PropertyValueSequenceIterator aCollect = m_aMappedEvents.begin(); aCollect != m_aMappedEvents.end(); ++aCollect, ++pReturn @@ -126,7 +126,7 @@ namespace xmloff } //--------------------------------------------------------------------- - sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException) + sal_Bool SAL_CALL OEventDescriptorMapper::hasByName( const OUString& _rName ) throw(RuntimeException) { ConstMapString2PropertyValueSequenceIterator aPos = m_aMappedEvents.find(_rName); return m_aMappedEvents.end() != aPos; diff --git a/xmloff/source/forms/eventexport.hxx b/xmloff/source/forms/eventexport.hxx index d0c9d36be38a..b919236275fa 100644 --- a/xmloff/source/forms/eventexport.hxx +++ b/xmloff/source/forms/eventexport.hxx @@ -57,12 +57,12 @@ namespace xmloff const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& _rEvents); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/xmloff/source/forms/eventimport.cxx b/xmloff/source/forms/eventimport.cxx index 20d184d83c68..d61fe5f4f9b7 100644 --- a/xmloff/source/forms/eventimport.cxx +++ b/xmloff/source/forms/eventimport.cxx @@ -37,7 +37,7 @@ namespace xmloff //= OFormEventsImportContext //===================================================================== //--------------------------------------------------------------------- - OFormEventsImportContext::OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, IEventAttacher& _rEventAttacher) + OFormEventsImportContext::OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rLocalName, IEventAttacher& _rEventAttacher) :XMLEventsImportContext(_rImport, _nPrefix, _rLocalName) ,m_rEventAttacher(_rEventAttacher) { @@ -64,7 +64,7 @@ namespace xmloff pTranslated->ListenerType = aEvent->first.copy(0, nSeparatorPos); pTranslated->EventMethod = aEvent->first.copy(nSeparatorPos + sizeof(EVENT_NAME_SEPARATOR) - 1); - ::rtl::OUString sLibrary; + OUString sLibrary; // the local macro name and the event type are specified as properties pEventDescription = aEvent->second.getConstArray(); @@ -89,7 +89,7 @@ namespace xmloff { // for StarBasic, the library is prepended sal_Unicode cLibSeparator = ':'; - sLibrary += ::rtl::OUString( &cLibSeparator, 1 ); + sLibrary += OUString( &cLibSeparator, 1 ); } sLibrary += pTranslated->ScriptCode; pTranslated->ScriptCode = sLibrary; diff --git a/xmloff/source/forms/eventimport.hxx b/xmloff/source/forms/eventimport.hxx index d0ea88f31fb4..af7df463bade 100644 --- a/xmloff/source/forms/eventimport.hxx +++ b/xmloff/source/forms/eventimport.hxx @@ -40,7 +40,7 @@ namespace xmloff IEventAttacher& m_rEventAttacher; public: - OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + OFormEventsImportContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rLocalName, IEventAttacher& _rEventAttacher); protected: diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index aaafb1b08910..b944f5c1981e 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -251,7 +251,7 @@ namespace xmloff //--------------------------------------------------------------------- const OAttribute2Property::AttributeAssignment* OAttribute2Property::getAttributeTranslation( - const ::rtl::OUString& _rAttribName) + const OUString& _rAttribName) { ConstAttributeAssignmentsIterator aPos = m_aKnownProperties.find(_rAttribName); if (m_aKnownProperties.end() != aPos) @@ -261,19 +261,19 @@ namespace xmloff //--------------------------------------------------------------------- void OAttribute2Property::addStringProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault) { - implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), - _pAttributeDefault ? ::rtl::OUString::createFromAscii(_pAttributeDefault) : ::rtl::OUString()); + implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< OUString* >(NULL) ), + _pAttributeDefault ? OUString::createFromAscii(_pAttributeDefault) : OUString()); } //--------------------------------------------------------------------- void OAttribute2Property::addBooleanProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Bool _bAttributeDefault, const sal_Bool _bInverseSemantics) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; ::sax::Converter::convertBool(aDefault, _bAttributeDefault); AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, ::getBooleanCppuType(), aDefault.makeStringAndClear()); aAssignment.bInverseSemantics = _bInverseSemantics; @@ -281,31 +281,31 @@ namespace xmloff //--------------------------------------------------------------------- void OAttribute2Property::addInt16Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int16 _nAttributeDefault) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; ::sax::Converter::convertNumber(aDefault, (sal_Int32)_nAttributeDefault); implAdd(_pAttributeName, _rPropertyName, ::getCppuType( static_cast< sal_Int16* >(NULL) ), aDefault.makeStringAndClear()); } //--------------------------------------------------------------------- void OAttribute2Property::addInt32Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int32 _nAttributeDefault) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; ::sax::Converter::convertNumber( aDefault, _nAttributeDefault ); implAdd( _pAttributeName, _rPropertyName, ::getCppuType( static_cast< sal_Int32* >(NULL) ), aDefault.makeStringAndClear() ); } //--------------------------------------------------------------------- void OAttribute2Property::addEnumProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, const ::com::sun::star::uno::Type* _pType) { - ::rtl::OUStringBuffer aDefault; + OUStringBuffer aDefault; SvXMLUnitConverter::convertEnum(aDefault, _nAttributeDefault, _pValueMap); AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, _pType ? *_pType : ::getCppuType( static_cast< sal_Int32* >(NULL) ), @@ -316,13 +316,13 @@ namespace xmloff //--------------------------------------------------------------------- OAttribute2Property::AttributeAssignment& OAttribute2Property::implAdd( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, const ::rtl::OUString& /*_rDefaultString*/) + const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const ::com::sun::star::uno::Type& _rType, const OUString& /*_rDefaultString*/) { - OSL_ENSURE(m_aKnownProperties.end() == m_aKnownProperties.find(::rtl::OUString::createFromAscii(_pAttributeName)), + OSL_ENSURE(m_aKnownProperties.end() == m_aKnownProperties.find(OUString::createFromAscii(_pAttributeName)), "OAttribute2Property::implAdd: already have this attribute!"); - ::rtl::OUString sAttributeName = ::rtl::OUString::createFromAscii(_pAttributeName); + OUString sAttributeName = OUString::createFromAscii(_pAttributeName); AttributeAssignment aAssignment; aAssignment.sAttributeName = sAttributeName; diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx index 0c9d16b561e6..f535d0172ba0 100644 --- a/xmloff/source/forms/formattributes.hxx +++ b/xmloff/source/forms/formattributes.hxx @@ -237,10 +237,10 @@ namespace xmloff // store it's instances in a map, but in a vector for faster access. struct AttributeAssignment { - ::rtl::OUString sAttributeName; // the attribute name - ::rtl::OUString sPropertyName; // the property name + OUString sAttributeName; // the attribute name + OUString sPropertyName; // the property name ::com::sun::star::uno::Type aPropertyType; // the property type - ::rtl::OUString sAttributeDefault; // the default if the attribute is not present + OUString sAttributeDefault; // the default if the attribute is not present // entries which are special to some value types const SvXMLEnumMapEntry* pEnumMap; // the enum map, if appliable @@ -266,7 +266,7 @@ namespace xmloff does not represent a property. */ const AttributeAssignment* getAttributeTranslation( - const ::rtl::OUString& _rAttribName); + const OUString& _rAttribName); /** add a attribute assignment referring to a string property to the map @param _pAttributeName @@ -278,7 +278,7 @@ namespace xmloff an empty string. */ void addStringProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Char* _pAttributeDefault = NULL); /** add a attribute assignment referring to a boolean property to the map @@ -294,7 +294,7 @@ namespace xmloff if <FALSE/>, the attribute value is used as property value directly */ void addBooleanProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Bool _bAttributeDefault, const sal_Bool _bInverseSemantics = sal_False); /** add a attribute assignment referring to an int16 property to the map @@ -307,7 +307,7 @@ namespace xmloff the default value for the attribute. */ void addInt16Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int16 _nAttributeDefault); /** add a attribute assignment referring to an int32 property to the map @@ -320,7 +320,7 @@ namespace xmloff the default value for the attribute. */ void addInt32Property( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_Int32 _nAttributeDefault ); /** add a attribute assignment referring to an enum property to the map @@ -337,15 +337,15 @@ namespace xmloff the type of the property. May be NULL, in this case 32bit integer is assumed. */ void addEnumProperty( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, + const sal_Char* _pAttributeName, const OUString& _rPropertyName, const sal_uInt16 _nAttributeDefault, const SvXMLEnumMapEntry* _pValueMap, const ::com::sun::star::uno::Type* _pType = NULL); protected: /// some common code for the various add*Property methods AttributeAssignment& implAdd( - const sal_Char* _pAttributeName, const ::rtl::OUString& _rPropertyName, - const ::com::sun::star::uno::Type& _rType, const ::rtl::OUString& _rDefaultString); + const sal_Char* _pAttributeName, const OUString& _rPropertyName, + const ::com::sun::star::uno::Type& _rType, const OUString& _rDefaultString); }; //......................................................................... } // namespace xmloff diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index 72c39c791c2e..a874c132ea62 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -86,15 +86,15 @@ namespace } //.................................................................... - struct StringCompare : public ::std::unary_function< ::rtl::OUString, bool > + struct StringCompare : public ::std::unary_function< OUString, bool > { private: - const ::rtl::OUString m_sReference; + const OUString m_sReference; public: - StringCompare( const ::rtl::OUString& _rReference ) : m_sReference( _rReference ) { } + StringCompare( const OUString& _rReference ) : m_sReference( _rReference ) { } - inline bool operator()( const ::rtl::OUString& _rCompare ) + inline bool operator()( const OUString& _rCompare ) { return ( _rCompare == m_sReference ); } @@ -124,7 +124,7 @@ sal_Bool FormCellBindingHelper::livesInSpreadsheetDocument( const Reference< XPr } //------------------------------------------------------------------------ -bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress, sal_Int16 /*_nAssumeSheet*/ ) const +bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress, sal_Int16 /*_nAssumeSheet*/ ) const { Any aAddress; return doConvertAddressRepresentations( @@ -138,7 +138,7 @@ bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddre } //------------------------------------------------------------------------ -bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddressDescription, +bool FormCellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellRangeAddress& /* [out] */ _rAddress ) const { Any aAddress; @@ -153,7 +153,7 @@ bool FormCellBindingHelper::convertStringAddress( const ::rtl::OUString& _rAddre } //------------------------------------------------------------------------ -Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAddress( const ::rtl::OUString& _rAddress, bool _bUseIntegerBinding ) const +Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAddress( const OUString& _rAddress, bool _bUseIntegerBinding ) const { Reference< XValueBinding > xBinding; if ( !m_xDocument.is() ) @@ -175,7 +175,7 @@ Reference< XValueBinding > FormCellBindingHelper::createCellBindingFromStringAdd } //------------------------------------------------------------------------ -Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const +Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStringAddress( const OUString& _rAddress ) const { Reference< XListEntrySource > xSource; @@ -194,11 +194,11 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } //------------------------------------------------------------------------ -::rtl::OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const +OUString FormCellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const { OSL_PRECOND( !_rxBinding.is() || isCellBinding( _rxBinding ), "FormCellBindingHelper::getStringAddressFromCellBinding: this is no cell binding!" ); - ::rtl::OUString sAddress; + OUString sAddress; try { Reference< XPropertySet > xBindingProps( _rxBinding, UNO_QUERY ); @@ -224,11 +224,11 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } //------------------------------------------------------------------------ -::rtl::OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const +OUString FormCellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const { OSL_PRECOND( !_rxSource.is() || isCellRangeListSource( _rxSource ), "FormCellBindingHelper::getStringAddressFromCellListSource: this is no cell list source!" ); - ::rtl::OUString sAddress; + OUString sAddress; try { Reference< XPropertySet > xSourceProps( _rxSource, UNO_QUERY ); @@ -253,7 +253,7 @@ Reference< XListEntrySource > FormCellBindingHelper::createCellListSourceFromStr } //------------------------------------------------------------------------ -bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< XSpreadsheetDocument >& _rxDocument, const ::rtl::OUString& _rService ) SAL_THROW(()) +bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< XSpreadsheetDocument >& _rxDocument, const OUString& _rService ) SAL_THROW(()) { bool bYesItIs = false; @@ -265,11 +265,11 @@ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< Reference< XMultiServiceFactory > xDocumentFactory( _rxDocument, UNO_QUERY ); OSL_ENSURE( xDocumentFactory.is(), "FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies: spreadsheet document, but no factory?" ); - Sequence< ::rtl::OUString > aAvailableServices; + Sequence< OUString > aAvailableServices; if ( xDocumentFactory.is() ) aAvailableServices = xDocumentFactory->getAvailableServiceNames( ); - const ::rtl::OUString* pFound = ::std::find_if( + const OUString* pFound = ::std::find_if( aAvailableServices.getConstArray(), aAvailableServices.getConstArray() + aAvailableServices.getLength(), StringCompare( _rService ) @@ -289,7 +289,7 @@ bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const Reference< } //------------------------------------------------------------------------ -bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const SAL_THROW(()) +bool FormCellBindingHelper::isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const SAL_THROW(()) { return isSpreadsheetDocumentWhichSupplies( m_xDocument, _rService ); } @@ -361,7 +361,7 @@ bool FormCellBindingHelper::isCellRangeListSource( const Reference< XListEntrySo } //------------------------------------------------------------------------ -bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const ::rtl::OUString& _rService ) const +bool FormCellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const { Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY ); bool bDoes = xSI.is() && xSI->supportsService( _rService ); @@ -407,7 +407,7 @@ void FormCellBindingHelper::setListSource( const Reference< XListEntrySource >& } //------------------------------------------------------------------------ -Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( const ::rtl::OUString& _rService, const ::rtl::OUString& _rArgumentName, +Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName, const Any& _rArgumentValue ) const { Reference< XInterface > xReturn; @@ -443,15 +443,15 @@ Reference< XInterface > FormCellBindingHelper::createDocumentDependentInstance( } //------------------------------------------------------------------------ -bool FormCellBindingHelper::doConvertAddressRepresentations( const ::rtl::OUString& _rInputProperty, const Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) +bool FormCellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue, + const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()) { bool bSuccess = false; Reference< XPropertySet > xConverter( createDocumentDependentInstance( _bIsRange ? OUString(SERVICE_RANGEADDRESS_CONVERSION) : OUString(SERVICE_ADDRESS_CONVERSION), - ::rtl::OUString(), + OUString(), Any() ), UNO_QUERY diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx index 1ab30cd87f8e..55d3f885ce9e 100644 --- a/xmloff/source/forms/formcellbinding.hxx +++ b/xmloff/source/forms/formcellbinding.hxx @@ -77,14 +77,14 @@ namespace xmloff */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding > createCellBindingFromStringAddress( - const ::rtl::OUString& _rAddress, + const OUString& _rAddress, bool _bUseIntegerBinding ) const; /** gets a cell range list source binding for the given address */ ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > - createCellListSourceFromStringAddress( const ::rtl::OUString& _rAddress ) const; + createCellListSourceFromStringAddress( const OUString& _rAddress ) const; /** creates a string representation for the given value binding's address @@ -95,7 +95,7 @@ namespace xmloff The binding is a valid cell binding, or <NULL/> @see isCellBinding */ - ::rtl::OUString getStringAddressFromCellBinding( + OUString getStringAddressFromCellBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XValueBinding >& _rxBinding ) const; @@ -109,7 +109,7 @@ namespace xmloff The object is a valid cell range list source, or <NULL/> @see isCellRangeListSource */ - ::rtl::OUString getStringAddressFromCellListSource( + OUString getStringAddressFromCellListSource( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& _rxSource ) const; @@ -186,7 +186,7 @@ namespace xmloff /** creates an address object from a string representation of a cell address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellAddress& /* [out] */ _rAddress, sal_Int16 _nAssumeSheet = -1 ) const; @@ -194,28 +194,28 @@ namespace xmloff /** creates an address range object from a string representation of a cell range address */ bool convertStringAddress( - const ::rtl::OUString& _rAddressDescription, + const OUString& _rAddressDescription, ::com::sun::star::table::CellRangeAddress& /* [out] */ _rAddress ) const; /** determines if our document is a spreadsheet document, *and* can supply the given service */ - bool isSpreadsheetDocumentWhichSupplies( const ::rtl::OUString& _rService ) const SAL_THROW(()); + bool isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const SAL_THROW(()); /** determines if our document is a spreadsheet document, *and* can supply the given service */ static bool isSpreadsheetDocumentWhichSupplies( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument >& _rxDocument, - const ::rtl::OUString& _rService + const OUString& _rService ) SAL_THROW(()); /** checkes whether a given component supports a given servive */ bool doesComponentSupport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, - const ::rtl::OUString& _rService + const OUString& _rService ) const; /** uses the document (it's factory interface, respectively) to create a component instance @@ -230,8 +230,8 @@ namespace xmloff */ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createDocumentDependentInstance( - const ::rtl::OUString& _rService, - const ::rtl::OUString& _rArgumentName, + const OUString& _rService, + const OUString& _rArgumentName, const ::com::sun::star::uno::Any& _rArgumentValue ) const; @@ -256,9 +256,9 @@ namespace xmloff @see com::sun::star::table::CellRangeAddressConversion */ bool doConvertAddressRepresentations( - const ::rtl::OUString& _rInputProperty, + const OUString& _rInputProperty, const ::com::sun::star::uno::Any& _rInputValue, - const ::rtl::OUString& _rOutputProperty, + const OUString& _rOutputProperty, ::com::sun::star::uno::Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(()); diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx index 4219b3c308e2..b200503caad7 100644 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -71,13 +71,13 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport::getControlId(const Reference< XPropertySet >& _rxControl) + OUString OFormLayerXMLExport::getControlId(const Reference< XPropertySet >& _rxControl) { return m_pImpl->getControlId(_rxControl); } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) + OUString OFormLayerXMLExport::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) { return m_pImpl->getControlNumberStyle(_rxControl); } diff --git a/xmloff/source/forms/formlayerimport.cxx b/xmloff/source/forms/formlayerimport.cxx index c9e06a012145..80245da6195b 100644 --- a/xmloff/source/forms/formlayerimport.cxx +++ b/xmloff/source/forms/formlayerimport.cxx @@ -68,7 +68,7 @@ namespace xmloff } //--------------------------------------------------------------------- - Reference< XPropertySet > OFormLayerXMLImport::lookupControl(const ::rtl::OUString& _rId) + Reference< XPropertySet > OFormLayerXMLImport::lookupControl(const OUString& _rId) { return m_pImpl->lookupControlId(_rId); } @@ -77,20 +77,20 @@ namespace xmloff SvXMLImportContext* OFormLayerXMLImport::createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName) + const OUString& _rLocalName) { return m_pImpl->createOfficeFormsContext(_rImport, _nPrefix, _rLocalName); } //--------------------------------------------------------------------- - SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const rtl::OUString& _rLocalName, + SvXMLImportContext* OFormLayerXMLImport::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< xml::sax::XAttributeList >& _rxAttribs) { return m_pImpl->createContext(_nPrefix, _rLocalName, _rxAttribs); } //--------------------------------------------------------------------- - void OFormLayerXMLImport::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rControlNumerStyleName) + void OFormLayerXMLImport::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName) { m_pImpl->applyControlNumberStyle(_rxControlModel, _rControlNumerStyleName); } diff --git a/xmloff/source/forms/gridcolumnproptranslator.cxx b/xmloff/source/forms/gridcolumnproptranslator.cxx index 86fa2046359c..c8c553629b4f 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.cxx +++ b/xmloff/source/forms/gridcolumnproptranslator.cxx @@ -54,11 +54,11 @@ namespace xmloff } //---------------------------------------------------------------- - sal_Int32 findStringElement( const Sequence< ::rtl::OUString >& _rNames, const ::rtl::OUString& _rName ) + sal_Int32 findStringElement( const Sequence< OUString >& _rNames, const OUString& _rName ) { - const ::rtl::OUString* pStart = _rNames.getConstArray(); - const ::rtl::OUString* pEnd = _rNames.getConstArray() + _rNames.getLength(); - const ::rtl::OUString* pPos = ::std::find( pStart, pEnd, _rName ); + const OUString* pStart = _rNames.getConstArray(); + const OUString* pEnd = _rNames.getConstArray() + _rNames.getLength(); + const OUString* pPos = ::std::find( pStart, pEnd, _rName ); if ( pPos != pEnd ) return pPos - pStart; return -1; @@ -138,8 +138,8 @@ namespace xmloff // XPropertySetInfo virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw (::com::sun::star::uno::RuntimeException); }; //---------------------------------------------------------------- @@ -170,7 +170,7 @@ namespace xmloff } //---------------------------------------------------------------- - Property SAL_CALL OMergedPropertySetInfo::getPropertyByName( const ::rtl::OUString& aName ) throw (UnknownPropertyException, RuntimeException) + Property SAL_CALL OMergedPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException) { if ( aName == getParaAlignProperty() ) return Property( getParaAlignProperty(), -1, @@ -183,7 +183,7 @@ namespace xmloff } //---------------------------------------------------------------- - ::sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const ::rtl::OUString& Name ) throw (RuntimeException) + ::sal_Bool SAL_CALL OMergedPropertySetInfo::hasPropertyByName( const OUString& Name ) throw (RuntimeException) { if ( Name == getParaAlignProperty() ) return sal_True; @@ -221,7 +221,7 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::setPropertyValue( const OUString& _rPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // we implement this by delegating it to setPropertyValues, which is to ignore unknown properties. On the other hand, our // contract requires us to throw a UnknownPropertyException for unknown properties, so check this first. @@ -229,15 +229,15 @@ namespace xmloff if ( !getPropertySetInfo()->hasPropertyByName( _rPropertyName ) ) throw UnknownPropertyException( _rPropertyName, *this ); - Sequence< ::rtl::OUString > aNames( &_rPropertyName, 1 ); + Sequence< OUString > aNames( &_rPropertyName, 1 ); Sequence< Any > aValues( &aValue, 1 ); setPropertyValues( aNames, aValues ); } //-------------------------------------------------------------------- - Any SAL_CALL OGridColumnPropertyTranslator::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + Any SAL_CALL OGridColumnPropertyTranslator::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - Sequence< ::rtl::OUString > aNames( &PropertyName, 1 ); + Sequence< OUString > aNames( &PropertyName, 1 ); Sequence< Any > aValues = getPropertyValues( aNames ); OSL_ENSURE( aValues.getLength() == 1, "OGridColumnPropertyTranslator::getPropertyValue: nonsense!" ); if ( aValues.getLength() == 1 ) @@ -246,31 +246,31 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addPropertyChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::removePropertyChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addVetoableChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::removeVetoableChangeListener: not implemented - this should not be needed!" ); } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { if ( !m_xGridColumn.is() ) return; @@ -278,7 +278,7 @@ namespace xmloff // if there's ever the need for more than one property being translated, then we should // certainly have a more clever implementation than this ... - Sequence< ::rtl::OUString > aTranslatedNames( aPropertyNames ); + Sequence< OUString > aTranslatedNames( aPropertyNames ); Sequence< Any > aTranslatedValues( aValues ); sal_Int32 nParaAlignPos = findStringElement( aTranslatedNames, getParaAlignProperty() ); @@ -292,13 +292,13 @@ namespace xmloff } //-------------------------------------------------------------------- - Sequence< Any > SAL_CALL OGridColumnPropertyTranslator::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) throw (RuntimeException) + Sequence< Any > SAL_CALL OGridColumnPropertyTranslator::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException) { Sequence< Any > aValues( aPropertyNames.getLength() ); if ( !m_xGridColumn.is() ) return aValues; - Sequence< ::rtl::OUString > aTranslatedNames( aPropertyNames ); + Sequence< OUString > aTranslatedNames( aPropertyNames ); sal_Int32 nAlignPos = findStringElement( aTranslatedNames, getParaAlignProperty() ); if ( nAlignPos != -1 ) aTranslatedNames[ nAlignPos ] = getAlignProperty(); @@ -311,7 +311,7 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::addPropertiesChangeListener: not implemented - this should not be needed!" ); } @@ -323,7 +323,7 @@ namespace xmloff } //-------------------------------------------------------------------- - void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) + void SAL_CALL OGridColumnPropertyTranslator::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException) { OSL_FAIL( "OGridColumnPropertyTranslator::firePropertiesChangeEvent: not implemented - this should not be needed!" ); } diff --git a/xmloff/source/forms/gridcolumnproptranslator.hxx b/xmloff/source/forms/gridcolumnproptranslator.hxx index ce391297496f..6c9313bdc7e7 100644 --- a/xmloff/source/forms/gridcolumnproptranslator.hxx +++ b/xmloff/source/forms/gridcolumnproptranslator.hxx @@ -51,19 +51,19 @@ namespace xmloff // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XMultiPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); }; //........................................................................ diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx index eeea8e4ca831..b306a65ce04b 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.cxx +++ b/xmloff/source/forms/handler/vcl_date_handler.cxx @@ -47,14 +47,14 @@ namespace xmloff } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLDateHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const + OUString VCLDateHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const { OSL_ENSURE( false, "VCLDateHandler::getAttributeValue: unexpected call!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLDateHandler::getAttributeValue( const Any& i_propertyValue ) const + OUString VCLDateHandler::getAttributeValue( const Any& i_propertyValue ) const { sal_Int32 nVCLDate(0); OSL_VERIFY( i_propertyValue >>= nVCLDate ); @@ -65,13 +65,13 @@ namespace xmloff aDateTime.Month = aVCLDate.GetMonth(); aDateTime.Year = aVCLDate.GetYear(); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertDateTime( aBuffer, aDateTime, false ); return aBuffer.makeStringAndClear(); } //------------------------------------------------------------------------------------------------------------------ - bool VCLDateHandler::getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const + bool VCLDateHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const { sal_Int32 nVCLDate(0); diff --git a/xmloff/source/forms/handler/vcl_date_handler.hxx b/xmloff/source/forms/handler/vcl_date_handler.hxx index 6863dbc802bb..720270ba04b0 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.hxx +++ b/xmloff/source/forms/handler/vcl_date_handler.hxx @@ -36,9 +36,9 @@ namespace xmloff VCLDateHandler(); // IPropertyHandler - virtual ::rtl::OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; - virtual ::rtl::OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; - virtual bool getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const; + virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; + virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; + virtual bool getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const; }; //...................................................................................................................... diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx index 4a29fbd71301..4339ed75c791 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.cxx +++ b/xmloff/source/forms/handler/vcl_time_handler.cxx @@ -47,14 +47,14 @@ namespace xmloff } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLTimeHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const + OUString VCLTimeHandler::getAttributeValue( const PropertyValues& /*i_propertyValues*/ ) const { OSL_ENSURE( false, "VCLTimeHandler::getAttributeValue: unexpected call!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const + OUString VCLTimeHandler::getAttributeValue( const Any& i_propertyValue ) const { sal_Int32 nVCLTime(0); OSL_VERIFY( i_propertyValue >>= nVCLTime ); @@ -66,13 +66,13 @@ namespace xmloff aDuration.Seconds = aVCLTime.GetSec(); aDuration.MilliSeconds = aVCLTime.Get100Sec() * 10; - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertDuration( aBuffer, aDuration ); return aBuffer.makeStringAndClear(); } //------------------------------------------------------------------------------------------------------------------ - bool VCLTimeHandler::getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const + bool VCLTimeHandler::getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const { sal_Int32 nVCLTime(0); diff --git a/xmloff/source/forms/handler/vcl_time_handler.hxx b/xmloff/source/forms/handler/vcl_time_handler.hxx index d9631f02d2c9..5785a78cbb08 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.hxx +++ b/xmloff/source/forms/handler/vcl_time_handler.hxx @@ -36,9 +36,9 @@ namespace xmloff VCLTimeHandler(); // IPropertyHandler - virtual ::rtl::OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; - virtual ::rtl::OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; - virtual bool getPropertyValues( const ::rtl::OUString i_attributeValue, PropertyValues& o_propertyValues ) const; + virtual OUString getAttributeValue( const PropertyValues& i_propertyValues ) const; + virtual OUString getAttributeValue( const ::com::sun::star::uno::Any& i_propertyValue ) const; + virtual bool getPropertyValues( const OUString i_attributeValue, PropertyValues& o_propertyValues ) const; }; //...................................................................................................................... diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index 13e0ed37a93b..2b065c7d5165 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -74,9 +74,9 @@ namespace xmloff //= OFormLayerXMLExport_Impl //===================================================================== //--------------------------------------------------------------------- - const ::rtl::OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix() + const OUString& OFormLayerXMLExport_Impl::getControlNumberStyleNamePrefix() { - static const ::rtl::OUString s_sControlNumberStyleNamePrefix("C"); + static const OUString s_sControlNumberStyleNamePrefix("C"); return s_sControlNumberStyleNamePrefix; } @@ -96,7 +96,7 @@ namespace xmloff m_rContext.GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_CONTROL_ID, token::GetXMLToken(token::XML_PARAGRAPH), m_xStyleExportMapper.get(), - ::rtl::OUString( XML_STYLE_FAMILY_CONTROL_PREFIX ) + OUString( XML_STYLE_FAMILY_CONTROL_PREFIX ) ); // add our event translation table @@ -150,13 +150,13 @@ namespace xmloff const Sequence< ScriptEventDescriptor >& _rEvents) { // the list of the referring controls - ::rtl::OUString sReferringControls; + OUString sReferringControls; MapPropertySet2String::const_iterator aReferring = m_aCurrentPageReferring->second.find(_rxControl); if (aReferring != m_aCurrentPageReferring->second.end()) sReferringControls = aReferring->second; // the control id (should already have been created in examineForms) - ::rtl::OUString sControlId( getControlId( _rxControl ) ); + OUString sControlId( getControlId( _rxControl ) ); // do the exporting OControlExport aExportImpl(*this, _rxControl, sControlId, sReferringControls, _rEvents); @@ -241,9 +241,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getObjectStyleName( const Reference< XPropertySet >& _rxObject ) + OUString OFormLayerXMLExport_Impl::getObjectStyleName( const Reference< XPropertySet >& _rxObject ) { - ::rtl::OUString aObjectStyle; + OUString aObjectStyle; MapPropertySet2String::const_iterator aObjectStylePos = m_aGridColumnStyles.find( _rxObject ); if ( m_aGridColumnStyles.end() != aObjectStylePos ) @@ -389,10 +389,10 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getControlId(const Reference< XPropertySet >& _rxControl) + OUString OFormLayerXMLExport_Impl::getControlId(const Reference< XPropertySet >& _rxControl) { if (m_aCurrentPageIds == m_aControlIds.end()) - return ::rtl::OUString(); + return OUString(); OSL_ENSURE(m_aCurrentPageIds->second.end() != m_aCurrentPageIds->second.find(_rxControl), "OFormLayerXMLExport_Impl::getControlId: can not find the control!"); @@ -400,9 +400,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getImmediateNumberStyle( const Reference< XPropertySet >& _rxObject ) + OUString OFormLayerXMLExport_Impl::getImmediateNumberStyle( const Reference< XPropertySet >& _rxObject ) { - ::rtl::OUString sNumberStyle; + OUString sNumberStyle; sal_Int32 nOwnFormatKey = implExamineControlNumberFormat( _rxObject ); if ( -1 != nOwnFormatKey ) @@ -412,9 +412,9 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OFormLayerXMLExport_Impl::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) + OUString OFormLayerXMLExport_Impl::getControlNumberStyle( const Reference< XPropertySet >& _rxControl ) { - ::rtl::OUString sNumberStyle; + OUString sNumberStyle; ConstMapPropertySet2IntIterator aControlFormatPos = m_aControlNumberFormats.find(_rxControl); if (m_aControlNumberFormats.end() != aControlFormatPos) @@ -503,13 +503,13 @@ namespace xmloff } }; - ::rtl::OUString lcl_findFreeControlId( const MapPropertySet2Map& _rAllPagesControlIds ) + OUString lcl_findFreeControlId( const MapPropertySet2Map& _rAllPagesControlIds ) { - static const ::rtl::OUString sControlIdBase( "control" ); - ::rtl::OUString sControlId = sControlIdBase; + static const OUString sControlIdBase( "control" ); + OUString sControlId = sControlIdBase; size_t nKnownControlCount = ::std::accumulate( _rAllPagesControlIds.begin(), _rAllPagesControlIds.end(), (size_t)0, AccumulateSize() ); - sControlId += ::rtl::OUString::valueOf( (sal_Int32)nKnownControlCount + 1 ); + sControlId += OUString::valueOf( (sal_Int32)nKnownControlCount + 1 ); #ifdef DBG_UTIL // Check if the id is already used. It shouldn't, as we currently have no mechanism for removing entries @@ -545,7 +545,7 @@ namespace xmloff // generate a new control id // find a free id - ::rtl::OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); + OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); // add it to the map m_aCurrentPageIds->second[_rxObject] = sCurrentId; @@ -556,11 +556,11 @@ namespace xmloff Reference< XPropertySet > xCurrentReference( _rxObject->getPropertyValue( PROPERTY_CONTROLLABEL ), UNO_QUERY ); if (xCurrentReference.is()) { - ::rtl::OUString& sReferencedBy = m_aCurrentPageReferring->second[xCurrentReference]; + OUString& sReferencedBy = m_aCurrentPageReferring->second[xCurrentReference]; if (!sReferencedBy.isEmpty()) // it's not the first _rxObject referring to the xCurrentReference // -> separate the id - sReferencedBy += ::rtl::OUString(","); + sReferencedBy += OUString(","); sReferencedBy += sCurrentId; } } @@ -618,7 +618,7 @@ namespace xmloff // generate a new control id // find a free id - ::rtl::OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); + OUString sCurrentId = lcl_findFreeControlId( m_aControlIds ); // add it to the map m_aCurrentPageIds->second[ xColumnProperties ] = sCurrentId; @@ -629,7 +629,7 @@ namespace xmloff ::std::vector< XMLPropertyState > aPropertyStates = m_xStyleExportMapper->Filter( xColumnProperties ); // care for the number format, additionally - ::rtl::OUString sColumnNumberStyle; + OUString sColumnNumberStyle; if ( xColumnPropertiesMeta.is() && xColumnPropertiesMeta->hasPropertyByName( PROPERTY_FORMATKEY ) ) sColumnNumberStyle = getImmediateNumberStyle( xColumnProperties ); @@ -656,7 +656,7 @@ namespace xmloff if ( !aPropertyStates.empty() ) { // add to the style pool - ::rtl::OUString sColumnStyleName = m_rContext.GetAutoStylePool()->Add( XML_STYLE_FAMILY_CONTROL_ID, aPropertyStates ); + OUString sColumnStyleName = m_rContext.GetAutoStylePool()->Add( XML_STYLE_FAMILY_CONTROL_ID, aPropertyStates ); OSL_ENSURE( m_aGridColumnStyles.end() == m_aGridColumnStyles.find( xColumnProperties ), "OFormLayerXMLExport_Impl::collectGridColumnStylesAndIds: already have a style for this column!" ); @@ -723,7 +723,7 @@ namespace xmloff // obtain the persistent (does not depend on the formats supplier) representation of the control's format Locale aFormatLocale; - ::rtl::OUString sFormatDescription; + OUString sFormatDescription; if (xControlFormats.is()) { Reference< XPropertySet > xControlFormat = xControlFormats->getByKey(nControlFormatKey); @@ -762,9 +762,9 @@ namespace xmloff { // create it for en-US (does not really matter, as we will specify a locale for every // concrete language to use) - Locale aLocale ( ::rtl::OUString("en"), - ::rtl::OUString("US"), - ::rtl::OUString() + Locale aLocale ( OUString("en"), + OUString("US"), + OUString() ); xFormatsSupplier = NumberFormatsSupplier::createWithLocale( m_rContext.getComponentContext(), aLocale ); m_xControlNumberFormats = xFormatsSupplier->getNumberFormats(); diff --git a/xmloff/source/forms/layerexport.hxx b/xmloff/source/forms/layerexport.hxx index 12fe435417cf..bd25986b478e 100644 --- a/xmloff/source/forms/layerexport.hxx +++ b/xmloff/source/forms/layerexport.hxx @@ -44,7 +44,7 @@ namespace xmloff // maps objects (property sets) to strings, e.g. control ids. typedef ::std::map < ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - , ::rtl::OUString + , OUString , OPropertySetCompare > MapPropertySet2String; @@ -157,7 +157,7 @@ namespace xmloff <p>You must have sought to the page of the control before calling this.</p> */ - ::rtl::OUString + OUString getControlId(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl); /** retrieves the style name for the control's number style. @@ -165,13 +165,13 @@ namespace xmloff <p>For performance reasons, this method is allowed to be called for any controls, even those which do not have a number style. In this case, an empty string is returned.</p> */ - ::rtl::OUString + OUString getControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl ); // IFormsExportContext virtual void exportCollectionElements(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& _rxCollection); virtual SvXMLExport& getGlobalContext(); - virtual ::rtl::OUString getObjectStyleName( + virtual OUString getObjectStyleName( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); virtual ::rtl::Reference< SvXMLExportPropertyMapper > getStylePropertyMapper(); @@ -283,12 +283,12 @@ namespace xmloff /** determines the number format style for the given object without remembering it */ - ::rtl::OUString + OUString getImmediateNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxObject ); /** returns the prefix to be used for control number styles */ - static const ::rtl::OUString& getControlNumberStyleNamePrefix(); + static const OUString& getControlNumberStyleNamePrefix(); /** exclude the given control (model) from export. diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index f87c791e6470..bbbb8d59405a 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -109,7 +109,7 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) // properties not added because they're already present in another form OSL_ENSURE( - 0 == ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_LOCATION)).compareToAscii( + 0 == OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_LOCATION)).compareToAscii( OAttributeMetaData::getFormAttributeName(faAction)), "OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl: invalid attribute names (1)!"); // if this fails, we would have to add a translation from faAction->PROPERTY_TARGETURL @@ -117,7 +117,7 @@ OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl(SvXMLImport& _rImporter) // and CCA_TARGET_LOCATION and faAction should be represented by the same attribute OSL_ENSURE( - 0 == ::rtl::OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_NAME)).compareToAscii( + 0 == OUString::createFromAscii(OAttributeMetaData::getCommonControlAttributeName(CCA_NAME)).compareToAscii( OAttributeMetaData::getFormAttributeName(faName)), "OFormLayerXMLImport_Impl::OFormLayerXMLImport_Impl: invalid attribute names (2)!"); // the same for faName, CCA_NAME and PROPERTY_NAME @@ -252,7 +252,7 @@ void OFormLayerXMLImport_Impl::setAutoStyleContext(SvXMLStylesContext* _pNewCont } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rControlNumerStyleName) +void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropertySet >& _rxControlModel, const OUString& _rControlNumerStyleName) { OSL_ENSURE(_rxControlModel.is() && (!_rControlNumerStyleName.isEmpty()), "OFormLayerXMLImport_Impl::applyControlNumberStyle: invalid arguments (this will crash)!"); @@ -304,7 +304,7 @@ void OFormLayerXMLImport_Impl::applyControlNumberStyle(const Reference< XPropert } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rCellAddress ) +void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPropertySet >& _rxControlModel, const OUString& _rCellAddress ) { OSL_ENSURE( _rxControlModel.is() && !_rCellAddress.isEmpty(), "OFormLayerXMLImport_Impl::registerCellValueBinding: invalid arguments!" ); @@ -314,7 +314,7 @@ void OFormLayerXMLImport_Impl::registerCellValueBinding( const Reference< XPrope //--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsValueBinding( const Reference< XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID ) + const OUString& _rBindingID ) { // TODO: is an empty binding name allowed? OSL_ENSURE( _rxControlModel.is(), "need model" ); @@ -326,7 +326,7 @@ void OFormLayerXMLImport_Impl::registerXFormsValueBinding( //--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsListBinding( const Reference< XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID ) + const OUString& _rBindingID ) { // TODO: is an empty binding name allowed? OSL_ENSURE( _rxControlModel.is(), "need model" ); @@ -338,7 +338,7 @@ void OFormLayerXMLImport_Impl::registerXFormsListBinding( //--------------------------------------------------------------------- void OFormLayerXMLImport_Impl::registerXFormsSubmission( const Reference< XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rSubmissionID ) + const OUString& _rSubmissionID ) { // TODO: is an empty binding name allowed? OSL_ENSURE( _rxControlModel.is(), "need model" ); @@ -348,14 +348,14 @@ void OFormLayerXMLImport_Impl::registerXFormsSubmission( } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerCellRangeListSource( const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rCellRangeAddress ) +void OFormLayerXMLImport_Impl::registerCellRangeListSource( const Reference< XPropertySet >& _rxControlModel, const OUString& _rCellRangeAddress ) { OSL_ENSURE( _rxControlModel.is() && !_rCellRangeAddress.isEmpty(), "OFormLayerXMLImport_Impl::registerCellRangeListSource: invalid arguments!" ); m_aCellRangeListSources.push_back( ModelStringPair( _rxControlModel, _rCellRangeAddress ) ); } //--------------------------------------------------------------------- -const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const ::rtl::OUString& _rStyleName) const +const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const OUString& _rStyleName) const { OSL_ENSURE( m_pAutoStyles, "OFormLayerXMLImport_Impl::getStyleElement: have no auto style context!" ); // did you use setAutoStyleContext? @@ -363,7 +363,7 @@ const SvXMLStyleContext* OFormLayerXMLImport_Impl::getStyleElement(const ::rtl:: const SvXMLStyleContext* pControlStyle = m_pAutoStyles ? m_pAutoStyles->FindStyleChildContext( XML_STYLE_FAMILY_TEXT_PARAGRAPH, _rStyleName ) : NULL; OSL_ENSURE( pControlStyle || !m_pAutoStyles, - ::rtl::OStringBuffer("OFormLayerXMLImport_Impl::getStyleElement: did not find the style named \"").append(rtl::OUStringToOString(_rStyleName, RTL_TEXTENCODING_ASCII_US)).append("\"!").getStr() ); + OStringBuffer("OFormLayerXMLImport_Impl::getStyleElement: did not find the style named \"").append(OUStringToOString(_rStyleName, RTL_TEXTENCODING_ASCII_US)).append("\"!").getStr() ); return pControlStyle; } @@ -383,7 +383,7 @@ void OFormLayerXMLImport_Impl::leaveEventContext() } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet >& _rxControl, const ::rtl::OUString& _rId) +void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet >& _rxControl, const OUString& _rId) { OSL_ENSURE(m_aCurrentPageIds != m_aControlIds.end(), "OFormLayerXMLImport_Impl::registerControlId: no current page!"); OSL_ENSURE(!_rId.isEmpty(), "OFormLayerXMLImport_Impl::registerControlId: invalid (empty) control id!"); @@ -393,7 +393,7 @@ void OFormLayerXMLImport_Impl::registerControlId(const Reference< XPropertySet > } //--------------------------------------------------------------------- -void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPropertySet >& _rxControl, const ::rtl::OUString& _rReferringControls) +void OFormLayerXMLImport_Impl::registerControlReferences(const Reference< XPropertySet >& _rxControl, const OUString& _rReferringControls) { OSL_ENSURE(!_rReferringControls.isEmpty(), "OFormLayerXMLImport_Impl::registerControlReferences: invalid (empty) control id list!"); OSL_ENSURE(_rxControl.is(), "OFormLayerXMLImport_Impl::registerControlReferences: invalid (NULL) control!"); @@ -428,9 +428,9 @@ void OFormLayerXMLImport_Impl::endPage() try { static const sal_Unicode s_nSeparator = ','; - ::rtl::OUString sReferring; - ::rtl::OUString sCurrentReferring; - ::rtl::OUString sSeparator(&s_nSeparator, 1); + OUString sReferring; + OUString sCurrentReferring; + OUString sSeparator(&s_nSeparator, 1); Reference< XPropertySet > xCurrentReferring; sal_Int32 nSeparator, nPrevSep; ::std::vector< ModelStringPair >::const_iterator aEnd = m_aControlReferences.end(); @@ -479,7 +479,7 @@ void OFormLayerXMLImport_Impl::endPage() } //--------------------------------------------------------------------- -Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const ::rtl::OUString& _rControlId) +Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const OUString& _rControlId) { OSL_ENSURE(m_aCurrentPageIds != m_aControlIds.end(), "OFormLayerXMLImport_Impl::lookupControlId: no current page!"); Reference< XPropertySet > xReturn; @@ -498,13 +498,13 @@ Reference< XPropertySet > OFormLayerXMLImport_Impl::lookupControlId(const ::rtl: SvXMLImportContext* OFormLayerXMLImport_Impl::createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName) + const OUString& _rLocalName) { return new OFormsRootImport( _rImport, _nPrefix, _rLocalName ); } //--------------------------------------------------------------------- -SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const rtl::OUString& _rLocalName, +SvXMLImportContext* OFormLayerXMLImport_Impl::createContext(const sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< xml::sax::XAttributeList >&) { SvXMLImportContext* pContext = NULL; @@ -557,7 +557,7 @@ void OFormLayerXMLImport_Impl::documentDone( ) { // There are special bindings for listboxes. See // OListAndComboImport::doRegisterCellValueBinding for a comment on this HACK. - ::rtl::OUString sBoundCellAddress( aCellBindings->second ); + OUString sBoundCellAddress( aCellBindings->second ); sal_Int32 nIndicator = sBoundCellAddress.lastIndexOf( s_sIndex ); bool bUseIndexBinding = false; diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx index 1e7fb1427a2b..cb1b68d46435 100644 --- a/xmloff/source/forms/layerimport.hxx +++ b/xmloff/source/forms/layerimport.hxx @@ -67,7 +67,7 @@ namespace xmloff MapDrawPage2Map m_aControlIds; // ids of the controls on all known page MapDrawPage2MapIterator m_aCurrentPageIds; // ifs of the controls on the current page - typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, ::rtl::OUString > + typedef ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >, OUString > ModelStringPair; ::std::vector< ModelStringPair > m_aControlReferences; // control reference descriptions for current page @@ -89,44 +89,44 @@ namespace xmloff // IControlIdMap void registerControlId( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rId); + const OUString& _rId); void registerControlReferences( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControl, - const ::rtl::OUString& _rReferringControls); + const OUString& _rReferringControls); // OFormLayerXMLImport_Impl inline OAttribute2Property& getAttributeMap() { return m_aAttributeMetaData; } inline SvXMLImport& getGlobalContext() { return m_rImporter; } - const SvXMLStyleContext* getStyleElement(const ::rtl::OUString& _rStyleName) const; + const SvXMLStyleContext* getStyleElement(const OUString& _rStyleName) const; void enterEventContext(); void leaveEventContext(); void applyControlNumberStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rControlNumerStyleName + const OUString& _rControlNumerStyleName ); void registerCellValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rCellAddress + const OUString& _rCellAddress ); void registerCellRangeListSource( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rCellRangeAddress + const OUString& _rCellRangeAddress ); void registerXFormsValueBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID + const OUString& _rBindingID ); void registerXFormsListBinding( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rBindingID + const OUString& _rBindingID ); void registerXFormsSubmission( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, - const ::rtl::OUString& _rSubmissionID + const OUString& _rSubmissionID ); protected: @@ -147,20 +147,20 @@ namespace xmloff SvXMLImportContext* createOfficeFormsContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName); + const OUString& _rLocalName); /** create an <type>SvXMLImportContext</type> instance which is able to import the <form:form> element. */ SvXMLImportContext* createContext( const sal_uInt16 _nPrefix, - const rtl::OUString& _rLocalName, + const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttribs); /** get the control with the given id */ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - lookupControlId(const ::rtl::OUString& _rControlId); + lookupControlId(const OUString& _rControlId); /** announces the auto-style context to the form importer */ diff --git a/xmloff/source/forms/officeforms.cxx b/xmloff/source/forms/officeforms.cxx index 35c6b33570d1..1b1aeed8c461 100644 --- a/xmloff/source/forms/officeforms.cxx +++ b/xmloff/source/forms/officeforms.cxx @@ -48,7 +48,7 @@ namespace xmloff //========================================================================= TYPEINIT1(OFormsRootImport, SvXMLImportContext); //------------------------------------------------------------------------- - OFormsRootImport::OFormsRootImport( SvXMLImport& rImport, sal_uInt16 nPrfx, const rtl::OUString& rLocalName ) + OFormsRootImport::OFormsRootImport( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName ) :SvXMLImportContext(rImport, nPrfx, rLocalName) { } @@ -59,7 +59,7 @@ namespace xmloff } //------------------------------------------------------------------------- - SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + SvXMLImportContext* OFormsRootImport::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList>& xAttrList ) { return GetImport().GetFormImport()->createContext( _nPrefix, _rLocalName, xAttrList ); @@ -68,15 +68,15 @@ namespace xmloff //------------------------------------------------------------------------- void OFormsRootImport::implImportBool(const Reference< XAttributeList >& _rxAttributes, OfficeFormsAttributes _eAttribute, const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, sal_Bool _bDefault) + const OUString& _rPropName, sal_Bool _bDefault) { // the complete attribute name to look for - ::rtl::OUString sCompleteAttributeName = GetImport().GetNamespaceMap().GetQNameByIndex( + OUString sCompleteAttributeName = GetImport().GetNamespaceMap().GetQNameByIndex( OAttributeMetaData::getOfficeFormsAttributeNamespace(_eAttribute), - ::rtl::OUString::createFromAscii(OAttributeMetaData::getOfficeFormsAttributeName(_eAttribute))); + OUString::createFromAscii(OAttributeMetaData::getOfficeFormsAttributeName(_eAttribute))); // get and convert the value - ::rtl::OUString sAttributeValue = _rxAttributes->getValueByName(sCompleteAttributeName); + OUString sAttributeValue = _rxAttributes->getValueByName(sCompleteAttributeName); bool bValue = _bDefault; ::sax::Converter::convertBool(bValue, sAttributeValue); @@ -141,7 +141,7 @@ namespace xmloff //------------------------------------------------------------------------- void OFormsRootExport::implExportBool(SvXMLExport& _rExp, OfficeFormsAttributes _eAttribute, const Reference< XPropertySet >& _rxProps, const Reference< XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, sal_Bool _bDefault) + const OUString& _rPropName, sal_Bool _bDefault) { // retrieve the property value sal_Bool bValue = _bDefault; @@ -149,7 +149,7 @@ namespace xmloff bValue = ::cppu::any2bool(_rxProps->getPropertyValue(_rPropName)); // convert into a string - ::rtl::OUStringBuffer aValue; + OUStringBuffer aValue; ::sax::Converter::convertBool(aValue, bValue); // add the attribute diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx index 338d06adfdd1..7225ce9280b8 100644 --- a/xmloff/source/forms/officeforms.hxx +++ b/xmloff/source/forms/officeforms.hxx @@ -42,11 +42,11 @@ namespace xmloff public: TYPEINFO(); - OFormsRootImport( SvXMLImport& _rImport, sal_uInt16 _nPrfx, const rtl::OUString& _rLocalName); + OFormsRootImport( SvXMLImport& _rImport, sal_uInt16 _nPrfx, const OUString& _rLocalName); virtual ~OFormsRootImport(); // SvXMLImportContext overriabled - virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, + virtual SvXMLImportContext * CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ); virtual void EndElement(); @@ -57,7 +57,7 @@ namespace xmloff OfficeFormsAttributes _eAttribute, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, + const OUString& _rPropName, sal_Bool _bDefault ); }; @@ -82,7 +82,7 @@ namespace xmloff OfficeFormsAttributes _eAttribute, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo >& _rxPropInfo, - const ::rtl::OUString& _rPropName, + const OUString& _rPropName, sal_Bool _bDefault ); }; diff --git a/xmloff/source/forms/property_description.hxx b/xmloff/source/forms/property_description.hxx index 488e625c28f9..170b23d52269 100644 --- a/xmloff/source/forms/property_description.hxx +++ b/xmloff/source/forms/property_description.hxx @@ -70,7 +70,7 @@ namespace xmloff struct PropertyDescription { /// is the name of the property - const ::rtl::OUString propertyName; + const OUString propertyName; /** denotes the attribute which represents the property. Note that multiple properties might comprise a single attribute value. */ @@ -100,7 +100,7 @@ namespace xmloff } PropertyDescription( - const ::rtl::OUString& i_propertyName, + const OUString& i_propertyName, const sal_uInt16 i_namespacePrefix, const ::xmloff::token::XMLTokenEnum i_attributeToken, const PropertyHandlerFactory i_factory, diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx index d3d0ceba6611..c9583fff4976 100644 --- a/xmloff/source/forms/property_meta_data.cxx +++ b/xmloff/source/forms/property_meta_data.cxx @@ -74,7 +74,7 @@ namespace xmloff { namespace metadata // for some attribute or property, and otherwise delegate to the next instance. //.............................................................................................................. - typedef ::boost::unordered_map< ::rtl::OUString, const PropertyDescription*, ::rtl::OUStringHash > DescriptionsByName; + typedef ::boost::unordered_map< OUString, const PropertyDescription*, OUStringHash > DescriptionsByName; //.............................................................................................................. const DescriptionsByName& lcl_getPropertyDescriptions() @@ -115,7 +115,7 @@ namespace xmloff { namespace metadata } //.............................................................................................................. - typedef ::boost::unordered_map< ::rtl::OUString, XMLTokenEnum, ::rtl::OUStringHash > ReverseTokenLookup; + typedef ::boost::unordered_map< OUString, XMLTokenEnum, OUStringHash > ReverseTokenLookup; //.............................................................................................................. const ReverseTokenLookup& getReverseTokenLookup() @@ -192,7 +192,7 @@ namespace xmloff { namespace metadata } //------------------------------------------------------------------------------------------------------------------ - const PropertyDescription* getPropertyDescription( const ::rtl::OUString& i_propertyName ) + const PropertyDescription* getPropertyDescription( const OUString& i_propertyName ) { const DescriptionsByName& rAllDescriptions( lcl_getPropertyDescriptions() ); DescriptionsByName::const_iterator pos = rAllDescriptions.find( i_propertyName ); @@ -248,7 +248,7 @@ namespace xmloff { namespace metadata } //------------------------------------------------------------------------------------------------------------------ - AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const ::rtl::OUString& i_attributeName ) + AttributeDescription getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ) { AttributeDescription attribute; const ReverseTokenLookup& rTokenLookup( getReverseTokenLookup() ); diff --git a/xmloff/source/forms/property_meta_data.hxx b/xmloff/source/forms/property_meta_data.hxx index 27d21b9bef0d..7db6912190da 100644 --- a/xmloff/source/forms/property_meta_data.hxx +++ b/xmloff/source/forms/property_meta_data.hxx @@ -27,7 +27,7 @@ namespace xmloff { namespace metadata { //...................................................................................................................... - const PropertyDescription* getPropertyDescription( const ::rtl::OUString& i_propertyName ); + const PropertyDescription* getPropertyDescription( const OUString& i_propertyName ); /** retries the descriptions of all properties which add to the given XML attribute @@ -49,7 +49,7 @@ namespace xmloff { namespace metadata /** retrieves the attribute descriptor for the attribute given by namespace prefix and attribute name */ AttributeDescription - getAttributeDescription( const sal_uInt16 i_namespacePrefix, const ::rtl::OUString& i_attributeName ); + getAttributeDescription( const sal_uInt16 i_namespacePrefix, const OUString& i_attributeName ); //...................................................................................................................... } } // namespace xmloff::metadata diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index c86c6ac6ea72..a0de21a02029 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -65,7 +65,7 @@ namespace xmloff ,m_xPropertyState( _rxProps, UNO_QUERY ) { // caching - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; ::sax::Converter::convertBool(aBuffer, true); m_sValueTrue = aBuffer.makeStringAndClear(); ::sax::Converter::convertBool(aBuffer, false); @@ -78,7 +78,7 @@ namespace xmloff } //--------------------------------------------------------------------- - bool OPropertyExport::shouldExportProperty( const ::rtl::OUString& i_propertyName ) const + bool OPropertyExport::shouldExportProperty( const OUString& i_propertyName ) const { // if the property state is DEFAULT, it does not need to be written - at least // if it's a built-in property, and not a dynamically-added one. @@ -96,7 +96,7 @@ namespace xmloff OSequenceIterator< T > i(value); while (i.hasMoreElements()) { - ::rtl::OUString sValue(implConvertAny(i.nextElement())); + OUString sValue(implConvertAny(i.nextElement())); AddAttribute(XML_NAMESPACE_OFFICE, eValueAttName, sValue ); SvXMLElementExport aValueTag( m_rContext.getGlobalContext(), XML_NAMESPACE_FORM, @@ -112,7 +112,7 @@ namespace xmloff try { Any aValue; - ::rtl::OUString sValue; + OUString sValue; // loop through all the properties which are yet to be exported for ( ConstStringSetIterator aProperty = m_aRemainingProps.begin(); @@ -123,7 +123,7 @@ namespace xmloff DBG_CHECK_PROPERTY_NO_TYPE(*aProperty); #if OSL_DEBUG_LEVEL > 0 - const ::rtl::OUString sPropertyName = *aProperty; (void)sPropertyName; + const OUString sPropertyName = *aProperty; (void)sPropertyName; #endif if ( !shouldExportProperty( *aProperty ) ) continue; @@ -194,7 +194,7 @@ namespace xmloff switch ( aExportType.getTypeClass() ) { case TypeClass_STRING: - exportRemainingPropertiesSequence< ::rtl::OUString >( + exportRemainingPropertiesSequence< OUString >( aValue, eValueAttName); break; case TypeClass_DOUBLE: @@ -257,9 +257,9 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName ) + const OUString& _rPropertyName ) { - DBG_CHECK_PROPERTY( _rPropertyName, ::rtl::OUString ); + DBG_CHECK_PROPERTY( _rPropertyName, OUString ); // no try-catch here, this would be to expensive. The outer scope has to handle exceptions (which should not // happen if we're used correctly :) @@ -267,7 +267,7 @@ namespace xmloff // this is way simple, as we don't need to convert anything (the property already is a string) // get the string - ::rtl::OUString sPropValue; + OUString sPropValue; m_xProps->getPropertyValue( _rPropertyName ) >>= sPropValue; // add the attribute @@ -280,7 +280,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportBooleanPropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags) + const OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags) { DBG_CHECK_PROPERTY_NO_TYPE( _rPropertyName ); // no check of the property value type: this method is allowed to be called with any interger properties @@ -319,7 +319,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportInt16PropertyAttribute(const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, const sal_Int16 _nDefault) + const OUString& _rPropertyName, const sal_Int16 _nDefault) { DBG_CHECK_PROPERTY( _rPropertyName, sal_Int16 ); @@ -331,7 +331,7 @@ namespace xmloff if (_nDefault != nCurrentValue) { // let the formatter of the export context build a string - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber(sBuffer, (sal_Int32)nCurrentValue); AddAttribute(_nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear()); @@ -343,7 +343,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, const sal_Int32 _nDefault ) + const OUString& _rPropertyName, const sal_Int32 _nDefault ) { DBG_CHECK_PROPERTY( _rPropertyName, sal_Int32 ); @@ -355,7 +355,7 @@ namespace xmloff if ( _nDefault != nCurrentValue ) { // let the formatter of the export context build a string - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; ::sax::Converter::convertNumber( sBuffer, nCurrentValue ); AddAttribute( _nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear() ); @@ -368,7 +368,7 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportEnumPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const rtl::OUString &rPropertyName, const SvXMLEnumMapEntry* _pValueMap, + const OUString &rPropertyName, const SvXMLEnumMapEntry* _pValueMap, const sal_Int32 _nDefault, const sal_Bool _bVoidDefault) { // get the value @@ -384,7 +384,7 @@ namespace xmloff { // the default does not equal the value, or the default is void and the value isn't // let the formatter of the export context build a string - ::rtl::OUStringBuffer sBuffer; + OUStringBuffer sBuffer; m_rContext.getGlobalContext().GetMM100UnitConverter().convertEnum(sBuffer, (sal_uInt16)nCurrentValue, _pValueMap); AddAttribute(_nNamespaceKey, _pAttributeName, sBuffer.makeStringAndClear()); @@ -403,9 +403,9 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportTargetFrameAttribute() { - DBG_CHECK_PROPERTY( PROPERTY_TARGETFRAME, ::rtl::OUString ); + DBG_CHECK_PROPERTY( PROPERTY_TARGETFRAME, OUString ); - ::rtl::OUString sTargetFrame = comphelper::getString(m_xProps->getPropertyValue(PROPERTY_TARGETFRAME)); + OUString sTargetFrame = comphelper::getString(m_xProps->getPropertyValue(PROPERTY_TARGETFRAME)); if (0 != sTargetFrame.compareToAscii("_blank")) { // an empty string and "_blank" have the same meaning and don't have to be written AddAttribute(OAttributeMetaData::getCommonControlAttributeNamespace(CCA_TARGET_FRAME) @@ -419,9 +419,9 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportRelativeTargetLocation(const OUString& _sPropertyName,sal_Int32 _nProperty,bool _bAddType) { - DBG_CHECK_PROPERTY( _sPropertyName, ::rtl::OUString ); + DBG_CHECK_PROPERTY( _sPropertyName, OUString ); - ::rtl::OUString sTargetLocation = comphelper::getString(m_xProps->getPropertyValue(_sPropertyName)); + OUString sTargetLocation = comphelper::getString(m_xProps->getPropertyValue(_sPropertyName)); if ( !sTargetLocation.isEmpty() ) // If this isn't a GraphicObject then GetRelativeReference // will be called anyway ( in AddEmbeddedGraphic ) @@ -467,7 +467,7 @@ namespace xmloff { DBG_CHECK_PROPERTY_ASCII_NO_TYPE( _pPropertyName ); - ::rtl::OUString sPropertyName = ::rtl::OUString::createFromAscii(_pPropertyName); + OUString sPropertyName = OUString::createFromAscii(_pPropertyName); exportedProperty(sPropertyName); Any aCurrentValue = m_xProps->getPropertyValue(sPropertyName); @@ -475,7 +475,7 @@ namespace xmloff // nothing to do without a concrete value return; - ::rtl::OUString sValue = implConvertAny(aCurrentValue); + OUString sValue = implConvertAny(aCurrentValue); if (sValue.isEmpty() && (TypeClass_STRING == aCurrentValue.getValueTypeClass())) { // check whether or not the property is allowed to be VOID @@ -492,26 +492,26 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::exportStringSequenceAttribute(const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Unicode _aQuoteCharacter, const sal_Unicode _aListSeparator) { - DBG_CHECK_PROPERTY( _rPropertyName, Sequence< ::rtl::OUString > ); + DBG_CHECK_PROPERTY( _rPropertyName, Sequence< OUString > ); OSL_ENSURE(_aListSeparator != 0, "OPropertyExport::exportStringSequenceAttribute: invalid separator character!"); - Sequence< ::rtl::OUString > aItems; + Sequence< OUString > aItems; m_xProps->getPropertyValue( _rPropertyName ) >>= aItems; - ::rtl::OUString sFinalList; + OUString sFinalList; // unfortunately the OUString can't append single sal_Unicode characters ... - const ::rtl::OUString sQuote(&_aQuoteCharacter, 1); - const ::rtl::OUString sSeparator(&_aListSeparator, 1); + const OUString sQuote(&_aQuoteCharacter, 1); + const OUString sSeparator(&_aListSeparator, 1); const sal_Bool bQuote = !sQuote.isEmpty(); // concatenate the string items - const ::rtl::OUString* pItems = aItems.getConstArray(); - const ::rtl::OUString* pEnd = pItems + aItems.getLength(); - const ::rtl::OUString* pLastElement = pEnd - 1; + const OUString* pItems = aItems.getConstArray(); + const OUString* pEnd = pItems + aItems.getLength(); + const OUString* pLastElement = pEnd - 1; for ( ; pItems != pEnd; ++pItems @@ -539,14 +539,14 @@ namespace xmloff } //--------------------------------------------------------------------- - ::rtl::OUString OPropertyExport::implConvertAny(const Any& _rValue) + OUString OPropertyExport::implConvertAny(const Any& _rValue) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; switch (_rValue.getValueTypeClass()) { case TypeClass_STRING: { // extract the string - ::rtl::OUString sCurrentValue; + OUString sCurrentValue; _rValue >>= sCurrentValue; aBuffer.append(sCurrentValue); } @@ -646,16 +646,16 @@ namespace xmloff #ifdef DBG_UTIL //--------------------------------------------------------------------- - void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const ::rtl::OUString& _rValue) + void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue) { - OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::rtl::OUString::createFromAscii(_pName)).isEmpty(), + OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(), "OPropertyExport::AddAttribute: already have such an attribute"); m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, _rValue); } //--------------------------------------------------------------------- - void OPropertyExport::AddAttribute( sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue ) + void OPropertyExport::AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName( _rName ).isEmpty(), "OPropertyExport::AddAttribute: already have such an attribute"); @@ -666,14 +666,14 @@ namespace xmloff //--------------------------------------------------------------------- void OPropertyExport::AddAttributeASCII(sal_uInt16 _nPrefix, const sal_Char* _pName, const sal_Char *pValue) { - OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::rtl::OUString::createFromAscii(_pName)).isEmpty(), + OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(OUString::createFromAscii(_pName)).isEmpty(), "OPropertyExport::AddAttributeASCII: already have such an attribute"); m_rContext.getGlobalContext().AddAttributeASCII(_nPrefix, _pName, pValue); } //--------------------------------------------------------------------- - void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const ::rtl::OUString& _rValue) + void OPropertyExport::AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue) { OSL_ENSURE(m_rContext.getGlobalContext().GetXAttrList()->getValueByName(::xmloff::token::GetXMLToken(_eName)).isEmpty(), "OPropertyExport::AddAttribute: already have such an attribute"); @@ -691,15 +691,15 @@ namespace xmloff } //--------------------------------------------------------------------- - void OPropertyExport::dbg_implCheckProperty(const ::rtl::OUString& _rPropertyName, const Type* _pType) + void OPropertyExport::dbg_implCheckProperty(const OUString& _rPropertyName, const Type* _pType) { try { // the property must exist if (!m_xPropertyInfo->hasPropertyByName(_rPropertyName)) { - rtl::OStringBuffer aBuf("OPropertyExport::dbg_implCheckProperty: no property with the name "); - aBuf.append(rtl::OUStringToOString(_rPropertyName, RTL_TEXTENCODING_ASCII_US)).append('!'); + OStringBuffer aBuf("OPropertyExport::dbg_implCheckProperty: no property with the name "); + aBuf.append(OUStringToOString(_rPropertyName, RTL_TEXTENCODING_ASCII_US)).append('!'); OSL_FAIL(aBuf.getStr()); return; } diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx index 315edcee9007..3e59dc179288 100644 --- a/xmloff/source/forms/propertyexport.hxx +++ b/xmloff/source/forms/propertyexport.hxx @@ -58,7 +58,7 @@ namespace xmloff class OPropertyExport { private: - DECLARE_STL_STDKEY_SET(::rtl::OUString, StringSet); + DECLARE_STL_STDKEY_SET(OUString, StringSet); StringSet m_aRemainingProps; // see examinePersistence @@ -75,8 +75,8 @@ namespace xmloff m_xPropertyState; // caching - ::rtl::OUString m_sValueTrue; - ::rtl::OUString m_sValueFalse; + OUString m_sValueTrue; + OUString m_sValueFalse; public: /** constructs an object capable of handling attributes for export @@ -113,7 +113,7 @@ namespace xmloff <p>In this case you should call exportedProperty for every property you export yourself, so the property will be flagged as <em>already handled</em></p> */ - void exportedProperty(const ::rtl::OUString& _rPropertyName) + void exportedProperty(const OUString& _rPropertyName) { m_aRemainingProps.erase(_rPropertyName); } /** add an attribute which is represented by a string property to the export context @@ -129,7 +129,7 @@ namespace xmloff void exportStringPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName + const OUString& _rPropertyName ); /** add an attribute which is represented by a boolean property to the export context @@ -147,7 +147,7 @@ namespace xmloff void exportBooleanPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Int8 _nBooleanAttributeFlags); /** add an attribute which is represented by a sal_Int16 property to the export context @@ -166,7 +166,7 @@ namespace xmloff void exportInt16PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Int16 _nDefault); /** add an attribute which is represented by a sal_Int32 property to the export context @@ -185,7 +185,7 @@ namespace xmloff void exportInt32PropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Int32 _nDefault); /** add an attribute which is represented by a enum property to the export context @@ -206,7 +206,7 @@ namespace xmloff void exportEnumPropertyAttribute( const sal_uInt16 _nNamespaceKey, const sal_Char* _pAttributeName, - const rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const SvXMLEnumMapEntry* _pValueMap, const sal_Int32 _nDefault, const sal_Bool _bVoidDefault = sal_False); @@ -301,7 +301,7 @@ namespace xmloff void exportStringSequenceAttribute( const sal_uInt16 _nAttributeNamespaceKey, const sal_Char* _pAttributeName, - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const sal_Unicode _aQuoteCharacter = '"', const sal_Unicode _aListSeparator = ','); @@ -311,7 +311,7 @@ namespace xmloff or whether the property is a dynamic property (i.e. added via an <code>XPropertyContainer</code>). So, take care when using the method - the heuristics is not applicable for all properties.</p> */ - bool shouldExportProperty( const ::rtl::OUString& i_propertyName ) const; + bool shouldExportProperty( const OUString& i_propertyName ) const; /** tries to convert an arbitrary <type scope="com.sun:star.uno">Any</type> into an string @@ -321,7 +321,7 @@ namespace xmloff @param _rValue the value to convert */ - ::rtl::OUString implConvertAny( + OUString implConvertAny( const ::com::sun::star::uno::Any& _rValue); /** @@ -341,20 +341,20 @@ namespace xmloff ::xmloff::token::XMLTokenEnum implGetPropertyXMLType(const ::com::sun::star::uno::Type& _rType); #ifdef DBG_UTIL - void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const ::rtl::OUString& _rValue); - void AddAttribute( sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue ); + void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue); + void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ); void AddAttributeASCII( sal_uInt16 nPrefix, const sal_Char *pName, const sal_Char *pValue ); - void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const ::rtl::OUString& _rValue); + void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue); void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue ); #else // in the product version, inline this, so it does not cost us extra time calling into our method - inline void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const ::rtl::OUString& _rValue) + inline void AddAttribute(sal_uInt16 _nPrefix, const sal_Char* _pName, const OUString& _rValue) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _pName, _rValue); } - inline void AddAttribute( sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue ) + inline void AddAttribute( sal_uInt16 _nPrefix, const OUString& _rName, const OUString& _rValue ) { m_rContext.getGlobalContext().AddAttribute( _nPrefix, _rName, _rValue ); } inline void AddAttributeASCII( sal_uInt16 _nPrefix, const sal_Char* _pName, const sal_Char *pValue ) { m_rContext.getGlobalContext().AddAttributeASCII(_nPrefix, _pName, pValue); } - inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const ::rtl::OUString& _rValue) + inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, const OUString& _rValue) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _rValue); } inline void AddAttribute(sal_uInt16 _nPrefix, ::xmloff::token::XMLTokenEnum _eName, ::xmloff::token::XMLTokenEnum _eValue ) { m_rContext.getGlobalContext().AddAttribute(_nPrefix, _eName, _eValue); } @@ -373,14 +373,14 @@ namespace xmloff @return sal_True, if the property exists and is of the correct type */ void dbg_implCheckProperty( - const ::rtl::OUString& _rPropertyName, + const OUString& _rPropertyName, const ::com::sun::star::uno::Type* _pType); // void dbg_implCheckProperty( // const sal_Char* _rPropertyName, // const ::com::sun::star::uno::Type* _pType) // { -// dbg_implCheckProperty(::rtl::OUString::createFromAscii(_rPropertyName), _pType); +// dbg_implCheckProperty(OUString::createFromAscii(_rPropertyName), _pType); // } #endif }; @@ -396,7 +396,7 @@ namespace xmloff dbg_implCheckProperty(name, NULL) #define DBG_CHECK_PROPERTY_ASCII_NO_TYPE( name ) \ - dbg_implCheckProperty( ::rtl::OUString::createFromAscii( name ), NULL ) + dbg_implCheckProperty( OUString::createFromAscii( name ), NULL ) #else #define DBG_CHECK_PROPERTY(name, type) #define DBG_CHECK_PROPERTY_NO_TYPE(name) diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 8bd21c6ecb77..a6c667c27166 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -93,7 +93,7 @@ namespace //--------------------------------------------------------------------- Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType, - const ::rtl::OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const sal_Bool _bInvertBoolean ) + const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap, const sal_Bool _bInvertBoolean ) { Any aReturn; sal_Bool bEnumAsInt = sal_False; @@ -107,8 +107,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a boolean!").getStr()); aReturn = ::cppu::bool2any(_bInvertBoolean ? !bValue : bValue); } @@ -123,8 +123,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into an integer!").getStr()); if (TypeClass_SHORT == _rExpectedType.getTypeClass()) aReturn <<= (sal_Int16)nValue; @@ -164,8 +164,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a double!").getStr()); aReturn <<= (double)nValue; } @@ -192,8 +192,8 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun #endif ::sax::Converter::convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OStringBuffer("PropertyConversion::convertString: could not convert \""). - append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). + OStringBuffer("PropertyConversion::convertString: could not convert \""). + append(OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)). append("\" into a double!").getStr()); // then convert it into the target type @@ -243,7 +243,7 @@ Any PropertyConversion::convertString( SvXMLImport& _rImporter, const ::com::sun } //--------------------------------------------------------------------- -Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType ) +Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType ) { Type aUnoType( ::getVoidCppuType() ); @@ -252,7 +252,7 @@ Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType ) { s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] = ::getBooleanCppuType(); s_aTypeNameMap[ token::GetXMLToken( token::XML_FLOAT ) ] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING ) ] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING ) ] = ::getCppuType( static_cast< OUString* >(NULL) ); s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID ) ] = ::getVoidCppuType(); } @@ -268,7 +268,7 @@ Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType ) //= OPropertyImport //===================================================================== //--------------------------------------------------------------------- -OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName) +OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const OUString& _rName) :SvXMLImportContext(_rImport.getGlobalContext(), _nPrefix, _rName) ,m_rContext(_rImport) ,m_bTrackAttributes(sal_False) @@ -276,7 +276,7 @@ OPropertyImport::OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 } //--------------------------------------------------------------------- -SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, +SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& _rxAttrList) { if( token::IsXMLToken( _rLocalName, token::XML_PROPERTIES) ) @@ -286,8 +286,8 @@ SvXMLImportContext* OPropertyImport::CreateChildContext(sal_uInt16 _nPrefix, con } else { - OSL_FAIL(::rtl::OStringBuffer("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is "). - append(rtl::OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OPropertyImport::CreateChildContext: unknown sub element (only \"properties\" is recognized, but it is "). + append(OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). append(")!").getStr()); return SvXMLImportContext::CreateChildContext(_nPrefix, _rLocalName, _rxAttrList); } @@ -305,7 +305,7 @@ void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrLis const SvXMLNamespaceMap& rMap = m_rContext.getGlobalContext().GetNamespaceMap(); sal_uInt16 nNamespace; - ::rtl::OUString sLocalName; + OUString sLocalName; for (sal_Int16 i=0; i<nAttributeCount; ++i) { nNamespace = rMap.GetKeyByAttrName(_rxAttrList->getNameByIndex(i), &sLocalName); @@ -321,14 +321,14 @@ void OPropertyImport::StartElement(const Reference< XAttributeList >& _rxAttrLis } //--------------------------------------------------------------------- -sal_Bool OPropertyImport::encounteredAttribute(const ::rtl::OUString& _rAttributeName) const +sal_Bool OPropertyImport::encounteredAttribute(const OUString& _rAttributeName) const { OSL_ENSURE(m_bTrackAttributes, "OPropertyImport::encounteredAttribute: attribute tracking not enabled!"); return m_aEncounteredAttributes.end() != m_aEncounteredAttributes.find(_rAttributeName); } //--------------------------------------------------------------------- -void OPropertyImport::Characters(const ::rtl::OUString& +void OPropertyImport::Characters(const OUString& #if OSL_DEBUG_LEVEL > 0 _rChars #endif @@ -339,7 +339,7 @@ _rChars } //--------------------------------------------------------------------- -bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl::OUString& _rLocalName, const ::rtl::OUString& _rValue) +bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const OUString& _rLocalName, const OUString& _rValue) { const OAttribute2Property::AttributeAssignment* pProperty = m_rContext.getAttributeMap().getAttributeTranslation(_rLocalName); if (pProperty) @@ -356,11 +356,11 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl if (!token::IsXMLToken(_rLocalName, token::XML_TYPE)) // xlink:type is valid but ignored for <form:form> { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "OPropertyImport::handleAttribute: Can't handle the following:\n" ); - sMessage += ::rtl::OString( " Attribute name: " ); - sMessage += ::rtl::OString( _rLocalName.getStr(), _rLocalName.getLength(), osl_getThreadTextEncoding() ); - sMessage += ::rtl::OString( "\n value: " ); - sMessage += ::rtl::OString( _rValue.getStr(), _rValue.getLength(), osl_getThreadTextEncoding() ); + OString sMessage( "OPropertyImport::handleAttribute: Can't handle the following:\n" ); + sMessage += OString( " Attribute name: " ); + sMessage += OString( _rLocalName.getStr(), _rLocalName.getLength(), osl_getThreadTextEncoding() ); + sMessage += OString( "\n value: " ); + sMessage += OString( _rValue.getStr(), _rValue.getLength(), osl_getThreadTextEncoding() ); OSL_FAIL( sMessage.getStr() ); #endif return false; @@ -372,7 +372,7 @@ bool OPropertyImport::handleAttribute(sal_uInt16 /*_nNamespaceKey*/, const ::rtl //= OPropertyElementsContext //===================================================================== //--------------------------------------------------------------------- -OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xPropertyImporter(_rPropertyImporter) @@ -380,7 +380,7 @@ OPropertyElementsContext::OPropertyElementsContext(SvXMLImport& _rImport, sal_uI } //--------------------------------------------------------------------- -SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, +SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { if( token::IsXMLToken( _rLocalName, token::XML_PROPERTY ) ) @@ -393,8 +393,8 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr } else { - OSL_FAIL(::rtl::OStringBuffer("OPropertyElementsContext::CreateChildContext: unknown child element (\""). - append(::rtl::OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OPropertyElementsContext::CreateChildContext: unknown child element (\""). + append(OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr()); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName); } @@ -409,7 +409,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr } //--------------------------------------------------------------------- - void OPropertyElementsContext::Characters(const ::rtl::OUString& _rChars) + void OPropertyElementsContext::Characters(const OUString& _rChars) { OSL_ENSURE(0 == _rChars.trim(), "OPropertyElementsContext::Characters: non-whitespace characters detected!"); SvXMLImportContext::Characters(_rChars); @@ -421,7 +421,7 @@ SvXMLImportContext* OPropertyElementsContext::CreateChildContext(sal_uInt16 _nPr //= OSinglePropertyContext //===================================================================== //--------------------------------------------------------------------- -OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter) :SvXMLImportContext(_rImport, _nPrefix, _rName) ,m_xPropertyImporter(_rPropertyImporter) @@ -429,11 +429,11 @@ OSinglePropertyContext::OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 } //--------------------------------------------------------------------- -SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, +SvXMLImportContext* OSinglePropertyContext::CreateChildContext(sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >&) { - OSL_FAIL(::rtl::OStringBuffer("OSinglePropertyContext::CreateChildContext: unknown child element (\""). - append(::rtl::OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL(OStringBuffer("OSinglePropertyContext::CreateChildContext: unknown child element (\""). + append(OUStringToOString(_rLocalName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr()); return new SvXMLImportContext(GetImport(), _nPrefix, _rLocalName); } @@ -444,14 +444,14 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx ::com::sun::star::beans::PropertyValue aPropValue; // the property the instance imports currently ::com::sun::star::uno::Type aPropType; // the type of the property the instance imports currently - ::rtl::OUString sType, sValue; + OUString sType, sValue; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); const sal_Int16 nAttrCount = _rxAttrList.is() ? _rxAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) { - const ::rtl::OUString& rAttrName = _rxAttrList->getNameByIndex( i ); + const OUString& rAttrName = _rxAttrList->getNameByIndex( i ); - ::rtl::OUString aLocalName; + OUString aLocalName; sal_uInt16 nPrefix = rMap.GetKeyByAttrName( rAttrName, &aLocalName ); @@ -500,7 +500,7 @@ void OSinglePropertyContext::StartElement(const Reference< XAttributeList >& _rx //= OListPropertyContext //===================================================================== //--------------------------------------------------------------------- -OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, +OListPropertyContext::OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter ) :SvXMLImportContext( _rImport, _nPrefix, _rName ) ,m_xPropertyImporter( _rPropertyImporter ) @@ -513,7 +513,7 @@ void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxA sal_Int32 nAttributeCount = _rxAttrList->getLength(); sal_uInt16 nNamespace; - ::rtl::OUString sAttributeName; + OUString sAttributeName; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); for ( sal_Int16 i = 0; i < nAttributeCount; ++i ) { @@ -532,8 +532,8 @@ void OListPropertyContext::StartElement( const Reference< XAttributeList >& _rxA } else { - OSL_FAIL( ::rtl::OStringBuffer( "OListPropertyContext::StartElement: unknown child element (\""). - append(rtl::OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL( OStringBuffer( "OListPropertyContext::StartElement: unknown child element (\""). + append(OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr() ); } } @@ -551,7 +551,7 @@ void OListPropertyContext::EndElement() Sequence< Any > aListElements( m_aListValues.size() ); Any* pListElement = aListElements.getArray(); com::sun::star::uno::Type aType = PropertyConversion::xmlTypeToUnoType( m_sPropertyType ); - for ( ::std::vector< ::rtl::OUString >::const_iterator values = m_aListValues.begin(); + for ( ::std::vector< OUString >::const_iterator values = m_aListValues.begin(); values != m_aListValues.end(); ++values, ++pListElement ) @@ -567,7 +567,7 @@ void OListPropertyContext::EndElement() } //--------------------------------------------------------------------- -SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, const Reference< XAttributeList >& /*_rxAttrList*/ ) +SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefix, const OUString& _rLocalName, const Reference< XAttributeList >& /*_rxAttrList*/ ) { if ( token::IsXMLToken( _rLocalName, token::XML_LIST_VALUE ) ) { @@ -576,8 +576,8 @@ SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefi } else { - OSL_FAIL( ::rtl::OStringBuffer("OListPropertyContext::CreateChildContext: unknown child element (\""). - append(rtl::OUStringToOString(_rLocalName.getStr(), RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL( OStringBuffer("OListPropertyContext::CreateChildContext: unknown child element (\""). + append(OUStringToOString(_rLocalName.getStr(), RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr() ); return new SvXMLImportContext( GetImport(), _nPrefix, _rLocalName ); } @@ -587,7 +587,7 @@ SvXMLImportContext* OListPropertyContext::CreateChildContext( sal_uInt16 _nPrefi //= OListValueContext //===================================================================== //--------------------------------------------------------------------- -OListValueContext::OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, ::rtl::OUString& _rListValueHolder ) +OListValueContext::OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, OUString& _rListValueHolder ) :SvXMLImportContext( _rImport, _nPrefix, _rName ) ,m_rListValueHolder( _rListValueHolder ) { @@ -599,7 +599,7 @@ void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttr const sal_Int32 nAttributeCount = _rxAttrList->getLength(); sal_uInt16 nNamespace; - ::rtl::OUString sAttributeName; + OUString sAttributeName; const SvXMLNamespaceMap& rMap = GetImport().GetNamespaceMap(); for ( sal_Int16 i = 0; i < nAttributeCount; ++i ) { @@ -616,8 +616,8 @@ void OListValueContext::StartElement( const Reference< XAttributeList >& _rxAttr } } - OSL_FAIL( ::rtl::OStringBuffer( "OListValueContext::StartElement: unknown child element (\""). - append(rtl::OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). + OSL_FAIL( OStringBuffer( "OListValueContext::StartElement: unknown child element (\""). + append(OUStringToOString(sAttributeName, RTL_TEXTENCODING_ASCII_US)). append("\")!").getStr() ); } } diff --git a/xmloff/source/forms/propertyimport.hxx b/xmloff/source/forms/propertyimport.hxx index 9f890d33c65e..e813d383e348 100644 --- a/xmloff/source/forms/propertyimport.hxx +++ b/xmloff/source/forms/propertyimport.hxx @@ -46,12 +46,12 @@ namespace xmloff static ::com::sun::star::uno::Any convertString( SvXMLImport& _rImporter, const ::com::sun::star::uno::Type& _rExpectedType, - const ::rtl::OUString& _rReadCharacters, + const OUString& _rReadCharacters, const SvXMLEnumMapEntry* _pEnumMap = NULL, const sal_Bool _bInvertBoolean = sal_False ); - static ::com::sun::star::uno::Type xmlTypeToUnoType( const ::rtl::OUString& _rType ); + static ::com::sun::star::uno::Type xmlTypeToUnoType( const OUString& _rType ); }; class OFormLayerXMLImport_Impl; @@ -74,7 +74,7 @@ namespace xmloff PropertyValueArray m_aGenericValues; // the values which the instance collects between StartElement and EndElement - DECLARE_STL_STDKEY_SET( ::rtl::OUString, StringSet ); + DECLARE_STL_STDKEY_SET( OUString, StringSet ); StringSet m_aEncounteredAttributes; OFormLayerXMLImport_Impl& m_rContext; @@ -86,15 +86,15 @@ namespace xmloff // style properties) can be done in our own EndElement instead of letting derived classes do this. public: - OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName); + OPropertyImport(OFormLayerXMLImport_Impl& _rImport, sal_uInt16 _nPrefix, const OUString& _rName); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); - virtual void Characters(const ::rtl::OUString& _rChars); + virtual void Characters(const OUString& _rChars); protected: /** handle one single attribute. @@ -112,20 +112,20 @@ namespace xmloff attribute value */ virtual bool handleAttribute(sal_uInt16 _nNamespaceKey, - const ::rtl::OUString& _rLocalName, - const ::rtl::OUString& _rValue); + const OUString& _rLocalName, + const OUString& _rValue); /** determine if the element imported by the object had an given attribute. <p>Please be aware of the fact that the name given must be a local name, i.e. not contain a namespace. All form relevant attributes are in the same namespace, so this would be an redundant information.</p> */ - sal_Bool encounteredAttribute(const ::rtl::OUString& _rAttributeName) const; + sal_Bool encounteredAttribute(const OUString& _rAttributeName) const; /** determine if the element imported by the object had an given attribute. <p>Please be aware of the fact that the name given must be a local name, i.e. not contain a namespace. All form relevant attributes are in the same namespace, so this would be an redundant information.</p> */ - sal_Bool encounteredAttribute(const sal_Char* _pAttributeName) const { return encounteredAttribute(::rtl::OUString::createFromAscii(_pAttributeName)); } + sal_Bool encounteredAttribute(const sal_Char* _pAttributeName) const { return encounteredAttribute(OUString::createFromAscii(_pAttributeName)); } /** enables the tracking of the encountered attributes <p>The tracking will raise the import costs a little bit, but it's cheaper than @@ -138,7 +138,7 @@ namespace xmloff m_aValues.push_back(_rProp); } - inline void implPushBackPropertyValue( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& _rValue ) + inline void implPushBackPropertyValue( const OUString& _rName, const ::com::sun::star::uno::Any& _rValue ) { m_aValues.push_back( ::com::sun::star::beans::PropertyValue( _rName, -1, _rValue, ::com::sun::star::beans::PropertyState_DIRECT_VALUE ) ); @@ -162,17 +162,17 @@ namespace xmloff OPropertyImportRef m_xPropertyImporter; // to add the properties public: - OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OPropertyElementsContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); #if OSL_DEBUG_LEVEL > 0 virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); - virtual void Characters(const ::rtl::OUString& _rChars); + virtual void Characters(const OUString& _rChars); #endif }; @@ -186,11 +186,11 @@ namespace xmloff OPropertyImportRef m_xPropertyImporter; // to add the properties public: - OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OSinglePropertyContext(SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); virtual void StartElement( @@ -203,12 +203,12 @@ namespace xmloff class OListPropertyContext : public SvXMLImportContext { OPropertyImportRef m_xPropertyImporter; - ::rtl::OUString m_sPropertyName; - ::rtl::OUString m_sPropertyType; - ::std::vector< ::rtl::OUString > m_aListValues; + OUString m_sPropertyName; + OUString m_sPropertyType; + ::std::vector< OUString > m_aListValues; public: - OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, + OListPropertyContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, const OPropertyImportRef& _rPropertyImporter ); virtual void StartElement( @@ -217,7 +217,7 @@ namespace xmloff virtual void EndElement(); virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 _nPrefix, const ::rtl::OUString& _rLocalName, + sal_uInt16 _nPrefix, const OUString& _rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList); }; @@ -226,11 +226,11 @@ namespace xmloff //===================================================================== class OListValueContext : public SvXMLImportContext { - ::rtl::OUString& m_rListValueHolder; + OUString& m_rListValueHolder; public: - OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const ::rtl::OUString& _rName, - ::rtl::OUString& _rListValueHolder ); + OListValueContext( SvXMLImport& _rImport, sal_uInt16 _nPrefix, const OUString& _rName, + OUString& _rListValueHolder ); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& _rxAttrList ); |