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 /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 'forms')
158 files changed, 1436 insertions, 1461 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 8526cc35b5de..d3db076b9507 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -112,8 +112,8 @@ void OButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) cons DECL_PROP1( BUTTONTYPE, FormButtonType, BOUND ); DECL_PROP1( DEFAULT_STATE, sal_Int16, BOUND ); DECL_PROP1( DISPATCHURLINTERNAL, sal_Bool, BOUND ); - DECL_PROP1( TARGET_URL, ::rtl::OUString, BOUND ); - DECL_PROP1( TARGET_FRAME, ::rtl::OUString, BOUND ); + DECL_PROP1( TARGET_URL, OUString, BOUND ); + DECL_PROP1( TARGET_FRAME, OUString, BOUND ); DECL_PROP1( TABINDEX, sal_Int16, BOUND ); END_DESCRIBE_PROPERTIES(); } @@ -128,14 +128,14 @@ StringSequence OButtonModel::getSupportedServiceNames() throw() StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_COMMANDBUTTON; return aSupported; } //------------------------------------------------------------------------------ -::rtl::OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_COMMANDBUTTON; // old (non-sun) name for compatibility ! } @@ -153,7 +153,7 @@ void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) thr _rxOutStream->writeShort( (sal_uInt16)m_eButtonType ); - ::rtl::OUString sTmp = INetURLObject::decode( m_sTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS); + OUString sTmp = INetURLObject::decode( m_sTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS); _rxOutStream << sTmp; _rxOutStream << m_sTargetFrame; writeHelpTextCompatibly(_rxOutStream); @@ -215,8 +215,8 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw default: OSL_FAIL("OButtonModel::read : unknown version !"); m_eButtonType = FormButtonType_PUSH; - m_sTargetURL = ::rtl::OUString(); - m_sTargetFrame = ::rtl::OUString(); + m_sTargetURL = OUString(); + m_sTargetFrame = OUString(); break; } } @@ -358,7 +358,7 @@ StringSequence OButtonControl::getSupportedServiceNames() throw() StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_COMMANDBUTTON; return aSupported; } @@ -517,7 +517,7 @@ void OButtonControl::actionPerformed_Impl( sal_Bool _bNotifyListener, const ::co // XButton //------------------------------------------------------------------------------ -void OButtonControl::setLabel(const ::rtl::OUString& Label) throw( RuntimeException ) +void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException ) { Reference<XButton> xButton; query_aggregation( m_xAggregate, xButton ); @@ -526,7 +526,7 @@ void OButtonControl::setLabel(const ::rtl::OUString& Label) throw( RuntimeExcept } //------------------------------------------------------------------------------ -void SAL_CALL OButtonControl::setActionCommand(const ::rtl::OUString& _rCommand) throw( RuntimeException ) +void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw( RuntimeException ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -566,7 +566,7 @@ public: bool _bStart ); - void handleListening( const ::rtl::OUString& _rPropertyName ); + void handleListening( const OUString& _rPropertyName ); }; //.............................................................................. @@ -582,7 +582,7 @@ DoPropertyListening::DoPropertyListening( } //.............................................................................. -void DoPropertyListening::handleListening( const ::rtl::OUString& _rPropertyName ) +void DoPropertyListening::handleListening( const OUString& _rPropertyName ) { if ( m_xProps.is() ) { @@ -652,7 +652,7 @@ void SAL_CALL OButtonControl::propertyChange( const PropertyChangeEvent& _rEvent //------------------------------------------------------------------------------ namespace { - bool isFormControllerURL( const ::rtl::OUString& _rURL ) + bool isFormControllerURL( const OUString& _rURL ) { return ( _rURL.getLength() > RTL_CONSTASCII_LENGTH( ".uno:FormController/" ) ) && ( _rURL.startsWith( ".uno:FormController/" ) ); @@ -665,7 +665,7 @@ sal_Int16 OButtonControl::getModelUrlFeatureId( ) const sal_Int16 nFeatureId = -1; // some URL related properties of the model - ::rtl::OUString sUrl; + OUString sUrl; FormButtonType eButtonType = FormButtonType_PUSH; Reference< XPropertySet > xModelProps( const_cast< OButtonControl* >( this )->getModel(), UNO_QUERY ); diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index 1a13136bc280..0128cebb5b01 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -62,7 +62,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -147,8 +147,8 @@ public: // XButton virtual void SAL_CALL addActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeActionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener>& _rxListener) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setLabel(const ::rtl::OUString& Label) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActionCommand(const ::rtl::OUString& _rCommand) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setLabel(const OUString& Label) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setActionCommand(const OUString& _rCommand) throw(::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index cff783f50c2e..dd24d44e7b39 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -62,7 +62,7 @@ StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_CHECKBOX; return aSupported; } @@ -114,7 +114,7 @@ StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com:: sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -139,7 +139,7 @@ void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_CHECKBOX; // old (non-sun) name for compatibility ! } @@ -169,7 +169,7 @@ void SAL_CALL OCheckBoxModel::read(const Reference<stario::XObjectInputStream>& // Version sal_uInt16 nVersion = _rxInStream->readShort(); - ::rtl::OUString sReferenceValue; + OUString sReferenceValue; sal_Int16 nDefaultChecked( 0 ); switch ( nVersion ) { diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index 7e186bceebd6..3ad94b8ffc9f 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -42,7 +42,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 01c71872c3ca..aa004a031730 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -69,26 +69,26 @@ const StringSequence& getColumnTypes() static StringSequence aColumnTypes(10); if (aColumnTypes.getConstArray()[0].isEmpty()) { - ::rtl::OUString* pNames = aColumnTypes.getArray(); - pNames[TYPE_CHECKBOX] = ::rtl::OUString( "CheckBox" ); - pNames[TYPE_COMBOBOX] = ::rtl::OUString( "ComboBox" ); - pNames[TYPE_CURRENCYFIELD] = ::rtl::OUString( "CurrencyField" ); - pNames[TYPE_DATEFIELD] = ::rtl::OUString( "DateField" ); - pNames[TYPE_FORMATTEDFIELD] = ::rtl::OUString( "FormattedField" ); - pNames[TYPE_LISTBOX] = ::rtl::OUString( "ListBox" ); - pNames[TYPE_NUMERICFIELD] = ::rtl::OUString( "NumericField" ); - pNames[TYPE_PATTERNFIELD] = ::rtl::OUString( "PatternField" ); - pNames[TYPE_TEXTFIELD] = ::rtl::OUString( "TextField" ); - pNames[TYPE_TIMEFIELD] = ::rtl::OUString( "TimeField" ); + OUString* pNames = aColumnTypes.getArray(); + pNames[TYPE_CHECKBOX] = OUString( "CheckBox" ); + pNames[TYPE_COMBOBOX] = OUString( "ComboBox" ); + pNames[TYPE_CURRENCYFIELD] = OUString( "CurrencyField" ); + pNames[TYPE_DATEFIELD] = OUString( "DateField" ); + pNames[TYPE_FORMATTEDFIELD] = OUString( "FormattedField" ); + pNames[TYPE_LISTBOX] = OUString( "ListBox" ); + pNames[TYPE_NUMERICFIELD] = OUString( "NumericField" ); + pNames[TYPE_PATTERNFIELD] = OUString( "PatternField" ); + pNames[TYPE_TEXTFIELD] = OUString( "TextField" ); + pNames[TYPE_TIMEFIELD] = OUString( "TimeField" ); } return aColumnTypes; } //------------------------------------------------------------------------------ -sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) +sal_Int32 getColumnTypeByModelName(const OUString& aModelName) { - const ::rtl::OUString aModelPrefix ("com.sun.star.form.component."); - const ::rtl::OUString aCompatibleModelPrefix ("stardiv.one.form.component."); + const OUString aModelPrefix ("com.sun.star.form.component."); + const OUString aCompatibleModelPrefix ("stardiv.one.form.component."); sal_Int32 nTypeId = -1; if (aModelName == FRM_COMPONENT_EDIT) @@ -102,7 +102,7 @@ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) DBG_ASSERT( (nPrefixPos != -1) || (nCompatiblePrefixPos != -1), "::getColumnTypeByModelName() : wrong servivce !"); - ::rtl::OUString aColumnType = (nPrefixPos != -1) + OUString aColumnType = (nPrefixPos != -1) ? aModelName.copy(aModelPrefix.getLength()) : aModelName.copy(aCompatibleModelPrefix.getLength()); @@ -200,7 +200,7 @@ Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeE DBG_NAME(OGridColumn); //------------------------------------------------------------------------------ -OGridColumn::OGridColumn( const comphelper::ComponentContext& _rContext, const ::rtl::OUString& _sModelName ) +OGridColumn::OGridColumn( const comphelper::ComponentContext& _rContext, const OUString& _sModelName ) :OGridColumn_BASE(m_aMutex) ,OPropertySetAggregationHelper(OGridColumn_BASE::rBHelper) ,m_aHidden( makeAny( sal_False ) ) @@ -304,7 +304,7 @@ void OGridColumn::disposing() void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_Bool bAllowDropDown ) { // some properties are not to be exposed to the outer world - ::std::set< ::rtl::OUString > aForbiddenProperties; + ::std::set< OUString > aForbiddenProperties; aForbiddenProperties.insert( PROPERTY_ALIGN ); aForbiddenProperties.insert( PROPERTY_AUTOCOMPLETE ); aForbiddenProperties.insert( PROPERTY_BACKGROUNDCOLOR ); @@ -341,7 +341,7 @@ void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_B aForbiddenProperties.insert( PROPERTY_VERTICAL_ALIGN ); aForbiddenProperties.insert( PROPERTY_IMAGE_URL ); aForbiddenProperties.insert( PROPERTY_IMAGE_POSITION ); - aForbiddenProperties.insert( ::rtl::OUString( "EnableVisible" ) ); + aForbiddenProperties.insert( OUString( "EnableVisible" ) ); if ( !bAllowDropDown ) aForbiddenProperties.insert( PROPERTY_DROPDOWN ); @@ -365,11 +365,11 @@ void OGridColumn::setOwnProperties(Sequence<Property>& aDescriptor) { aDescriptor.realloc(5); Property* pProperties = aDescriptor.getArray(); - DECL_PROP1(LABEL, ::rtl::OUString, BOUND); + DECL_PROP1(LABEL, OUString, BOUND); DECL_PROP3(WIDTH, sal_Int32, BOUND, MAYBEVOID, MAYBEDEFAULT); DECL_PROP3(ALIGN, sal_Int16, BOUND, MAYBEVOID, MAYBEDEFAULT); DECL_BOOL_PROP2(HIDDEN, BOUND, MAYBEDEFAULT); - DECL_PROP1(COLUMNSERVICENAME, ::rtl::OUString, READONLY); + DECL_PROP1(COLUMNSERVICENAME, OUString, READONLY); } // Reference<XPropertySet> diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index c5463a999b4a..ed2a1054d82f 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -61,14 +61,14 @@ protected: // [properties] ::comphelper::ComponentContext m_aContext; - ::rtl::OUString m_aModelName; + OUString m_aModelName; // [properties] - ::rtl::OUString m_aLabel; // Column name + OUString m_aLabel; // Column name // [properties] public: - OGridColumn(const ::comphelper::ComponentContext& _rContext, const ::rtl::OUString& _sModelName = ::rtl::OUString()); + OGridColumn(const ::comphelper::ComponentContext& _rContext, const OUString& _sModelName = OUString()); OGridColumn(const OGridColumn* _pOriginal ); virtual ~OGridColumn(); @@ -110,7 +110,7 @@ public: // XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException); - const ::rtl::OUString& getModelName() const { return m_aModelName; } + const OUString& getModelName() const { return m_aModelName; } protected: static void clearAggregateProperties(::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property>& seqProps, sal_Bool bAllowDropDown); @@ -189,7 +189,7 @@ OGridColumn* ClassName::createCloneColumn() const \ // List of all known columns const StringSequence& getColumnTypes(); -sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName); +sal_Int32 getColumnTypeByModelName(const OUString& aModelName); // Columns DECL_COLUMN(TextFieldColumn) diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index 29abbe3a7af8..84613659ac90 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -95,7 +95,7 @@ StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(Runtime sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -305,10 +305,10 @@ void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co BEGIN_DESCRIBE_PROPERTIES( 6, OBoundControlModel ) DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); - DECL_PROP1(LISTSOURCE, ::rtl::OUString, BOUND); + DECL_PROP1(LISTSOURCE, OUString, BOUND); DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); - DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND); - DECL_PROP1(STRINGITEMLIST, Sequence< ::rtl::OUString >,BOUND); + DECL_PROP1(DEFAULT_TEXT, OUString, BOUND); + DECL_PROP1(STRINGITEMLIST, Sequence< OUString >,BOUND); END_DESCRIBE_PROPERTIES(); } @@ -322,7 +322,7 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_COMBOBOX; // old (non-sun) name for compatibility ! } @@ -391,9 +391,9 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>& if (nVersion > 0x0006) { OSL_FAIL("OComboBoxModel::read : invalid (means unknown) version !"); - m_aListSource = ::rtl::OUString(); + m_aListSource = OUString(); m_aBoundColumn <<= (sal_Int16)0; - m_aDefaultText = ::rtl::OUString(); + m_aDefaultText = OUString(); m_eListSourceType = ListSourceType_TABLE; m_bEmptyIsNull = sal_True; defaultCommonProperties(); @@ -411,10 +411,10 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>& } else // nVersion == 4 { - m_aListSource = ::rtl::OUString(); + m_aListSource = OUString(); StringSequence aListSource; _rxInStream >> aListSource; - const ::rtl::OUString* pToken = aListSource.getConstArray(); + const OUString* pToken = aListSource.getConstArray(); sal_Int32 nLen = aListSource.getLength(); for (sal_Int32 i = 0; i < nLen; ++i, ++pToken) m_aListSource += *pToken; @@ -511,7 +511,7 @@ void OComboBoxModel::loadData( bool _bForce ) Reference<XNameAccess> xFieldsByName = getTableFields(xConnection, m_aListSource); Reference<XIndexAccess> xFieldsByIndex(xFieldsByName, UNO_QUERY); - ::rtl::OUString aFieldName; + OUString aFieldName; if ( xFieldsByName.is() && xFieldsByName->hasByName( getControlSource() ) ) { aFieldName = getControlSource(); @@ -521,7 +521,7 @@ void OComboBoxModel::loadData( bool _bForce ) // otherwise look for the alias Reference<XPropertySet> xFormProp(xForm,UNO_QUERY); Reference< XColumnsSupplier > xSupplyFields; - xFormProp->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupplyFields; + xFormProp->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSupplyFields; // search the field DBG_ASSERT(xSupplyFields.is(), "OComboBoxModel::loadData : invalid query composer !"); @@ -543,12 +543,12 @@ void OComboBoxModel::loadData( bool _bForce ) OSL_ENSURE(xMeta.is(),"No database meta data!"); if ( xMeta.is() ) { - ::rtl::OUString aQuote = xMeta->getIdentifierQuoteString(); + OUString aQuote = xMeta->getIdentifierQuoteString(); - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; qualifiedNameComponents( xMeta, m_aListSource, sCatalog, sSchema, sTable, eInDataManipulation ); - ::rtl::OUStringBuffer aStatement; + OUStringBuffer aStatement; aStatement.appendAscii( "SELECT DISTINCT " ); aStatement.append ( quoteName( aQuote, aFieldName ) ); aStatement.appendAscii( " FROM " ); @@ -597,7 +597,7 @@ void OComboBoxModel::loadData( bool _bForce ) return; } - ::std::vector< ::rtl::OUString > aStringList; + ::std::vector< OUString > aStringList; aStringList.reserve(16); try { @@ -646,7 +646,7 @@ void OComboBoxModel::loadData( bool _bForce ) { StringSequence seqNames = xFieldNames->getElementNames(); sal_Int32 nFieldsCount = seqNames.getLength(); - const ::rtl::OUString* pustrNames = seqNames.getConstArray(); + const OUString* pustrNames = seqNames.getConstArray(); for (sal_Int32 k=0; k<nFieldsCount; ++k) aStringList.push_back(pustrNames[k]); @@ -671,7 +671,7 @@ void OComboBoxModel::loadData( bool _bForce ) // Create StringSequence for ListBox StringSequence aStringSeq(aStringList.size()); - ::rtl::OUString* pStringAry = aStringSeq.getArray(); + OUString* pStringAry = aStringSeq.getArray(); for (sal_Int32 i = 0; i<aStringSeq.getLength(); ++i) pStringAry[i] = aStringList[i]; @@ -726,7 +726,7 @@ sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset ) { Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) ); - ::rtl::OUString sNewValue; + OUString sNewValue; aNewValue >>= sNewValue; bool bModified = ( aNewValue != m_aLastKnownValue ); @@ -771,7 +771,7 @@ sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset ) StringSequence aStringItemList; if ( getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aStringItemList ) { - const ::rtl::OUString* pStringItems = aStringItemList.getConstArray(); + const OUString* pStringItems = aStringItemList.getConstArray(); sal_Int32 i; for (i=0; i<aStringItemList.getLength(); ++i, ++pStringItems) { @@ -801,7 +801,7 @@ Any OComboBoxModel::translateDbColumnToControlValue() OSL_PRECOND( m_pValueFormatter.get(), "OComboBoxModel::translateDbColumnToControlValue: no value formatter!" ); if ( m_pValueFormatter.get() ) { - ::rtl::OUString sValue( m_pValueFormatter->getFormattedValue() ); + OUString sValue( m_pValueFormatter->getFormattedValue() ); if ( sValue.isEmpty() && m_pValueFormatter->getColumn().is() && m_pValueFormatter->getColumn()->wasNull() @@ -818,7 +818,7 @@ Any OComboBoxModel::translateDbColumnToControlValue() else m_aLastKnownValue.clear(); - return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : makeAny( ::rtl::OUString() ); + return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : makeAny( OUString() ); // (m_aLastKnownValue is alllowed to be VOID, the control value isn't) } @@ -890,7 +890,7 @@ StringSequence SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(Runti StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_COMBOBOX; return aSupported; } diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx index 548163523817..7803af357e1d 100644 --- a/forms/source/component/ComboBox.hxx +++ b/forms/source/component/ComboBox.hxx @@ -51,8 +51,8 @@ class OComboBoxModel { CachedRowSet m_aListRowSet; // the row set to fill the list ::com::sun::star::uno::Any m_aBoundColumn; // obsolet - ::rtl::OUString m_aListSource; // - ::rtl::OUString m_aDefaultText; // DefaultText + OUString m_aListSource; // + OUString m_aDefaultText; // DefaultText ::com::sun::star::uno::Any m_aLastKnownValue; StringSequence m_aDesignModeStringItems; @@ -98,7 +98,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index 6076fc64b7d2..7df3e8e939d7 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -66,7 +66,7 @@ StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_CURRENCYFIELD; return aSupported; } @@ -97,7 +97,7 @@ void OCurrencyModel::implConstruct() const SvtSysLocale aSysLocale; const LocaleDataWrapper& aLocaleInfo = aSysLocale.GetLocaleData(); - ::rtl::OUString sCurrencySymbol; + OUString sCurrencySymbol; sal_Bool bPrependCurrencySymbol; switch ( aLocaleInfo.getCurrPositiveFormat() ) { @@ -110,11 +110,11 @@ void OCurrencyModel::implConstruct() bPrependCurrencySymbol = sal_False; break; case 2: // $ 1 - sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(" "); + sCurrencySymbol = OUString(String(aLocaleInfo.getCurrSymbol())) + OUString(" "); bPrependCurrencySymbol = sal_True; break; case 3: // 1 $ - sCurrencySymbol = ::rtl::OUString(" ") + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())); + sCurrencySymbol = OUString(" ") + OUString(String(aLocaleInfo.getCurrSymbol())); bPrependCurrencySymbol = sal_False; break; } @@ -172,7 +172,7 @@ StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames() throw() sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 4 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; *pStoreTo++ = VALIDATABLE_CONTROL_MODEL; @@ -196,7 +196,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_CURRENCYFIELD; // old (non-sun) name for compatibility ! } diff --git a/forms/source/component/Currency.hxx b/forms/source/component/Currency.hxx index 91e428e78681..ba6571dbbe86 100644 --- a/forms/source/component/Currency.hxx +++ b/forms/source/component/Currency.hxx @@ -46,7 +46,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun ::star::uno::RuntimeException); // OControlModel's property handling virtual void describeFixedProperties( diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 91cedf46f933..ac4305b745f2 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -403,7 +403,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource ) catch(const Exception&) { throw WrappedTargetException( - ::rtl::OUString( "Could not clone the given database form." ), + OUString( "Could not clone the given database form." ), *const_cast< ODatabaseForm* >( &_cloneSource ), ::cppu::getCaughtException() ); @@ -478,22 +478,22 @@ ODatabaseForm::~ODatabaseForm() //============================================================================== // html tools //------------------------------------------------------------------------ -::rtl::OUString ODatabaseForm::GetDataURLEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) +OUString ODatabaseForm::GetDataURLEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) { return GetDataEncoded(true,SubmitButton,MouseEvt); } // ----------------------------------------------------------------------------- -::rtl::OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) +OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) { // Fill List of successful Controls HtmlSuccessfulObjList aSuccObjList; FillSuccessfulList( aSuccObjList, SubmitButton, MouseEvt ); - // Aggregate Liste to ::rtl::OUString - ::rtl::OUStringBuffer aResult; - ::rtl::OUString aName; - ::rtl::OUString aValue; + // Aggregate Liste to OUString + OUStringBuffer aResult; + OUString aName; + OUString aValue; for ( HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin(); pSuccObj < aSuccObjList.end(); @@ -536,13 +536,13 @@ ODatabaseForm::~ODatabaseForm() //============================================================================== // html tools //------------------------------------------------------------------------ -::rtl::OUString ODatabaseForm::GetDataTextEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) +OUString ODatabaseForm::GetDataTextEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) { return GetDataEncoded(false,SubmitButton,MouseEvt); } //------------------------------------------------------------------------ -Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, ::rtl::OUString& rContentType) +Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, OUString& rContentType) { // Create Parent @@ -555,7 +555,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr FillSuccessfulList( aSuccObjList, SubmitButton, MouseEvt ); - // Aggregate Liste to ::rtl::OUString + // Aggregate Liste to OUString for ( HtmlSuccessfulObjListIterator pSuccObj = aSuccObjList.begin(); pSuccObj < aSuccObjList.end(); ++pSuccObj @@ -596,7 +596,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr //------------------------------------------------------------------------ namespace { - static void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, ::rtl::OUStringBuffer& _rOut ) + static void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, OUStringBuffer& _rOut ) { sal_Int32 nCurLen = _rOut.getLength(); _rOut.append( _nNumber ); @@ -606,7 +606,7 @@ namespace } //------------------------------------------------------------------------ -void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Reference<XPropertySet>& xComponentSet, const ::rtl::OUString& rNamePrefix, +void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Reference<XPropertySet>& xComponentSet, const OUString& rNamePrefix, const Reference<XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt) { if (!xComponentSet.is()) @@ -622,7 +622,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc sal_Int16 nClassId = 0; xComponentSet->getPropertyValue(PROPERTY_CLASSID) >>= nClassId; - ::rtl::OUString aName; + OUString aName; xComponentSet->getPropertyValue( PROPERTY_NAME ) >>= aName; if( aName.isEmpty() && nClassId != FormComponentType::IMAGEBUTTON) return; @@ -642,7 +642,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc if (xSubmitButtonComponent == xComponentSet && hasProperty(PROPERTY_LABEL, xComponentSet)) { // <name>=<label> - ::rtl::OUString aLabel; + OUString aLabel; xComponentSet->getPropertyValue( PROPERTY_LABEL ) >>= aLabel; rList.push_back( HtmlSuccessfulObj(aName, aLabel) ); } @@ -660,10 +660,10 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc if (xSubmitButtonComponent == xComponentSet) { // <name>.x=<pos.X>&<name>.y=<pos.Y> - ::rtl::OUString aRhs = ::rtl::OUString::valueOf( MouseEvt.X ); + OUString aRhs = OUString::valueOf( MouseEvt.X ); // Only if a name is available we have a name.x - rtl::OUStringBuffer aLhs(aName); + OUStringBuffer aLhs(aName); if (!aName.isEmpty()) aLhs.append(".x"); else @@ -671,7 +671,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc rList.push_back( HtmlSuccessfulObj(aLhs.makeStringAndClear(), aRhs) ); aLhs.append(aName); - aRhs = ::rtl::OUString::valueOf( MouseEvt.Y ); + aRhs = OUString::valueOf( MouseEvt.Y ); if (!aName.isEmpty()) aLhs.append(".y"); else @@ -693,7 +693,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc if( nChecked != 1 ) break; - ::rtl::OUString aStrValue; + OUString aStrValue; if( hasProperty(PROPERTY_REFVALUE, xComponentSet) ) xComponentSet->getPropertyValue( PROPERTY_REFVALUE ) >>= aStrValue; @@ -712,7 +712,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc sal_Bool bMulti = rxSubmitButton.is() && (aTmp.getValueType().getTypeClass() == TypeClass_BOOLEAN) && getBOOL(aTmp); - ::rtl::OUString sText; + OUString sText; if ( bMulti ) // For multiline edit, get the text at the control { @@ -754,7 +754,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc // <name>=<text> if( hasProperty(PROPERTY_TEXT, xComponentSet) ) { - ::rtl::OUString aText; + OUString aText; xComponentSet->getPropertyValue( PROPERTY_TEXT ) >>= aText; rList.push_back( HtmlSuccessfulObj(aName, aText) ); } @@ -766,7 +766,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc // no value (NULL) means empty value if( hasProperty(PROPERTY_VALUE, xComponentSet) ) { - ::rtl::OUString aText; + OUString aText; Any aVal = xComponentSet->getPropertyValue( PROPERTY_VALUE ); double aDoubleVal = 0; @@ -785,13 +785,13 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc // no value (NULL) means empty value if( hasProperty(PROPERTY_DATE, xComponentSet) ) { - ::rtl::OUString aText; + OUString aText; Any aVal = xComponentSet->getPropertyValue( PROPERTY_DATE ); sal_Int32 nInt32Val = 0; if (aVal >>= nInt32Val) { ::Date aDate( nInt32Val ); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; appendDigits( aDate.GetMonth(), 2, aBuffer ); aBuffer.append( (sal_Unicode)'-' ); appendDigits( aDate.GetDay(), 2, aBuffer ); @@ -808,13 +808,13 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc // no value (NULL) means empty value if( hasProperty(PROPERTY_TIME, xComponentSet) ) { - ::rtl::OUString aText; + OUString aText; Any aVal = xComponentSet->getPropertyValue( PROPERTY_TIME ); sal_Int32 nInt32Val = 0; if (aVal >>= nInt32Val) { ::Time aTime(nInt32Val); - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; appendDigits( aTime.GetHour(), 2, aBuffer ); aBuffer.append( (sal_Unicode)'-' ); appendDigits( aTime.GetMin(), 2, aBuffer ); @@ -833,7 +833,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc // <name>=<value> if( hasProperty(PROPERTY_HIDDEN_VALUE, xComponentSet) ) { - ::rtl::OUString aText; + OUString aText; xComponentSet->getPropertyValue( PROPERTY_HIDDEN_VALUE ) >>= aText; rList.push_back( HtmlSuccessfulObj(aName, aText) ); } @@ -846,7 +846,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc if( hasProperty(PROPERTY_TEXT, xComponentSet) ) { - ::rtl::OUString aText; + OUString aText; xComponentSet->getPropertyValue( PROPERTY_TEXT ) >>= aText; rList.push_back( HtmlSuccessfulObj(aName, aText, SUCCESSFUL_REPRESENT_FILE) ); } @@ -862,16 +862,16 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc break; // Displayed values - Sequence< ::rtl::OUString > aVisibleList; + Sequence< OUString > aVisibleList; xComponentSet->getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aVisibleList; sal_Int32 nStringCnt = aVisibleList.getLength(); - const ::rtl::OUString* pStrings = aVisibleList.getConstArray(); + const OUString* pStrings = aVisibleList.getConstArray(); // Value list - Sequence< ::rtl::OUString > aValueList; + Sequence< OUString > aValueList; xComponentSet->getPropertyValue( PROPERTY_VALUE_SEQ ) >>= aValueList; sal_Int32 nValCnt = aValueList.getLength(); - const ::rtl::OUString* pVals = aValueList.getConstArray(); + const OUString* pVals = aValueList.getConstArray(); // Selection Sequence<sal_Int16> aSelectList; @@ -894,7 +894,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc ++nCurCnt; } - ::rtl::OUString aSubValue; + OUString aSubValue; for(i=0; i<nCurCnt; ++i ) { sal_Int16 nSelPos = pSels[i]; @@ -917,7 +917,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc if (!xContainer.is()) break; - aName += rtl::OUString(static_cast<sal_Unicode>('.')); + aName += OUString(static_cast<sal_Unicode>('.')); Reference<XPropertySet> xSet; sal_Int32 nCount = xContainer->getCount(); @@ -942,7 +942,7 @@ void ODatabaseForm::FillSuccessfulList( HtmlSuccessfulObjList& rList, rList.clear(); // Iterate over Components Reference<XPropertySet> xComponentSet; - ::rtl::OUString aPrefix; + OUString aPrefix; // we know already how many objects should be appended, // so why not allocate the space for them @@ -955,9 +955,9 @@ void ODatabaseForm::FillSuccessfulList( HtmlSuccessfulObjList& rList, } //------------------------------------------------------------------------ -void ODatabaseForm::Encode( ::rtl::OUString& rString ) const +void ODatabaseForm::Encode( OUString& rString ) const { - ::rtl::OUStringBuffer aResult; + OUStringBuffer aResult; // Line endings are represented as CR rString = convertLineEnd(rString, LINEEND_CR); @@ -1010,8 +1010,8 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const } //------------------------------------------------------------------------ -void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUString& rName, - const ::rtl::OUString& rData ) +void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const OUString& rName, + const OUString& rData ) { // Create part as MessageChild @@ -1019,21 +1019,21 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUStr // Header - ::rtl::OUStringBuffer aContentDisp; + OUStringBuffer aContentDisp; aContentDisp.append("form-data; name=\""); aContentDisp.append(rName); aContentDisp.append('\"'); pChild->SetContentDisposition(aContentDisp.makeStringAndClear()); - pChild->SetContentType(::rtl::OUString("text/plain")); + pChild->SetContentType(OUString("text/plain")); rtl_TextEncoding eSystemEncoding = osl_getThreadTextEncoding(); const sal_Char* pBestMatchingEncoding = rtl_getBestMimeCharsetFromTextEncoding( eSystemEncoding ); - rtl::OUString aBestMatchingEncoding = rtl::OUString::createFromAscii(pBestMatchingEncoding); + OUString aBestMatchingEncoding = OUString::createFromAscii(pBestMatchingEncoding); pChild->SetContentTransferEncoding(aBestMatchingEncoding); // Body SvMemoryStream* pStream = new SvMemoryStream; - pStream->WriteLine( rtl::OUStringToOString(rData, rtl_getTextEncodingFromMimeCharset(pBestMatchingEncoding)) ); + pStream->WriteLine( OUStringToOString(rData, rtl_getTextEncodingFromMimeCharset(pBestMatchingEncoding)) ); pStream->Flush(); pStream->Seek( 0 ); pChild->SetDocumentLB( new SvLockBytes(pStream, sal_True) ); @@ -1041,11 +1041,11 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUStr } //------------------------------------------------------------------------ -sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::OUString& rName, - const ::rtl::OUString& rFileName ) +sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const OUString& rName, + const OUString& rFileName ) { - rtl::OUString aFileName(rFileName); - rtl::OUString aContentType(CONTENT_TYPE_STR_TEXT_PLAIN); + OUString aFileName(rFileName); + OUString aContentType(CONTENT_TYPE_STR_TEXT_PLAIN); SvStream *pStream = 0; if (!aFileName.isEmpty()) @@ -1081,7 +1081,7 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::O // Header - ::rtl::OUStringBuffer aContentDisp; + OUStringBuffer aContentDisp; aContentDisp.append("form-data; name=\""); aContentDisp.append(rName); aContentDisp.append('\"'); @@ -1090,7 +1090,7 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::O aContentDisp.append('\"'); pChild->SetContentDisposition(aContentDisp.makeStringAndClear()); pChild->SetContentType( aContentType ); - pChild->SetContentTransferEncoding(::rtl::OUString("8bit")); + pChild->SetContentTransferEncoding(OUString("8bit")); // Body @@ -1109,7 +1109,7 @@ void ODatabaseForm::onError( const SQLErrorEvent& _rEvent ) } //------------------------------------------------------------------------------ -void ODatabaseForm::onError( const SQLException& _rException, const ::rtl::OUString& _rContextDescription ) +void ODatabaseForm::onError( const SQLException& _rException, const OUString& _rContextDescription ) { if ( !m_aErrorListeners.getLength() ) return; @@ -1385,20 +1385,20 @@ void ODatabaseForm::describeFixedAndAggregateProperties( DECL_IFACE_PROP4(ACTIVE_CONNECTION, XConnection, BOUND, TRANSIENT, MAYBEVOID, CONSTRAINED); DECL_BOOL_PROP2 ( APPLYFILTER, BOUND, MAYBEDEFAULT ); - DECL_PROP1 ( NAME, ::rtl::OUString, BOUND ); - DECL_PROP1 ( MASTERFIELDS, Sequence< ::rtl::OUString >, BOUND ); - DECL_PROP1 ( DETAILFIELDS, Sequence< ::rtl::OUString >, BOUND ); - DECL_PROP2 ( DATASOURCE, ::rtl::OUString, BOUND, CONSTRAINED ); + DECL_PROP1 ( NAME, OUString, BOUND ); + DECL_PROP1 ( MASTERFIELDS, Sequence< OUString >, BOUND ); + DECL_PROP1 ( DETAILFIELDS, Sequence< OUString >, BOUND ); + DECL_PROP2 ( DATASOURCE, OUString, BOUND, CONSTRAINED ); DECL_PROP3 ( CYCLE, TabulatorCycle, BOUND, MAYBEVOID, MAYBEDEFAULT ); - DECL_PROP2 ( FILTER, ::rtl::OUString, BOUND, MAYBEDEFAULT ); + DECL_PROP2 ( FILTER, OUString, BOUND, MAYBEDEFAULT ); DECL_BOOL_PROP2 ( INSERTONLY, BOUND, MAYBEDEFAULT ); DECL_PROP1 ( NAVIGATION, NavigationBarMode, BOUND ); DECL_BOOL_PROP1 ( ALLOWADDITIONS, BOUND ); DECL_BOOL_PROP1 ( ALLOWEDITS, BOUND ); DECL_BOOL_PROP1 ( ALLOWDELETIONS, BOUND ); DECL_PROP2 ( PRIVILEGES, sal_Int32, TRANSIENT, READONLY ); - DECL_PROP1 ( TARGET_URL, ::rtl::OUString, BOUND ); - DECL_PROP1 ( TARGET_FRAME, ::rtl::OUString, BOUND ); + DECL_PROP1 ( TARGET_URL, OUString, BOUND ); + DECL_PROP1 ( TARGET_FRAME, OUString, BOUND ); DECL_PROP1 ( SUBMIT_METHOD, FormSubmitMethod, BOUND ); DECL_PROP1 ( SUBMIT_ENCODING, FormSubmitEncoding, BOUND ); DECL_BOOL_PROP3 ( DYNAMIC_CONTROL_BORDER, BOUND, MAYBEVOID, MAYBEDEFAULT ); @@ -1427,13 +1427,13 @@ Reference< XPropertySetInfo > ODatabaseForm::getPropertySetInfo() throw( Runtime } //-------------------------------------------------------------------- -void SAL_CALL ODatabaseForm::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) +void SAL_CALL ODatabaseForm::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) { m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue ); } //-------------------------------------------------------------------- -void SAL_CALL ODatabaseForm::removeProperty( const ::rtl::OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) +void SAL_CALL ODatabaseForm::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) { m_aPropertyBagHelper.removeProperty( _rName ); } @@ -1625,7 +1625,7 @@ sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOl { Any aAggregateProperty; getFastPropertyValue(aAggregateProperty, PROPERTY_ID_DATASOURCE); - bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, aAggregateProperty, ::getCppuType(static_cast<const ::rtl::OUString*>(NULL))); + bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, aAggregateProperty, ::getCppuType(static_cast<const OUString*>(NULL))); } break; case PROPERTY_ID_TARGET_URL: @@ -1701,7 +1701,7 @@ void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const A case PROPERTY_ID_FILTER: { - ::rtl::OUString sNewFilter; + OUString sNewFilter; rValue >>= sNewFilter; m_aFilterManager.setFilterComponent( FilterManager::fcPublicFilter, sNewFilter ); } @@ -1912,7 +1912,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const break; case PROPERTY_ID_FILTER: - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); break; case PROPERTY_ID_APPLYFILTER: @@ -2012,7 +2012,7 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners) if ( xColProps.is() ) xPSI = xColProps->getPropertySetInfo( ); - static const ::rtl::OUString PROPERTY_CONTROLDEFAULT( "ControlDefault" ); + static const OUString PROPERTY_CONTROLDEFAULT( "ControlDefault" ); if ( xPSI.is() && xPSI->hasPropertyByName( PROPERTY_CONTROLDEFAULT ) ) { Any aDefault = xColProps->getPropertyValue( PROPERTY_CONTROLDEFAULT ); @@ -2147,8 +2147,8 @@ void SAL_CALL ODatabaseForm::submit( const Reference<XControl>& Control, } } // ----------------------------------------------------------------------------- -void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransformer>& xTransformer,const ::rtl::OUString& aURLStr,const ::rtl::OUString& aReferer,const ::rtl::OUString& aTargetName - ,const ::rtl::OUString& aData,rtl_TextEncoding _eEncoding) +void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransformer>& xTransformer,const OUString& aURLStr,const OUString& aReferer,const OUString& aTargetName + ,const OUString& aData,rtl_TextEncoding _eEncoding) { URL aURL; aURL.Complete = aURLStr; @@ -2161,16 +2161,16 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor if (xDisp.is()) { Sequence<PropertyValue> aArgs(2); - aArgs.getArray()[0].Name = ::rtl::OUString("Referer"); + aArgs.getArray()[0].Name = OUString("Referer"); aArgs.getArray()[0].Value <<= aReferer; // build a sequence from the to-be-submitted string - rtl::OString a8BitData(rtl::OUStringToOString(aData, _eEncoding)); + OString a8BitData(OUStringToOString(aData, _eEncoding)); // always ANSI #58641 Sequence< sal_Int8 > aPostData((const sal_Int8*)a8BitData.getStr(), a8BitData.getLength()); Reference< XInputStream > xPostData = new SequenceInputStream(aPostData); - aArgs.getArray()[1].Name = ::rtl::OUString("PostData"); + aArgs.getArray()[1].Name = OUString("PostData"); aArgs.getArray()[1].Value <<= xPostData; xDisp->dispatch(aURL, aArgs); @@ -2197,9 +2197,9 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: FormSubmitEncoding eSubmitEncoding; FormSubmitMethod eSubmitMethod; - ::rtl::OUString aURLStr; - ::rtl::OUString aReferer; - ::rtl::OUString aTargetName; + OUString aURLStr; + OUString aReferer; + OUString aTargetName; Reference< XModel > xModel; { SolarMutexGuard aGuard; @@ -2232,7 +2232,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: // URL encoding if( eSubmitEncoding == FormSubmitEncoding_URL ) { - ::rtl::OUString aData; + OUString aData; { SolarMutexGuard aGuard; aData = GetDataURLEncoded( Control, MouseEvt ); @@ -2255,7 +2255,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: if (xDisp.is()) { Sequence<PropertyValue> aArgs(1); - aArgs.getArray()->Name = ::rtl::OUString("Referer"); + aArgs.getArray()->Name = OUString("Referer"); aArgs.getArray()->Value <<= aReferer; xDisp->dispatch(aURL, aArgs); } @@ -2278,7 +2278,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: if (xDisp.is()) { - ::rtl::OUString aContentType; + OUString aContentType; Sequence<sal_Int8> aData; { SolarMutexGuard aGuard; @@ -2288,15 +2288,15 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: return; Sequence<PropertyValue> aArgs(3); - aArgs.getArray()[0].Name = ::rtl::OUString("Referer"); + aArgs.getArray()[0].Name = OUString("Referer"); aArgs.getArray()[0].Value <<= aReferer; - aArgs.getArray()[1].Name = ::rtl::OUString("ContentType"); + aArgs.getArray()[1].Name = OUString("ContentType"); aArgs.getArray()[1].Value <<= aContentType; // build a sequence from the to-be-submitted string Reference< XInputStream > xPostData = new SequenceInputStream(aData); - aArgs.getArray()[2].Name = ::rtl::OUString("PostData"); + aArgs.getArray()[2].Name = OUString("PostData"); aArgs.getArray()[2].Value <<= xPostData; xDisp->dispatch(aURL, aArgs); @@ -2304,7 +2304,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: } else if( eSubmitEncoding == FormSubmitEncoding_TEXT ) { - ::rtl::OUString aData; + OUString aData; { SolarMutexGuard aGuard; aData = GetDataTextEncoded( Reference<XControl> (), MouseEvt ); @@ -2429,7 +2429,7 @@ void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com sal_Bool bIsEmbedded = ::dbtools::isEmbeddedInDatabase( Parent, xOuterConnection ); if ( bIsEmbedded ) - xAggregateProperties->setPropertyValue( PROPERTY_DATASOURCE, makeAny( ::rtl::OUString() ) ); + xAggregateProperties->setPropertyValue( PROPERTY_DATASOURCE, makeAny( OUString() ) ); } //============================================================================== @@ -2499,7 +2499,7 @@ Sequence<Reference<XControlModel> > SAL_CALL ODatabaseForm::getControlModels() t } //------------------------------------------------------------------------------ -void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const ::rtl::OUString& Name ) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const OUString& Name ) throw( RuntimeException ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -2507,7 +2507,7 @@ void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> > // first control of the sequence const Reference<XControlModel>* pControls = _rGroup.getConstArray(); Reference< XPropertySet > xSet; - ::rtl::OUString sGroupName( Name ); + OUString sGroupName( Name ); for( sal_Int32 i=0; i<_rGroup.getLength(); ++i, ++pControls ) { @@ -2535,11 +2535,11 @@ sal_Int32 SAL_CALL ODatabaseForm::getGroupCount() throw( RuntimeException ) } //------------------------------------------------------------------------------ -void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XControlModel> >& _rGroup, ::rtl::OUString& _rName ) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XControlModel> >& _rGroup, OUString& _rName ) throw( RuntimeException ) { ::osl::MutexGuard aGuard(m_aMutex); _rGroup.realloc(0); - _rName = ::rtl::OUString(); + _rName = OUString(); if ((nGroup < 0) || (nGroup >= m_pGroupManager->getGroupCount())) return; @@ -2547,7 +2547,7 @@ void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XCon } //------------------------------------------------------------------------------ -void SAL_CALL ODatabaseForm::getGroupByName(const ::rtl::OUString& Name, Sequence< Reference<XControlModel> >& _rGroup) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Reference<XControlModel> >& _rGroup) throw( RuntimeException ) { ::osl::MutexGuard aGuard(m_aMutex); _rGroup.realloc(0); @@ -2679,11 +2679,11 @@ void SAL_CALL ODatabaseForm::load() throw( RuntimeException ) sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rxParentProps ) { // our own data source - ::rtl::OUString sOwnDatasource; + OUString sOwnDatasource; m_xAggregateSet->getPropertyValue( PROPERTY_DATASOURCE ) >>= sOwnDatasource; // our parents data source - ::rtl::OUString sParentDataSource; + OUString sParentDataSource; OSL_ENSURE( _rxParentProps.is() && _rxParentProps->getPropertySetInfo().is() && _rxParentProps->getPropertySetInfo()->hasPropertyByName( PROPERTY_DATASOURCE ), "ODatabaseForm::doShareConnection: invalid parent form!" ); if ( _rxParentProps.is() ) @@ -2700,8 +2700,8 @@ sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rx else { // the data source name is empty // -> ook for the URL - ::rtl::OUString sParentURL; - ::rtl::OUString sMyURL; + OUString sParentURL; + OUString sMyURL; _rxParentProps->getPropertyValue( PROPERTY_URL ) >>= sParentURL; m_xAggregateSet->getPropertyValue( PROPERTY_URL ) >>= sMyURL; @@ -2714,11 +2714,11 @@ sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rx // check for the user/password // take the user property on the rowset (if any) into account - ::rtl::OUString sParentUser, sParentPwd; + OUString sParentUser, sParentPwd; _rxParentProps->getPropertyValue( PROPERTY_USER ) >>= sParentUser; _rxParentProps->getPropertyValue( PROPERTY_PASSWORD ) >>= sParentPwd; - ::rtl::OUString sMyUser, sMyPwd; + OUString sMyUser, sMyPwd; m_xAggregateSet->getPropertyValue( PROPERTY_USER ) >>= sMyUser; m_xAggregateSet->getPropertyValue( PROPERTY_PASSWORD ) >>= sMyPwd; @@ -3625,7 +3625,7 @@ void SAL_CALL ODatabaseForm::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType } //------------------------------------------------------------------------------ -void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException ) { m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName); } @@ -3673,7 +3673,7 @@ void SAL_CALL ODatabaseForm::setDouble(sal_Int32 parameterIndex, double x) throw } //------------------------------------------------------------------------------ -void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw( SQLException, RuntimeException ) +void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException ) { m_aParameterManager.setString(parameterIndex, x); } @@ -3775,16 +3775,16 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th // com::sun::star::lang::XServiceInfo //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName_Static() +OUString SAL_CALL ODatabaseForm::getImplementationName_Static() { - return ::rtl::OUString( "com.sun.star.comp.forms.ODatabaseForm" ); + return OUString( "com.sun.star.comp.forms.ODatabaseForm" ); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCompatibleServiceNames_Static() +Sequence< OUString > SAL_CALL ODatabaseForm::getCompatibleServiceNames_Static() { - Sequence< ::rtl::OUString > aServices( 1 ); - ::rtl::OUString* pServices = aServices.getArray(); + Sequence< OUString > aServices( 1 ); + OUString* pServices = aServices.getArray(); *pServices++ = FRM_COMPONENT_FORM; @@ -3792,13 +3792,13 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCompatibleServiceNames_St } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Static() +Sequence< OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Static() { - Sequence< ::rtl::OUString > aServices( 5 ); - ::rtl::OUString* pServices = aServices.getArray(); + Sequence< OUString > aServices( 5 ); + OUString* pServices = aServices.getArray(); *pServices++ = FRM_SUN_FORMCOMPONENT; - *pServices++ = ::rtl::OUString("com.sun.star.form.FormComponents"); + *pServices++ = OUString("com.sun.star.form.FormComponents"); *pServices++ = FRM_SUN_COMPONENT_FORM; *pServices++ = FRM_SUN_COMPONENT_HTMLFORM; *pServices++ = FRM_SUN_COMPONENT_DATAFORM; @@ -3807,7 +3807,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Stati } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Static() +Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Static() { return ::comphelper::concatSequences( getCurrentServiceNames_Static(), @@ -3816,16 +3816,16 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Sta } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( RuntimeException ) { // the services of our aggregate - Sequence< ::rtl::OUString > aServices; + Sequence< OUString > aServices; Reference< XServiceInfo > xInfo; if (query_aggregation(m_xAggregate, xInfo)) aServices = xInfo->getSupportedServiceNames(); @@ -3842,10 +3842,10 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() t } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL ODatabaseForm::supportsService(const ::rtl::OUString& ServiceName) throw( RuntimeException ) +sal_Bool SAL_CALL ODatabaseForm::supportsService(const OUString& ServiceName) throw( RuntimeException ) { - Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSupported.getConstArray(); + Sequence< OUString > aSupported( getSupportedServiceNames() ); + const OUString* pArray = aSupported.getConstArray(); for( sal_Int32 i = 0; i < aSupported.getLength(); ++i, ++pArray ) if( pArray->equals( ServiceName ) ) return sal_True; @@ -3860,7 +3860,7 @@ const sal_uInt16 CYCLE = 0x0001; const sal_uInt16 DONTAPPLYFILTER = 0x0002; //------------------------------------------------------------------------------ -::rtl::OUString ODatabaseForm::getServiceName() throw( RuntimeException ) +OUString ODatabaseForm::getServiceName() throw( RuntimeException ) { return FRM_COMPONENT_FORM; // old (non-sun) name for compatibility ! } @@ -3879,13 +3879,13 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS // Name _rxOutStream << m_sName; - ::rtl::OUString sDataSource; + OUString sDataSource; if (m_xAggregateSet.is()) m_xAggregateSet->getPropertyValue(PROPERTY_DATASOURCE) >>= sDataSource; _rxOutStream << sDataSource; // former CursorSource - ::rtl::OUString sCommand; + OUString sCommand; if (m_xAggregateSet.is()) m_xAggregateSet->getPropertyValue(PROPERTY_COMMAND) >>= sCommand; _rxOutStream << sCommand; @@ -3932,7 +3932,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS _rxOutStream->writeBoolean(m_bAllowDelete); // html form stuff - ::rtl::OUString sTmp = INetURLObject::decode( m_aTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS); + OUString sTmp = INetURLObject::decode( m_aTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS); _rxOutStream << sTmp; _rxOutStream->writeShort( (sal_Int16)m_eSubmitMethod ); _rxOutStream->writeShort( (sal_Int16)m_eSubmitEncoding ); @@ -3951,8 +3951,8 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS _rxOutStream->writeShort((sal_Int16)m_eNavigation); - ::rtl::OUString sFilter; - ::rtl::OUString sOrder; + OUString sFilter; + OUString sOrder; if (m_xAggregateSet.is()) { m_xAggregateSet->getPropertyValue(PROPERTY_FILTER) >>= sFilter; @@ -3992,7 +3992,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre _rxInStream >> m_sName; - ::rtl::OUString sAggregateProp; + OUString sAggregateProp; _rxInStream >> sAggregateProp; if (m_xAggregateSet.is()) m_xAggregateSet->setPropertyValue(PROPERTY_DATASOURCE, makeAny(sAggregateProp)); @@ -4040,7 +4040,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre m_bAllowDelete = _rxInStream->readBoolean(); // html stuff - ::rtl::OUString sTmp; + OUString sTmp; _rxInStream >> sTmp; m_aTargetURL = INetURLObject::decode( sTmp, '%', INetURLObject::DECODE_UNAMBIGUOUS); m_eSubmitMethod = (FormSubmitMethod)_rxInStream->readShort(); @@ -4115,15 +4115,15 @@ void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( R // com::sun::star::container::XNamed //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException ) +OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException ) { - ::rtl::OUString sReturn; + OUString sReturn; OPropertySetHelper::getFastPropertyValue(PROPERTY_ID_NAME) >>= sReturn; return sReturn; } //------------------------------------------------------------------------------ -void SAL_CALL ODatabaseForm::setName(const ::rtl::OUString& aName) throw( RuntimeException ) +void SAL_CALL ODatabaseForm::setName(const OUString& aName) throw( RuntimeException ) { setFastPropertyValue(PROPERTY_ID_NAME, makeAny(aName)); } diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 4e250a0fa7e9..776b5fed1830 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -94,11 +94,11 @@ const sal_uInt16 SUCCESSFUL_REPRESENT_FILE = 0x0002; class HtmlSuccessfulObj { public: - ::rtl::OUString aName; - ::rtl::OUString aValue; + OUString aName; + OUString aValue; sal_uInt16 nRepresentation; - HtmlSuccessfulObj( const ::rtl::OUString& _rName, const ::rtl::OUString& _rValue, + HtmlSuccessfulObj( const OUString& _rName, const OUString& _rValue, sal_uInt16 _nRepresent = SUCCESSFUL_REPRESENT_TEXT ) :aName( _rName ) ,aValue( _rValue ) @@ -169,8 +169,8 @@ class ODatabaseForm :public OFormComponents ::osl::Mutex m_aResetSafety; ::com::sun::star::uno::Any m_aCycle; ::com::sun::star::uno::Any m_aIgnoreResult; // set when we are a subform and our master form positioned on a new row - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aDetailFields; + ::com::sun::star::uno::Sequence< OUString > m_aMasterFields; + ::com::sun::star::uno::Sequence< OUString > m_aDetailFields; // the object doin' most of the work - an SDB-rowset ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; @@ -187,7 +187,7 @@ class ODatabaseForm :public OFormComponents Timer* m_pLoadTimer; OFormSubmitResetThread* m_pThread; - ::rtl::OUString m_sCurrentErrorContext; + OUString m_sCurrentErrorContext; // will be used as additional context information // when an exception is catched and forwarded to the listeners @@ -202,9 +202,9 @@ class ODatabaseForm :public OFormComponents ::com::sun::star::uno::Any m_aControlBorderColorMouse; ::com::sun::star::uno::Any m_aControlBorderColorInvalid; ::com::sun::star::uno::Any m_aDynamicControlBorder; - ::rtl::OUString m_sName; - ::rtl::OUString m_aTargetURL; - ::rtl::OUString m_aTargetFrame; + OUString m_sName; + OUString m_aTargetURL; + OUString m_aTargetFrame; ::com::sun::star::form::FormSubmitMethod m_eSubmitMethod; ::com::sun::star::form::FormSubmitEncoding m_eSubmitEncoding; ::com::sun::star::form::NavigationBarMode m_eNavigation; @@ -280,18 +280,18 @@ public: virtual void SAL_CALL setParent(const InterfaceRef& Parent) throw ( :: com::sun::star::lang::NoSupportException , ::com::sun::star::uno::RuntimeException); // com::sun::star::container::XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& aName) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException); // com::sun::star::awt::XTabControllerModel virtual sal_Bool SAL_CALL getGroupControl() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setGroupControl(sal_Bool /*_bGroupControl*/) throw(::com::sun::star::uno::RuntimeException) { } virtual void SAL_CALL setControlModels(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rControls) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > > SAL_CALL getControlModels() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const ::rtl::OUString& _rGroupName) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroup(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rGroup, const OUString& _rGroupName) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getGroupCount() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL getGroup(sal_Int32 _nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup, ::rtl::OUString& _rName) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL getGroupByName(const ::rtl::OUString& _rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL getGroup(sal_Int32 _nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup, OUString& _rName) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL getGroupByName(const OUString& _rName, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > >& _rxGroup) throw(::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XEventListener virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException); @@ -376,19 +376,19 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& rows) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCurrentServiceNames_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCompatibleServiceNames_Static(); + static OUString SAL_CALL getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCurrentServiceNames_Static(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCompatibleServiceNames_Static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); // com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -397,7 +397,7 @@ public: // com::sun::star::sdbc::XParameters virtual void SAL_CALL setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte(sal_Int32 parameterIndex, sal_Int8 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort(sal_Int32 parameterIndex, sal_Int16 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -405,7 +405,7 @@ public: virtual void SAL_CALL setLong(sal_Int32 parameterIndex, sal_Int64 x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat(sal_Int32 parameterIndex, float x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble(sal_Int32 parameterIndex, double x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString(sal_Int32 parameterIndex, const OUString& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes(sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -424,8 +424,8 @@ public: virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& evt ) throw (::com::sun::star::uno::RuntimeException); // XPropertyContainer - virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeProperty( const ::rtl::OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException); @@ -516,23 +516,23 @@ private: // error handling void onError(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent); - void onError(const ::com::sun::star::sdbc::SQLException&, const ::rtl::OUString& _rContextDescription); + void onError(const ::com::sun::star::sdbc::SQLException&, const OUString& _rContextDescription); // html tools - ::rtl::OUString GetDataEncoded(bool _bURLEncoded,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); - ::rtl::OUString GetDataURLEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); - ::rtl::OUString GetDataTextEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); + OUString GetDataEncoded(bool _bURLEncoded,const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); + OUString GetDataURLEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); + OUString GetDataTextEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); ::com::sun::star::uno::Sequence<sal_Int8> GetDataMultiPartEncoded(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, - ::rtl::OUString& rContentType); + OUString& rContentType); - void AppendComponent(HtmlSuccessfulObjList& rList, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xComponentSet, const ::rtl::OUString& rNamePrefix, + void AppendComponent(HtmlSuccessfulObjList& rList, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xComponentSet, const OUString& rNamePrefix, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); void FillSuccessfulList(HtmlSuccessfulObjList& rList, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt); - void InsertTextPart(INetMIMEMessage& rParent, const ::rtl::OUString& rName, const ::rtl::OUString& rData); - sal_Bool InsertFilePart(INetMIMEMessage& rParent, const ::rtl::OUString& rName, const ::rtl::OUString& rFileName); - void Encode(::rtl::OUString& rString) const; + void InsertTextPart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rData); + sal_Bool InsertFilePart(INetMIMEMessage& rParent, const OUString& rName, const OUString& rFileName); + void Encode(OUString& rString) const; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection(); diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index bc59971729f6..7ebc20d53389 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -68,7 +68,7 @@ StringSequence SAL_CALL ODateControl::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_DATEFIELD; return aSupported; } @@ -143,7 +143,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw() sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -160,7 +160,7 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw() } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_DATEFIELD; // old (non-sun) name for compatibility ! } diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx index 7384c93a7c55..1160945550fb 100644 --- a/forms/source/component/Date.hxx +++ b/forms/source/component/Date.hxx @@ -45,7 +45,7 @@ public: DECLARE_DEFAULT_LEAF_XTOR( ODateModel ); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::beans::XPropertySet virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 81b816c55427..e3e3b76cf0b4 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -153,7 +153,7 @@ StringSequence OEditControl::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_TEXTFIELD; return aSupported; } @@ -180,7 +180,7 @@ void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( ::com::sun::star Reference<XPropertySet> xSet(getModel(), UNO_QUERY); if (xSet.is()) { - ::rtl::OUString sNewHtmlChangeValue; + OUString sNewHtmlChangeValue; xSet->getPropertyValue( PROPERTY_TEXT ) >>= sNewHtmlChangeValue; if( sNewHtmlChangeValue != m_aHtmlChangeValue ) { @@ -217,7 +217,7 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( return; aTmp = xFormSet->getPropertyValue( PROPERTY_TARGET_URL ); - if (!aTmp.getValueType().equals(::getCppuType((const ::rtl::OUString*)NULL)) || + if (!aTmp.getValueType().equals(::getCppuType((const OUString*)NULL)) || getString(aTmp).isEmpty() ) return; @@ -338,7 +338,7 @@ void OEditModel::disposing() // XPersistObject //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_EDIT; // old (non-sun) name for compatibility ! } @@ -351,7 +351,7 @@ StringSequence SAL_CALL OEditModel::getSupportedServiceNames() throw() sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -388,7 +388,7 @@ void OEditModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 5, OEditBaseModel ) DECL_PROP2(PERSISTENCE_MAXTEXTLENGTH,sal_Int16, READONLY, TRANSIENT); - DECL_PROP2(DEFAULT_TEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT); + DECL_PROP2(DEFAULT_TEXT, OUString, BOUND, MAYBEDEFAULT); DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_BOOL_PROP2(FILTERPROPOSAL, BOUND, MAYBEDEFAULT); @@ -477,13 +477,13 @@ namespace catch(const IllegalArgumentException& e) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "could not transfer the property named '" ); - sMessage += ::rtl::OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ); - sMessage += ::rtl::OString( "'." ); + OString sMessage( "could not transfer the property named '" ); + sMessage += OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "'." ); if ( !e.Message.isEmpty() ) { - sMessage += ::rtl::OString( "\n\nMessage:\n" ); - sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( "\n\nMessage:\n" ); + sMessage += OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US ); } OSL_FAIL( sMessage.getStr() ); #else @@ -508,7 +508,7 @@ void OEditModel::writeAggregate( const Reference< XObjectOutputStream >& _rxOutS // but for compatibility, we need to use an "old" aggregate for writing and reading Reference< XPropertySet > xFakedAggregate( - getContext().createComponent( (rtl::OUString)VCL_CONTROLMODEL_EDIT ), + getContext().createComponent( (OUString)VCL_CONTROLMODEL_EDIT ), UNO_QUERY ); OSL_ENSURE( xFakedAggregate.is(), "OEditModel::writeAggregate: could not create an old EditControlModel!" ); @@ -530,7 +530,7 @@ void OEditModel::readAggregate( const Reference< XObjectInputStream >& _rxInStre // but for compatibility, we need to use an "old" aggregate for writing and reading Reference< XPropertySet > xFakedAggregate( - getContext().createComponent( (rtl::OUString)VCL_CONTROLMODEL_EDIT ), + getContext().createComponent( (OUString)VCL_CONTROLMODEL_EDIT ), UNO_QUERY ); Reference< XPersistObject > xFakedPersist( xFakedAggregate, UNO_QUERY ); @@ -567,7 +567,7 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw // First we set it to an empty string : Without this the second setPropertyValue would not do anything as it thinks // we aren't changing the prop (it didn't notify the - implicite - change of the text prop while setting the max text len) // This seems to be a bug with in toolkit's EditControl-implementation. - m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, makeAny(::rtl::OUString())); + m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, makeAny(OUString())); m_xAggregateSet->setPropertyValue(PROPERTY_TEXT, aCurrentText); } } @@ -587,7 +587,7 @@ void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( && (getString(aDefaultControl) == STARDIV_ONE_FORM_CONTROL_TEXTFIELD ) ) { - m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, makeAny( (::rtl::OUString)STARDIV_ONE_FORM_CONTROL_EDIT ) ); + m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, makeAny( (OUString)STARDIV_ONE_FORM_CONTROL_EDIT ) ); // Older as well as current versions should understand this : the former knew only the STARDIV_ONE_FORM_CONTROL_EDIT, // the latter are registered for both STARDIV_ONE_FORM_CONTROL_EDIT and STARDIV_ONE_FORM_CONTROL_TEXTFIELD. } @@ -619,7 +619,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm ) if ( !m_bMaxTextLenModified ) { sal_Int32 nFieldLen = 0; - xField->getPropertyValue(::rtl::OUString("Precision") ) >>= nFieldLen; + xField->getPropertyValue(OUString("Precision") ) >>= nFieldLen; if (nFieldLen && nFieldLen <= USHRT_MAX) { @@ -673,7 +673,7 @@ sal_Bool OEditModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) { Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) ); - ::rtl::OUString sNewValue; + OUString sNewValue; aNewValue >>= sNewValue; if ( !aNewValue.hasValue() @@ -713,7 +713,7 @@ Any OEditModel::translateDbColumnToControlValue() Any aRet; if ( m_pValueFormatter.get() ) { - ::rtl::OUString sValue( m_pValueFormatter->getFormattedValue() ); + OUString sValue( m_pValueFormatter->getFormattedValue() ); if ( sValue.isEmpty() && m_pValueFormatter->getColumn().is() && m_pValueFormatter->getColumn()->wasNull() @@ -727,14 +727,14 @@ Any OEditModel::translateDbColumnToControlValue() if ( nMaxTextLen && sValue.getLength() > nMaxTextLen ) { sal_Int32 nDiff = sValue.getLength() - nMaxTextLen; - sValue = sValue.replaceAt( nMaxTextLen, nDiff, ::rtl::OUString() ); + sValue = sValue.replaceAt( nMaxTextLen, nDiff, OUString() ); } aRet <<= sValue; } } - return aRet.hasValue() ? aRet : makeAny( ::rtl::OUString() ); + return aRet.hasValue() ? aRet : makeAny( OUString() ); } //------------------------------------------------------------------------------ diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index bf39ef19957f..5ef4daf247e4 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -66,7 +66,7 @@ public: // XPersistObject virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); // XPropertySet using OBoundControlModel::getFastPropertyValue; @@ -131,7 +131,7 @@ class OEditControl : public OBoundControl ::cppu::OInterfaceContainerHelper m_aChangeListeners; - ::rtl::OUString m_aHtmlChangeValue; + OUString m_aHtmlChangeValue; sal_uInt32 m_nKeyEvent; public: diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx index a9c6b4366c99..bfbb76f1d86a 100644 --- a/forms/source/component/EditBase.cxx +++ b/forms/source/component/EditBase.cxx @@ -48,8 +48,8 @@ const sal_uInt16 FILTERPROPOSAL = 0x0004; DBG_NAME( OEditBaseModel ) //------------------------------------------------------------------ -OEditBaseModel::OEditBaseModel( const Reference< XMultiServiceFactory >& _rxFactory, const ::rtl::OUString& rUnoControlModelName, - const ::rtl::OUString& rDefault, const sal_Bool _bSupportExternalBinding, const sal_Bool _bSupportsValidation ) +OEditBaseModel::OEditBaseModel( const Reference< XMultiServiceFactory >& _rxFactory, const OUString& rUnoControlModelName, + const OUString& rDefault, const sal_Bool _bSupportExternalBinding, const sal_Bool _bSupportsValidation ) :OBoundControlModel( _rxFactory, rUnoControlModelName, rDefault, sal_True, _bSupportExternalBinding, _bSupportsValidation ) ,m_nLastReadVersion(0) ,m_bEmptyIsNull(sal_True) @@ -331,7 +331,7 @@ Any OEditBaseModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const switch (nHandle) { case PROPERTY_ID_DEFAULT_TEXT: - return makeAny(::rtl::OUString()); + return makeAny(OUString()); case PROPERTY_ID_FILTERPROPOSAL: return Any(makeAny((sal_Bool)sal_False)); case PROPERTY_ID_DEFAULT_VALUE: diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx index 9fdcca7858d3..3d22332657b5 100644 --- a/forms/source/component/EditBase.hxx +++ b/forms/source/component/EditBase.hxx @@ -59,7 +59,7 @@ class OEditBaseModel : public OBoundControlModel protected: // [properties] for all EditingFields ::com::sun::star::uno::Any m_aDefault; - ::rtl::OUString m_aDefaultText; // default value + OUString m_aDefaultText; // default value sal_Bool m_bEmptyIsNull : 1; // empty string will be interepreted as NULL when committing sal_Bool m_bFilterProposal : 1; // use a list of possible value in filtermode // [properties] diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx index 3b3cb127443e..43798c4dce26 100644 --- a/forms/source/component/File.cxx +++ b/forms/source/component/File.cxx @@ -76,7 +76,7 @@ StringSequence OFileControlModel::getSupportedServiceNames() throw(RuntimeExcep StringSequence aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_FILECONTROL; return aSupported; } @@ -145,7 +145,7 @@ Any OFileControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const switch ( _nHandle ) { case PROPERTY_ID_DEFAULT_TEXT: - return makeAny( ::rtl::OUString() ); + return makeAny( OUString() ); } return OControlModel::getPropertyDefaultByHandle( _nHandle ); } @@ -192,13 +192,13 @@ sal_Bool OFileControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 2, OControlModel ) - DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND); + DECL_PROP1(DEFAULT_TEXT, OUString, BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); END_DESCRIBE_PROPERTIES(); } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_FILECONTROL; // old (non-sun) name for compatibility ! } @@ -236,7 +236,7 @@ void OFileControlModel::read(const Reference<stario::XObjectInputStream>& _rxInS break; default: OSL_FAIL("OFileControlModel::read : unknown version !"); - m_sDefaultValue = ::rtl::OUString(); + m_sDefaultValue = OUString(); } // Display default values after read diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx index 13d813a139d6..992e90776848 100644 --- a/forms/source/component/File.hxx +++ b/forms/source/component/File.hxx @@ -35,7 +35,7 @@ class OFileControlModel ,public ::com::sun::star::form::XReset { ::cppu::OInterfaceContainerHelper m_aResetListeners; - ::rtl::OUString m_sDefaultValue; + OUString m_sDefaultValue; protected: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); @@ -63,7 +63,7 @@ public: virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const; // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com ::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com ::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index c6c665f5db41..e7775267abb9 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -152,28 +152,28 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString OFilterControl::GetComponentServiceName() + OUString OFilterControl::GetComponentServiceName() { - ::rtl::OUString aServiceName; + OUString aServiceName; switch (m_nControlClass) { case FormComponentType::RADIOBUTTON: - aServiceName = rtl::OUString("radiobutton"); + aServiceName = OUString("radiobutton"); break; case FormComponentType::CHECKBOX: - aServiceName = rtl::OUString("checkbox"); + aServiceName = OUString("checkbox"); break; case FormComponentType::COMBOBOX: - aServiceName = rtl::OUString("combobox"); + aServiceName = OUString("combobox"); break; case FormComponentType::LISTBOX: - aServiceName = rtl::OUString("listbox"); + aServiceName = OUString("listbox"); break; default: if (m_bMultiLine) - aServiceName = rtl::OUString("MultiLineEdit"); + aServiceName = OUString("MultiLineEdit"); else - aServiceName = rtl::OUString("Edit"); + aServiceName = OUString("Edit"); } return aServiceName; } @@ -268,7 +268,7 @@ namespace frm } //--------------------------------------------------------------------- - void OFilterControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const Any& rVal ) + void OFilterControl::ImplSetPeerProperty( const OUString& rPropName, const Any& rVal ) { // these properties are ignored if (rPropName == PROPERTY_TEXT || @@ -289,7 +289,7 @@ namespace frm //--------------------------------------------------------------------- void SAL_CALL OFilterControl::itemStateChanged( const ItemEvent& rEvent ) throw(RuntimeException) { - ::rtl::OUStringBuffer aText; + OUStringBuffer aText; switch (m_nControlClass) { case FormComponentType::CHECKBOX: @@ -300,7 +300,7 @@ namespace frm bool bSelected = ( rEvent.Selected == STATE_CHECK ); - ::rtl::OUString sExpressionMarker( "$expression$" ); + OUString sExpressionMarker( "$expression$" ); ::dbtools::getBoleanComparisonPredicate( sExpressionMarker, bSelected, @@ -308,7 +308,7 @@ namespace frm aText ); - ::rtl::OUString sText( aText.makeStringAndClear() ); + OUString sText( aText.makeStringAndClear() ); sal_Int32 nMarkerPos( sText.indexOf( sExpressionMarker ) ); OSL_ENSURE( nMarkerPos == 0, "OFilterControl::itemStateChanged: unsupported boolean comparison mode!" ); // If this assertion fails, then getBoleanComparisonPredicate created a predicate which @@ -335,7 +335,7 @@ namespace frm try { const Reference< XItemList > xItemList( getModel(), UNO_QUERY_THROW ); - ::rtl::OUString sItemText( xItemList->getItemText( rEvent.Selected ) ); + OUString sItemText( xItemList->getItemText( rEvent.Selected ) ); const MapString2String::const_iterator itemPos = m_aDisplayItemToValueItem.find( sItemText ); if ( itemPos != m_aDisplayItemToValueItem.end() ) @@ -344,7 +344,7 @@ namespace frm if ( !sItemText.isEmpty() ) { ::dbtools::OPredicateInputController aPredicateInput( m_xContext, m_xConnection, getParseContext() ); - ::rtl::OUString sErrorMessage; + OUString sErrorMessage; OSL_VERIFY( aPredicateInput.normalizePredicateString( sItemText, m_xField, &sErrorMessage ) ); } } @@ -365,7 +365,7 @@ namespace frm break; } - ::rtl::OUString sText( aText.makeStringAndClear() ); + OUString sText( aText.makeStringAndClear() ); if ( m_aText.compareTo( sText ) ) { m_aText = sText; @@ -395,7 +395,7 @@ namespace frm if ( !m_xField.is() ) return; - ::rtl::OUString sFieldName; + OUString sFieldName; m_xField->getPropertyValue( PROPERTY_NAME ) >>= sFieldName; // here we need a table to which the field belongs to @@ -405,13 +405,13 @@ namespace frm // create a query composer Reference< XColumnsSupplier > xSuppColumns; - xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSuppColumns; + xFormProps->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSuppColumns; const Reference< XConnection > xConnection( ::dbtools::getConnection( xForm ), UNO_SET_THROW ); const Reference< XNameAccess > xFieldNames( xSuppColumns->getColumns(), UNO_SET_THROW ); if ( !xFieldNames->hasByName( sFieldName ) ) return; - ::rtl::OUString sRealFieldName, sTableName; + OUString sRealFieldName, sTableName; const Reference< XPropertySet > xComposerFieldProps( xFieldNames->getByName( sFieldName ), UNO_QUERY_THROW ); xComposerFieldProps->getPropertyValue( PROPERTY_REALNAME ) >>= sRealFieldName; xComposerFieldProps->getPropertyValue( PROPERTY_TABLENAME ) >>= sTableName; @@ -423,10 +423,10 @@ namespace frm sTableName = xNamedTable->getName(); // create a statement selecting all values for the given field - ::rtl::OUStringBuffer aStatement; + OUStringBuffer aStatement; const Reference< XDatabaseMetaData > xMeta( xConnection->getMetaData(), UNO_SET_THROW ); - const ::rtl::OUString sQuoteChar = xMeta->getIdentifierQuoteString(); + const OUString sQuoteChar = xMeta->getIdentifierQuoteString(); aStatement.appendAscii( "SELECT DISTINCT " ); aStatement.append( sQuoteChar ); @@ -444,13 +444,13 @@ namespace frm aStatement.appendAscii( " FROM " ); - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; ::dbtools::qualifiedNameComponents( xMeta, sTableName, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation ); aStatement.append( ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sTable ) ); // execute the statement xStatement.reset( xConnection->createStatement() ); - const ::rtl::OUString sSelectStatement( aStatement.makeStringAndClear( ) ); + const OUString sSelectStatement( aStatement.makeStringAndClear( ) ); xListCursor.reset( xStatement->executeQuery( sSelectStatement ) ); // retrieve the one column which we take the values from @@ -461,17 +461,17 @@ namespace frm // ensure the values will be formatted according to the field format const ::dbtools::FormattedColumnValue aFormatter( m_xFormatter, xDataField ); - ::std::vector< ::rtl::OUString > aProposals; + ::std::vector< OUString > aProposals; aProposals.reserve(16); while ( xListCursor->next() && ( aProposals.size() < size_t( SHRT_MAX ) ) ) { - const ::rtl::OUString sCurrentValue = aFormatter.getFormattedValue(); + const OUString sCurrentValue = aFormatter.getFormattedValue(); aProposals.push_back( sCurrentValue ); } // fill the list items into our peer - Sequence< ::rtl::OUString> aStringSeq( aProposals.size() ); + Sequence< OUString> aStringSeq( aProposals.size() ); ::std::copy( aProposals.begin(), aProposals.end(), aStringSeq.getArray() ); const Reference< XComboBox > xComboBox( getPeer(), UNO_QUERY_THROW ); @@ -508,7 +508,7 @@ namespace frm // already asserted in ensureInitialized return sal_True; - ::rtl::OUString aText; + OUString aText; switch (m_nControlClass) { case FormComponentType::TEXTFIELD: @@ -524,12 +524,12 @@ namespace frm if (m_aText.compareTo(aText)) { // check the text with the SQL-Parser - ::rtl::OUString aNewText(aText); + OUString aNewText(aText); aNewText = aNewText.trim(); if ( !aNewText.isEmpty() ) { ::dbtools::OPredicateInputController aPredicateInput( m_xContext, m_xConnection, getParseContext() ); - ::rtl::OUString sErrorMessage; + OUString sErrorMessage; if ( !aPredicateInput.normalizePredicateString( aNewText, m_xField, &sErrorMessage ) ) { // display the error and outta here @@ -565,7 +565,7 @@ namespace frm } //--------------------------------------------------------------------- - void SAL_CALL OFilterControl::setText( const ::rtl::OUString& aText ) throw(RuntimeException) + void SAL_CALL OFilterControl::setText( const OUString& aText ) throw(RuntimeException) { if ( !ensureInitialized( ) ) // already asserted in ensureInitialized @@ -602,7 +602,7 @@ namespace frm Reference< XVclWindowPeer > xVclWindow( getPeer(), UNO_QUERY ); if (xVclWindow.is()) { - ::rtl::OUString aRefText = ::comphelper::getString(com::sun::star::uno::Reference< XPropertySet > (getModel(), UNO_QUERY)->getPropertyValue(PROPERTY_REFVALUE)); + OUString aRefText = ::comphelper::getString(com::sun::star::uno::Reference< XPropertySet > (getModel(), UNO_QUERY)->getPropertyValue(PROPERTY_REFVALUE)); Any aValue; if (aText == aRefText) aValue <<= (sal_Int32)STATE_CHECK; @@ -634,7 +634,7 @@ namespace frm OSL_ENSURE( ( itemPos != m_aDisplayItemToValueItem.end() ) || m_aText.isEmpty(), "OFilterControl::setText: this text is not in my display list!" ); if ( itemPos == m_aDisplayItemToValueItem.end() ) - m_aText = ::rtl::OUString(); + m_aText = OUString(); if ( m_aText.isEmpty() ) { @@ -664,7 +664,7 @@ namespace frm } //--------------------------------------------------------------------- - void SAL_CALL OFilterControl::insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw(::com::sun::star::uno::RuntimeException) + void SAL_CALL OFilterControl::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException) { Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) @@ -675,15 +675,15 @@ namespace frm } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OFilterControl::getText() throw(RuntimeException) + OUString SAL_CALL OFilterControl::getText() throw(RuntimeException) { return m_aText; } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OFilterControl::getSelectedText( void ) throw(RuntimeException) + OUString SAL_CALL OFilterControl::getSelectedText( void ) throw(RuntimeException) { - ::rtl::OUString aSelected; + OUString aSelected; Reference< XTextComponent > xText( getPeer(), UNO_QUERY ); if (xText.is()) aSelected = xText->getSelectedText(); @@ -761,7 +761,7 @@ namespace frm PropertyValue aProp; NamedValue aValue; - const ::rtl::OUString* pName = NULL; + const OUString* pName = NULL; const Any* pValue = NULL; Reference< XPropertySet > xControlModel; @@ -847,9 +847,9 @@ namespace frm m_nControlClass = nClassId; if ( FormComponentType::LISTBOX == nClassId ) { - Sequence< ::rtl::OUString > aDisplayItems; + Sequence< OUString > aDisplayItems; OSL_VERIFY( xControlModel->getPropertyValue( PROPERTY_STRINGITEMLIST ) >>= aDisplayItems ); - Sequence< ::rtl::OUString > aValueItems; + Sequence< OUString > aValueItems; OSL_VERIFY( xControlModel->getPropertyValue( PROPERTY_VALUE_SEQ ) >>= aValueItems ); OSL_ENSURE( aDisplayItems.getLength() == aValueItems.getLength(), "OFilterControl::initialize: inconsistent item lists!" ); for ( sal_Int32 i=0; i < ::std::min( aDisplayItems.getLength(), aValueItems.getLength() ); ++i ) @@ -874,16 +874,16 @@ namespace frm } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OFilterControl::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL OFilterControl::getImplementationName( ) throw (RuntimeException) { return getImplementationName_Static(); } //--------------------------------------------------------------------- - sal_Bool SAL_CALL OFilterControl::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException) + sal_Bool SAL_CALL OFilterControl::supportsService( const OUString& ServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSupported.getConstArray(); + Sequence< OUString > aSupported( getSupportedServiceNames() ); + const OUString* pArray = aSupported.getConstArray(); for( sal_Int32 i = 0; i < aSupported.getLength(); ++i, ++pArray ) if( pArray->equals( ServiceName ) ) return sal_True; @@ -891,23 +891,23 @@ namespace frm } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OFilterControl::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_Static(); } //--------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OFilterControl::getImplementationName_Static() + OUString SAL_CALL OFilterControl::getImplementationName_Static() { - return ::rtl::OUString( "com.sun.star.comp.forms.OFilterControl" ); + return OUString( "com.sun.star.comp.forms.OFilterControl" ); } //--------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OFilterControl::getSupportedServiceNames_Static() + Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames_Static() { - Sequence< ::rtl::OUString > aNames( 2 ); - aNames[ 0 ] = ::rtl::OUString( "com.sun.star.form.control.FilterControl" ); - aNames[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" ); + Sequence< OUString > aNames( 2 ); + aNames[ 0 ] = OUString( "com.sun.star.form.control.FilterControl" ); + aNames[ 1 ] = OUString( "com.sun.star.awt.UnoControl" ); return aNames; } diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx index cd530478be0d..b8d7fd57eea3 100644 --- a/forms/source/component/Filter.hxx +++ b/forms/source/component/Filter.hxx @@ -67,10 +67,10 @@ namespace frm ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMessageParent; - typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > MapString2String; + typedef ::boost::unordered_map< OUString, OUString, OUStringHash > MapString2String; MapString2String m_aDisplayItemToValueItem; - ::rtl::OUString m_aText; + OUString m_aText; ::connectivity::OSQLParser m_aParser; sal_Int16 m_nControlClass; // which kind of control do we use? sal_Bool m_bFilterList : 1; @@ -87,7 +87,7 @@ namespace frm DECLARE_UNO3_AGG_DEFAULTS(OFilterControl,OWeakAggObject); ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString GetComponentServiceName(); + virtual OUString GetComponentServiceName(); virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & rxToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer ) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::lang::XComponent @@ -96,10 +96,10 @@ namespace frm // ::com::sun::star::awt::XTextComponent virtual void SAL_CALL addTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeTextListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextListener > & l ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setText( const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const ::rtl::OUString& aText ) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::rtl::OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setText( const OUString& aText ) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::awt::Selection SAL_CALL getSelection() throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL isEditable() throw( ::com::sun::star::uno::RuntimeException ); @@ -126,18 +126,18 @@ namespace frm virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); + static OUString SAL_CALL getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); protected: virtual void PrepareWindowDescriptor( ::com::sun::star::awt::WindowDescriptor& rDesc ); - virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); + virtual void ImplSetPeerProperty( const OUString& rPropName, const ::com::sun::star::uno::Any& rVal ); sal_Bool ensureInitialized( ); diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx index 29fa80c1c214..f45efc18dae8 100644 --- a/forms/source/component/FixedText.cxx +++ b/forms/source/component/FixedText.cxx @@ -78,7 +78,7 @@ StringSequence SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com: StringSequence aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_FIXEDTEXT; return aSupported; } @@ -91,7 +91,7 @@ void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggre } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_FIXEDTEXT; // old (non-sun) name for compatibility ! } diff --git a/forms/source/component/FixedText.hxx b/forms/source/component/FixedText.hxx index a813298eab99..bfea6178ea07 100644 --- a/forms/source/component/FixedText.hxx +++ b/forms/source/component/FixedText.hxx @@ -40,7 +40,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index ac5b96c92a17..a666f6ab6bf2 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -90,7 +90,7 @@ namespace frm if ( ( nOldLength != m_aOldValues.getLength() ) || ( nOldLength != m_aNewValues.getLength() ) ) - throw RuntimeException( ::rtl::OUString(), m_rModel ); + throw RuntimeException( OUString(), m_rModel ); m_aHandles.realloc( nOldLength + 1 ); m_aHandles[ nOldLength ] = _nHandle; @@ -132,7 +132,7 @@ namespace frm //============================================================================= DBG_NAME(frm_OControl) //------------------------------------------------------------------------------ -OControl::OControl( const Reference< XMultiServiceFactory >& _rxFactory, const rtl::OUString& _rAggregateService, const sal_Bool _bSetDelegator ) +OControl::OControl( const Reference< XMultiServiceFactory >& _rxFactory, const OUString& _rAggregateService, const sal_Bool _bSetDelegator ) :OComponentHelper(m_aMutex) ,m_aContext( _rxFactory ) { @@ -241,10 +241,10 @@ void OControl::disposing() // XServiceInfo //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OControl::supportsService(const rtl::OUString& _rsServiceName) throw ( RuntimeException) +sal_Bool SAL_CALL OControl::supportsService(const OUString& _rsServiceName) throw ( RuntimeException) { - Sequence<rtl::OUString> aSupported = getSupportedServiceNames(); - const rtl::OUString* pSupported = aSupported.getConstArray(); + Sequence<OUString> aSupported = getSupportedServiceNames(); + const OUString* pSupported = aSupported.getConstArray(); for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) if (pSupported->equals(_rsServiceName)) return sal_True; @@ -252,9 +252,9 @@ sal_Bool SAL_CALL OControl::supportsService(const rtl::OUString& _rsServiceName) } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > OControl::getAggregateServiceNames() +Sequence< OUString > OControl::getAggregateServiceNames() { - Sequence< ::rtl::OUString > aAggServices; + Sequence< OUString > aAggServices; Reference< XServiceInfo > xInfo; if ( query_aggregation( m_xAggregate, xInfo ) ) aAggServices = xInfo->getSupportedServiceNames(); @@ -262,7 +262,7 @@ Sequence< ::rtl::OUString > OControl::getAggregateServiceNames() } //------------------------------------------------------------------------------ -Sequence<rtl::OUString> SAL_CALL OControl::getSupportedServiceNames() throw(RuntimeException) +Sequence<OUString> SAL_CALL OControl::getSupportedServiceNames() throw(RuntimeException) { return ::comphelper::concatSequences( getAggregateServiceNames(), @@ -271,10 +271,10 @@ Sequence<rtl::OUString> SAL_CALL OControl::getSupportedServiceNames() throw(Runt } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL OControl::getSupportedServiceNames_Static() throw( RuntimeException ) +Sequence< OUString > SAL_CALL OControl::getSupportedServiceNames_Static() throw( RuntimeException ) { // no own supported service names - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); } // XEventListener @@ -391,7 +391,7 @@ sal_Bool SAL_CALL OControl::isTransparent() throw ( RuntimeException) DBG_NAME(frm_OBoundControl); //------------------------------------------------------------------ OBoundControl::OBoundControl( const Reference< XMultiServiceFactory >& _rxFactory, - const ::rtl::OUString& _rAggregateService, const sal_Bool _bSetDelegator ) + const OUString& _rAggregateService, const sal_Bool _bSetDelegator ) :OControl( _rxFactory, _rAggregateService, _bSetDelegator ) ,m_bLocked(sal_False) ,m_aOriginalFont( EmptyFontDescriptor() ) @@ -542,7 +542,7 @@ Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeE //------------------------------------------------------------------------------ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XObjectInputStream >& _rxInStream) { - ::rtl::OUString sHelpText; + OUString sHelpText; ::comphelper::operator>>( _rxInStream, sHelpText); try { @@ -558,7 +558,7 @@ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XOb //------------------------------------------------------------------------------ void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XObjectOutputStream >& _rxOutStream) { - ::rtl::OUString sHelpText; + OUString sHelpText; try { if (m_xAggregateSet.is()) @@ -574,8 +574,8 @@ void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XO //------------------------------------------------------------------ OControlModel::OControlModel( const Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory, - const ::rtl::OUString& _rUnoControlModelTypeName, - const ::rtl::OUString& rDefault, const sal_Bool _bSetDelegator) + const OUString& _rUnoControlModelTypeName, + const OUString& rDefault, const sal_Bool _bSetDelegator) :OComponentHelper(m_aMutex) ,OPropertySetAggregationHelper(OComponentHelper::rBHelper) ,m_aContext( _rxFactory ) @@ -723,25 +723,25 @@ void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) // XNamed //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OControlModel::getName() throw(RuntimeException) +OUString SAL_CALL OControlModel::getName() throw(RuntimeException) { - ::rtl::OUString aReturn; + OUString aReturn; OPropertySetHelper::getFastPropertyValue(PROPERTY_ID_NAME) >>= aReturn; return aReturn; } //------------------------------------------------------------------------------ -void SAL_CALL OControlModel::setName(const ::rtl::OUString& _rName) throw(RuntimeException) +void SAL_CALL OControlModel::setName(const OUString& _rName) throw(RuntimeException) { setFastPropertyValue(PROPERTY_ID_NAME, makeAny(_rName)); } // XServiceInfo //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OControlModel::supportsService(const rtl::OUString& _rServiceName) throw ( RuntimeException) +sal_Bool SAL_CALL OControlModel::supportsService(const OUString& _rServiceName) throw ( RuntimeException) { - Sequence<rtl::OUString> aSupported = getSupportedServiceNames(); - const rtl::OUString* pSupported = aSupported.getConstArray(); + Sequence<OUString> aSupported = getSupportedServiceNames(); + const OUString* pSupported = aSupported.getConstArray(); for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) if (pSupported->equals(_rServiceName)) return sal_True; @@ -749,9 +749,9 @@ sal_Bool SAL_CALL OControlModel::supportsService(const rtl::OUString& _rServiceN } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > OControlModel::getAggregateServiceNames() +Sequence< OUString > OControlModel::getAggregateServiceNames() { - Sequence< ::rtl::OUString > aAggServices; + Sequence< OUString > aAggServices; Reference< XServiceInfo > xInfo; if ( query_aggregation( m_xAggregate, xInfo ) ) aAggServices = xInfo->getSupportedServiceNames(); @@ -759,7 +759,7 @@ Sequence< ::rtl::OUString > OControlModel::getAggregateServiceNames() } //------------------------------------------------------------------------------ -Sequence<rtl::OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw(RuntimeException) +Sequence<OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw(RuntimeException) { return ::comphelper::concatSequences( getAggregateServiceNames(), @@ -768,11 +768,11 @@ Sequence<rtl::OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() throw( RuntimeException ) +Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aServiceNames( 2 ); + Sequence< OUString > aServiceNames( 2 ); aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT; - aServiceNames[ 1 ] = ::rtl::OUString("com.sun.star.form.FormControlModel"); + aServiceNames[ 1 ] = OUString("com.sun.star.form.FormControlModel"); return aServiceNames; } @@ -964,7 +964,7 @@ Any OControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const { case PROPERTY_ID_NAME: case PROPERTY_ID_TAG: - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); break; case PROPERTY_ID_CLASSID: @@ -1064,12 +1064,12 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A switch (_nHandle) { case PROPERTY_ID_NAME: - DBG_ASSERT(_rValue.getValueType() == getCppuType((const ::rtl::OUString*)NULL), + DBG_ASSERT(_rValue.getValueType() == getCppuType((const OUString*)NULL), "OControlModel::setFastPropertyValue_NoBroadcast : invalid type" ); _rValue >>= m_aName; break; case PROPERTY_ID_TAG: - DBG_ASSERT(_rValue.getValueType() == getCppuType((const ::rtl::OUString*)NULL), + DBG_ASSERT(_rValue.getValueType() == getCppuType((const OUString*)NULL), "OControlModel::setFastPropertyValue_NoBroadcast : invalid type" ); _rValue >>= m_aTag; break; @@ -1098,9 +1098,9 @@ void OControlModel::describeFixedProperties( Sequence< Property >& _rProps ) con { BEGIN_DESCRIBE_BASE_PROPERTIES( 5 ) DECL_PROP2 (CLASSID, sal_Int16, READONLY, TRANSIENT); - DECL_PROP1 (NAME, ::rtl::OUString, BOUND); + DECL_PROP1 (NAME, OUString, BOUND); DECL_BOOL_PROP2 (NATIVE_LOOK, BOUND, TRANSIENT); - DECL_PROP1 (TAG, ::rtl::OUString, BOUND); + DECL_PROP1 (TAG, OUString, BOUND); DECL_PROP1 (GENERATEVBAEVENTS, sal_Bool, TRANSIENT); END_DESCRIBE_PROPERTIES() } @@ -1148,13 +1148,13 @@ Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() throw( } //-------------------------------------------------------------------- -void SAL_CALL OControlModel::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) +void SAL_CALL OControlModel::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) { m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue ); } //-------------------------------------------------------------------- -void SAL_CALL OControlModel::removeProperty( const ::rtl::OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) +void SAL_CALL OControlModel::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) { m_aPropertyBagHelper.removeProperty( _rName ); } @@ -1228,7 +1228,7 @@ Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) throw (R //------------------------------------------------------------------ OBoundControlModel::OBoundControlModel( const Reference< XMultiServiceFactory>& _rxFactory, - const ::rtl::OUString& _rUnoControlModelTypeName, const ::rtl::OUString& _rDefault, + const OUString& _rUnoControlModelTypeName, const OUString& _rDefault, const sal_Bool _bCommitable, const sal_Bool _bSupportExternalBinding, const sal_Bool _bSupportsValidation ) :OControlModel( _rxFactory, _rUnoControlModelTypeName, _rDefault, sal_False ) ,OPropertyChangeListener( m_aMutex ) @@ -1387,7 +1387,7 @@ void OBoundControlModel::implInitValuePropertyListening( ) const } //----------------------------------------------------------------------------- -void OBoundControlModel::initOwnValueProperty( const ::rtl::OUString& i_rValuePropertyName ) +void OBoundControlModel::initOwnValueProperty( const OUString& i_rValuePropertyName ) { OSL_PRECOND( m_sValuePropertyName.isEmpty() && -1 == m_nValuePropertyAggregateHandle, "OBoundControlModel::initOwnValueProperty: value property is already initialized!" ); @@ -1396,7 +1396,7 @@ void OBoundControlModel::initOwnValueProperty( const ::rtl::OUString& i_rValuePr } //----------------------------------------------------------------------------- -void OBoundControlModel::initValueProperty( const ::rtl::OUString& _rValuePropertyName, sal_Int32 _nValuePropertyExternalHandle ) +void OBoundControlModel::initValueProperty( const OUString& _rValuePropertyName, sal_Int32 _nValuePropertyExternalHandle ) { OSL_PRECOND( m_sValuePropertyName.isEmpty() && -1 == m_nValuePropertyAggregateHandle, "OBoundControlModel::initValueProperty: value property is already initialized!" ); @@ -1540,7 +1540,7 @@ void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt ) th } //------------------------------------------------------------------------------ -void OBoundControlModel::startAggregatePropertyListening( const ::rtl::OUString& _rPropertyName ) +void OBoundControlModel::startAggregatePropertyListening( const OUString& _rPropertyName ) { OSL_PRECOND( m_pAggPropMultiplexer, "OBoundControlModel::startAggregatePropertyListening: no multiplexer!" ); OSL_ENSURE( !_rPropertyName.isEmpty(), "OBoundControlModel::startAggregatePropertyListening: invalid property name!" ); @@ -1653,10 +1653,10 @@ StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(Run } //------------------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException ) +Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aOwnServiceNames( 1 ); - aOwnServiceNames[ 0 ] = ::rtl::OUString("com.sun.star.form.DataAwareControlModel"); + Sequence< OUString > aOwnServiceNames( 1 ); + aOwnServiceNames[ 0 ] = OUString("com.sun.star.form.DataAwareControlModel"); return ::comphelper::concatSequences( OControlModel::getSupportedServiceNames_Static(), @@ -1843,7 +1843,7 @@ Any OBoundControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const break; case PROPERTY_ID_CONTROLSOURCE: - aDefault <<= ::rtl::OUString(); + aDefault <<= OUString(); break; case PROPERTY_ID_CONTROLLABEL: @@ -1949,7 +1949,7 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt OSL_ENSURE( evt.Source == m_xExternalBinding, "OBoundControlModel::propertyChange: where did this come from?" ); // our binding has properties which can control properties of ourself - ::rtl::OUString sBindingControlledProperty; + OUString sBindingControlledProperty; bool bForwardToLabelControl = false; if ( evt.PropertyName.equals( PROPERTY_READONLY ) ) { @@ -3058,10 +3058,10 @@ void OBoundControlModel::recheckValidity( bool _bForceNotification ) void OBoundControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 5, OControlModel ) - DECL_PROP1 ( CONTROLSOURCE, ::rtl::OUString, BOUND ); + DECL_PROP1 ( CONTROLSOURCE, OUString, BOUND ); DECL_IFACE_PROP3( BOUNDFIELD, XPropertySet, BOUND, READONLY, TRANSIENT ); DECL_IFACE_PROP2( CONTROLLABEL, XPropertySet, BOUND, MAYBEVOID ); - DECL_PROP2 ( CONTROLSOURCEPROPERTY, ::rtl::OUString, READONLY, TRANSIENT ); + DECL_PROP2 ( CONTROLSOURCEPROPERTY, OUString, READONLY, TRANSIENT ); DECL_BOOL_PROP1 ( INPUT_REQUIRED, BOUND ); END_DESCRIBE_PROPERTIES() } diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index d217a80f28dc..ca3142566205 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -266,7 +266,7 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr return; Any aTmp(xFormSet->getPropertyValue( PROPERTY_TARGET_URL )); - if (!isA(aTmp, static_cast< ::rtl::OUString* >(NULL)) || + if (!isA(aTmp, static_cast< OUString* >(NULL)) || getString(aTmp).isEmpty() ) return; @@ -322,7 +322,7 @@ StringSequence OFormattedControl::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_FORMATTEDFIELD; return aSupported; } @@ -404,7 +404,7 @@ StringSequence OFormattedModel::getSupportedServiceNames() throw() sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -440,9 +440,9 @@ Sequence< Type > OFormattedModel::_getTypes() // XPersistObject //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OFormattedModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OFormattedModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { - return ::rtl::OUString(FRM_COMPONENT_EDIT); + return OUString(FRM_COMPONENT_EDIT); } // XPropertySet @@ -509,7 +509,7 @@ void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle) } //------------------------------------------------------------------------------ -void OFormattedModel::setPropertyToDefault(const ::rtl::OUString& aPropertyName) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException ) +void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException ) { OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -533,7 +533,7 @@ Any OFormattedModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const } //------------------------------------------------------------------------------ -Any SAL_CALL OFormattedModel::getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException ) +Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName ) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException ) { OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -601,7 +601,7 @@ void OFormattedModel::updateFormatterNullDate() // calc the current NULL date Reference< XNumberFormatsSupplier > xSupplier( calcFormatsSupplier() ); if ( xSupplier.is() ) - xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= m_aNullDate; + xSupplier->getNumberFormatSettings()->getPropertyValue( OUString( "NullDate" ) ) >>= m_aNullDate; } //------------------------------------------------------------------------------ @@ -774,7 +774,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor Reference<XNumberFormatsSupplier> xSupplier = calcFormatsSupplier(); m_bNumeric = getBOOL( getPropertyValue( PROPERTY_TREATASNUMERIC ) ); m_nKeyType = getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey ); - xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString("NullDate") ) >>= m_aNullDate; + xSupplier->getNumberFormatSettings()->getPropertyValue( OUString("NullDate") ) >>= m_aNullDate; OEditBaseModel::onConnectedDbColumn( _rxForm ); } @@ -833,10 +833,10 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) Reference<XNumberFormats> xFormats = xSupplier->getNumberFormats(); - ::rtl::OUString sFormatDescription; + OUString sFormatDescription; LanguageType eFormatLanguage = LANGUAGE_DONTKNOW; - static const ::rtl::OUString s_aLocaleProp ("Locale"); + static const OUString s_aLocaleProp ("Locale"); Reference<com::sun::star::beans::XPropertySet> xFormat = xFormats->getByKey(nKey); if (hasProperty(s_aLocaleProp, xFormat)) { @@ -849,7 +849,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) } } - static const ::rtl::OUString s_aFormatStringProp ("FormatString"); + static const OUString s_aFormatStringProp ("FormatString"); if (hasProperty(s_aFormatStringProp, xFormat)) xFormat->getPropertyValue(s_aFormatStringProp) >>= sFormatDescription; @@ -919,7 +919,7 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr if (bNonVoidKey) { // den String und die Language lesen .... - ::rtl::OUString sFormatDescription = _rxInStream->readUTF(); + OUString sFormatDescription = _rxInStream->readUTF(); LanguageType eDescriptionLanguage = (LanguageType)_rxInStream->readLong(); // und daraus von einem Formatter zu einem Key zusammenwuerfeln lassen ... @@ -1128,7 +1128,7 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const { case TypeClass_STRING: { - ::rtl::OUString sString; + OUString sString; if ( aControlValue >>= sString ) { aExternalValue <<= sString; @@ -1212,7 +1212,7 @@ Sequence< Type > OFormattedModel::getSupportedBindingTypes() aTypes.push_front(::getCppuType( static_cast< UNODateTime* >( NULL ) ) ); break; case NumberFormat::TEXT: - aTypes.push_front(::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ) ); + aTypes.push_front(::getCppuType( static_cast< OUString* >( NULL ) ) ); break; case NumberFormat::LOGICAL: aTypes.push_front(::getCppuType( static_cast< sal_Bool* >( NULL ) ) ); diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx index 6129e64dc5cf..a21313838d07 100644 --- a/forms/source/component/FormattedField.hxx +++ b/forms/source/component/FormattedField.hxx @@ -78,7 +78,7 @@ namespace frm // XPersistObject virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); // XPropertySet virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; @@ -94,8 +94,8 @@ namespace frm void setPropertyToDefaultByHandle(sal_Int32 nHandle); ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const; - void SAL_CALL setPropertyToDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + void SAL_CALL setPropertyToDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // OControlModel's property handling virtual void describeFixedProperties( diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index e634bbf8ed7c..2a21dec3c620 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -186,20 +186,20 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException) +OUString SAL_CALL OFormattedFieldWrapper::getServiceName() throw(RuntimeException) { // return the old compatibility name for an EditModel return FRM_COMPONENT_EDIT; } //------------------------------------------------------------------ -::rtl::OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException) +OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper"); + return OUString("com.sun.star.comp.forms.OFormattedFieldWrapper"); } //------------------------------------------------------------------ -sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::supportsService: should never have made it 'til here without an aggregate!"); Reference< XServiceInfo > xSI; @@ -208,7 +208,7 @@ sal_Bool SAL_CALL OFormattedFieldWrapper::supportsService( const ::rtl::OUString } //------------------------------------------------------------------ -Sequence< ::rtl::OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > SAL_CALL OFormattedFieldWrapper::getSupportedServiceNames( ) throw (RuntimeException) { DBG_ASSERT(m_xAggregate.is(), "OFormattedFieldWrapper::getSupportedServiceNames: should never have made it 'til here without an aggregate!"); Reference< XServiceInfo > xSI; @@ -237,7 +237,7 @@ void SAL_CALL OFormattedFieldWrapper::write(const Reference<XObjectOutputStream> // else we have to write an edit part first OSL_ENSURE(m_pEditPart.is(), "OFormattedFieldWrapper::write : formatted part without edit part ?"); if ( !m_pEditPart.is() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); // for this we transfer the current props of the formatted part to the edit part Reference<XPropertySet> xFormatProps(m_xFormattedPart, UNO_QUERY); diff --git a/forms/source/component/FormattedFieldWrapper.hxx b/forms/source/component/FormattedFieldWrapper.hxx index 957c6a7e94fa..1dc202c72d93 100644 --- a/forms/source/component/FormattedFieldWrapper.hxx +++ b/forms/source/component/FormattedFieldWrapper.hxx @@ -69,12 +69,12 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index e997ef77b948..7a37b4ebec68 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -44,7 +44,7 @@ InterfaceRef SAL_CALL OFormsCollection_CreateInstance(const Reference<XMultiServ } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException) +OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException) { return FRM_SUN_FORMS_COLLECTION; } @@ -106,16 +106,16 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException) +OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.comp.forms.OFormsCollection"); + return OUString("com.sun.star.comp.forms.OFormsCollection"); } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OFormsCollection::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { - Sequence<rtl::OUString> aSupported = getSupportedServiceNames(); - const rtl::OUString* pSupported = aSupported.getConstArray(); + Sequence<OUString> aSupported = getSupportedServiceNames(); + const OUString* pSupported = aSupported.getConstArray(); for (sal_Int32 i=0; i<aSupported.getLength(); ++i, ++pSupported) if (pSupported->equals(_rServiceName)) return sal_True; @@ -128,7 +128,7 @@ StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(Runti StringSequence aReturn(2); aReturn.getArray()[0] = FRM_SUN_FORMS_COLLECTION; - aReturn.getArray()[1] = ::rtl::OUString("com.sun.star.form.FormComponents"); + aReturn.getArray()[1] = OUString("com.sun.star.form.FormComponents"); return aReturn; } diff --git a/forms/source/component/FormsCollection.hxx b/forms/source/component/FormsCollection.hxx index f5ec4c6c2241..c6c585806584 100644 --- a/forms/source/component/FormsCollection.hxx +++ b/forms/source/component/FormsCollection.hxx @@ -65,11 +65,11 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual StringSequence SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // XCloneable diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index d25212629ec5..be0bdbf9c031 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -78,7 +78,7 @@ InterfaceRef SAL_CALL OGridControlModel_CreateInstance(const Reference<XMultiSer DBG_NAME(OGridControlModel); //------------------------------------------------------------------ OGridControlModel::OGridControlModel(const Reference<XMultiServiceFactory>& _rxFactory) - :OControlModel(_rxFactory, ::rtl::OUString()) + :OControlModel(_rxFactory, OUString()) ,OInterfaceContainer(_rxFactory, m_aMutex, ::getCppuType(static_cast<Reference<XPropertySet>*>(NULL))) ,OErrorBroadcaster( OComponentHelper::rBHelper ) ,FontControlModel( false ) @@ -201,8 +201,8 @@ StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeExcept StringSequence aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); - ::rtl::OUString*pArray = aSupported.getArray(); - pArray[aSupported.getLength()-2] = ::rtl::OUString("com.sun.star.awt.UnoControlModel"); + OUString*pArray = aSupported.getArray(); + pArray[aSupported.getLength()-2] = OUString("com.sun.star.awt.UnoControlModel"); pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GRIDCONTROL; return aSupported; } @@ -363,9 +363,9 @@ void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectio // XGridColumnFactory //------------------------------------------------------------------------------ -Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const ::rtl::OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) +Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - const Sequence< ::rtl::OUString >& rColumnTypes = frm::getColumnTypes(); + const Sequence< OUString >& rColumnTypes = frm::getColumnTypes(); return createColumn( ::detail::findPos( ColumnType, rColumnTypes ) ); } @@ -445,9 +445,9 @@ void OGridControlModel::_reset() void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_BASE_PROPERTIES( 37 ) - DECL_PROP1(NAME, ::rtl::OUString, BOUND); + DECL_PROP1(NAME, OUString, BOUND); DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT); - DECL_PROP1(TAG, ::rtl::OUString, BOUND); + DECL_PROP1(TAG, OUString, BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP3(TABSTOP, sal_Bool, BOUND, MAYBEDEFAULT, MAYBEVOID); DECL_PROP2(HASNAVIGATION, sal_Bool, BOUND, MAYBEDEFAULT); @@ -455,14 +455,14 @@ void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) DECL_PROP2(ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT); DECL_PROP1(BORDER, sal_Int16, BOUND); DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID); - DECL_PROP1(DEFAULTCONTROL, ::rtl::OUString, BOUND); + DECL_PROP1(DEFAULTCONTROL, OUString, BOUND); DECL_PROP3(TEXTCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); DECL_PROP3(BACKGROUNDCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); DECL_PROP2(FONT, FontDescriptor, BOUND, MAYBEDEFAULT); DECL_PROP3(ROWHEIGHT, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID); - DECL_PROP1(HELPTEXT, ::rtl::OUString, BOUND); - DECL_PROP1(FONT_NAME, ::rtl::OUString, MAYBEDEFAULT); - DECL_PROP1(FONT_STYLENAME, ::rtl::OUString, MAYBEDEFAULT); + DECL_PROP1(HELPTEXT, OUString, BOUND); + DECL_PROP1(FONT_NAME, OUString, MAYBEDEFAULT); + DECL_PROP1(FONT_STYLENAME, OUString, MAYBEDEFAULT); DECL_PROP1(FONT_FAMILY, sal_Int16, MAYBEDEFAULT); DECL_PROP1(FONT_CHARSET, sal_Int16, MAYBEDEFAULT); DECL_PROP1(FONT_HEIGHT, float, MAYBEDEFAULT); @@ -479,7 +479,7 @@ void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) DECL_PROP4(CURSORCOLOR, sal_Int32, BOUND, MAYBEDEFAULT, MAYBEVOID , TRANSIENT); DECL_PROP3(ALWAYSSHOWCURSOR, sal_Bool, BOUND, MAYBEDEFAULT, TRANSIENT); DECL_PROP3(DISPLAYSYNCHRON, sal_Bool, BOUND, MAYBEDEFAULT, TRANSIENT); - DECL_PROP2(HELPURL, ::rtl::OUString, BOUND, MAYBEDEFAULT); + DECL_PROP2(HELPURL, OUString, BOUND, MAYBEDEFAULT); DECL_PROP2(WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT); DECL_PROP3(CONTEXT_WRITING_MODE,sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT); END_DESCRIBE_PROPERTIES(); @@ -733,7 +733,7 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const break; case PROPERTY_ID_DEFAULTCONTROL: - aReturn <<= ::rtl::OUString( STARDIV_ONE_FORM_CONTROL_GRID ); + aReturn <<= OUString( STARDIV_ONE_FORM_CONTROL_GRID ); break; case PROPERTY_ID_PRINTABLE: @@ -751,7 +751,7 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const case PROPERTY_ID_HELPURL: case PROPERTY_ID_HELPTEXT: - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); break; case PROPERTY_ID_BORDER: @@ -868,7 +868,7 @@ void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxO // XPersistObject //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_GRID; // old (non-sun) name for compatibility ! } @@ -1009,7 +1009,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t { // Lesen des Modelnamen - ::rtl::OUString sModelName; + OUString sModelName; _rxInStream >> sModelName; Reference<XPropertySet> xCol(createColumn(getColumnTypeByModelName(sModelName))); diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx index f29e6be26d1c..a5b963394571 100644 --- a/forms/source/component/Grid.hxx +++ b/forms/source/component/Grid.hxx @@ -76,14 +76,14 @@ class OGridControlModel :public OControlModel ::com::sun::star::uno::Any m_aBackgroundColor; ::com::sun::star::uno::Any m_aCursorColor; // transient ::com::sun::star::uno::Any m_aBorderColor; - ::rtl::OUString m_aDefaultControl; - ::rtl::OUString m_sHelpText; + OUString m_aDefaultControl; + OUString m_sHelpText; // [properties] ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSelection; // [properties] - ::rtl::OUString m_sHelpURL; // URL + OUString m_sHelpURL; // URL sal_Int16 m_nBorder; sal_Int16 m_nWritingMode; sal_Int16 m_nContextWritingMode; @@ -134,11 +134,11 @@ public: virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException); // XGridColumnFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL createColumn(const ::rtl::OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> SAL_CALL createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual StringSequence SAL_CALL getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx index 81a9275bcc7c..0779522702b9 100644 --- a/forms/source/component/GroupBox.cxx +++ b/forms/source/component/GroupBox.cxx @@ -72,7 +72,7 @@ StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(Runtime StringSequence aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GROUPBOX; return aSupported; } @@ -95,7 +95,7 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_GROUPBOX; // old (non-sun) name for compatibility ! } @@ -152,7 +152,7 @@ StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(Runti StringSequence aSupported = OControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_GROUPBOX; return aSupported; } diff --git a/forms/source/component/GroupBox.hxx b/forms/source/component/GroupBox.hxx index d270e48025e7..e825e02c5f43 100644 --- a/forms/source/component/GroupBox.hxx +++ b/forms/source/component/GroupBox.hxx @@ -40,7 +40,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index caa015af2d0b..86234c3db591 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -153,7 +153,7 @@ public: DBG_NAME(OGroup) //------------------------------------------------------------------ -OGroup::OGroup( const ::rtl::OUString& rGroupName ) +OGroup::OGroup( const OUString& rGroupName ) :m_aGroupName( rGroupName ) ,m_nInsertPos(0) { @@ -257,7 +257,7 @@ Sequence< Reference<XControlModel> > OGroup::GetControlModels() const DBG_NAME(OGroupManager); //------------------------------------------------------------------ OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer) - :m_pCompGroup( new OGroup( ::rtl::OUString("AllComponentGroup") ) ) + :m_pCompGroup( new OGroup( OUString("AllComponentGroup") ) ) ,m_xContainer(_rxContainer) { DBG_CTOR(OGroupManager,NULL); @@ -293,7 +293,7 @@ void OGroupManager::disposing(const EventObject& evt) throw( RuntimeException ) } } // ----------------------------------------------------------------------------- -void OGroupManager::removeFromGroupMap(const ::rtl::OUString& _sGroupName,const Reference<XPropertySet>& _xSet) +void OGroupManager::removeFromGroupMap(const OUString& _sGroupName,const Reference<XPropertySet>& _xSet) { // Component aus CompGroup entfernen m_pCompGroup->RemoveComponent( _xSet ); @@ -338,7 +338,7 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro Reference<XPropertySet> xSet(evt.Source, UNO_QUERY); // Component aus Gruppe entfernen - ::rtl::OUString sGroupName; + OUString sGroupName; if (hasProperty( PROPERTY_GROUP_NAME, xSet )) xSet->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName; if (evt.PropertyName == PROPERTY_NAME) { @@ -410,7 +410,7 @@ sal_Int32 OGroupManager::getGroupCount() } //------------------------------------------------------------------ -void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel> >& _rGroup, ::rtl::OUString& _rName) +void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel> >& _rGroup, OUString& _rName) { OSL_ENSURE(nGroup >= 0 && (size_t)nGroup < m_aActiveGroupMap.size(),"OGroupManager::getGroup: Invalid group index!"); OGroupArr::iterator aGroupPos = m_aActiveGroupMap[nGroup]; @@ -419,7 +419,7 @@ void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel } //------------------------------------------------------------------ -void OGroupManager::getGroupByName(const ::rtl::OUString& _rName, Sequence< Reference<XControlModel> >& _rGroup) +void OGroupManager::getGroupByName(const OUString& _rName, Sequence< Reference<XControlModel> >& _rGroup) { OGroupArr::iterator aFind = m_aGroupArr.find(_rName); if ( aFind != m_aGroupArr.end() ) @@ -438,7 +438,7 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet ) m_pCompGroup->InsertComponent( xSet ); // Component in Gruppe aufnehmen - ::rtl::OUString sGroupName( GetGroupName( xSet ) ); + OUString sGroupName( GetGroupName( xSet ) ); OGroupArr::iterator aFind = m_aGroupArr.find(sGroupName); @@ -494,16 +494,16 @@ void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet ) return; // Component aus Gruppe entfernen - ::rtl::OUString sGroupName( GetGroupName( xSet ) ); + OUString sGroupName( GetGroupName( xSet ) ); removeFromGroupMap(sGroupName,xSet); } -::rtl::OUString OGroupManager::GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent ) +OUString OGroupManager::GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent ) { if (!xComponent.is()) - return ::rtl::OUString(); - ::rtl::OUString sGroupName; + return OUString(); + OUString sGroupName; if (hasProperty( PROPERTY_GROUP_NAME, xComponent )) { xComponent->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName; if (sGroupName.isEmpty()) diff --git a/forms/source/component/GroupManager.hxx b/forms/source/component/GroupManager.hxx index 3fda7f12b39b..484412525767 100644 --- a/forms/source/component/GroupManager.hxx +++ b/forms/source/component/GroupManager.hxx @@ -96,7 +96,7 @@ namespace frm //======================================================================== class OGroupComp { - ::rtl::OUString m_aName; + OUString m_aName; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xComponent; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> m_xControlModel; sal_Int32 m_nPos; @@ -116,7 +116,7 @@ public: sal_Int32 GetPos() const { return m_nPos; } sal_Int16 GetTabIndex() const { return m_nTabIndex; } - ::rtl::OUString GetName() const { return m_aName; } + OUString GetName() const { return m_aName; } }; DECLARE_STL_VECTOR(OGroupComp, OGroupCompArr); @@ -148,13 +148,13 @@ class OGroup OGroupCompArr m_aCompArray; OGroupCompAccArr m_aCompAccArray; - ::rtl::OUString m_aGroupName; + OUString m_aGroupName; sal_uInt16 m_nInsertPos; // Die Einfugeposition der GroupComps wird von der Gruppe bestimmt. friend class OGroupLess; public: - OGroup( const ::rtl::OUString& rGroupName ); + OGroup( const OUString& rGroupName ); #ifdef DBG_UTIL OGroup( const OGroup& _rSource ); // just to ensure the DBG_CTOR call #endif @@ -162,7 +162,7 @@ public: sal_Bool operator==( const OGroup& rGroup ) const; - ::rtl::OUString GetGroupName() const { return m_aGroupName; } + OUString GetGroupName() const { return m_aGroupName; } ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > GetControlModels() const; void InsertComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement ); @@ -189,7 +189,7 @@ class OGroupManager : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::X // Helper functions void InsertElement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement ); void RemoveElement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& rxElement ); - void removeFromGroupMap(const ::rtl::OUString& _sGroupName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSet); + void removeFromGroupMap(const OUString& _sGroupName,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSet); public: OGroupManager(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _rxContainer); @@ -208,11 +208,11 @@ public: // Other functions sal_Int32 getGroupCount(); - void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, ::rtl::OUString& Name); - void getGroupByName(const ::rtl::OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup); + void getGroup(sal_Int32 nGroup, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup, OUString& Name); + void getGroupByName(const OUString& Name, ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> >& _rGroup); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel> > getControlModels(); - static ::rtl::OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent ); + static OUString GetGroupName( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xComponent ); }; diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index a2abcc23299c..4271482cc7b1 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -49,7 +49,7 @@ InterfaceRef SAL_CALL OHiddenModel_CreateInstance(const Reference<XMultiServiceF DBG_NAME( OHiddenModel ) //------------------------------------------------------------------ OHiddenModel::OHiddenModel(const Reference<XMultiServiceFactory>& _rxFactory) - :OControlModel(_rxFactory, ::rtl::OUString()) + :OControlModel(_rxFactory, OUString()) { DBG_CTOR( OHiddenModel, NULL ); m_nClassId = FormComponentType::HIDDENCONTROL; @@ -120,9 +120,9 @@ void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) cons { BEGIN_DESCRIBE_BASE_PROPERTIES(4) DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT); - DECL_PROP1(HIDDEN_VALUE, ::rtl::OUString, BOUND); - DECL_PROP1(NAME, ::rtl::OUString, BOUND); - DECL_PROP1(TAG, ::rtl::OUString, BOUND); + DECL_PROP1(HIDDEN_VALUE, OUString, BOUND); + DECL_PROP1(NAME, OUString, BOUND); + DECL_PROP1(TAG, OUString, BOUND); END_DESCRIBE_PROPERTIES(); } @@ -137,7 +137,7 @@ StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::su } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_HIDDEN; // old (non-sun) name for compatibility ! } @@ -165,9 +165,9 @@ void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStrea DBG_ASSERT(nVersion != 1, "OHiddenModel::read : this version is obsolete !"); switch (nVersion) { - case 1 : { ::rtl::OUString sDummy; _rxInStream >> sDummy; _rxInStream >> m_sHiddenValue; } break; + case 1 : { OUString sDummy; _rxInStream >> sDummy; _rxInStream >> m_sHiddenValue; } break; case 2 : _rxInStream >> m_sHiddenValue; break; - default : OSL_FAIL("OHiddenModel::read : unknown version !"); m_sHiddenValue = ::rtl::OUString(); + default : OSL_FAIL("OHiddenModel::read : unknown version !"); m_sHiddenValue = OUString(); } OControlModel::read(_rxInStream); } diff --git a/forms/source/component/Hidden.hxx b/forms/source/component/Hidden.hxx index 091c15fb4722..08d77d613c04 100644 --- a/forms/source/component/Hidden.hxx +++ b/forms/source/component/Hidden.hxx @@ -32,7 +32,7 @@ namespace frm class OHiddenModel :public OControlModel { - ::rtl::OUString m_sHiddenValue; + OUString m_sHiddenValue; public: DECLARE_DEFAULT_LEAF_XTOR( OHiddenModel ); @@ -50,7 +50,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 025f6938e0b0..7fa744c50ea3 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -84,7 +84,7 @@ StringSequence OImageButtonModel::getSupportedServiceNames() throw() StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_IMAGEBUTTON; return aSupported; } @@ -95,14 +95,14 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) BEGIN_DESCRIBE_PROPERTIES( 5, OClickableImageBaseModel ) DECL_PROP1(BUTTONTYPE, FormButtonType, BOUND); DECL_PROP1(DISPATCHURLINTERNAL, sal_Bool, BOUND); - DECL_PROP1(TARGET_URL, ::rtl::OUString, BOUND); - DECL_PROP1(TARGET_FRAME, ::rtl::OUString, BOUND); + DECL_PROP1(TARGET_URL, OUString, BOUND); + DECL_PROP1(TARGET_FRAME, OUString, BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); END_DESCRIBE_PROPERTIES(); } //------------------------------------------------------------------------------ -::rtl::OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_IMAGEBUTTON; // old (non-sun) name for compatibility ! } @@ -116,7 +116,7 @@ void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream _rxOutStream->writeShort(0x0003); _rxOutStream->writeShort((sal_uInt16)m_eButtonType); - ::rtl::OUString sTmp(INetURLObject::decode( m_sTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS)); + OUString sTmp(INetURLObject::decode( m_sTargetURL, '%', INetURLObject::DECODE_UNAMBIGUOUS)); _rxOutStream << sTmp; _rxOutStream << m_sTargetFrame; writeHelpTextCompatibly(_rxOutStream); @@ -156,8 +156,8 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t default : OSL_FAIL("OImageButtonModel::read : unknown version !"); m_eButtonType = FormButtonType_PUSH; - m_sTargetURL = ::rtl::OUString(); - m_sTargetFrame = ::rtl::OUString(); + m_sTargetURL = OUString(); + m_sTargetFrame = OUString(); break; } } @@ -186,7 +186,7 @@ StringSequence OImageButtonControl::getSupportedServiceNames() throw() StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_IMAGEBUTTON; return aSupported; } diff --git a/forms/source/component/ImageButton.hxx b/forms/source/component/ImageButton.hxx index 4d26287aed0e..1496b42ef417 100644 --- a/forms/source/component/ImageButton.hxx +++ b/forms/source/component/ImageButton.hxx @@ -42,7 +42,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 801d833c9341..1991e32ef14d 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -207,7 +207,7 @@ StringSequence OImageControlModel::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_IMAGECONTROL; return aSupported; } @@ -291,10 +291,10 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con { // if that's an external graphic, i.e. one which has not been loaded by ourselves in response to a // new image URL, then also adjust our ImageURL. - ::rtl::OUString sNewImageURL; + OUString sNewImageURL; if ( m_xGraphicObject.is() ) { - sNewImageURL = ::rtl::OUString( "vnd.sun.star.GraphicObject:" ); + sNewImageURL = OUString( "vnd.sun.star.GraphicObject:" ); sNewImageURL = sNewImageURL + m_xGraphicObject->getUniqueID(); } m_sImageURL = sNewImageURL; @@ -340,7 +340,7 @@ void OImageControlModel::describeFixedProperties( Sequence< Property >& _rProps { BEGIN_DESCRIBE_PROPERTIES( 4, OBoundControlModel ) DECL_IFACE_PROP2( GRAPHIC, XGraphic, BOUND, TRANSIENT ); - DECL_PROP1 ( IMAGE_URL, ::rtl::OUString, BOUND ); + DECL_PROP1 ( IMAGE_URL, OUString, BOUND ); DECL_BOOL_PROP1 ( READONLY, BOUND ); DECL_PROP1 ( TABINDEX, sal_Int16, BOUND ); END_DESCRIBE_PROPERTIES(); @@ -357,7 +357,7 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [ } //------------------------------------------------------------------------------ -::rtl::OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_IMAGECONTROL; // old (non-sun) name for compatibility ! } @@ -412,7 +412,7 @@ void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream) } //------------------------------------------------------------------------------ -sal_Bool OImageControlModel::impl_updateStreamForURL_lck( const ::rtl::OUString& _rURL, ValueChangeInstigator _eInstigator ) +sal_Bool OImageControlModel::impl_updateStreamForURL_lck( const OUString& _rURL, ValueChangeInstigator _eInstigator ) { // create a stream for the image specified by the URL ::std::auto_ptr< SvStream > pImageStream; @@ -465,7 +465,7 @@ sal_Bool OImageControlModel::impl_handleNewImageURL_lck( ValueChangeInstigator _ case ImageStoreLink: { - ::rtl::OUString sCommitURL( m_sImageURL ); + OUString sCommitURL( m_sImageURL ); if ( !m_sDocumentURL.isEmpty() ) sCommitURL = URIHelper::simpleNormalizedMakeRelative( m_sDocumentURL, sCommitURL ); OSL_ENSURE( m_xColumnUpdate.is(), "OImageControlModel::impl_handleNewImageURL_lck: no bound field, but ImageStoreLink?!" ); @@ -514,7 +514,7 @@ sal_Bool OImageControlModel::commitControlValueToDbColumn( bool _bPostReset ) //------------------------------------------------------------------------------ namespace { - bool lcl_isValidDocumentURL( const ::rtl::OUString& _rDocURL ) + bool lcl_isValidDocumentURL( const OUString& _rDocURL ) { return ( !_rDocURL.isEmpty() && _rDocURL != "private:object" ); } @@ -555,7 +555,7 @@ void OImageControlModel::onDisconnectedDbColumn() { OBoundControlModel::onDisconnectedDbColumn(); - m_sDocumentURL = ::rtl::OUString(); + m_sDocumentURL = OUString(); } //------------------------------------------------------------------------------ @@ -572,7 +572,7 @@ Any OImageControlModel::translateDbColumnToControlValue() } case ImageStoreLink: { - ::rtl::OUString sImageLink( m_xColumn->getString() ); + OUString sImageLink( m_xColumn->getString() ); if ( !m_sDocumentURL.isEmpty() ) sImageLink = INetURLObject::GetAbsURL( m_sDocumentURL, sImageLink ); return makeAny( sImageLink ); @@ -612,7 +612,7 @@ void OImageControlModel::doSetControlValue( const Any& _rValue ) case ImageStoreLink: { - ::rtl::OUString sImageURL; + OUString sImageURL; _rValue >>= sImageURL; GetImageProducer()->SetImage( sImageURL ); bStartProduction = true; @@ -749,7 +749,7 @@ StringSequence OImageControlControl::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_IMAGECONTROL; return aSupported; } @@ -789,18 +789,18 @@ void OImageControlControl::implClearGraphics( sal_Bool _bForce ) { if ( _bForce ) { - ::rtl::OUString sOldImageURL; + OUString sOldImageURL; xSet->getPropertyValue( PROPERTY_IMAGE_URL ) >>= sOldImageURL; if ( sOldImageURL.isEmpty() ) // the ImageURL is already empty, so simply setting a new empty one would not suffice // (since it would be ignored) - xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( "private:emptyImage" ) ) ); + xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( OUString( "private:emptyImage" ) ) ); // (the concrete URL we're passing here doens't matter. It's important that // the model cannot resolve it to a a valid resource describing an image stream } - xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString() ) ); + xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( OUString() ) ); } } @@ -811,7 +811,7 @@ bool OImageControlControl::implInsertGraphics() if ( !xSet.is() ) return false; - ::rtl::OUString sTitle = FRM_RES_STRING(RID_STR_IMPORT_GRAPHIC); + OUString sTitle = FRM_RES_STRING(RID_STR_IMPORT_GRAPHIC); // build some arguments for the upcoming dialog try { @@ -858,7 +858,7 @@ bool OImageControlControl::implInsertGraphics() xSet->setPropertyValue( PROPERTY_GRAPHIC, makeAny( aGraphic.GetXGraphic() ) ); } else - xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( ::rtl::OUString( aDialog.GetPath() ) ) ); + xSet->setPropertyValue( PROPERTY_IMAGE_URL, makeAny( OUString( aDialog.GetPath() ) ) ); return true; } @@ -879,7 +879,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const { Reference< XPropertySet > xModelProps( const_cast< OImageControlControl* >( this )->getModel(), UNO_QUERY_THROW ); Reference< XGraphic > xGraphic; - OSL_VERIFY( xModelProps->getPropertyValue( ::rtl::OUString( "Graphic" ) ) >>= xGraphic ); + OSL_VERIFY( xModelProps->getPropertyValue( OUString( "Graphic" ) ) >>= xGraphic ); bIsEmpty = !xGraphic.is(); } catch( const Exception& ) diff --git a/forms/source/component/ImageControl.hxx b/forms/source/component/ImageControl.hxx index 3b9acd98b0e1..56f8952b2de4 100644 --- a/forms/source/component/ImageControl.hxx +++ b/forms/source/component/ImageControl.hxx @@ -52,10 +52,10 @@ class OImageControlModel ImageProducer* m_pImageProducer; bool m_bExternalGraphic; sal_Bool m_bReadOnly; - ::rtl::OUString m_sImageURL; + OUString m_sImageURL; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > m_xGraphicObject; - ::rtl::OUString m_sDocumentURL; + OUString m_sDocumentURL; protected: // UNO Anbindung @@ -84,7 +84,7 @@ public: virtual void SAL_CALL disposing(); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -138,7 +138,7 @@ protected: /** updates the binary stream, created from loading the file which the given URL points to, into our bound field, or the control itself if there is no bound field */ - sal_Bool impl_updateStreamForURL_lck( const ::rtl::OUString& _rURL, ValueChangeInstigator _eInstigator ); + sal_Bool impl_updateStreamForURL_lck( const OUString& _rURL, ValueChangeInstigator _eInstigator ); DECL_LINK( OnImageImportDone, ::Graphic* ); }; diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index ac526da62618..5b75332b090a 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -84,35 +84,35 @@ namespace frm namespace { //-------------------------------------------------------------------------- - struct RowSetValueToString : public ::std::unary_function< ORowSetValue, ::rtl::OUString > + struct RowSetValueToString : public ::std::unary_function< ORowSetValue, OUString > { - ::rtl::OUString operator()( const ORowSetValue& _value ) const + OUString operator()( const ORowSetValue& _value ) const { return _value.getString(); } }; //-------------------------------------------------------------------------- - struct AppendRowSetValueString : public ::std::unary_function< ::rtl::OUString, void > + struct AppendRowSetValueString : public ::std::unary_function< OUString, void > { - AppendRowSetValueString( ::rtl::OUString& _string ) + AppendRowSetValueString( OUString& _string ) :m_string( _string ) { } - void operator()( const ::rtl::OUString _append ) + void operator()( const OUString _append ) { m_string += _append; } private: - ::rtl::OUString& m_string; + OUString& m_string; }; //-------------------------------------------------------------------------- - Sequence< ::rtl::OUString > lcl_convertToStringSequence( const ValueList& _values ) + Sequence< OUString > lcl_convertToStringSequence( const ValueList& _values ) { - Sequence< ::rtl::OUString > aStrings( _values.size() ); + Sequence< OUString > aStrings( _values.size() ); ::std::transform( _values.begin(), _values.end(), @@ -212,7 +212,7 @@ namespace frm sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -302,7 +302,7 @@ namespace frm case PROPERTY_ID_LISTSOURCE: { // extract - Sequence< ::rtl::OUString > aListSource; + Sequence< OUString > aListSource; OSL_VERIFY( _rValue >>= aListSource ); // copy to member @@ -398,21 +398,21 @@ namespace frm } //------------------------------------------------------------------------------ - void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< ::rtl::OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // if both SelectedItems and StringItemList are set, care for this // #i27024# const Any* pSelectSequenceValue = NULL; - const ::rtl::OUString* pStartPos = _rPropertyNames.getConstArray(); - const ::rtl::OUString* pEndPos = _rPropertyNames.getConstArray() + _rPropertyNames.getLength(); - const ::rtl::OUString* pSelectedItemsPos = ::std::find_if( + const OUString* pStartPos = _rPropertyNames.getConstArray(); + const OUString* pEndPos = _rPropertyNames.getConstArray() + _rPropertyNames.getLength(); + const OUString* pSelectedItemsPos = ::std::find_if( pStartPos, pEndPos, - ::std::bind2nd( ::std::equal_to< ::rtl::OUString >(), PROPERTY_SELECT_SEQ ) + ::std::bind2nd( ::std::equal_to< OUString >(), PROPERTY_SELECT_SEQ ) ); - const ::rtl::OUString* pStringItemListPos = ::std::find_if( + const OUString* pStringItemListPos = ::std::find_if( pStartPos, pEndPos, - ::std::bind2nd( ::std::equal_to< ::rtl::OUString >(), PROPERTY_STRINGITEMLIST ) + ::std::bind2nd( ::std::equal_to< OUString >(), PROPERTY_STRINGITEMLIST ) ); if ( ( pSelectedItemsPos != pEndPos ) && ( pStringItemListPos != pEndPos ) ) { @@ -443,7 +443,7 @@ namespace frm DECL_PROP1(LISTSOURCE, StringSequence, BOUND); DECL_PROP3(VALUE_SEQ, StringSequence, BOUND, READONLY, TRANSIENT); DECL_PROP1(DEFAULT_SELECT_SEQ, Sequence<sal_Int16>, BOUND); - DECL_PROP1(STRINGITEMLIST, Sequence< ::rtl::OUString >, BOUND); + DECL_PROP1(STRINGITEMLIST, Sequence< OUString >, BOUND); END_DESCRIBE_PROPERTIES(); } @@ -473,7 +473,7 @@ namespace frm } //------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException) + OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_LISTBOX; // old (non-sun) name for compatibility ! } @@ -562,7 +562,7 @@ namespace frm if (nVersion == 0x0001) { // Create ListSourceSeq from String - ::rtl::OUString sListSource; + OUString sListSource; _rxInStream >> sListSource; sal_Int32 nTokens = 1; @@ -652,7 +652,7 @@ namespace frm xFormProps->getPropertyValue( PROPERTY_ACTIVE_CONNECTION ) >>= xConnection; // PRE2: list source - ::rtl::OUString sListSource; + OUString sListSource; // if our list source type is no value list, we need to concatenate // the single list source elements ::std::for_each( @@ -696,8 +696,8 @@ namespace frm // do we have a bound column if yes we have to select it // and the displayed column is the first column othwhise we act as a combobox - ::rtl::OUString aFieldName; - ::rtl::OUString aBoundFieldName; + OUString aFieldName; + OUString aBoundFieldName; if ( !!aBoundColumn && ( *aBoundColumn >= 0 ) && xFieldsByIndex.is() ) { @@ -719,7 +719,7 @@ namespace frm { // otherwise look for the alias Reference< XColumnsSupplier > xSupplyFields; - xFormProps->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupplyFields; + xFormProps->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSupplyFields; // search the field DBG_ASSERT(xSupplyFields.is(), "OListBoxModel::loadData : invalid query composer !"); @@ -738,20 +738,20 @@ namespace frm break; Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); - ::rtl::OUString aQuote = xMeta->getIdentifierQuoteString(); - ::rtl::OUString aStatement("SELECT "); + OUString aQuote = xMeta->getIdentifierQuoteString(); + OUString aStatement("SELECT "); if (aBoundFieldName.isEmpty()) // act like a combobox - aStatement += ::rtl::OUString("DISTINCT "); + aStatement += OUString("DISTINCT "); aStatement += quoteName(aQuote,aFieldName); if (!aBoundFieldName.isEmpty()) { - aStatement += ::rtl::OUString(", "); + aStatement += OUString(", "); aStatement += quoteName(aQuote, aBoundFieldName); } - aStatement += ::rtl::OUString(" FROM "); + aStatement += OUString(" FROM "); - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; qualifiedNameComponents( xMeta, sListSource, sCatalog, sSchema, sTable, eInDataManipulation ); aStatement += composeTableNameForSelect( xConnection, sCatalog, sSchema, sTable ); @@ -841,7 +841,7 @@ namespace frm try { Reference< XPropertySet > xBoundField( xColumns->getByIndex( *aBoundColumn ), UNO_QUERY_THROW ); - OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString("Type") ) >>= m_nBoundColumnType ); + OSL_VERIFY( xBoundField->getPropertyValue( OUString("Type") ) >>= m_nBoundColumnType ); } catch( const Exception& ) { @@ -852,7 +852,7 @@ namespace frm // If the LB is bound to a field and empty entries are valid, we remember the position // for an empty entry RTL_LOGFILE_CONTEXT( aLogContext, "OListBoxModel::loadData: string collection" ); - ::rtl::OUString aStr; + OUString aStr; sal_Int16 entryPos = 0; ORowSetValue aBoundValue; Reference< XRow > xCursorRow( xListCursor, UNO_QUERY_THROW ); @@ -911,7 +911,7 @@ namespace frm if ( impl_hasBoundComponent() ) aValueList.insert( aValueList.begin(), ORowSetValue() ); - aDisplayList.insert( aDisplayList.begin(), ORowSetValue( ::rtl::OUString() ) ); + aDisplayList.insert( aDisplayList.begin(), ORowSetValue( OUString() ) ); m_nNULLPos = 0; } @@ -998,11 +998,11 @@ namespace frm return m_aConvertedBoundValues; } - Sequence< ::rtl::OUString > aStringItems( getStringItemList() ); + Sequence< OUString > aStringItems( getStringItemList() ); ValueList aValues( aStringItems.getLength() ); ValueList::iterator dst = aValues.begin(); - const ::rtl::OUString *src (aStringItems.getConstArray()); - const ::rtl::OUString * const end = src + aStringItems.getLength(); + const OUString *src (aStringItems.getConstArray()); + const OUString * const end = src + aStringItems.getLength(); for (; src < end; ++src, ++dst ) { *dst = *src; @@ -1222,14 +1222,14 @@ namespace frm case eEntryList: { // we can retrieve a string list from the binding for multiple selection - Sequence< ::rtl::OUString > aSelectEntries; + Sequence< OUString > aSelectEntries; OSL_VERIFY( _rExternalValue >>= aSelectEntries ); ::std::set< sal_Int16 > aSelectionSet; // find the selection entries in our item list - const ::rtl::OUString* pSelectEntries = aSelectEntries.getArray(); - const ::rtl::OUString* pSelectEntriesEnd = pSelectEntries + aSelectEntries.getLength(); + const OUString* pSelectEntries = aSelectEntries.getArray(); + const OUString* pSelectEntriesEnd = pSelectEntries + aSelectEntries.getLength(); while ( pSelectEntries != pSelectEntriesEnd ) { // the indexes where the current string appears in our string items @@ -1256,7 +1256,7 @@ namespace frm case eEntry: { - ::rtl::OUString sStringToSelect; + OUString sStringToSelect; OSL_VERIFY( _rExternalValue >>= sStringToSelect ); aSelectIndexes = findValue( getStringItemList(), sStringToSelect, sal_False ); @@ -1271,25 +1271,25 @@ namespace frm namespace { //................................................................ - struct ExtractStringFromSequence_Safe : public ::std::unary_function< sal_Int16, ::rtl::OUString > + struct ExtractStringFromSequence_Safe : public ::std::unary_function< sal_Int16, OUString > { protected: - const Sequence< ::rtl::OUString >& m_rList; + const Sequence< OUString >& m_rList; public: - ExtractStringFromSequence_Safe( const Sequence< ::rtl::OUString >& _rList ) : m_rList( _rList ) { } + ExtractStringFromSequence_Safe( const Sequence< OUString >& _rList ) : m_rList( _rList ) { } - ::rtl::OUString operator ()( sal_Int16 _nIndex ) + OUString operator ()( sal_Int16 _nIndex ) { OSL_ENSURE( _nIndex < m_rList.getLength(), "ExtractStringFromSequence_Safe: inconsistence!" ); if ( _nIndex < m_rList.getLength() ) return m_rList[ _nIndex ]; - return ::rtl::OUString(); + return OUString(); } }; //................................................................ - Any lcl_getSingleSelectedEntry( const Sequence< sal_Int16 >& _rSelectSequence, const Sequence< ::rtl::OUString >& _rStringList ) + Any lcl_getSingleSelectedEntry( const Sequence< sal_Int16 >& _rSelectSequence, const Sequence< OUString >& _rStringList ) { Any aReturn; @@ -1297,7 +1297,7 @@ namespace frm // binding does not support string lists if ( _rSelectSequence.getLength() <= 1 ) { - ::rtl::OUString sSelectedEntry; + OUString sSelectedEntry; if ( _rSelectSequence.getLength() == 1 ) sSelectedEntry = ExtractStringFromSequence_Safe( _rStringList )( _rSelectSequence[0] ); @@ -1309,9 +1309,9 @@ namespace frm } //................................................................ - Any lcl_getMultiSelectedEntries( const Sequence< sal_Int16 >& _rSelectSequence, const Sequence< ::rtl::OUString >& _rStringList ) + Any lcl_getMultiSelectedEntries( const Sequence< sal_Int16 >& _rSelectSequence, const Sequence< OUString >& _rStringList ) { - Sequence< ::rtl::OUString > aSelectedEntriesTexts( _rSelectSequence.getLength() ); + Sequence< OUString > aSelectedEntriesTexts( _rSelectSequence.getLength() ); ::std::transform( _rSelectSequence.getConstArray(), _rSelectSequence.getConstArray() + _rSelectSequence.getLength(), @@ -1406,8 +1406,8 @@ namespace frm Sequence< Type > aTypes(4); aTypes[0] = ::getCppuType( static_cast< Sequence< sal_Int32 >* >( NULL ) ); aTypes[1] = ::getCppuType( static_cast< sal_Int32* >( NULL ) ); - aTypes[2] = ::getCppuType( static_cast< Sequence< ::rtl::OUString >* >( NULL ) ); - aTypes[3] = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + aTypes[2] = ::getCppuType( static_cast< Sequence< OUString >* >( NULL ) ); + aTypes[3] = ::getCppuType( static_cast< OUString* >( NULL ) ); return aTypes; } @@ -1563,7 +1563,7 @@ namespace frm StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_LISTBOX; return aSupported; } @@ -1757,14 +1757,14 @@ namespace frm } //-------------------------------------------------------------------- - void SAL_CALL OListBoxControl::addItem( const ::rtl::OUString& aItem, ::sal_Int16 nPos ) throw (RuntimeException) + void SAL_CALL OListBoxControl::addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (RuntimeException) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->addItem( aItem, nPos ); } //-------------------------------------------------------------------- - void SAL_CALL OListBoxControl::addItems( const Sequence< ::rtl::OUString >& aItems, ::sal_Int16 nPos ) throw (RuntimeException) + void SAL_CALL OListBoxControl::addItems( const Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (RuntimeException) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->addItems( aItems, nPos ); @@ -1786,19 +1786,19 @@ namespace frm } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos ) throw (RuntimeException) + OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos ) throw (RuntimeException) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getItem( nPos ); - return ::rtl::OUString( ); + return OUString( ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OListBoxControl::getItems( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OListBoxControl::getItems( ) throw (RuntimeException) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getItems(); - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- @@ -1818,19 +1818,19 @@ namespace frm } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OListBoxControl::getSelectedItem( ) throw (RuntimeException) + OUString SAL_CALL OListBoxControl::getSelectedItem( ) throw (RuntimeException) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getSelectedItem(); - return ::rtl::OUString( ); + return OUString( ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OListBoxControl::getSelectedItems( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OListBoxControl::getSelectedItems( ) throw (RuntimeException) { if ( m_xAggregateListBox.is() ) return m_xAggregateListBox->getSelectedItems(); - return Sequence< ::rtl::OUString >( ); + return Sequence< OUString >( ); } //-------------------------------------------------------------------- @@ -1848,7 +1848,7 @@ namespace frm } //-------------------------------------------------------------------- - void SAL_CALL OListBoxControl::selectItem( const ::rtl::OUString& aItem, ::sal_Bool bSelect ) throw (RuntimeException) + void SAL_CALL OListBoxControl::selectItem( const OUString& aItem, ::sal_Bool bSelect ) throw (RuntimeException) { if ( m_xAggregateListBox.is() ) m_xAggregateListBox->selectItem( aItem, bSelect ); diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx index 1b2ad6510538..590a9cbd8577 100644 --- a/forms/source/component/ListBox.hxx +++ b/forms/source/component/ListBox.hxx @@ -101,10 +101,10 @@ public: protected: // XMultiPropertySet - virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -243,19 +243,19 @@ public: virtual void SAL_CALL removeItemListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XItemListener >& l ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeActionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XActionListener >& l ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addItem( const ::rtl::OUString& aItem, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aItems, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addItems( const ::com::sun::star::uno::Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getItemCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getItem( ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getItems( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getItem( ::sal_Int16 nPos ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getItems( ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getSelectedItemPos( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSelectedItemsPos( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getSelectedItem( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedItems( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getSelectedItem( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedItems( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL selectItemPos( ::sal_Int16 nPos, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL selectItemsPos( const ::com::sun::star::uno::Sequence< ::sal_Int16 >& aPositions, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL selectItem( const ::rtl::OUString& aItem, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL selectItem( const OUString& aItem, ::sal_Bool bSelect ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isMutipleMode( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setMultipleMode( ::sal_Bool bMulti ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getDropDownLineCount( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx index 387413754611..679991159dfb 100644 --- a/forms/source/component/Numeric.cxx +++ b/forms/source/component/Numeric.cxx @@ -53,7 +53,7 @@ StringSequence ONumericControl::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_NUMERICFIELD; return aSupported; } @@ -124,7 +124,7 @@ StringSequence ONumericModel::getSupportedServiceNames() throw() sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -150,7 +150,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_NUMERICFIELD; // old (non-sun) name for compatibility ! } diff --git a/forms/source/component/Numeric.hxx b/forms/source/component/Numeric.hxx index a8ce05fe2e56..542028ca485f 100644 --- a/forms/source/component/Numeric.hxx +++ b/forms/source/component/Numeric.hxx @@ -46,7 +46,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); // OControlModel's property handling virtual void describeFixedProperties( diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index e0da52961d61..8a6af8afb605 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -65,7 +65,7 @@ StringSequence OPatternControl::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_PATTERNFIELD; return aSupported; } @@ -122,7 +122,7 @@ StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControlModel::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 2); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-2] = FRM_SUN_COMPONENT_DATABASE_PATTERNFIELD; pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_PATTERNFIELD; return aSupported; @@ -133,7 +133,7 @@ StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw() void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel ) - DECL_PROP2(DEFAULT_TEXT, ::rtl::OUString, BOUND, MAYBEDEFAULT); + DECL_PROP2(DEFAULT_TEXT, OUString, BOUND, MAYBEDEFAULT); DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP2(FILTERPROPOSAL, sal_Bool, BOUND, MAYBEDEFAULT); @@ -141,7 +141,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_PATTERNFIELD; // old (non-sun) name for compatibility ! } @@ -153,7 +153,7 @@ sal_Bool OPatternModel::commitControlValueToDbColumn( bool /*_bPostReset*/ ) if ( aNewValue != m_aLastKnownValue ) { - ::rtl::OUString sNewValue; + OUString sNewValue; aNewValue >>= sNewValue; if ( !aNewValue.hasValue() @@ -207,7 +207,7 @@ Any OPatternModel::translateDbColumnToControlValue() if ( m_pFormattedValue.get() ) { - ::rtl::OUString sValue( m_pFormattedValue->getFormattedValue() ); + OUString sValue( m_pFormattedValue->getFormattedValue() ); if ( sValue.isEmpty() && m_pFormattedValue->getColumn().is() && m_pFormattedValue->getColumn()->wasNull() @@ -223,7 +223,7 @@ Any OPatternModel::translateDbColumnToControlValue() else m_aLastKnownValue.clear(); - return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : makeAny( ::rtl::OUString() ); + return m_aLastKnownValue.hasValue() ? m_aLastKnownValue : makeAny( OUString() ); // (m_aLastKnownValue is alllowed to be VOID, the control value isn't) } diff --git a/forms/source/component/Pattern.hxx b/forms/source/component/Pattern.hxx index ca54b4698797..80aac87dfb9a 100644 --- a/forms/source/component/Pattern.hxx +++ b/forms/source/component/Pattern.hxx @@ -53,7 +53,7 @@ public: virtual StringSequence SAL_CALL getSupportedServiceNames() throw(); // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); // OControlModel's property handling virtual void describeFixedProperties( diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index 34466d2cf733..439462adf0f0 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -57,7 +57,7 @@ StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(Ru StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_RADIOBUTTON; return aSupported; } @@ -78,7 +78,7 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit> // (formerly this switch-off was done in the toolkit - but the correct place is here ...) // Reference< XVclWindowPeer > xVclWindowPeer( getPeer(), UNO_QUERY ); // if (xVclWindowPeer.is()) -// xVclWindowPeer->setProperty(::rtl::OUString("AutoToggle"), ::cppu::bool2any(sal_False)); +// xVclWindowPeer->setProperty(OUString("AutoToggle"), ::cppu::bool2any(sal_False)); // new order: do _not_ switch off the auto toggle because: // * today, it is not necessary anymore to handle the toggling ourself (everything works fine without it) // * without auto toggle, the AccessibleEvents as fired by the radio buttons are @@ -136,7 +136,7 @@ StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(Runt sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -153,10 +153,10 @@ StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(Runt } //------------------------------------------------------------------------------ -void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, const Any& rValue) +void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any& rValue) { // my name - ::rtl::OUString sMyGroup; + OUString sMyGroup; if (hasProperty(PROPERTY_GROUP_NAME, this)) this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sMyGroup; if (sMyGroup.isEmpty()) @@ -168,7 +168,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const ::rtl::OUString& rPropName, cons { Reference<XPropertySet> xMyProps; query_interface(static_cast<XWeak*>(this), xMyProps); - ::rtl::OUString sCurrentGroup; + OUString sCurrentGroup; sal_Int32 nNumSiblings = xIndexAccess->getCount(); for (sal_Int32 i=0; i<nNumSiblings; ++i) { @@ -237,7 +237,7 @@ void ORadioButtonModel::setControlSource() Reference<XIndexAccess> xIndexAccess(getParent(), UNO_QUERY); if (xIndexAccess.is()) { - ::rtl::OUString sName, sGroupName; + OUString sName, sGroupName; if (hasProperty(PROPERTY_GROUP_NAME, this)) this->getPropertyValue(PROPERTY_GROUP_NAME) >>= sGroupName; @@ -261,7 +261,7 @@ void ORadioButtonModel::setControlSource() // Only RadioButtons continue; - ::rtl::OUString sSiblingName, sSiblingGroupName; + OUString sSiblingName, sSiblingGroupName; if (hasProperty(PROPERTY_GROUP_NAME, xSiblingProperties)) xSiblingProperties->getPropertyValue(PROPERTY_GROUP_NAME) >>= sSiblingGroupName; xSiblingProperties->getPropertyValue(PROPERTY_NAME) >>= sSiblingName; @@ -287,7 +287,7 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) } //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException) +OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException) { return FRM_COMPONENT_RADIOBUTTON; // old (non-sun) name for compatibility ! } @@ -319,7 +319,7 @@ void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxIn // Version sal_uInt16 nVersion = _rxInStream->readShort(); - ::rtl::OUString sReferenceValue; + OUString sReferenceValue; sal_Int16 nDefaultChecked( 0 ); switch (nVersion) { diff --git a/forms/source/component/RadioButton.hxx b/forms/source/component/RadioButton.hxx index 8da67de8330d..94e50eb11404 100644 --- a/forms/source/component/RadioButton.hxx +++ b/forms/source/component/RadioButton.hxx @@ -43,7 +43,7 @@ public: throw (::com::sun::star::uno::Exception); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -66,7 +66,7 @@ protected: translateExternalValueToControlValue( const ::com::sun::star::uno::Any& _rExternalValue ) const; protected: - void SetSiblingPropsTo(const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rValue); + void SetSiblingPropsTo(const OUString& rPropName, const ::com::sun::star::uno::Any& rValue); DECLARE_XCLONEABLE( ); diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index 346f09695089..7b7b56c2821c 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -75,7 +75,7 @@ StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw() StringSequence aSupported = OBoundControl::getSupportedServiceNames(); aSupported.realloc(aSupported.getLength() + 1); - ::rtl::OUString*pArray = aSupported.getArray(); + OUString*pArray = aSupported.getArray(); pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_TIMEFIELD; return aSupported; } @@ -97,7 +97,7 @@ StringSequence SAL_CALL OTimeModel::getSupportedServiceNames() throw() sal_Int32 nOldLen = aSupported.getLength(); aSupported.realloc( nOldLen + 8 ); - ::rtl::OUString* pStoreTo = aSupported.getArray() + nOldLen; + OUString* pStoreTo = aSupported.getArray() + nOldLen; *pStoreTo++ = BINDABLE_CONTROL_MODEL; *pStoreTo++ = DATA_AWARE_CONTROL_MODEL; @@ -157,7 +157,7 @@ OTimeModel::~OTimeModel( ) IMPLEMENT_DEFAULT_CLONING( OTimeModel ) //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException) { return FRM_COMPONENT_TIMEFIELD; // old (non-sun) name for compatibility ! } diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx index d0ee89a8cbcd..b36c3c612087 100644 --- a/forms/source/component/Time.hxx +++ b/forms/source/component/Time.hxx @@ -46,7 +46,7 @@ public: DECLARE_DEFAULT_LEAF_XTOR( OTimeModel ); // stario::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx index ce410092155f..4a2792bdf121 100644 --- a/forms/source/component/cachedrowset.cxx +++ b/forms/source/component/cachedrowset.cxx @@ -59,7 +59,7 @@ namespace frm struct CachedRowSet_Data { ::comphelper::ComponentContext aContext; - ::rtl::OUString sCommand; + OUString sCommand; sal_Bool bEscapeProcessing; Reference< XConnection > xConnection; @@ -91,7 +91,7 @@ namespace frm } //-------------------------------------------------------------------- - void CachedRowSet::setCommand( const ::rtl::OUString& _rCommand ) + void CachedRowSet::setCommand( const OUString& _rCommand ) { if ( m_pData->sCommand == _rCommand ) return; @@ -101,7 +101,7 @@ namespace frm } //-------------------------------------------------------------------- - void CachedRowSet::setCommandFromQuery( const ::rtl::OUString& _rQueryName ) + void CachedRowSet::setCommandFromQuery( const OUString& _rQueryName ) { Reference< XQueriesSupplier > xSupplyQueries( m_pData->xConnection, UNO_QUERY_THROW ); Reference< XNameAccess > xQueries ( xSupplyQueries->getQueries(), UNO_QUERY_THROW ); @@ -111,7 +111,7 @@ namespace frm OSL_VERIFY( xQuery->getPropertyValue( PROPERTY_ESCAPE_PROCESSING ) >>= bEscapeProcessing ); setEscapeProcessing( bEscapeProcessing ); - ::rtl::OUString sCommand; + OUString sCommand; OSL_VERIFY( xQuery->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand ); setCommand( sCommand ); } diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx index 15443e547cd8..7b7ece865b83 100644 --- a/forms/source/component/cachedrowset.hxx +++ b/forms/source/component/cachedrowset.hxx @@ -70,9 +70,9 @@ namespace frm @throws Exception */ - void setCommandFromQuery ( const ::rtl::OUString& _rQueryName ); + void setCommandFromQuery ( const OUString& _rQueryName ); - void setCommand ( const ::rtl::OUString& _rCommand ); + void setCommand ( const OUString& _rCommand ); void setEscapeProcessing ( const sal_Bool _bEscapeProcessing ); void setConnection ( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection ); diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 97b06d6b9309..93ef01e01053 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -77,7 +77,7 @@ namespace frm } //------------------------------------------------------------------------------ - OClickableImageBaseControl::OClickableImageBaseControl(const Reference<XMultiServiceFactory>& _rxFactory, const ::rtl::OUString& _aService) + OClickableImageBaseControl::OClickableImageBaseControl(const Reference<XMultiServiceFactory>& _rxFactory, const OUString& _aService) :OControl(_rxFactory, _aService) ,m_pThread(NULL) ,m_aSubmissionVetoListeners( m_aMutex ) @@ -296,7 +296,7 @@ namespace frm { m_pFeatureInterception->getTransformer().parseSmartWithAsciiProtocol( aURL, INET_FILE_SCHEME ); - ::rtl::OUString aTargetFrame; + OUString aTargetFrame; xSet->getPropertyValue(PROPERTY_TARGET_FRAME) >>= aTargetFrame; Reference< XDispatch > xDisp = Reference< XDispatchProvider > (xFrame,UNO_QUERY)->queryDispatch( aURL, aTargetFrame, @@ -305,7 +305,7 @@ namespace frm Sequence<PropertyValue> aArgs(1); PropertyValue& rProp = aArgs.getArray()[0]; - rProp.Name = ::rtl::OUString("Referer"); + rProp.Name = OUString("Referer"); rProp.Value <<= xModel->getURL(); if (xDisp.is()) @@ -315,18 +315,18 @@ namespace frm { URL aHyperLink = m_pFeatureInterception->getTransformer().getStrictURLFromAscii( ".uno:OpenHyperlink" ); - Reference< XDispatch > xDisp = Reference< XDispatchProvider > (xFrame,UNO_QUERY)->queryDispatch(aHyperLink, ::rtl::OUString() , 0); + Reference< XDispatch > xDisp = Reference< XDispatchProvider > (xFrame,UNO_QUERY)->queryDispatch(aHyperLink, OUString() , 0); if ( xDisp.is() ) { Sequence<PropertyValue> aProps(3); - aProps[0].Name = ::rtl::OUString("URL"); + aProps[0].Name = OUString("URL"); aProps[0].Value <<= aURL.Complete; - aProps[1].Name = ::rtl::OUString("FrameName"); + aProps[1].Name = OUString("FrameName"); aProps[1].Value = xSet->getPropertyValue(PROPERTY_TARGET_FRAME); - aProps[2].Name = ::rtl::OUString("Referer"); + aProps[2].Name = OUString("Referer"); aProps[2].Value <<= xModel->getURL(); xDisp->dispatch( aHyperLink, aProps ); @@ -368,12 +368,12 @@ namespace frm } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported = OControl::getSupportedServiceNames(); + Sequence< OUString > aSupported = OControl::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[ aSupported.getLength() - 1 ] = FRM_SUN_CONTROL_SUBMITBUTTON; return aSupported; @@ -429,7 +429,7 @@ namespace frm catch( const Exception& e ) { OSL_FAIL( "OClickableImageBaseControl::implSubmit: caught an unknown exception!" ); - throw WrappedTargetException( ::rtl::OUString(), *this, makeAny( e ) ); + throw WrappedTargetException( OUString(), *this, makeAny( e ) ); } } @@ -448,8 +448,8 @@ namespace frm //------------------------------------------------------------------ DBG_NAME( OClickableImageBaseModel ) //------------------------------------------------------------------ - OClickableImageBaseModel::OClickableImageBaseModel( const Reference< XMultiServiceFactory >& _rxFactory, const ::rtl::OUString& _rUnoControlModelTypeName, - const ::rtl::OUString& rDefault ) + OClickableImageBaseModel::OClickableImageBaseModel( const Reference< XMultiServiceFactory >& _rxFactory, const OUString& _rUnoControlModelTypeName, + const OUString& rDefault ) :OControlModel( _rxFactory, _rUnoControlModelTypeName, rDefault ) ,OPropertyChangeListener(m_aMutex) ,m_pMedium(NULL) @@ -562,12 +562,12 @@ namespace frm } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupported = OControlModel::getSupportedServiceNames(); + Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames(); aSupported.realloc( aSupported.getLength() + 1 ); - ::rtl::OUString* pArray = aSupported.getArray(); + OUString* pArray = aSupported.getArray(); pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_SUBMITBUTTON; return aSupported; @@ -678,8 +678,8 @@ namespace frm { ImageProducer *pImgProd = GetImageProducer(); // grab the ImageURL - rtl::OUString sURL; - getPropertyValue( rtl::OUString("ImageURL") ) >>= sURL; + OUString sURL; + getPropertyValue( OUString("ImageURL") ) >>= sURL; if (!m_pMedium) { if ( ::svt::GraphicAccess::isSupportedURL( sURL ) ) @@ -708,7 +708,7 @@ namespace frm } //------------------------------------------------------------------------------ - void OClickableImageBaseModel::SetURL( const ::rtl::OUString& rURL ) + void OClickableImageBaseModel::SetURL( const OUString& rURL ) { if (m_pMedium || rURL.isEmpty()) { @@ -853,7 +853,7 @@ namespace frm { case PROPERTY_ID_BUTTONTYPE : return makeAny( FormButtonType_PUSH ); case PROPERTY_ID_TARGET_URL : - case PROPERTY_ID_TARGET_FRAME : return makeAny( ::rtl::OUString() ); + case PROPERTY_ID_TARGET_FRAME : return makeAny( OUString() ); case PROPERTY_ID_DISPATCHURLINTERNAL : return makeAny( sal_False ); default: return OControlModel::getPropertyDefaultByHandle(nHandle); diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index 45e51157a275..4ce20fcd0349 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -59,8 +59,8 @@ namespace frm { protected: ::com::sun::star::form::FormButtonType m_eButtonType; // Art des Buttons (push,submit,reset) - ::rtl::OUString m_sTargetURL; // URL fuer den URL-Button - ::rtl::OUString m_sTargetFrame; // TargetFrame zum Oeffnen + OUString m_sTargetURL; // URL fuer den URL-Button + OUString m_sTargetFrame; // TargetFrame zum Oeffnen // ImageProducer stuff ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageProducer> m_xProducer; @@ -79,7 +79,7 @@ namespace frm inline ImageProducer* GetImageProducer() { return m_pProducer; } void StartProduction(); - void SetURL(const ::rtl::OUString& rURL); + void SetURL(const OUString& rURL); void DataAvailable(); void DownloadDone(); @@ -126,7 +126,7 @@ namespace frm virtual void SAL_CALL setSubmission( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmission >& _submission ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XEventListener using OControlModel::disposing; @@ -159,7 +159,7 @@ namespace frm { if ( NULL == _rModel.getImageProducer( OClickableImageBaseModel::GuardAccess() ) ) throw ::com::sun::star::lang::DisposedException( - ::rtl::OUString(), + OUString(), static_cast< ::com::sun::star::form::XImageProducerSupplier* >( &_rModel ) ); } @@ -187,7 +187,7 @@ namespace frm protected: ::cppu::OInterfaceContainerHelper m_aApproveActionListeners; ::cppu::OInterfaceContainerHelper m_aActionListeners; - ::rtl::OUString m_aActionCommand; + OUString m_aActionCommand; // XSubmission virtual void SAL_CALL submit( ) throw (::com::sun::star::util::VetoException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -196,7 +196,7 @@ namespace frm virtual void SAL_CALL removeSubmissionVetoListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::submission::XSubmissionVetoListener >& listener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XEventListener using OControl::disposing; @@ -204,7 +204,7 @@ namespace frm public: OClickableImageBaseControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, - const ::rtl::OUString& _aService); + const OUString& _aService); virtual ~OClickableImageBaseControl(); protected: diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx index cf4a51750b4e..07df31f2e87a 100644 --- a/forms/source/component/entrylisthelper.cxx +++ b/forms/source/component/entrylisthelper.cxx @@ -117,12 +117,12 @@ namespace frm ) { // the entries *before* the insertion pos - Sequence< ::rtl::OUString > aKeepEntries( + Sequence< OUString > aKeepEntries( m_aStringItems.getConstArray(), _rEvent.Position ); // the entries *behind* the insertion pos - Sequence< ::rtl::OUString > aMovedEntries( + Sequence< OUString > aMovedEntries( m_aStringItems.getConstArray() + _rEvent.Position, m_aStringItems.getLength() - _rEvent.Position ); diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index 929b5a5cd1e5..72a159f0330a 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -51,7 +51,7 @@ namespace frm ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource > m_xListSource; /// our external list source - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > m_aStringItems; /// "overridden" StringItemList property value ::cppu::OInterfaceContainerHelper m_aRefreshListeners; @@ -63,7 +63,7 @@ namespace frm virtual ~OEntryListHelper( ); /// returns the current string item list - inline const ::com::sun::star::uno::Sequence< ::rtl::OUString >& + inline const ::com::sun::star::uno::Sequence< OUString >& getStringItemList() const { return m_aStringItems; } inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntrySource >& getExternalListEntrySource() const { return m_xListSource; } diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx index a94efd6bc350..3fae840e2fa0 100644 --- a/forms/source/component/errorbroadcaster.cxx +++ b/forms/source/component/errorbroadcaster.cxx @@ -62,7 +62,7 @@ namespace frm } //------------------------------------------------------------------------------ - void SAL_CALL OErrorBroadcaster::onError( const SQLException& _rException, const ::rtl::OUString& _rContextDescription ) + void SAL_CALL OErrorBroadcaster::onError( const SQLException& _rException, const OUString& _rContextDescription ) { Any aError; if ( !_rContextDescription.isEmpty() ) diff --git a/forms/source/component/errorbroadcaster.hxx b/forms/source/component/errorbroadcaster.hxx index bf9fe4193484..398d86be3593 100644 --- a/forms/source/component/errorbroadcaster.hxx +++ b/forms/source/component/errorbroadcaster.hxx @@ -49,7 +49,7 @@ namespace frm void SAL_CALL disposing(); - void SAL_CALL onError( const ::com::sun::star::sdbc::SQLException& _rException, const ::rtl::OUString& _rContextDescription ); + void SAL_CALL onError( const ::com::sun::star::sdbc::SQLException& _rException, const OUString& _rContextDescription ); void SAL_CALL onError( const ::com::sun::star::sdb::SQLErrorEvent& _rException ); protected: diff --git a/forms/source/component/findpos.cxx b/forms/source/component/findpos.cxx index ac496760809a..08c15dc1be7a 100644 --- a/forms/source/component/findpos.cxx +++ b/forms/source/component/findpos.cxx @@ -32,11 +32,11 @@ namespace detail { sal_Int32 findPos( - const ::rtl::OUString& aStr, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rList) + const OUString& aStr, + const ::com::sun::star::uno::Sequence< OUString >& rList) { - const ::rtl::OUString* pStrList = rList.getConstArray(); - const ::rtl::OUString* pResult = ::std::lower_bound( + const OUString* pStrList = rList.getConstArray(); + const OUString* pResult = ::std::lower_bound( pStrList, pStrList + rList.getLength(), aStr ); if ( ( pResult != pStrList + rList.getLength() ) && ( *pResult == aStr ) ) return ( pResult - pStrList ); diff --git a/forms/source/component/findpos.hxx b/forms/source/component/findpos.hxx index 1f1057b55ec3..a179e0792b17 100644 --- a/forms/source/component/findpos.hxx +++ b/forms/source/component/findpos.hxx @@ -29,8 +29,8 @@ namespace rtl { class OUString; } namespace detail { sal_Int32 findPos( - const ::rtl::OUString& aStr, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rList); + const OUString& aStr, + const ::com::sun::star::uno::Sequence< OUString >& rList); } diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index 963d70800b18..cd351e5b88a2 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -207,8 +207,8 @@ namespace frm DECL_PROP1 ( FONT_PITCH, sal_Int16, MAYBEDEFAULT ); DECL_PROP1 ( FONT_TYPE, sal_Int16, MAYBEDEFAULT ); DECL_PROP1 ( FONT_WIDTH, sal_Int16, MAYBEDEFAULT ); - DECL_PROP1 ( FONT_NAME, ::rtl::OUString, MAYBEDEFAULT ); - DECL_PROP1 ( FONT_STYLENAME, ::rtl::OUString, MAYBEDEFAULT ); + DECL_PROP1 ( FONT_NAME, OUString, MAYBEDEFAULT ); + DECL_PROP1 ( FONT_STYLENAME, OUString, MAYBEDEFAULT ); DECL_PROP1 ( FONT_FAMILY, sal_Int16, MAYBEDEFAULT ); DECL_PROP1 ( FONT_CHARSET, sal_Int16, MAYBEDEFAULT ); DECL_PROP1 ( FONT_HEIGHT, float, MAYBEDEFAULT ); @@ -499,7 +499,7 @@ namespace frm case PROPERTY_ID_FONT_NAME: case PROPERTY_ID_FONT_STYLENAME: - aReturn <<= ::rtl::OUString(); + aReturn <<= OUString(); case PROPERTY_ID_FONT_FAMILY: case PROPERTY_ID_FONT_CHARSET: diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx index add795d7a94f..f2d7273585a0 100644 --- a/forms/source/component/imgprod.cxx +++ b/forms/source/component/imgprod.cxx @@ -226,7 +226,7 @@ void ImageProducer::removeConsumer( const ::com::sun::star::uno::Reference< ::co // ------------------------------------------------------------ -void ImageProducer::SetImage( const ::rtl::OUString& rPath ) +void ImageProducer::SetImage( const OUString& rPath ) { maURL = rPath; mpGraphic->Clear(); @@ -250,7 +250,7 @@ void ImageProducer::SetImage( const ::rtl::OUString& rPath ) void ImageProducer::SetImage( SvStream& rStm ) { - maURL = ::rtl::OUString(); + maURL = OUString(); mpGraphic->Clear(); mbConsInit = sal_False; @@ -262,7 +262,7 @@ void ImageProducer::SetImage( SvStream& rStm ) void ImageProducer::setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rInputStmRef ) { - maURL = ::rtl::OUString(); + maURL = OUString(); mpGraphic->Clear(); mbConsInit = sal_False; delete mpStm; @@ -548,7 +548,7 @@ void ImageProducer::initialize( const ::com::sun::star::uno::Sequence< ::com::su if ( aArguments.getLength() == 1 ) { ::com::sun::star::uno::Any aArg = aArguments.getConstArray()[0]; - rtl::OUString aURL; + OUString aURL; if ( aArg >>= aURL ) { SetImage( aURL ); diff --git a/forms/source/component/imgprod.hxx b/forms/source/component/imgprod.hxx index b6a33ec883e9..3bcbc3222632 100644 --- a/forms/source/component/imgprod.hxx +++ b/forms/source/component/imgprod.hxx @@ -52,7 +52,7 @@ private: typedef boost::ptr_vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > > ConsumerList_t; - ::rtl::OUString maURL; + OUString maURL; ConsumerList_t maConsList; Graphic* mpGraphic; SvStream* mpStm; @@ -70,7 +70,7 @@ public: ImageProducer(); ~ImageProducer(); - void SetImage( const ::rtl::OUString& rPath ); + void SetImage( const OUString& rPath ); void SetImage( SvStream& rStm ); void NewDataAvailable(); diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index f2f133688fa7..3d15e1326e3f 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -58,7 +58,7 @@ namespace frm DBG_NAME( ONavigationBarModel ) //------------------------------------------------------------------ ONavigationBarModel::ONavigationBarModel( const Reference< XMultiServiceFactory >& _rxFactory ) - :OControlModel( _rxFactory, ::rtl::OUString() ) + :OControlModel( _rxFactory, OUString() ) ,FontControlModel( true ) { DBG_CTOR( ONavigationBarModel, NULL ); @@ -159,31 +159,31 @@ namespace frm IMPLEMENT_DEFAULT_CLONING( ONavigationBarModel ) //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName() throw(RuntimeException) + OUString SAL_CALL ONavigationBarModel::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames() throw(RuntimeException) + Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ONavigationBarModel::getImplementationName_Static() + OUString SAL_CALL ONavigationBarModel::getImplementationName_Static() { - return ::rtl::OUString( "com.sun.star.comp.form.ONavigationBarModel" ); + return OUString( "com.sun.star.comp.form.ONavigationBarModel" ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames_Static() + Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames_Static() { - Sequence< ::rtl::OUString > aSupported = OControlModel::getSupportedServiceNames_Static(); + Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames_Static(); aSupported.realloc( aSupported.getLength() + 2 ); - ::rtl::OUString* pArray = aSupported.getArray(); - pArray[ aSupported.getLength() - 2 ] = ::rtl::OUString( "com.sun.star.awt.UnoControlModel" ); + OUString* pArray = aSupported.getArray(); + pArray[ aSupported.getLength() - 2 ] = OUString( "com.sun.star.awt.UnoControlModel" ); pArray[ aSupported.getLength() - 1 ] = FRM_SUN_COMPONENT_NAVTOOLBAR; return aSupported; } @@ -201,7 +201,7 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException ) + OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException ) { return FRM_SUN_COMPONENT_NAVTOOLBAR; } @@ -447,12 +447,12 @@ namespace frm break; case PROPERTY_ID_DEFAULTCONTROL: - aDefault <<= ::rtl::OUString( "com.sun.star.form.control.NavigationToolBar" ); + aDefault <<= OUString( "com.sun.star.form.control.NavigationToolBar" ); break; case PROPERTY_ID_HELPTEXT: case PROPERTY_ID_HELPURL: - aDefault <<= ::rtl::OUString(); + aDefault <<= OUString(); break; case PROPERTY_ID_BORDER: diff --git a/forms/source/component/navigationbar.hxx b/forms/source/component/navigationbar.hxx index 46ddba0b586d..7a7278f89b18 100644 --- a/forms/source/component/navigationbar.hxx +++ b/forms/source/component/navigationbar.hxx @@ -52,9 +52,9 @@ namespace frm // <properties> ::com::sun::star::uno::Any m_aTabStop; ::com::sun::star::uno::Any m_aBackgroundColor; - ::rtl::OUString m_sDefaultControl; - ::rtl::OUString m_sHelpText; - ::rtl::OUString m_sHelpURL; + OUString m_sDefaultControl; + OUString m_sHelpText; + OUString m_sHelpURL; sal_Int16 m_nIconSize; sal_Int16 m_nBorder; sal_Int32 m_nDelay; @@ -72,8 +72,8 @@ namespace frm DECLARE_DEFAULT_LEAF_XTOR( ONavigationBarModel ); // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); + static OUString SAL_CALL getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); protected: @@ -82,8 +82,8 @@ namespace frm virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider DECLARE_XTYPEPROVIDER() @@ -92,7 +92,7 @@ namespace frm virtual void SAL_CALL disposing(); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx index 0806249447dd..fb4c0d99cc8d 100644 --- a/forms/source/component/propertybaghelper.cxx +++ b/forms/source/component/propertybaghelper.cxx @@ -108,7 +108,7 @@ namespace frm } //-------------------------------------------------------------------- - sal_Int32 PropertyBagHelper::impl_findFreeHandle( const ::rtl::OUString& _rPropertyName ) + sal_Int32 PropertyBagHelper::impl_findFreeHandle( const OUString& _rPropertyName ) { ::comphelper::OPropertyArrayAggregationHelper& rPropInfo( impl_ts_getArrayHelper() ); @@ -181,7 +181,7 @@ namespace frm } //-------------------------------------------------------------------- - void PropertyBagHelper::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) + void PropertyBagHelper::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) { ::osl::MutexGuard aGuard( m_rContext.getMutex() ); impl_nts_checkDisposed_throw(); @@ -208,7 +208,7 @@ namespace frm } //-------------------------------------------------------------------- - void PropertyBagHelper::removeProperty( const ::rtl::OUString& _rName ) + void PropertyBagHelper::removeProperty( const OUString& _rName ) { ::osl::MutexGuard aGuard( m_rContext.getMutex() ); impl_nts_checkDisposed_throw(); @@ -228,15 +228,15 @@ namespace frm namespace { //---------------------------------------------------------------- - struct SelectNameOfProperty : public ::std::unary_function< Property, ::rtl::OUString > + struct SelectNameOfProperty : public ::std::unary_function< Property, OUString > { - const ::rtl::OUString& operator()( const Property& _rProp ) const { return _rProp.Name; } + const OUString& operator()( const Property& _rProp ) const { return _rProp.Name; } }; //---------------------------------------------------------------- - struct SelectNameOfPropertyValue : public ::std::unary_function< PropertyValue, ::rtl::OUString > + struct SelectNameOfPropertyValue : public ::std::unary_function< PropertyValue, OUString > { - const ::rtl::OUString& operator()( const PropertyValue& _rProp ) const { return _rProp.Name; } + const OUString& operator()( const PropertyValue& _rProp ) const { return _rProp.Name; } }; //---------------------------------------------------------------- @@ -265,7 +265,7 @@ namespace frm Reference< XPropertySetInfo > xPSI( xMe->getPropertySetInfo(), UNO_QUERY_THROW ); Sequence< Property > aProperties( xPSI->getProperties() ); - Sequence< ::rtl::OUString > aPropertyNames( aProperties.getLength() ); + Sequence< OUString > aPropertyNames( aProperties.getLength() ); ::std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), aPropertyNames.getArray(), SelectNameOfProperty() ); @@ -285,8 +285,8 @@ namespace frm Sequence< PropertyValue > aPropertyValues( aValues.getLength() ); PropertyValue* pPropertyValue = aPropertyValues.getArray(); - const ::rtl::OUString* pName = aPropertyNames.getConstArray(); - const ::rtl::OUString* pNameEnd = aPropertyNames.getConstArray() + aPropertyNames.getLength(); + const OUString* pName = aPropertyNames.getConstArray(); + const OUString* pNameEnd = aPropertyNames.getConstArray() + aPropertyNames.getLength(); const Any* pValue = aValues.getConstArray(); for ( ; pName != pNameEnd; ++pName, ++pValue, ++pPropertyValue ) { @@ -325,7 +325,7 @@ namespace frm // Now finally split into a Name and a Value sequence, and forward to // XMultiPropertySet::setPropertyValues - Sequence< ::rtl::OUString > aNames( nPropertyValues ); + Sequence< OUString > aNames( nPropertyValues ); ::std::transform( aSortedProps.getConstArray(), aSortedProps.getConstArray() + nPropertyValues, aNames.getArray(), SelectNameOfPropertyValue() ); diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx index 4676cc28df77..f8825a556c2d 100644 --- a/forms/source/component/refvaluecomponent.cxx +++ b/forms/source/component/refvaluecomponent.cxx @@ -37,7 +37,7 @@ namespace frm //= //==================================================================== //-------------------------------------------------------------------- - OReferenceValueComponent::OReferenceValueComponent( const Reference< XMultiServiceFactory>& _rxFactory, const ::rtl::OUString& _rUnoControlModelTypeName, const ::rtl::OUString& _rDefault, sal_Bool _bSupportNoCheckRefValue ) + OReferenceValueComponent::OReferenceValueComponent( const Reference< XMultiServiceFactory>& _rxFactory, const OUString& _rUnoControlModelTypeName, const OUString& _rDefault, sal_Bool _bSupportNoCheckRefValue ) :OBoundControlModel( _rxFactory, _rUnoControlModelTypeName, _rDefault, sal_False, sal_True, sal_True ) ,m_eDefaultChecked( STATE_NOCHECK ) ,m_bSupportSecondRefValue( _bSupportNoCheckRefValue ) @@ -62,7 +62,7 @@ namespace frm } //-------------------------------------------------------------------- - void OReferenceValueComponent::setReferenceValue( const ::rtl::OUString& _rRefValue ) + void OReferenceValueComponent::setReferenceValue( const OUString& _rRefValue ) { m_sReferenceValue = _rRefValue; calculateExternalValueType(); @@ -151,11 +151,11 @@ namespace frm void OReferenceValueComponent::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( m_bSupportSecondRefValue ? 3 : 2, OBoundControlModel ) - DECL_PROP1( REFVALUE, ::rtl::OUString, BOUND ); + DECL_PROP1( REFVALUE, OUString, BOUND ); DECL_PROP1( DEFAULT_STATE, sal_Int16, BOUND ); if ( m_bSupportSecondRefValue ) { - DECL_PROP1( UNCHECKED_REFVALUE, ::rtl::OUString, BOUND ); + DECL_PROP1( UNCHECKED_REFVALUE, OUString, BOUND ); } END_DESCRIBE_PROPERTIES(); } @@ -167,7 +167,7 @@ namespace frm aTypes.push_back( ::getCppuType( static_cast< sal_Bool* >( NULL ) ) ); if ( !m_sReferenceValue.isEmpty() ) - aTypes.push_front( ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ) ); + aTypes.push_front( ::getCppuType( static_cast< OUString* >( NULL ) ) ); // push_front, because this is the preferred type Sequence< Type > aTypesRet( aTypes.size() ); @@ -181,7 +181,7 @@ namespace frm sal_Int16 nState = STATE_DONTKNOW; sal_Bool bExternalState = sal_False; - ::rtl::OUString sExternalValue; + OUString sExternalValue; if ( _rExternalValue >>= bExternalState ) { nState = ::sal::static_int_cast< sal_Int16 >( bExternalState ? STATE_CHECK : STATE_NOCHECK ); @@ -246,7 +246,7 @@ namespace frm } else if ( bStringExchange ) { - aExternalValue <<= (m_bSupportSecondRefValue ? m_sNoCheckReferenceValue : ::rtl::OUString()); + aExternalValue <<= (m_bSupportSecondRefValue ? m_sNoCheckReferenceValue : OUString()); } break; } diff --git a/forms/source/component/refvaluecomponent.hxx b/forms/source/component/refvaluecomponent.hxx index c0a10ea857d8..80c389004278 100644 --- a/forms/source/component/refvaluecomponent.hxx +++ b/forms/source/component/refvaluecomponent.hxx @@ -37,18 +37,18 @@ namespace frm { private: // <properties> - ::rtl::OUString m_sReferenceValue; // the reference value to use for data exchange - ::rtl::OUString m_sNoCheckReferenceValue; // the reference value to be exchanged when the control is not checked + OUString m_sReferenceValue; // the reference value to use for data exchange + OUString m_sNoCheckReferenceValue; // the reference value to be exchanged when the control is not checked ToggleState m_eDefaultChecked; // the default check state // </properties> sal_Bool m_bSupportSecondRefValue; // do we support the SecondaryRefValue property? protected: - const ::rtl::OUString& getReferenceValue() const { return m_sReferenceValue; } - void setReferenceValue( const ::rtl::OUString& _rRefValue ); + const OUString& getReferenceValue() const { return m_sReferenceValue; } + void setReferenceValue( const OUString& _rRefValue ); - const ::rtl::OUString& getNoCheckReferenceValue() const { return m_sNoCheckReferenceValue; } + const OUString& getNoCheckReferenceValue() const { return m_sNoCheckReferenceValue; } ToggleState getDefaultChecked() const { return m_eDefaultChecked; } void setDefaultChecked( ToggleState _eChecked ) { m_eDefaultChecked = _eChecked; } @@ -56,8 +56,8 @@ namespace frm protected: OReferenceValueComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, - const ::rtl::OUString& _rUnoControlModelTypeName, - const ::rtl::OUString& _rDefault, + const OUString& _rUnoControlModelTypeName, + const OUString& _rDefault, sal_Bool _bSupportNoCheckRefValue = sal_False ); DECLARE_DEFAULT_CLONE_CTOR( OReferenceValueComponent ) diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index dd8a6673af9d..26035bddedfe 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -48,7 +48,7 @@ namespace frm //-------------------------------------------------------------------- Any translateExternalDoubleToControlIntValue( const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties, - const ::rtl::OUString& _rMinValueName, const ::rtl::OUString& _rMaxValueName ) + const OUString& _rMinValueName, const OUString& _rMaxValueName ) { OSL_ENSURE( _rxProperties.is(), "translateExternalDoubleToControlIntValue: no aggregate!?" ); @@ -59,7 +59,7 @@ namespace frm if ( ::rtl::math::isInf( nExternalValue ) ) { // set the minimum or maximum of the scroll values - ::rtl::OUString sLimitPropertyName = ::rtl::math::isSignBitSet( nExternalValue ) + OUString sLimitPropertyName = ::rtl::math::isSignBitSet( nExternalValue ) ? _rMinValueName : _rMaxValueName; if ( _rxProperties.is() ) _rxProperties->getPropertyValue( sLimitPropertyName ) >>= nControlValue; @@ -146,7 +146,7 @@ namespace frm BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel ) DECL_PROP1( DEFAULT_SCROLL_VALUE, sal_Int32, BOUND ); DECL_PROP1( TABINDEX, sal_Int16, BOUND ); - DECL_PROP2( CONTROLSOURCEPROPERTY,::rtl::OUString, READONLY, TRANSIENT ); + DECL_PROP2( CONTROLSOURCEPROPERTY,OUString, READONLY, TRANSIENT ); END_DESCRIBE_PROPERTIES(); } @@ -238,7 +238,7 @@ namespace frm } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException ) + OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException ) { return FRM_SUN_COMPONENT_SCROLLBAR; } @@ -287,8 +287,8 @@ namespace frm Any OScrollBarModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const { return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, - ::rtl::OUString( "ScrollValueMin" ), - ::rtl::OUString( "ScrollValueMax" ) ); + OUString( "ScrollValueMin" ), + OUString( "ScrollValueMax" ) ); } //-------------------------------------------------------------------- diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index 77fe5439fa61..ced15e1d90ce 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -47,7 +47,7 @@ namespace frm // implemented elsewhere Any translateExternalDoubleToControlIntValue( const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties, - const ::rtl::OUString& _rMinValueName, const ::rtl::OUString& _rMaxValueName ); + const OUString& _rMinValueName, const OUString& _rMaxValueName ); Any translateControlIntToExternalDoubleValue( const Any& _rControlIntValue ); //==================================================================== @@ -102,7 +102,7 @@ namespace frm BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel ) DECL_PROP1( DEFAULT_SPIN_VALUE, sal_Int32, BOUND ); DECL_PROP1( TABINDEX, sal_Int16, BOUND ); - DECL_PROP2( CONTROLSOURCEPROPERTY,::rtl::OUString, READONLY, TRANSIENT ); + DECL_PROP2( CONTROLSOURCEPROPERTY,OUString, READONLY, TRANSIENT ); END_DESCRIBE_PROPERTIES(); } @@ -194,7 +194,7 @@ namespace frm } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException ) + OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException ) { return FRM_SUN_COMPONENT_SPINBUTTON; } @@ -243,8 +243,8 @@ namespace frm Any OSpinButtonModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const { return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet, - ::rtl::OUString( "SpinValueMin" ), - ::rtl::OUString( "SpinValueMax" ) ); + OUString( "SpinValueMin" ), + OUString( "SpinValueMax" ) ); } //-------------------------------------------------------------------- diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx index 16eccff51f18..b1edc2a216c6 100644 --- a/forms/source/helper/commanddescriptionprovider.cxx +++ b/forms/source/helper/commanddescriptionprovider.cxx @@ -68,7 +68,7 @@ namespace frm } // ICommandDescriptionProvider - virtual ::rtl::OUString getCommandDescription( const ::rtl::OUString& _rCommandURL ) const; + virtual OUString getCommandDescription( const OUString& _rCommandURL ) const; private: void impl_init_nothrow( const Reference<XComponentContext>& _rxContext, const Reference< XModel >& _rxDocument ); @@ -88,7 +88,7 @@ namespace frm try { Reference< XModuleManager2 > xModuleManager( ModuleManager::create(_rxContext) ); - ::rtl::OUString sModuleID = xModuleManager->identify( _rxDocument ); + OUString sModuleID = xModuleManager->identify( _rxDocument ); Reference< XNameAccess > xUICommandDescriptions( UICommandDescription::create(_rxContext) ); m_xCommandAccess.set( xUICommandDescriptions->getByName( sModuleID ), UNO_QUERY_THROW ); @@ -100,22 +100,22 @@ namespace frm } //-------------------------------------------------------------------- - ::rtl::OUString DefaultCommandDescriptionProvider::getCommandDescription( const ::rtl::OUString& _rCommandURL ) const + OUString DefaultCommandDescriptionProvider::getCommandDescription( const OUString& _rCommandURL ) const { if ( !m_xCommandAccess.is() ) - return ::rtl::OUString(); + return OUString(); try { ::comphelper::NamedValueCollection aCommandProperties( m_xCommandAccess->getByName( _rCommandURL ) ); - return aCommandProperties.getOrDefault( "Name", ::rtl::OUString() ); + return aCommandProperties.getOrDefault( "Name", OUString() ); } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } - return ::rtl::OUString(); + return OUString(); } //-------------------------------------------------------------------- diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx index 88b118ee42e5..b9c0575659b7 100644 --- a/forms/source/helper/commandimageprovider.cxx +++ b/forms/source/helper/commandimageprovider.cxx @@ -104,7 +104,7 @@ namespace frm try { Reference< XModuleManager2 > xModuleManager( ModuleManager::create(_rContext.getUNOContext()) ); - ::rtl::OUString sModuleID = xModuleManager->identify( _rxDocument ); + OUString sModuleID = xModuleManager->identify( _rxDocument ); Reference< XModuleUIConfigurationManagerSupplier > xSuppUIConfig( ModuleUIConfigurationManagerSupplier::create(_rContext.getUNOContext()) ); diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx index a5d02d5ca60a..e385d51f38d1 100644 --- a/forms/source/helper/controlfeatureinterception.cxx +++ b/forms/source/helper/controlfeatureinterception.cxx @@ -130,7 +130,7 @@ namespace frm } } //-------------------------------------------------------------------- - Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL, const ::rtl::OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((RuntimeException)) + Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((RuntimeException)) { Reference< XDispatch > xDispatcher; if ( m_xFirstDispatchInterceptor.is() ) @@ -141,7 +141,7 @@ namespace frm //-------------------------------------------------------------------- Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL ) SAL_THROW((RuntimeException)) { - return queryDispatch( _rURL, ::rtl::OUString(), 0 ); + return queryDispatch( _rURL, OUString(), 0 ); } //-------------------------------------------------------------------- diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx index 4ced762e7127..460b10ab1dd0 100644 --- a/forms/source/helper/formnavigation.cxx +++ b/forms/source/helper/formnavigation.cxx @@ -298,7 +298,7 @@ namespace frm if ( aInfo->second.xDispatcher.is() ) { Sequence< PropertyValue > aArgs( 1 ); - aArgs[0].Name = ::rtl::OUString::createFromAscii( _pParamAsciiName ); + aArgs[0].Name = OUString::createFromAscii( _pParamAsciiName ); aArgs[0].Value = _rParamValue; aInfo->second.xDispatcher->dispatch( aInfo->second.aURL, aArgs ); @@ -343,9 +343,9 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString OFormNavigationHelper::getStringState( sal_Int16 _nFeatureId ) const + OUString OFormNavigationHelper::getStringState( sal_Int16 _nFeatureId ) const { - ::rtl::OUString sState; + OUString sState; FeatureMap::const_iterator aInfo = m_aSupportedFeatures.find( _nFeatureId ); if ( m_aSupportedFeatures.end() != aInfo ) @@ -457,7 +457,7 @@ namespace frm } //------------------------------------------------------------------ - sal_Int16 OFormNavigationMapper::getFeatureId( const ::rtl::OUString& _rCompleteURL ) + sal_Int16 OFormNavigationMapper::getFeatureId( const OUString& _rCompleteURL ) { const FeatureURL* pFeatures = lcl_getFeatureTable(); while ( pFeatures->pAsciiURL ) diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx index 94a485f6ec2c..f5f584df1e7d 100644 --- a/forms/source/helper/urltransformer.cxx +++ b/forms/source/helper/urltransformer.cxx @@ -60,7 +60,7 @@ namespace frm } //-------------------------------------------------------------------- - URL UrlTransformer::getStrictURL( const ::rtl::OUString& _rURL ) const + URL UrlTransformer::getStrictURL( const OUString& _rURL ) const { URL aReturn; aReturn.Complete = _rURL; @@ -72,14 +72,14 @@ namespace frm //-------------------------------------------------------------------- URL UrlTransformer::getStrictURLFromAscii( const sal_Char* _pAsciiURL ) const { - return getStrictURL( ::rtl::OUString::createFromAscii( _pAsciiURL ) ); + return getStrictURL( OUString::createFromAscii( _pAsciiURL ) ); } //-------------------------------------------------------------------- void UrlTransformer::parseSmartWithAsciiProtocol( ::com::sun::star::util::URL& _rURL, const sal_Char* _pAsciiURL ) const { if ( implEnsureTransformer() ) - m_xTransformer->parseSmart( _rURL, ::rtl::OUString::createFromAscii( _pAsciiURL ) ); + m_xTransformer->parseSmart( _rURL, OUString::createFromAscii( _pAsciiURL ) ); } //........................................................................ diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 416453305574..611ba1730197 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -86,14 +86,14 @@ namespace frm // macros for quickly declaring/implementing XServiceInfo #define DECLARE_XPERSISTOBJECT() \ - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); \ + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException); \ virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); \ virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); \ // old macro for quickly implementing XServiceInfo::getImplementationName #define IMPLEMENTATION_NAME(ImplName) \ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \ - { return ::rtl::OUString("com.sun.star.comp.forms.") + ::rtl::OUString(#ImplName); } + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \ + { return OUString("com.sun.star.comp.forms.") + OUString(#ImplName); } class OControlModel; @@ -203,7 +203,7 @@ public: */ OControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rFactory, - const ::rtl::OUString& _rAggregateService, + const OUString& _rAggregateService, const sal_Bool _bSetDelegator = sal_True ); @@ -247,9 +247,9 @@ protected: virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; // XServiceInfo - static version static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); @@ -270,7 +270,7 @@ protected: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes(); // overwrite this and call the base class if you have additional types - ::com::sun::star::uno::Sequence< ::rtl::OUString > getAggregateServiceNames(); + ::com::sun::star::uno::Sequence< OUString > getAggregateServiceNames(); private: void impl_resetStateGuard_nothrow(); @@ -288,7 +288,7 @@ class OBoundControl :public OControl protected: sal_Bool m_bLocked : 1; - ::rtl::OUString m_sOriginalHelpText; // as long as the text/value is invalid, we change the help text of our peer + OUString m_sOriginalHelpText; // as long as the text/value is invalid, we change the help text of our peer ::com::sun::star::awt::FontDescriptor m_aOriginalFont; // as long as the text/value is invalid, we also change the font sal_Int32 m_nOriginalTextLineColor; // (we add red underlining) @@ -296,7 +296,7 @@ protected: public: OBoundControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory, - const ::rtl::OUString& _rAggregateService, + const OUString& _rAggregateService, const sal_Bool _bSetDelegator = sal_True ); @@ -360,8 +360,8 @@ protected: getContext() const { return m_aContext; } // <properties> - ::rtl::OUString m_aName; // name of the control - ::rtl::OUString m_aTag; // tag for additional data + OUString m_aName; // name of the control + OUString m_aTag; // tag for additional data sal_Int16 m_nTabIndex; // index within the taborder sal_Int16 m_nClassId; // type of the control sal_Bool m_bNativeLook; // should the control use the native platform look? @@ -372,8 +372,8 @@ protected: protected: OControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory, // factory to create the aggregate with - const ::rtl::OUString& _rUnoControlModelTypeName, // service name of te model to aggregate - const ::rtl::OUString& rDefault = ::rtl::OUString(), // service name of the default control + const OUString& _rUnoControlModelTypeName, // service name of te model to aggregate + const OUString& rDefault = OUString(), // service name of the default control const sal_Bool _bSetDelegator = sal_True // set to sal_False if you want to call setDelegator later (after returning from this ctor) ); OControlModel( @@ -402,7 +402,7 @@ protected: void doSetDelegator(); void doResetDelegator(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > getAggregateServiceNames(); + ::com::sun::star::uno::Sequence< OUString > getAggregateServiceNames(); public: DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper); @@ -416,19 +416,19 @@ public: virtual void SAL_CALL disposing(); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName(const ::rtl::OUString& aName) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName(const OUString& aName) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (::com::sun::star::uno::RuntimeException); virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException) = 0; // XSericeInfo - static version(s) static StringSequence SAL_CALL getSupportedServiceNames_Static() throw(::com::sun::star::uno::RuntimeException); // XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL @@ -459,8 +459,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone( ) throw (::com::sun::star::uno::RuntimeException) = 0; // XPropertyContainer - virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeProperty( const ::rtl::OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException); @@ -542,8 +542,8 @@ public: #define DECLARE_DEFAULT_XTOR( classname ) \ classname( \ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, \ - const ::rtl::OUString& _rUnoControlModelTypeName, \ - const ::rtl::OUString& _rDefault \ + const OUString& _rUnoControlModelTypeName, \ + const OUString& _rDefault \ ); \ DECLARE_DEFAULT_CLONE_CTOR( classname ) \ DECLARE_DEFAULT_DTOR( classname ) \ @@ -552,8 +552,8 @@ public: #define DECLARE_DEFAULT_BOUND_XTOR( classname ) \ classname( \ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, \ - const ::rtl::OUString& _rUnoControlModelTypeName, \ - const ::rtl::OUString& _rDefault, \ + const OUString& _rUnoControlModelTypeName, \ + const OUString& _rDefault, \ const sal_Bool _bSupportExternalBinding, \ const sal_Bool _bSupportsValidation \ ); \ @@ -631,7 +631,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xAmbientForm; - ::rtl::OUString m_sValuePropertyName; + OUString m_sValuePropertyName; sal_Int32 m_nValuePropertyAggregateHandle; sal_Int32 m_nFieldType; ::com::sun::star::uno::Type m_aValuePropertyType; @@ -648,7 +648,7 @@ private: ::com::sun::star::uno::Type m_aExternalValueType; // <properties> - ::rtl::OUString m_aControlSource; // Datenquelle, Name des Feldes + OUString m_aControlSource; // Datenquelle, Name des Feldes ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xLabelControl; // reference to a sibling control (model) which is our label sal_Bool m_bInputRequired; @@ -672,7 +672,7 @@ private: ValueChangeInstigator m_eControlValueChangeInstigator; protected: - ::rtl::OUString m_aLabelServiceName; + OUString m_aLabelServiceName; // when setting the label for our control (property FM_PROP_CONTROLLABEL, member m_xLabelControl), // we accept only objects supporting an XControlModel interface, an XServiceInfo interface and // support for a service (XServiceInfo::supportsService) determined by this string. @@ -687,9 +687,9 @@ protected: m_xColumn; protected: - inline const ::rtl::OUString& getValuePropertyName( ) const { return m_sValuePropertyName; } + inline const OUString& getValuePropertyName( ) const { return m_sValuePropertyName; } inline sal_Int32 getValuePropertyAggHandle( ) const { return m_nValuePropertyAggregateHandle; } - inline const ::rtl::OUString& getControlSource( ) const { return m_aControlSource; } + inline const OUString& getControlSource( ) const { return m_aControlSource; } inline sal_Bool isRequired() const { return m_bRequired; } inline sal_Bool isLoaded() const { return m_bLoaded; } @@ -698,8 +698,8 @@ protected: OBoundControlModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory, // factory to create the aggregate with - const ::rtl::OUString& _rUnoControlModelTypeName, // service name of te model to aggregate - const ::rtl::OUString& _rDefault, // service name of the default control + const OUString& _rUnoControlModelTypeName, // service name of te model to aggregate + const OUString& _rDefault, // service name of the default control const sal_Bool _bCommitable, // is the control (model) commitable ? const sal_Bool _bSupportExternalBinding, // set to sal_True if you want to support XBindableValue const sal_Bool _bSupportsValidation // set to sal_True if you want to support XValidatable @@ -746,7 +746,7 @@ protected: @see describeFixedProperties */ void initValueProperty( - const ::rtl::OUString& _rValuePropertyName, + const OUString& _rValuePropertyName, sal_Int32 _nValuePropertyExternalHandle ); @@ -759,7 +759,7 @@ protected: value and external validation. (This is not a conceptual limit, but simply missing implementation.)</p> */ void initOwnValueProperty( - const ::rtl::OUString& i_rValuePropertyName + const OUString& i_rValuePropertyName ); /** suspends listening at the value property @@ -804,7 +804,7 @@ protected: @see initValueProperty @see _propertyChanged */ - void startAggregatePropertyListening( const ::rtl::OUString& _rPropertyName ); + void startAggregatePropertyListening( const OUString& _rPropertyName ); /** returns the default which should be used when resetting the control diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index d0a72db8c391..ea5963512ce4 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -74,7 +74,7 @@ namespace frm }; typedef ::std::vector<InterfaceRef> OInterfaceArray; -typedef ::boost::unordered_multimap< ::rtl::OUString, InterfaceRef, ::rtl::OUStringHash, ::comphelper::UStringEqual> OInterfaceMap; +typedef ::boost::unordered_multimap< OUString, InterfaceRef, OUStringHash, ::comphelper::UStringEqual> OInterfaceMap; //================================================================== // OInterfaceContainer @@ -123,7 +123,7 @@ protected: public: // ::com::sun::star::io::XPersistObject - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException) = 0; + virtual OUString SAL_CALL getServiceName( ) throw(::com::sun::star::uno::RuntimeException) = 0; virtual void SAL_CALL write( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream >& OutStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL read( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream >& InStream ) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -141,16 +141,16 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration> SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::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::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual StringSequence 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 sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName(const ::rtl::OUString& Name, const ::com::sun::star::uno::Any& _rElement) 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& Name, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName(const ::rtl::OUString& Name, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName(const ::rtl::OUString& Name) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName(const OUString& Name, const ::com::sun::star::uno::Any& _rElement) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName(const OUString& Name) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException); @@ -170,7 +170,7 @@ public: // ::com::sun::star::script::XEventAttacherManager virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const ::com::sun::star::script::ScriptEventDescriptor& aScriptEvent ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >& aScriptEvents ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const ::rtl::OUString& aListenerType, const ::rtl::OUString& aEventMethod, const ::rtl::OUString& aRemoveListenerParam ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); diff --git a/forms/source/inc/commanddescriptionprovider.hxx b/forms/source/inc/commanddescriptionprovider.hxx index fa8d014f965a..05c16ac6c222 100644 --- a/forms/source/inc/commanddescriptionprovider.hxx +++ b/forms/source/inc/commanddescriptionprovider.hxx @@ -36,7 +36,7 @@ namespace frm class SAL_NO_VTABLE ICommandDescriptionProvider { public: - virtual ::rtl::OUString getCommandDescription( const ::rtl::OUString& _rCommandURL ) const = 0; + virtual OUString getCommandDescription( const OUString& _rCommandURL ) const = 0; virtual ~ICommandDescriptionProvider() { } }; diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx index 8e66ff508b44..6c282576331b 100644 --- a/forms/source/inc/commandimageprovider.hxx +++ b/forms/source/inc/commandimageprovider.hxx @@ -35,7 +35,7 @@ namespace frm //===================================================================== //= ICommandImageProvider //===================================================================== - typedef ::rtl::OUString CommandURL; + typedef OUString CommandURL; typedef ::com::sun::star::uno::Sequence< CommandURL > CommandURLs; typedef ::std::vector< Image > CommandImages; diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx index 5ad5c0901257..0981c6a2ace3 100644 --- a/forms/source/inc/controlfeatureinterception.hxx +++ b/forms/source/inc/controlfeatureinterception.hxx @@ -70,7 +70,7 @@ namespace frm /** queries the interceptor chain for the given dispatch */ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > - queryDispatch( const ::com::sun::star::util::URL& _rURL, const ::rtl::OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((::com::sun::star::uno::RuntimeException)); + queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((::com::sun::star::uno::RuntimeException)); /** queries the interceptor chain for the given dispatch, with a blank target frame and no frame search flags */ diff --git a/forms/source/inc/featuredispatcher.hxx b/forms/source/inc/featuredispatcher.hxx index 5004aa511b9b..b24604e4564f 100644 --- a/forms/source/inc/featuredispatcher.hxx +++ b/forms/source/inc/featuredispatcher.hxx @@ -81,7 +81,7 @@ namespace frm This method allows retrieving status information about features which have an additional string information associated with it. */ - virtual ::rtl::OUString getStringState( sal_Int16 _nFeatureId ) const = 0; + virtual OUString getStringState( sal_Int16 _nFeatureId ) const = 0; /** returns the integer state of a feature diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index fb8005ba6b2b..23fffb715d98 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -101,7 +101,7 @@ namespace frm virtual void dispatchWithArgument( sal_Int16 _nFeatureId, const sal_Char* _pParamName, const ::com::sun::star::uno::Any& _rParamValue ) const; virtual bool isEnabled( sal_Int16 _nFeatureId ) const; virtual bool getBooleanState( sal_Int16 _nFeatureId ) const; - virtual ::rtl::OUString getStringState( sal_Int16 _nFeatureId ) const; + virtual OUString getStringState( sal_Int16 _nFeatureId ) const; virtual sal_Int32 getIntegerState( sal_Int16 _nFeatureId ) const; // own overridables @@ -216,7 +216,7 @@ namespace frm the id of the feature URL, or -1 if the URl is not known (which is a valid usage) */ - sal_Int16 getFeatureId( const ::rtl::OUString& _rCompleteURL ); + sal_Int16 getFeatureId( const OUString& _rCompleteURL ); private: OFormNavigationMapper( ); // never implemented diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx index 2eaada90d15c..e59f973645d5 100644 --- a/forms/source/inc/forms_module.hxx +++ b/forms/source/inc/forms_module.hxx @@ -42,9 +42,9 @@ namespace FORMS_MODULE_NAMESPACE typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > (SAL_CALL *FactoryInstantiation) ( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager, - const ::rtl::OUString & _rComponentName, + const OUString & _rComponentName, ::cppu::ComponentInstantiation _pCreateFunction, - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, + const ::com::sun::star::uno::Sequence< OUString > & _rServiceNames, rtl_ModuleCount* _pModuleCounter ); @@ -59,9 +59,9 @@ namespace FORMS_MODULE_NAMESPACE protected: // auto registration administration - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >* s_pSupportedServices; static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; @@ -81,8 +81,8 @@ namespace FORMS_MODULE_NAMESPACE @see revokeComponent */ static void registerComponent( - const ::rtl::OUString& _rImplementationName, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction); @@ -91,7 +91,7 @@ namespace FORMS_MODULE_NAMESPACE the implementation name of the component */ static void revokeComponent( - const ::rtl::OUString& _rImplementationName); + const OUString& _rImplementationName); /** creates a Factory for the component with the given implementation name. <p>Usually used from within component_getFactory.<p/> @@ -103,7 +103,7 @@ namespace FORMS_MODULE_NAMESPACE the XInterface access to a factory for the component */ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager ); @@ -124,8 +124,8 @@ namespace FORMS_MODULE_NAMESPACE /** automatically registeres a multi instance component <p>Assumed that the template argument has the three methods <ul> - <li><code>static ::rtl::OUString getImplementationName_Static()</code><li/> - <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><li/> + <li><code>static OUString getImplementationName_Static()</code><li/> + <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/> <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code> </li> @@ -167,8 +167,8 @@ namespace FORMS_MODULE_NAMESPACE /** automatically registeres a single instance component <p>Assumed that the template argument has the three methods <ul> - <li><code>static ::rtl::OUString getImplementationName_Static()</code><li/> - <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static()</code><li/> + <li><code>static OUString getImplementationName_Static()</code><li/> + <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static()</code><li/> <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code> </li> @@ -204,11 +204,11 @@ namespace FORMS_MODULE_NAMESPACE //= OMultiInstanceAutoRegistration or OOneInstanceAutoRegistration //========================================================================== #define DECLARE_SERVICE_REGISTRATION( classname ) \ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); \ + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); \ \ - static ::rtl::OUString SAL_CALL getImplementationName_Static(); \ - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); \ + static OUString SAL_CALL getImplementationName_Static(); \ + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); \ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); \ \ friend class OOneInstanceAutoRegistration< classname >; \ @@ -216,10 +216,10 @@ namespace FORMS_MODULE_NAMESPACE #define IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \ \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw ( RuntimeException ) \ + OUString SAL_CALL classname::getImplementationName( ) throw ( RuntimeException ) \ { return getImplementationName_Static(); } \ \ - Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw (RuntimeException) \ + Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw (RuntimeException) \ { \ return ::comphelper::concatSequences( \ getAggregateServiceNames(), \ @@ -227,8 +227,8 @@ namespace FORMS_MODULE_NAMESPACE ); \ } \ \ - ::rtl::OUString SAL_CALL classname::getImplementationName_Static() \ - { return ::rtl::OUString( "com.sun.star.comp.forms."#classname ); } \ + OUString SAL_CALL classname::getImplementationName_Static() \ + { return OUString( "com.sun.star.comp.forms."#classname ); } \ \ Reference< XInterface > SAL_CALL classname::Create( const Reference< XMultiServiceFactory >& _rxFactory ) \ { return static_cast< XServiceInfo* >( new classname( _rxFactory ) ); } \ @@ -237,9 +237,9 @@ namespace FORMS_MODULE_NAMESPACE #define IMPLEMENT_SERVICE_REGISTRATION_1( classname, baseclass, service1 ) \ IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \ \ - Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static() \ + Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static() \ { \ - Sequence< ::rtl::OUString > aOwnNames( 1 ); \ + Sequence< OUString > aOwnNames( 1 ); \ aOwnNames[ 0 ] = service1; \ \ return ::comphelper::concatSequences( \ @@ -251,9 +251,9 @@ namespace FORMS_MODULE_NAMESPACE #define IMPLEMENT_SERVICE_REGISTRATION_2( classname, baseclass, service1, service2 ) \ IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \ \ - Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static() \ + Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static() \ { \ - Sequence< ::rtl::OUString > aOwnNames( 2 ); \ + Sequence< OUString > aOwnNames( 2 ); \ aOwnNames[ 0 ] = service1; \ aOwnNames[ 1 ] = service2; \ \ @@ -266,9 +266,9 @@ namespace FORMS_MODULE_NAMESPACE #define IMPLEMENT_SERVICE_REGISTRATION_7( classname, baseclass, service1, service2, service3, service4 , service5, service6, service7 ) \ IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \ \ - Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static() \ + Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static() \ { \ - Sequence< ::rtl::OUString > aOwnNames( 7 ); \ + Sequence< OUString > aOwnNames( 7 ); \ aOwnNames[ 0 ] = service1; \ aOwnNames[ 1 ] = service2; \ aOwnNames[ 2 ] = service3; \ @@ -286,9 +286,9 @@ namespace FORMS_MODULE_NAMESPACE #define IMPLEMENT_SERVICE_REGISTRATION_8( classname, baseclass, service1, service2, service3, service4 , service5, service6, service7, service8 ) \ IMPLEMENT_SERVICE_REGISTRATION_BASE( classname, baseclass ) \ \ - Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static() \ + Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static() \ { \ - Sequence< ::rtl::OUString > aOwnNames( 8 ); \ + Sequence< OUString > aOwnNames( 8 ); \ aOwnNames[ 0 ] = service1; \ aOwnNames[ 1 ] = service2; \ aOwnNames[ 2 ] = service3; \ diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx index 60435ad01300..b49f2bb22126 100644 --- a/forms/source/inc/forms_module_impl.hxx +++ b/forms/source/inc/forms_module_impl.hxx @@ -46,15 +46,15 @@ namespace FORMS_MODULE_NAMESPACE //- registration helper //-------------------------------------------------------------------------- - Sequence< ::rtl::OUString >* OFormsModule::s_pImplementationNames = NULL; - Sequence< Sequence< ::rtl::OUString > >* OFormsModule::s_pSupportedServices = NULL; + Sequence< OUString >* OFormsModule::s_pImplementationNames = NULL; + Sequence< Sequence< OUString > >* OFormsModule::s_pSupportedServices = NULL; Sequence< sal_Int64 >* OFormsModule::s_pCreationFunctionPointers = NULL; Sequence< sal_Int64 >* OFormsModule::s_pFactoryFunctionPointers = NULL; //-------------------------------------------------------------------------- void OFormsModule::registerComponent( - const ::rtl::OUString& _rImplementationName, - const Sequence< ::rtl::OUString >& _rServiceNames, + const OUString& _rImplementationName, + const Sequence< OUString >& _rServiceNames, ComponentInstantiation _pCreateFunction, FactoryInstantiation _pFactoryFunction) { @@ -62,8 +62,8 @@ namespace FORMS_MODULE_NAMESPACE { OSL_ENSURE(!s_pSupportedServices && !s_pCreationFunctionPointers && !s_pFactoryFunctionPointers, "OFormsModule::registerComponent : inconsistent state (the pointers (1)) !"); - s_pImplementationNames = new Sequence< ::rtl::OUString >; - s_pSupportedServices = new Sequence< Sequence< ::rtl::OUString > >; + s_pImplementationNames = new Sequence< OUString >; + s_pSupportedServices = new Sequence< Sequence< OUString > >; s_pCreationFunctionPointers = new Sequence< sal_Int64 >; s_pFactoryFunctionPointers = new Sequence< sal_Int64 >; } @@ -88,7 +88,7 @@ namespace FORMS_MODULE_NAMESPACE } //-------------------------------------------------------------------------- - void OFormsModule::revokeComponent(const ::rtl::OUString& _rImplementationName) + void OFormsModule::revokeComponent(const OUString& _rImplementationName) { if (!s_pImplementationNames) { @@ -103,7 +103,7 @@ namespace FORMS_MODULE_NAMESPACE "OFormsModule::revokeComponent : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplNames = s_pImplementationNames->getConstArray(); + const OUString* pImplNames = s_pImplementationNames->getConstArray(); for (sal_Int32 i=0; i<nLen; ++i, ++pImplNames) { if (pImplNames->equals(_rImplementationName)) @@ -127,7 +127,7 @@ namespace FORMS_MODULE_NAMESPACE //-------------------------------------------------------------------------- Reference< XInterface > OFormsModule::getComponentFactory( - const ::rtl::OUString& _rImplementationName, + const OUString& _rImplementationName, const Reference< XMultiServiceFactory >& _rxServiceManager) { OSL_ENSURE(_rxServiceManager.is(), "OFormsModule::getComponentFactory : invalid argument (service manager) !"); @@ -150,8 +150,8 @@ namespace FORMS_MODULE_NAMESPACE sal_Int32 nLen = s_pImplementationNames->getLength(); - const ::rtl::OUString* pImplName = s_pImplementationNames->getConstArray(); - const Sequence< ::rtl::OUString >* pServices = s_pSupportedServices->getConstArray(); + const OUString* pImplName = s_pImplementationNames->getConstArray(); + const Sequence< OUString >* pServices = s_pSupportedServices->getConstArray(); const sal_Int64* pComponentFunction = s_pCreationFunctionPointers->getConstArray(); const sal_Int64* pFactoryFunction = s_pFactoryFunctionPointers->getConstArray(); diff --git a/forms/source/inc/frm_resource.hxx b/forms/source/inc/frm_resource.hxx index aa30f1cf7611..e8f5cf9c3c94 100644 --- a/forms/source/inc/frm_resource.hxx +++ b/forms/source/inc/frm_resource.hxx @@ -58,7 +58,7 @@ namespace frm public: /** loads the string with the specified resource id from the FormLayer resource file */ - static ::rtl::OUString loadString(sal_uInt16 _nResId); + static OUString loadString(sal_uInt16 _nResId); }; //......................................................................... diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index ad3cbc1b03f5..cd5ef0a92ae3 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -50,13 +50,13 @@ class PropertyInfoService //.................................................................. struct PropertyAssignment { - ::rtl::OUString sName; + OUString sName; sal_Int32 nHandle; PropertyAssignment() { nHandle = -1; } PropertyAssignment(const PropertyAssignment& _rSource) :sName(_rSource.sName), nHandle(_rSource.nHandle) { } - PropertyAssignment(const ::rtl::OUString& _rName, sal_Int32 _nHandle) + PropertyAssignment(const OUString& _rName, sal_Int32 _nHandle) :sName(_rName), nHandle(_nHandle) { } }; @@ -85,8 +85,8 @@ public: PropertyInfoService() { } public: - static sal_Int32 getPropertyId(const ::rtl::OUString& _rName); - static ::rtl::OUString getPropertyName(sal_Int32 _nHandle); + static sal_Int32 getPropertyId(const OUString& _rName); + static OUString getPropertyName(sal_Int32 _nHandle); private: static void initialize(); @@ -99,7 +99,7 @@ class ConcreteInfoService : public ::comphelper::IPropertyInfoService public: virtual ~ConcreteInfoService() {} - virtual sal_Int32 getPreferedPropertyId(const ::rtl::OUString& _rName); + virtual sal_Int32 getPreferedPropertyId(const OUString& _rName); }; //------------------------------------------------------------------------------ diff --git a/forms/source/inc/propertybaghelper.hxx b/forms/source/inc/propertybaghelper.hxx index 5360330b2c7f..07d1e65f8aad 100644 --- a/forms/source/inc/propertybaghelper.hxx +++ b/forms/source/inc/propertybaghelper.hxx @@ -74,8 +74,8 @@ namespace frm inline ::comphelper::OPropertyArrayAggregationHelper& getInfoHelper() const; // XPropertyContainer equivalent - void addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const ::com::sun::star::uno::Any& _rInitialValue ); - void removeProperty( const ::rtl::OUString& _rName ); + void addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const ::com::sun::star::uno::Any& _rInitialValue ); + void removeProperty( const OUString& _rName ); // XPropertyAccess equivalent ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(); @@ -86,7 +86,7 @@ namespace frm inline bool convertDynamicFastPropertyValue( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::com::sun::star::uno::Any& _out_rConvertedValue, ::com::sun::star::uno::Any& _out_rCurrentValue ) const; inline void setDynamicFastPropertyValue( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ); inline void getDynamicPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _out_rValue ) const; - inline bool hasDynamicPropertyByName( const ::rtl::OUString& _rName ) const; + inline bool hasDynamicPropertyByName( const OUString& _rName ) const; inline bool hasDynamicPropertyByHandle( sal_Int32 _nHandle ) const; private: @@ -106,7 +106,7 @@ namespace frm the name of the property to find a handle for. If possible, the handle as determined by our ConcreteInfoService instance will be used */ - sal_Int32 impl_findFreeHandle( const ::rtl::OUString& _rPropertyName ); + sal_Int32 impl_findFreeHandle( const OUString& _rPropertyName ); }; //-------------------------------------------------------------------- @@ -140,7 +140,7 @@ namespace frm } //-------------------------------------------------------------------- - inline bool PropertyBagHelper::hasDynamicPropertyByName( const ::rtl::OUString& _rName ) const + inline bool PropertyBagHelper::hasDynamicPropertyByName( const OUString& _rName ) const { return m_aDynamicProperties.hasPropertyByName( _rName ); } diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx index 3ee1af6e8c63..09f8dc8eccbb 100644 --- a/forms/source/inc/urltransformer.hxx +++ b/forms/source/inc/urltransformer.hxx @@ -47,7 +47,7 @@ namespace frm /** returns an URL object for the given URL string */ ::com::sun::star::util::URL - getStrictURL( const ::rtl::OUString& _rURL ) const; + getStrictURL( const OUString& _rURL ) const; /** returns an URL object for the given URL ASCII string */ diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 7a3bf4178de8..43253b8d1e38 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -123,7 +123,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn break; Reference< XMultiServiceFactory > xDocFac( xDoc, UNO_QUERY_THROW ); - Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString("ooo.vba.VBACodeNameProvider") ), UNO_QUERY ); + Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( OUString("ooo.vba.VBACodeNameProvider") ), UNO_QUERY ); if ( !xNameQuery.is() ) break; @@ -140,15 +140,15 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn // Try getting the code name from the container first (faster), // then from the element if that fails (slower). Reference<XInterface> xThis = static_cast<XContainer*>(this); - rtl::OUString sCodeName = xNameQuery->getCodeNameForContainer(xThis); + OUString sCodeName = xNameQuery->getCodeNameForContainer(xThis); if (sCodeName.isEmpty()) sCodeName = xNameQuery->getCodeNameForObject(xElement); Reference< XPropertySet > xProps( xElement, UNO_QUERY_THROW ); - ::rtl::OUString sServiceName; - xProps->getPropertyValue( rtl::OUString("DefaultControl") ) >>= sServiceName; + OUString sServiceName; + xProps->getPropertyValue( OUString("DefaultControl") ) >>= sServiceName; - Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString("ooo.vba.VBAToOOEventDesc") ), UNO_QUERY_THROW ); + Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( OUString("ooo.vba.VBAToOOEventDesc") ), UNO_QUERY_THROW ); Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( m_xServiceFactory->createInstance( sServiceName ), sCodeName ); // register the vba script events m_xEventAttacher->registerScriptEvents( i_nIndex, vbaEvents ); @@ -223,7 +223,7 @@ void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource ) catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString( "Could not clone the given interface hierarchy." ), + OUString( "Could not clone the given interface hierarchy." ), static_cast< XIndexContainer* >( const_cast< OInterfaceContainer* >( &_cloneSource ) ), ::cppu::getCaughtException() ); @@ -370,7 +370,7 @@ struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescr if ( 0 <= nPrefixLength ) { // the macro name does not already contain a : #ifdef DBG_UTIL - const ::rtl::OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, nPrefixLength ); + const OUString sPrefix = _rDescriptor.ScriptCode.copy( 0, nPrefixLength ); DBG_ASSERT( 0 == sPrefix.compareToAscii( "document" ) || 0 == sPrefix.compareToAscii( "application" ), "TransformEventTo52Format: invalid (unknown) prefix!" ); @@ -392,7 +392,7 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr if ( _rDescriptor.ScriptCode.indexOf( ':' ) < 0 ) { // the macro name does not already contain a : // -> default the type to "document" - ::rtl::OUString sNewScriptCode( "document:" ); + OUString sNewScriptCode( "document:" ); sNewScriptCode += _rDescriptor.ScriptCode; _rDescriptor.ScriptCode = sNewScriptCode; } @@ -688,12 +688,12 @@ throw (::com::sun::star::uno::RuntimeException) { { ::osl::MutexGuard aGuard( m_rMutex ); OInterfaceMap::iterator i = ::std::find(m_aMap.begin(), m_aMap.end(), - ::std::pair<const ::rtl::OUString, InterfaceRef >(::comphelper::getString(evt.OldValue),evt.Source)); + ::std::pair<const OUString, InterfaceRef >(::comphelper::getString(evt.OldValue),evt.Source)); if (i != m_aMap.end()) { InterfaceRef xCorrectType((*i).second); m_aMap.erase(i); - m_aMap.insert(::std::pair<const ::rtl::OUString, InterfaceRef >(::comphelper::getString(evt.NewValue),xCorrectType)); + m_aMap.insert(::std::pair<const OUString, InterfaceRef >(::comphelper::getString(evt.NewValue),xCorrectType)); } } } @@ -721,7 +721,7 @@ Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw( // XNameAccess //------------------------------------------------------------------------------ -Any SAL_CALL OInterfaceContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ::std::pair <OInterfaceMap::iterator, OInterfaceMap::iterator> aPair = m_aMap.equal_range(_rName); @@ -736,7 +736,7 @@ Any SAL_CALL OInterfaceContainer::getByName( const ::rtl::OUString& _rName ) thr StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException) { StringSequence aNameList(m_aItems.size()); - ::rtl::OUString* pStringArray = aNameList.getArray(); + OUString* pStringArray = aNameList.getArray(); for (OInterfaceMap::const_iterator i = m_aMap.begin(); i != m_aMap.end(); ++i, ++pStringArray) { @@ -746,7 +746,7 @@ StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeExce } //------------------------------------------------------------------------------ -sal_Bool SAL_CALL OInterfaceContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException) +sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw(RuntimeException) { ::std::pair <OInterfaceMap::iterator, OInterfaceMap::iterator> aPair = m_aMap.equal_range(_rName); @@ -835,7 +835,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper // exist // set the name, and add as change listener for the name - ::rtl::OUString sName; + OUString sName; _rxElement->getPropertyValue(PROPERTY_NAME) >>= sName; _rxElement->addPropertyChangeListener(PROPERTY_NAME, this); @@ -848,7 +848,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper else m_aItems.insert( m_aItems.begin() + _nIndex, pElementMetaData->xInterface ); - m_aMap.insert( ::std::pair< const ::rtl::OUString, InterfaceRef >( sName, pElementMetaData->xInterface ) ); + m_aMap.insert( ::std::pair< const OUString, InterfaceRef >( sName, pElementMetaData->xInterface ) ); // announce ourself as parent to the new element pElementMetaData->xChild->setParent(static_cast<XContainer*>(this)); @@ -870,7 +870,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper bool bHandleVbaEvents = false; try { - _rxElement->getPropertyValue(rtl::OUString("GenerateVbaEvents") ) >>= bHandleVbaEvents; + _rxElement->getPropertyValue(OUString("GenerateVbaEvents") ) >>= bHandleVbaEvents; } catch( const Exception& ) { @@ -1006,14 +1006,14 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any m_aMap.erase(j); // examine the new element - ::rtl::OUString sName; + OUString sName; DBG_ASSERT( aElementMetaData.get()->xPropertySet.is(), "OInterfaceContainer::implReplaceByIndex: what did approveNewElement do?" ); aElementMetaData.get()->xPropertySet->getPropertyValue(PROPERTY_NAME) >>= sName; aElementMetaData.get()->xPropertySet->addPropertyChangeListener(PROPERTY_NAME, this); // insert the new one - m_aMap.insert( ::std::pair<const ::rtl::OUString, InterfaceRef >( sName, aElementMetaData.get()->xInterface ) ); + m_aMap.insert( ::std::pair<const OUString, InterfaceRef >( sName, aElementMetaData.get()->xInterface ) ); m_aItems[ _nIndex ] = aElementMetaData.get()->xInterface; aElementMetaData.get()->xChild->setParent(static_cast<XContainer*>(this)); @@ -1110,7 +1110,7 @@ ElementDescription* OInterfaceContainer::createElementMetaData( ) } //------------------------------------------------------------------------ -void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException ) +void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException ) { Reference< XPropertySet > xElementProps; @@ -1143,7 +1143,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const ::rtl::OUString& _rName, c } //------------------------------------------------------------------------ -void SAL_CALL OInterfaceContainer::replaceByName(const ::rtl::OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException ) +void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException ) { ::osl::ClearableMutexGuard aGuard( m_rMutex ); ::std::pair <OInterfaceMap::iterator, @@ -1171,7 +1171,7 @@ void SAL_CALL OInterfaceContainer::replaceByName(const ::rtl::OUString& Name, co } //------------------------------------------------------------------------ -void SAL_CALL OInterfaceContainer::removeByName(const ::rtl::OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException ) +void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException ) { ::osl::MutexGuard aGuard( m_rMutex ); ::std::pair <OInterfaceMap::iterator, @@ -1210,7 +1210,7 @@ void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const } //------------------------------------------------------------------------ -void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const ::rtl::OUString& aListenerType, const ::rtl::OUString& aEventMethod, const ::rtl::OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException) +void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException) { if ( m_xEventAttacher.is() ) m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam ); diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index b31c97eb91ec..7054db2403bb 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.cxx @@ -54,9 +54,9 @@ namespace frm //--------------------------------------------------------------------- static const Locale& getLocale(LocaleType _eType) { - static const Locale s_aEnglishUS( ::rtl::OUString("en"), ::rtl::OUString("us"), ::rtl::OUString() ); - static const Locale s_aGerman( ::rtl::OUString("de"), ::rtl::OUString("DE"), ::rtl::OUString() ); - static const ::rtl::OUString s_sEmptyString; + static const Locale s_aEnglishUS( OUString("en"), OUString("us"), OUString() ); + static const Locale s_aGerman( OUString("de"), OUString("DE"), OUString() ); + static const OUString s_sEmptyString; static const Locale s_aSystem( s_sEmptyString, s_sEmptyString, s_sEmptyString ); switch (_eType) @@ -171,7 +171,7 @@ namespace frm { // get the key for the description pLoopFormats->nKey = xStandardFormats->queryKey( - ::rtl::OUString::createFromAscii(pLoopFormats->pDescription), + OUString::createFromAscii(pLoopFormats->pDescription), getLocale(pLoopFormats->eLocale), sal_False ); @@ -179,7 +179,7 @@ namespace frm if (-1 == pLoopFormats->nKey) { pLoopFormats->nKey = xStandardFormats->addNew( - ::rtl::OUString::createFromAscii(pLoopFormats->pDescription), + OUString::createFromAscii(pLoopFormats->pDescription), getLocale(pLoopFormats->eLocale) ); #ifdef DBG_UTIL @@ -332,7 +332,7 @@ namespace frm if (!bFoundIt) { // somebody gave us an format which we can't translate - ::rtl::OUString sMessage ("This control supports only a very limited number of formats."); + OUString sMessage ("This control supports only a very limited number of formats."); throw IllegalArgumentException(sMessage, NULL, 2); } diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx index 105593b90faa..066b58d6f709 100644 --- a/forms/source/misc/property.cxx +++ b/forms/source/misc/property.cxx @@ -36,7 +36,7 @@ namespace frm //================================================================== PropertyInfoService::PropertyMap PropertyInfoService::s_AllKnownProperties; //------------------------------------------------------------------ -sal_Int32 PropertyInfoService::getPropertyId(const ::rtl::OUString& _rName) +sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName) { initialize(); @@ -58,7 +58,7 @@ sal_Int32 PropertyInfoService::getPropertyId(const ::rtl::OUString& _rName) } //------------------------------------------------------------------ -sal_Int32 ConcreteInfoService::getPreferedPropertyId(const ::rtl::OUString& _rName) +sal_Int32 ConcreteInfoService::getPreferedPropertyId(const OUString& _rName) { return PropertyInfoService::getPropertyId(_rName); } diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 2c2ce38172d7..db4342bc11fe 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -92,16 +92,16 @@ DECLARE_SERVICE_INFO(ImageProducer) //--------------------------------------------------------------------------------------- -static Sequence< ::rtl::OUString > s_aClassImplementationNames; -static Sequence<Sequence< ::rtl::OUString > > s_aClassServiceNames; +static Sequence< OUString > s_aClassImplementationNames; +static Sequence<Sequence< OUString > > s_aClassServiceNames; static Sequence<sal_Int64> s_aFactories; // need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so // it can't be used with sequences //--------------------------------------------------------------------------------------- void registerClassInfo( - ::rtl::OUString _rClassImplName, // the ImplName of the class - const Sequence< ::rtl::OUString >& _rServiceNames, // the services supported by this class + OUString _rClassImplName, // the ImplName of the class + const Sequence< OUString >& _rServiceNames, // the services supported by this class ::cppu::ComponentInstantiation _pCreateFunction // the method for instantiating such a class ) { @@ -123,7 +123,7 @@ void registerClassInfo( //....................................................................................... #define REGISTER_CLASS_CORE(classImplName) \ registerClassInfo( \ - ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(#classImplName), \ + OUString("com.sun.star.form.") + OUString(#classImplName), \ aServices, \ frm::classImplName##_CreateInstance) @@ -163,7 +163,7 @@ void ensureClassInfos() if (s_aClassImplementationNames.getLength()) // nothing to do return; - Sequence< ::rtl::OUString > aServices; + Sequence< OUString > aServices; // ======================================================================== // = ControlModels @@ -218,7 +218,7 @@ void ensureClassInfos() aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD; aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD; - registerClassInfo(::rtl::OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"), + registerClassInfo(OUString("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"), aServices, frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted); @@ -265,7 +265,7 @@ void ensureClassInfos() // = XForms core #define REGISTER_XFORMS_CLASS(name) \ aServices.realloc(1); \ - aServices.getArray()[0] = rtl::OUString( "com.sun.star.xforms." #name ); \ + aServices.getArray()[0] = OUString( "com.sun.star.xforms." #name ); \ REGISTER_CLASS_CORE(name) REGISTER_XFORMS_CLASS(Model); @@ -329,8 +329,8 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pI "forms::component_getFactory : invalid class infos !"); // loop through the sequences and register the service providers - const ::rtl::OUString* pClasses = s_aClassImplementationNames.getConstArray(); - const Sequence< ::rtl::OUString >* pServices = s_aClassServiceNames.getConstArray(); + const OUString* pClasses = s_aClassImplementationNames.getConstArray(); + const Sequence< OUString >* pServices = s_aClassServiceNames.getConstArray(); const sal_Int64* pFunctionsAsInts = s_aFactories.getConstArray(); for (sal_Int32 i=0; i<nClasses; ++i, ++pClasses, ++pServices, ++pFunctionsAsInts) @@ -366,7 +366,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pI // let the module look for the component Reference< XInterface > xRet; xRet = ::frm::OFormsModule::getComponentFactory( - ::rtl::OUString::createFromAscii( _pImplName ), + OUString::createFromAscii( _pImplName ), static_cast< XMultiServiceFactory* >( _pServiceManager ) ); if ( xRet.is() ) diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx index 9acd6b1c3fc8..3e643500b029 100644 --- a/forms/source/resource/frm_resource.cxx +++ b/forms/source/resource/frm_resource.cxx @@ -58,9 +58,9 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString ResourceManager::loadString(sal_uInt16 _nResId) + OUString ResourceManager::loadString(sal_uInt16 _nResId) { - ::rtl::OUString sReturn; + OUString sReturn; ensureImplExists(); if (m_pImpl) diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx index 225672e68c67..5a2acfe146c0 100644 --- a/forms/source/richtext/attributedispatcher.cxx +++ b/forms/source/richtext/attributedispatcher.cxx @@ -97,9 +97,9 @@ namespace frm #if OSL_DEBUG_LEVEL > 0 if ( _rArguments.getLength() ) { - ::rtl::OString sMessage( "OAttributeDispatcher::dispatch: found arguments, but can't handle arguments at all" ); + OString sMessage( "OAttributeDispatcher::dispatch: found arguments, but can't handle arguments at all" ); sMessage += "\n (URL: "; - sMessage += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); + sMessage += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += ")"; OSL_FAIL( sMessage.getStr() ); } diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 72e078973f6d..7f299b855ca1 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -44,13 +44,13 @@ namespace frm switch ( _eFunc ) { case OClipboardDispatcher::eCut: - aURL.Complete = ::rtl::OUString( ".uno:Cut" ); + aURL.Complete = OUString( ".uno:Cut" ); break; case OClipboardDispatcher::eCopy: - aURL.Complete = ::rtl::OUString( ".uno:Copy" ); + aURL.Complete = OUString( ".uno:Copy" ); break; case OClipboardDispatcher::ePaste: - aURL.Complete = ::rtl::OUString( ".uno:Paste" ); + aURL.Complete = OUString( ".uno:Paste" ); break; } return aURL; diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 12b9b1ed98b6..942253209681 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -110,7 +110,7 @@ namespace frm namespace { //.............................................................. - static void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const ::rtl::OUString& _rPropertyName, + static void implAdjustTriStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, WinBits& _rAllBits, WinBits _nPositiveFlag, WinBits nNegativeFlag ) { sal_Bool bFlagValue = sal_False; @@ -134,7 +134,7 @@ namespace frm } //.............................................................. - static void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const ::rtl::OUString& _rPropertyName, + static void implAdjustTwoStateFlag( const Reference< XPropertySet >& _rxProps, const OUString& _rPropertyName, WinBits& _rAllBits, WinBits _nFlag, bool _bInvert = false ) { implAdjustTwoStateFlag( _rxProps->getPropertyValue( _rPropertyName ), _rAllBits, _nFlag, _bInvert ); @@ -252,29 +252,29 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName() throw( RuntimeException ) + OUString SAL_CALL ORichTextControl::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ORichTextControl::getSupportedServiceNames() throw( RuntimeException ) + Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames() throw( RuntimeException ) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ORichTextControl::getImplementationName_Static() + OUString SAL_CALL ORichTextControl::getImplementationName_Static() { - return ::rtl::OUString( "com.sun.star.comp.form.ORichTextControl" ); + return OUString( "com.sun.star.comp.form.ORichTextControl" ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static() + Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static() { - Sequence< ::rtl::OUString > aServices( 3 ); - aServices[ 0 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" ); - aServices[ 1 ] = ::rtl::OUString( "com.sun.star.awt.UnoControlEdit" ); + Sequence< OUString > aServices( 3 ); + aServices[ 0 ] = OUString( "com.sun.star.awt.UnoControl" ); + aServices[ 1 ] = OUString( "com.sun.star.awt.UnoControlEdit" ); aServices[ 2 ] = FRM_SUN_CONTROL_RICHTEXTCONTROL; return aServices; } @@ -286,7 +286,7 @@ namespace frm } //-------------------------------------------------------------------- - Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const ::rtl::OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException) + Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException) { FORWARD_TO_PEER_3_RET( Reference< XDispatch >, XDispatchProvider, queryDispatch, _rURL, _rTargetFrameName, _nSearchFlags ); } @@ -298,7 +298,7 @@ namespace frm } //-------------------------------------------------------------------- - sal_Bool ORichTextControl::requiresNewPeer( const ::rtl::OUString& _rPropertyName ) const + sal_Bool ORichTextControl::requiresNewPeer( const OUString& _rPropertyName ) const { return UnoControl::requiresNewPeer( _rPropertyName ) || _rPropertyName.equals( PROPERTY_RICH_TEXT ); } @@ -398,7 +398,7 @@ namespace frm } //-------------------------------------------------------------------- - void SAL_CALL ORichTextPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (RuntimeException) + void SAL_CALL ORichTextPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw (RuntimeException) { if ( !GetWindow() ) { @@ -604,8 +604,8 @@ namespace frm if ( bNeedParametrizedDispatcher ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *parametrized* dispatcher for " ); - sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *parametrized* dispatcher for " ); + sTrace += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); OSL_TRACE( "%s", sTrace.getStr() ); #endif pAttributeDispatcher = new OParametrizedAttributeDispatcher( pRichTextControl->getView(), _nSlotId, _rURL, pRichTextControl ); @@ -613,8 +613,8 @@ namespace frm else { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *normal* dispatcher for " ); - sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString sTrace( "ORichTextPeer::implCreateDispatcher: creating *normal* dispatcher for " ); + sTrace += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); OSL_TRACE( "%s", sTrace.getStr() ); #endif pAttributeDispatcher = new OAttributeDispatcher( pRichTextControl->getView(), _nSlotId, _rURL, pRichTextControl ); @@ -623,8 +623,8 @@ namespace frm #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sTrace( "ORichTextPeer::implCreateDispatcher: not creating dispatcher (unsupported slot) for " ); - sTrace += ::rtl::OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); + OString sTrace( "ORichTextPeer::implCreateDispatcher: not creating dispatcher (unsupported slot) for " ); + sTrace += OString( _rURL.Complete.getStr(), _rURL.Complete.getLength(), RTL_TEXTENCODING_ASCII_US ); OSL_TRACE( "%s", sTrace.getStr() ); } #endif @@ -645,7 +645,7 @@ namespace frm //-------------------------------------------------------------------- namespace { - SfxSlotId lcl_getSlotFromUnoName( SfxSlotPool& _rSlotPool, const ::rtl::OUString& _rUnoSlotName ) + SfxSlotId lcl_getSlotFromUnoName( SfxSlotPool& _rSlotPool, const OUString& _rUnoSlotName ) { const SfxSlot* pSlot = _rSlotPool.GetUnoSlot( _rUnoSlotName ); if ( pSlot ) @@ -669,7 +669,7 @@ namespace frm } //-------------------------------------------------------------------- - Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const ::com::sun::star::util::URL& _rURL, const ::rtl::OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException) + Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException) { Reference< XDispatch > xReturn; if ( !GetWindow() ) @@ -679,10 +679,10 @@ namespace frm } // is it an UNO slot? - ::rtl::OUString sUnoProtocolPrefix( ".uno:" ); + OUString sUnoProtocolPrefix( ".uno:" ); if ( _rURL.Complete.startsWith( sUnoProtocolPrefix ) ) { - ::rtl::OUString sUnoSlotName = _rURL.Complete.copy( sUnoProtocolPrefix.getLength() ); + OUString sUnoSlotName = _rURL.Complete.copy( sUnoProtocolPrefix.getLength() ); SfxSlotId nSlotId = lcl_getSlotFromUnoName( SfxSlotPool::GetSlotPool( NULL ), sUnoSlotName ); if ( nSlotId > 0 ) { diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index 365a85f7a27c..5dd61be825d0 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -56,8 +56,8 @@ namespace frm public: // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); + static OUString SAL_CALL getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); protected: @@ -69,18 +69,18 @@ namespace frm virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider DECLARE_XTYPEPROVIDER() // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const ::rtl::OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException); // UnoControl - virtual sal_Bool requiresNewPeer( const ::rtl::OUString& _rPropertyName ) const; + virtual sal_Bool requiresNewPeer( const OUString& _rPropertyName ) const; }; //================================================================== @@ -119,7 +119,7 @@ namespace frm void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException); // XVclWindowPeer - virtual void SAL_CALL setProperty( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider DECLARE_XTYPEPROVIDER( ) @@ -128,7 +128,7 @@ namespace frm virtual void SAL_CALL dispose( ) throw(::com::sun::star::uno::RuntimeException); // XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const ::rtl::OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _rSearchFlags ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& Requests ) throw (::com::sun::star::uno::RuntimeException); // ITextSelectionListener diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 5799ca8a90af..292309e971db 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -64,7 +64,7 @@ namespace frm DBG_NAME( ORichTextModel ) //-------------------------------------------------------------------- ORichTextModel::ORichTextModel( const Reference< XMultiServiceFactory >& _rxFactory ) - :OControlModel ( _rxFactory, ::rtl::OUString() ) + :OControlModel ( _rxFactory, OUString() ) ,FontControlModel ( true ) ,m_pEngine ( RichTextEngine::Create() ) ,m_bSettingEngineText( false ) @@ -244,13 +244,13 @@ namespace frm //-------------------------------------------------------------------- IMPLEMENT_SERVICE_REGISTRATION_8( ORichTextModel, OControlModel, FRM_SUN_COMPONENT_RICHTEXTCONTROL, - ::rtl::OUString( "com.sun.star.text.TextRange" ), - ::rtl::OUString( "com.sun.star.style.CharacterProperties" ), - ::rtl::OUString( "com.sun.star.style.ParagraphProperties" ), - ::rtl::OUString( "com.sun.star.style.CharacterPropertiesAsian" ), - ::rtl::OUString( "com.sun.star.style.CharacterPropertiesComplex" ), - ::rtl::OUString( "com.sun.star.style.ParagraphPropertiesAsian" ), - ::rtl::OUString( "com.sun.star.style.ParagraphPropertiesComplex" ) + OUString( "com.sun.star.text.TextRange" ), + OUString( "com.sun.star.style.CharacterProperties" ), + OUString( "com.sun.star.style.ParagraphProperties" ), + OUString( "com.sun.star.style.CharacterPropertiesAsian" ), + OUString( "com.sun.star.style.CharacterPropertiesComplex" ), + OUString( "com.sun.star.style.ParagraphPropertiesAsian" ), + OUString( "com.sun.star.style.ParagraphPropertiesComplex" ) ) //------------------------------------------------------------------------------ @@ -266,7 +266,7 @@ namespace frm //------------------------------------------------------------------------------ namespace { - void lcl_removeProperty( Sequence< Property >& _rSeq, const ::rtl::OUString& _rPropertyName ) + void lcl_removeProperty( Sequence< Property >& _rSeq, const OUString& _rPropertyName ) { Property* pLoop = _rSeq.getArray(); Property* pEnd = _rSeq.getArray() + _rSeq.getLength(); @@ -409,7 +409,7 @@ namespace frm // forward to our aggregate, so the EditEngine knows about it if ( m_xAggregateSet.is() ) m_xAggregateSet->setPropertyValue( - ::rtl::OUString( "WritingMode" ), _rValue ); + OUString( "WritingMode" ), _rValue ); } break; @@ -466,13 +466,13 @@ namespace frm break; case PROPERTY_ID_DEFAULTCONTROL: - aDefault <<= (::rtl::OUString)FRM_SUN_CONTROL_RICHTEXTCONTROL; + aDefault <<= (OUString)FRM_SUN_CONTROL_RICHTEXTCONTROL; break; case PROPERTY_ID_HELPTEXT: case PROPERTY_ID_HELPURL: case PROPERTY_ID_TEXT: - aDefault <<= ::rtl::OUString(); + aDefault <<= OUString(); break; case PROPERTY_ID_BORDER: @@ -490,7 +490,7 @@ namespace frm } //-------------------------------------------------------------------- - void ORichTextModel::impl_smlock_setEngineText( const ::rtl::OUString& _rText ) + void ORichTextModel::impl_smlock_setEngineText( const OUString& _rText ) { if ( m_pEngine.get() ) { @@ -502,7 +502,7 @@ namespace frm } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException) + OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException) { return FRM_SUN_COMPONENT_RICHTEXTCONTROL; } @@ -606,7 +606,7 @@ namespace frm //-------------------------------------------------------------------- void ORichTextModel::potentialTextChange( ) { - ::rtl::OUString sCurrentEngineText; + OUString sCurrentEngineText; if ( m_pEngine.get() ) sCurrentEngineText = m_pEngine->GetText(); diff --git a/forms/source/richtext/richtextmodel.hxx b/forms/source/richtext/richtextmodel.hxx index 7d2fff59586f..75cab24a6466 100644 --- a/forms/source/richtext/richtextmodel.hxx +++ b/forms/source/richtext/richtextmodel.hxx @@ -62,10 +62,10 @@ namespace frm ::com::sun::star::uno::Any m_aBackgroundColor; ::com::sun::star::uno::Any m_aBorderColor; ::com::sun::star::uno::Any m_aVerticalAlignment; - ::rtl::OUString m_sDefaultControl; - ::rtl::OUString m_sHelpText; - ::rtl::OUString m_sHelpURL; - ::rtl::OUString m_sLastKnownEngineText; + OUString m_sDefaultControl; + OUString m_sHelpText; + OUString m_sHelpURL; + OUString m_sLastKnownEngineText; sal_Int16 m_nLineEndFormat; sal_Int16 m_nTextWritingMode; sal_Int16 m_nContextWritingMode; @@ -164,7 +164,7 @@ namespace frm @precond our mutex is not locked */ - void impl_smlock_setEngineText( const ::rtl::OUString& _rText ); + void impl_smlock_setEngineText( const OUString& _rText ); DECL_LINK( OnEngineContentModified, void* ); diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 7add303603fc..2f4349b247c6 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -243,8 +243,8 @@ namespace frm for ( size_t i = 0; i < SAL_N_ELEMENTS( aExportFormats ); ++i ) { aFP.AddFilter( - rtl::OUString::createFromAscii( aExportFormats[i].pDescription ), - rtl::OUString::createFromAscii( aExportFormats[i].pExtension ) ); + OUString::createFromAscii( aExportFormats[i].pDescription ), + OUString::createFromAscii( aExportFormats[i].pExtension ) ); } ErrCode nResult = aFP.Execute(); if ( nResult == 0 ) diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index a95a6b6e2f6d..914ae6af5180 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -140,16 +140,16 @@ namespace frm } //-------------------------------------------------------------------- - ::rtl::OUString FormOperations::getImplementationName_Static( ) throw(RuntimeException) + OUString FormOperations::getImplementationName_Static( ) throw(RuntimeException) { - return ::rtl::OUString( "com.sun.star.comp.forms.FormOperations" ); + return OUString( "com.sun.star.comp.forms.FormOperations" ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException) + Sequence< OUString > FormOperations::getSupportedServiceNames_Static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aNames(1); - aNames[0] = ::rtl::OUString( "com.sun.star.form.runtime.FormOperations" ); + Sequence< OUString > aNames(1); + aNames[0] = OUString( "com.sun.star.form.runtime.FormOperations" ); return aNames; } @@ -174,30 +174,30 @@ namespace frm else if ( _arguments[0] >>= xForm ) createWithForm( xForm ); else - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); return; } - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL FormOperations::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL FormOperations::getImplementationName( ) throw (RuntimeException) { return getImplementationName_Static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL FormOperations::supportsService( const ::rtl::OUString& _ServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL FormOperations::supportsService( const OUString& _ServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSupportedServiceNames( getSupportedServiceNames() ); - const ::rtl::OUString* pBegin = aSupportedServiceNames.getConstArray(); - const ::rtl::OUString* pEnd = aSupportedServiceNames.getConstArray() + aSupportedServiceNames.getLength(); + Sequence< OUString > aSupportedServiceNames( getSupportedServiceNames() ); + const OUString* pBegin = aSupportedServiceNames.getConstArray(); + const OUString* pEnd = aSupportedServiceNames.getConstArray() + aSupportedServiceNames.getLength(); return ::std::find( pBegin, pEnd, _ServiceName ) != pEnd; } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL FormOperations::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL FormOperations::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_Static(); } @@ -296,7 +296,7 @@ namespace frm aState.Enabled = ::dbtools::getConnection( xCursorRowSet ).is(); // and an active command - ::rtl::OUString sActiveCommand; + OUString sActiveCommand; m_xCursorProperties->getPropertyValue( PROPERTY_ACTIVECOMMAND ) >>= sActiveCommand; aState.Enabled &= !sActiveCommand.isEmpty(); } @@ -343,7 +343,7 @@ namespace frm case FormFeature::ToggleApplyFilter: { - ::rtl::OUString sFilter; + OUString sFilter; m_xCursorProperties->getPropertyValue( PROPERTY_FILTER ) >>= sFilter; if ( !sFilter.isEmpty() ) { @@ -398,9 +398,9 @@ namespace frm if ( bIsNew ) ++nCount; - ::rtl::OUString sValue = ::rtl::OUString::valueOf( sal_Int32( nCount ) ); + OUString sValue = OUString::valueOf( sal_Int32( nCount ) ); if ( !bFinalCount ) - sValue += ::rtl::OUString(" *"); + sValue += OUString(" *"); aState.State <<= sValue; aState.Enabled = sal_True; @@ -647,13 +647,13 @@ namespace frm OSL_ENSURE( xProperties.is(), "FormOperations::execute: no multi property access!" ); if ( xProperties.is() ) { - Sequence< ::rtl::OUString > aNames( 2 ); + Sequence< OUString > aNames( 2 ); aNames[0] = PROPERTY_FILTER; aNames[1] = PROPERTY_SORT; Sequence< Any> aValues( 2 ); - aValues[0] <<= ::rtl::OUString(); - aValues[1] <<= ::rtl::OUString(); + aValues[0] <<= OUString(); + aValues[1] <<= OUString(); WaitObject aWO( NULL ); xProperties->setPropertyValues( aNames, aValues ); @@ -713,7 +713,7 @@ namespace frm catch( const SQLException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); + throw WrappedTargetException( OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); } impl_invalidateAllSupportedFeatures_nothrow( aGuard ); @@ -767,7 +767,7 @@ namespace frm catch( const SQLException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + throw WrappedTargetException( OUString(), *this, ::cppu::getCaughtException() ); } } break; @@ -871,7 +871,7 @@ namespace frm catch( const RuntimeException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + throw WrappedTargetException( OUString(), *this, ::cppu::getCaughtException() ); } return bIs; } @@ -887,7 +887,7 @@ namespace frm catch( const RuntimeException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + throw WrappedTargetException( OUString(), *this, ::cppu::getCaughtException() ); } return bIs; } @@ -948,7 +948,7 @@ namespace frm { try { - ::rtl::OUString sNewValue; + OUString sNewValue; _rEvent.NewValue >>= sNewValue; if ( _rEvent.PropertyName == PROPERTY_ACTIVECOMMAND ) { @@ -1022,7 +1022,7 @@ namespace frm void FormOperations::impl_checkDisposed_throw() const { if ( impl_isDisposed_nothrow() ) - throw DisposedException( ::rtl::OUString(), *const_cast< FormOperations* >( this ) ); + throw DisposedException( OUString(), *const_cast< FormOperations* >( this ) ); } //-------------------------------------------------------------------- @@ -1031,7 +1031,7 @@ namespace frm OSL_PRECOND( m_xController.is(), "FormOperations::impl_initFromController_throw: invalid controller!" ); m_xCursor = m_xCursor.query( m_xController->getModel() ); if ( !m_xCursor.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); impl_initFromForm_throw(); @@ -1049,7 +1049,7 @@ namespace frm m_xLoadableForm = m_xLoadableForm.query ( m_xCursor ); if ( !m_xCursor.is() || !m_xCursorProperties.is() || !m_xLoadableForm.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); m_xCursor->addRowSetListener( this ); m_xCursorProperties->addPropertyChangeListener( PROPERTY_ISMODIFIED,this ); @@ -1061,7 +1061,7 @@ namespace frm { m_xController = _rxController; if ( !m_xController.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); impl_initFromController_throw(); @@ -1073,7 +1073,7 @@ namespace frm { m_xCursor = m_xCursor.query( _rxForm ); if ( !m_xCursor.is() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); impl_initFromForm_throw(); @@ -1135,7 +1135,7 @@ namespace frm Reference< XMultiServiceFactory > xFactory( ::dbtools::getConnection( m_xCursor ), UNO_QUERY ); if ( xFactory.is() ) { - m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); + m_xParser.set( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY ); OSL_ENSURE( m_xParser.is(), "FormOperations::impl_ensureInitializedParser_nothrow: factory did not create a parser for us!" ); } } @@ -1144,9 +1144,9 @@ namespace frm { if ( m_xLoadableForm.is() && m_xLoadableForm->isLoaded() ) { - ::rtl::OUString sStatement; - ::rtl::OUString sFilter; - ::rtl::OUString sSort; + OUString sStatement; + OUString sFilter; + OUString sSort; m_xCursorProperties->getPropertyValue( PROPERTY_ACTIVECOMMAND ) >>= sStatement; m_xCursorProperties->getPropertyValue( PROPERTY_FILTER ) >>= sFilter; @@ -1233,7 +1233,7 @@ namespace frm namespace { template < typename TYPE > - TYPE lcl_safeGetPropertyValue_throw( const Reference< XPropertySet >& _rxProperties, const ::rtl::OUString& _rPropertyName, TYPE _Default ) + TYPE lcl_safeGetPropertyValue_throw( const Reference< XPropertySet >& _rxProperties, const OUString& _rPropertyName, TYPE _Default ) { TYPE value( _Default ); OSL_PRECOND( _rxProperties.is(), "FormOperations::<foo>: no cursor (already disposed?)!" ); @@ -1480,11 +1480,11 @@ namespace frm if ( !xBoundField.is() ) return; - ::rtl::OUString sOriginalSort; + OUString sOriginalSort; m_xCursorProperties->getPropertyValue( PROPERTY_SORT ) >>= sOriginalSort; // automatic sort by field is expected to always resets the previous sort order - m_xParser->setOrder( ::rtl::OUString() ); + m_xParser->setOrder( OUString() ); impl_appendOrderByColumn_throw aAction(this, xBoundField, _bUp); impl_doActionInSQLContext_throw(aAction, RID_STR_COULD_NOT_SET_ORDER ); @@ -1520,7 +1520,7 @@ namespace frm catch( const SQLException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); + throw WrappedTargetException( OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); } } @@ -1543,14 +1543,14 @@ namespace frm if ( !xBoundField.is() ) return; - ::rtl::OUString sOriginalFilter; + OUString sOriginalFilter; m_xCursorProperties->getPropertyValue( PROPERTY_FILTER ) >>= sOriginalFilter; sal_Bool bApplied = sal_True; m_xCursorProperties->getPropertyValue( PROPERTY_APPLYFILTER ) >>= bApplied; // if we have a filter, but it's not applied, then we have to overwrite it, else append one if ( !bApplied ) - m_xParser->setFilter( ::rtl::OUString() ); + m_xParser->setFilter( OUString() ); impl_appendFilterByColumn_throw aAction(this, xBoundField); impl_doActionInSQLContext_throw( aAction, RID_STR_COULD_NOT_SET_FILTER ); @@ -1589,7 +1589,7 @@ namespace frm catch( const SQLException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); + throw WrappedTargetException( OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); } } @@ -1633,7 +1633,7 @@ namespace frm catch( const SQLException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); + throw WrappedTargetException( OUString(), *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); } } @@ -1653,14 +1653,14 @@ namespace frm throw; SQLExceptionInfo aInfo( ::cppu::getCaughtException() ); - ::rtl::OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) ); + OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) ); aInfo.prepend( sAdditionalError ); aInfo.doThrow(); } catch( const RuntimeException& ) { throw; } catch( const Exception& ) { - ::rtl::OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) ); + OUString sAdditionalError( FRM_RES_STRING( _nErrorResourceId ) ); throw WrappedTargetException( sAdditionalError, *const_cast< FormOperations* >( this ), ::cppu::getCaughtException() ); } } diff --git a/forms/source/runtime/formoperations.hxx b/forms/source/runtime/formoperations.hxx index 96853489bdb8..a518c3d31191 100644 --- a/forms/source/runtime/formoperations.hxx +++ b/forms/source/runtime/formoperations.hxx @@ -82,8 +82,8 @@ namespace frm FormOperations( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxContext ); // XServiceInfo - static versions - static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); + static OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); @@ -113,9 +113,9 @@ namespace frm virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XFormOperations virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getCursor() throw (::com::sun::star::uno::RuntimeException); diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index 16a26e7492dc..d0ef82b6aa58 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -180,29 +180,29 @@ namespace frm } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName() throw( RuntimeException ) + OUString SAL_CALL ONavigationBarControl::getImplementationName() throw( RuntimeException ) { return getImplementationName_Static(); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames() throw( RuntimeException ) + Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames() throw( RuntimeException ) { return getSupportedServiceNames_Static(); } //------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ONavigationBarControl::getImplementationName_Static() + OUString SAL_CALL ONavigationBarControl::getImplementationName_Static() { - return ::rtl::OUString( "com.sun.star.comp.form.ONavigationBarControl" ); + return OUString( "com.sun.star.comp.form.ONavigationBarControl" ); } //------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static() + Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static() { - Sequence< ::rtl::OUString > aServices( 2 ); - aServices[ 0 ] = ::rtl::OUString( "com.sun.star.awt.UnoControl" ); - aServices[ 1 ] = ::rtl::OUString( "com.sun.star.form.control.NavigationToolBar" ); + Sequence< OUString > aServices( 2 ); + aServices[ 0 ] = OUString( "com.sun.star.awt.UnoControl" ); + aServices[ 1 ] = OUString( "com.sun.star.form.control.NavigationToolBar" ); return aServices; } @@ -297,7 +297,7 @@ namespace frm } //------------------------------------------------------------------ - void SAL_CALL ONavigationBarPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException ) + void SAL_CALL ONavigationBarPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -377,7 +377,7 @@ namespace frm } //------------------------------------------------------------------ - Any SAL_CALL ONavigationBarPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( RuntimeException ) + Any SAL_CALL ONavigationBarPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException ) { SolarMutexGuard aGuard; @@ -450,7 +450,7 @@ namespace frm } else if ( _nFeatureId == FormFeature::MoveAbsolute ) { - pNavBar->setFeatureText( _nFeatureId, rtl::OUString::valueOf(getIntegerState(_nFeatureId)) ); + pNavBar->setFeatureText( _nFeatureId, OUString::valueOf(getIntegerState(_nFeatureId)) ); } } diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx index 78af8e4d7019..5639018b696e 100644 --- a/forms/source/solar/component/navbarcontrol.hxx +++ b/forms/source/solar/component/navbarcontrol.hxx @@ -57,8 +57,8 @@ namespace frm public: // XServiceInfo - static version - static ::rtl::OUString SAL_CALL getImplementationName_Static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); + static OUString SAL_CALL getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory ); protected: @@ -70,8 +70,8 @@ namespace frm virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& _rParent ) throw( ::com::sun::star::uno::RuntimeException ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); // XTypeProvider DECLARE_XTYPEPROVIDER() @@ -126,8 +126,8 @@ namespace frm void SAL_CALL dispose( ) throw( ::com::sun::star::uno::RuntimeException ); // XVclWindowPeer - void SAL_CALL setProperty( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw( ::com::sun::star::uno::RuntimeException ); - ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& _rPropertyName ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw( ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& _rPropertyName ) throw(::com::sun::star::uno::RuntimeException); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 2d102247b080..4820154e5968 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -57,13 +57,13 @@ namespace frm static String getLabelString( sal_uInt16 _nResId ) { - String sLabel = rtl::OUString( " " ); + String sLabel = OUString( " " ); sLabel += String( FRM_RES_STRING( _nResId ) ); - sLabel += rtl::OUString( " " ); + sLabel += OUString( " " ); return sLabel; } - ::rtl::OUString lcl_getCommandURL( const sal_Int16 _nFormFeature ) + OUString lcl_getCommandURL( const sal_Int16 _nFormFeature ) { const sal_Char* pAsciiCommandName = NULL; switch ( _nFormFeature ) @@ -89,10 +89,10 @@ namespace frm case FormFeature::RemoveFilterAndSort : pAsciiCommandName = "RemoveFilterSort"; break; } if ( pAsciiCommandName != NULL ) - return ::rtl::OUString( ".uno:" ) + ::rtl::OUString::createFromAscii( pAsciiCommandName ); + return OUString( ".uno:" ) + OUString::createFromAscii( pAsciiCommandName ); OSL_FAIL( "lcl_getCommandURL: unknown FormFeature!" ); - return ::rtl::OUString(); + return OUString(); } } @@ -230,7 +230,7 @@ namespace frm } //--------------------------------------------------------------------- - void NavigationToolBar::setFeatureText( sal_Int16 _nFeatureId, const ::rtl::OUString& _rText ) + void NavigationToolBar::setFeatureText( sal_Int16 _nFeatureId, const OUString& _rText ) { DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND, "NavigationToolBar::checkFeature: invalid id!" ); @@ -299,7 +299,7 @@ namespace frm if ( !isArtificialItem( pSupportedFeatures->nId ) ) { - ::rtl::OUString sCommandURL( lcl_getCommandURL( pSupportedFeatures->nId ) ); + OUString sCommandURL( lcl_getCommandURL( pSupportedFeatures->nId ) ); m_pToolbar->SetItemCommand( pSupportedFeatures->nId, sCommandURL ); if ( m_pDescriptionProvider ) m_pToolbar->SetQuickHelpText( pSupportedFeatures->nId, m_pDescriptionProvider->getCommandDescription( sCommandURL ) ); @@ -634,11 +634,11 @@ namespace frm break; case FormFeature::MoveAbsolute: - sItemText = rtl::OUString( "12345678" ); + sItemText = OUString( "12345678" ); break; case FormFeature::TotalRecords: - sItemText = rtl::OUString( "123456" ); + sItemText = OUString( "123456" ); break; } diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index ee6a77b97351..e9f91f05e977 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -94,7 +94,7 @@ namespace frm void checkFeature( sal_Int16 _nFeatureId, bool _bEnabled ); /// sets the text of a given feature - void setFeatureText( sal_Int16 _nFeatureId, const ::rtl::OUString& _rText ); + void setFeatureText( sal_Int16 _nFeatureId, const OUString& _rText ); /** retrieves the current image size */ diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index 7bcb059976ef..bd683100b086 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -40,7 +40,7 @@ template<class T> class NameContainer : public NameContainer_t { protected: - typedef std::map<rtl::OUString,T> map_t; + typedef std::map<OUString,T> map_t; map_t maItems; @@ -49,38 +49,38 @@ protected: return ! maItems.empty(); } - typename map_t::const_iterator findItem( const rtl::OUString& rName ) + typename map_t::const_iterator findItem( const OUString& rName ) { return maItems.find( rName ); } - bool hasItem( const rtl::OUString& rName ) + bool hasItem( const OUString& rName ) { return findItem( rName ) != maItems.end(); } - T getItem( const rtl::OUString& rName ) + T getItem( const OUString& rName ) { OSL_ENSURE( hasItem( rName ), "can't get non-existant item" ); return maItems[ rName ]; } - void replace( const rtl::OUString& rName, + void replace( const OUString& rName, const T& aElement ) { OSL_ENSURE( hasItem( rName ), "unknown item" ); maItems[ rName ] = aElement; } - void insert( const rtl::OUString& rName, + void insert( const OUString& rName, const T& aElement ) { OSL_ENSURE( ! hasItem( rName ), "item already in set" ); maItems[ rName ] = aElement; } - void remove( const rtl::OUString& rName ) + void remove( const OUString& rName ) { OSL_ENSURE( hasItem( rName ), "item not in set" ); maItems.erase( rName ); @@ -114,7 +114,7 @@ public: // virtual com::sun::star::uno::Any SAL_CALL getByName( - const rtl::OUString& rName ) + const OUString& rName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException ) @@ -126,12 +126,12 @@ public: return com::sun::star::uno::makeAny( aIter->second ); } - virtual com::sun::star::uno::Sequence<rtl::OUString> SAL_CALL getElementNames() + virtual com::sun::star::uno::Sequence<OUString> SAL_CALL getElementNames() throw( com::sun::star::uno::RuntimeException ) { - com::sun::star::uno::Sequence<rtl::OUString> aSequence( maItems.size() ); + com::sun::star::uno::Sequence<OUString> aSequence( maItems.size() ); typename map_t::const_iterator aIter = maItems.begin(); - rtl::OUString* pStrings = aSequence.getArray(); + OUString* pStrings = aSequence.getArray(); while( aIter != maItems.end() ) { *pStrings = aIter->first; @@ -144,7 +144,7 @@ public: } virtual sal_Bool SAL_CALL hasByName( - const rtl::OUString& rName ) + const OUString& rName ) throw( com::sun::star::uno::RuntimeException ) { return hasItem( rName ); @@ -156,7 +156,7 @@ public: // virtual void SAL_CALL replaceByName( - const rtl::OUString& rName, + const OUString& rName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, @@ -179,7 +179,7 @@ public: // virtual void SAL_CALL insertByName( - const rtl::OUString& rName, + const OUString& rName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, @@ -197,7 +197,7 @@ public: } virtual void SAL_CALL removeByName( - const rtl::OUString& rName ) + const OUString& rName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException) diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index b9db8ac9a8d7..99222b267f7e 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -58,8 +58,6 @@ using namespace com::sun::star::xml::xpath; using namespace com::sun::star::xml::dom::events; -using rtl::OUString; -using rtl::OUStringBuffer; using std::vector; using xforms::Binding; using xforms::MIP; @@ -843,7 +841,7 @@ bool Binding::isValid_DataType() : true; } -rtl::OUString Binding::explainInvalid_DataType() +OUString Binding::explainInvalid_DataType() { Reference<XDataType> xDataType = getDataType(); return xDataType.is() @@ -1065,7 +1063,7 @@ Binding::Any_t Binding::getValue( const Type_t& rType ) // return string value (if present; else return empty Any) Binding::Any_t result = Any(); if(maBindingExpression.hasValue()) { - rtl::OUString pathExpr(maBindingExpression.getString()); + OUString pathExpr(maBindingExpression.getString()); Convert &rConvert = Convert::get(); result = rConvert.toAny(pathExpr,rType); } @@ -1213,7 +1211,7 @@ sal_Bool Binding::isValid( const Any_t& ) return isValid(); } -rtl::OUString Binding::explainInvalid( +OUString Binding::explainInvalid( const Any_t& /*Value*/ ) throw( RuntimeException ) { @@ -1379,13 +1377,13 @@ void Binding::removeModifyListener( -rtl::OUString Binding::getName() +OUString Binding::getName() throw( RuntimeException ) { return getBindingID(); } -void SAL_CALL Binding::setName( const rtl::OUString& rName ) +void SAL_CALL Binding::setName( const OUString& rName ) throw( RuntimeException ) { // use the XPropertySet methods, so the change in the name is notified to the diff --git a/forms/source/xforms/binding.hxx b/forms/source/xforms/binding.hxx index 52e5cca4f2aa..7328bf3e8bad 100644 --- a/forms/source/xforms/binding.hxx +++ b/forms/source/xforms/binding.hxx @@ -102,7 +102,7 @@ public: typedef com::sun::star::uno::Reference<com::sun::star::xml::dom::XNodeList> XNodeList_t; typedef com::sun::star::uno::Reference<com::sun::star::util::XCloneable> XCloneable_t; typedef com::sun::star::uno::Sequence<sal_Int8> IntSequence_t; - typedef com::sun::star::uno::Sequence<rtl::OUString> StringSequence_t; + typedef com::sun::star::uno::Sequence<OUString> StringSequence_t; typedef std::vector<MIP> MIPs_t; typedef std::vector<XNode_t> XNodes_t; @@ -114,7 +114,7 @@ private: Model_t mxModel; /// binding-ID. A document-wide unique ID for this binding element. - rtl::OUString msBindingID; + OUString msBindingID; /// an XPath-expression to be instantiated on the data instance PathExpression maBindingExpression; @@ -132,7 +132,7 @@ private: BoolExpression maConstraint; /// user-readable explanation of the constraint - rtl::OUString msExplainConstraint; + OUString msExplainConstraint; /// an XPath-expression to calculate values ComputedExpression maCalculate; @@ -141,7 +141,7 @@ private: XNameContainer_t mxNamespaces; /// a type name - rtl::OUString msTypeName; + OUString msTypeName; /// modify listeners ModifyListeners_t maModifyListeners; @@ -183,33 +183,33 @@ public: void _setModel( const Model_t& ); /// set XForms model (only called by Model) - rtl::OUString getModelID() const; /// get ID of XForms model + OUString getModelID() const; /// get ID of XForms model - rtl::OUString getBindingID() const; /// get ID for this binding - void setBindingID( const rtl::OUString& ); /// set ID for this binding + OUString getBindingID() const; /// get ID for this binding + void setBindingID( const OUString& ); /// set ID for this binding - rtl::OUString getBindingExpression() const; /// get binding expression - void setBindingExpression( const rtl::OUString& ); /// set binding exp. + OUString getBindingExpression() const; /// get binding expression + void setBindingExpression( const OUString& ); /// set binding exp. // MIPs (model item properties) - rtl::OUString getReadonlyExpression() const; /// get read-only MIP - void setReadonlyExpression( const rtl::OUString& ); /// set read-only MIP + OUString getReadonlyExpression() const; /// get read-only MIP + void setReadonlyExpression( const OUString& ); /// set read-only MIP - rtl::OUString getRelevantExpression() const; /// get relevant MIP - void setRelevantExpression( const rtl::OUString& ); /// set relevant MIP + OUString getRelevantExpression() const; /// get relevant MIP + void setRelevantExpression( const OUString& ); /// set relevant MIP - rtl::OUString getRequiredExpression() const; /// get required MIP - void setRequiredExpression( const rtl::OUString& ); /// set required MIP + OUString getRequiredExpression() const; /// get required MIP + void setRequiredExpression( const OUString& ); /// set required MIP - rtl::OUString getConstraintExpression() const; /// get constraint MIP - void setConstraintExpression( const rtl::OUString& );/// set constraint MIP + OUString getConstraintExpression() const; /// get constraint MIP + void setConstraintExpression( const OUString& );/// set constraint MIP - rtl::OUString getCalculateExpression() const; /// get calculate MIP - void setCalculateExpression( const rtl::OUString& ); /// set calculate MIP + OUString getCalculateExpression() const; /// get calculate MIP + void setCalculateExpression( const OUString& ); /// set calculate MIP - rtl::OUString getType() const; /// get type name MIP (static) - void setType( const rtl::OUString& ); /// set type name MIP (static) + OUString getType() const; /// get type name MIP (static) + void setType( const OUString& ); /// set type name MIP (static) // a binding expression can only be interpreted with respect to // suitable namespace declarations. We collect those in the model and in a binding. @@ -271,7 +271,7 @@ public: bool isUseful(); /// explain why binding is invalid - rtl::OUString explainInvalid(); + OUString explainInvalid(); // the ID for XUnoTunnel calls @@ -355,7 +355,7 @@ private: bool isValid_DataType(); /// explain validity of binding with respect to the given data type - rtl::OUString explainInvalid_DataType(); + OUString explainInvalid_DataType(); /// 'clear' this binding - remove all listeners, etc. void clear(); @@ -411,7 +411,7 @@ public: virtual sal_Int32 SAL_CALL getListEntryCount() throw( RuntimeException_t ); - virtual rtl::OUString SAL_CALL getListEntry( sal_Int32 nPosition ) + virtual OUString SAL_CALL getListEntry( sal_Int32 nPosition ) throw( IndexOutOfBoundsException_t, RuntimeException_t ); @@ -436,7 +436,7 @@ public: const Any_t& ) throw( RuntimeException_t ); - virtual rtl::OUString SAL_CALL explainInvalid( + virtual OUString SAL_CALL explainInvalid( const Any_t& ) throw( RuntimeException_t ); @@ -476,10 +476,10 @@ public: public: - virtual rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw( RuntimeException_t ); - virtual void SAL_CALL setName( const rtl::OUString& ) + virtual void SAL_CALL setName( const OUString& ) throw( RuntimeException_t ); diff --git a/forms/source/xforms/boolexpression.cxx b/forms/source/xforms/boolexpression.cxx index 33110e26f440..01fd522d7170 100644 --- a/forms/source/xforms/boolexpression.cxx +++ b/forms/source/xforms/boolexpression.cxx @@ -38,7 +38,7 @@ BoolExpression::~BoolExpression() { } -void BoolExpression::setExpression( const rtl::OUString& rExpression ) +void BoolExpression::setExpression( const OUString& rExpression ) { ComputedExpression::setExpression( rExpression ); mbIsSimple = _checkExpression( " *(true)|(false) *\\( *\\) *" ); diff --git a/forms/source/xforms/boolexpression.hxx b/forms/source/xforms/boolexpression.hxx index f9bff076a5ae..ab03dfac4639 100644 --- a/forms/source/xforms/boolexpression.hxx +++ b/forms/source/xforms/boolexpression.hxx @@ -38,7 +38,7 @@ public: /// set the expression string /// (overridden for new definition of a simple expression) - void setExpression( const rtl::OUString& rExpression ); + void setExpression( const OUString& rExpression ); }; } // namespace xforms diff --git a/forms/source/xforms/computedexpression.cxx b/forms/source/xforms/computedexpression.cxx index 004521e72b93..184d91c61d96 100644 --- a/forms/source/xforms/computedexpression.cxx +++ b/forms/source/xforms/computedexpression.cxx @@ -38,7 +38,6 @@ #include <unotools/textsearch.hxx> #include <comphelper/processfactory.hxx> -using rtl::OUString; using com::sun::star::beans::NamedValue; using namespace com::sun::star::uno; using com::sun::star::lang::XInitialization; @@ -175,7 +174,7 @@ Reference<XXPathObject> ComputedExpression::getXPath() const return mxResult; } -OUString ComputedExpression::getString( const rtl::OUString& rDefault ) const +OUString ComputedExpression::getString( const OUString& rDefault ) const { return mxResult.is() ? mxResult->getString() : rDefault; } diff --git a/forms/source/xforms/computedexpression.hxx b/forms/source/xforms/computedexpression.hxx index 8f4783069955..876ef3c25fb5 100644 --- a/forms/source/xforms/computedexpression.hxx +++ b/forms/source/xforms/computedexpression.hxx @@ -49,7 +49,7 @@ namespace xforms class ComputedExpression { /// the expression string - rtl::OUString msExpression; + OUString msExpression; /// is msExpression empty? bool mbIsEmpty; @@ -66,14 +66,14 @@ protected: bool _checkExpression( const sal_Char* pExpression ) const; /// allow manipulation of the expression before it is evaluated - const rtl::OUString _getExpressionForEvaluation() const; + const OUString _getExpressionForEvaluation() const; /// obtain a (suitable) XPathAPI implementation com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathAPI> _getXPathAPI(const xforms::EvaluationContext& aContext); /// evaluate the expression relative to the content node. bool _evaluate( const xforms::EvaluationContext& rContext, - const rtl::OUString& sExpression ); + const OUString& sExpression ); public: @@ -82,10 +82,10 @@ public: /// get the expression string - rtl::OUString getExpression() const; + OUString getExpression() const; /// set a new expression string - void setExpression( const rtl::OUString& rExpression ); + void setExpression( const OUString& rExpression ); /// get the namespaces that are used to interpret the expression string com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> getNamespaces() const; @@ -119,7 +119,7 @@ public: // must call evaluate to ensure current results.) com::sun::star::uno::Reference<com::sun::star::xml::xpath::XXPathObject> getXPath() const; bool getBool( bool bDefault = false ) const; - rtl::OUString getString( const rtl::OUString& rDefault = rtl::OUString() ) const; + OUString getString( const OUString& rDefault = OUString() ) const; }; diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx index 2cf40983b873..b440f4b3705f 100644 --- a/forms/source/xforms/convert.cxx +++ b/forms/source/xforms/convert.cxx @@ -35,8 +35,6 @@ #include <com/sun/star/util/Time.hpp> using xforms::Convert; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; using com::sun::star::uno::Any; using com::sun::star::uno::makeAny; using com::sun::star::util::Time; @@ -61,13 +59,13 @@ namespace struct StringToken { private: - ::rtl::OUString m_sString; + OUString m_sString; sal_Int32 m_nTokenStart; sal_Int32 m_nTokenEnd; public: StringToken() : m_sString(), m_nTokenStart( 0 ), m_nTokenEnd( 0 ) { } - StringToken( const ::rtl::OUString& _rString, sal_Int32 _nTokenStart, sal_Int32 _nTokenEnd ); + StringToken( const OUString& _rString, sal_Int32 _nTokenStart, sal_Int32 _nTokenEnd ); StringToken( const StringToken& ); StringToken& operator=( const StringToken& ); @@ -80,7 +78,7 @@ namespace }; // ------------------------------------------------------------------------ - StringToken::StringToken( const ::rtl::OUString& _rString, sal_Int32 _nTokenStart, sal_Int32 _nTokenEnd ) + StringToken::StringToken( const OUString& _rString, sal_Int32 _nTokenStart, sal_Int32 _nTokenEnd ) :m_sString( _rString ) ,m_nTokenStart( _nTokenStart ) ,m_nTokenEnd( _nTokenEnd ) @@ -134,7 +132,7 @@ namespace class StringTokenizer { private: - ::rtl::OUString m_sString; + OUString m_sString; const sal_Unicode m_nTokenSeparator; sal_Int32 m_nTokenStart; @@ -146,7 +144,7 @@ namespace This may make sense if you want to apply <type>StringToken</type> methods to a whole string. */ - StringTokenizer( const ::rtl::OUString& _rString, sal_Unicode _nTokenSeparator = ';' ); + StringTokenizer( const OUString& _rString, sal_Unicode _nTokenSeparator = ';' ); /// resets the tokenizer to the beginning of the string void reset(); @@ -160,7 +158,7 @@ namespace }; // ------------------------------------------------------------------------ - StringTokenizer::StringTokenizer( const ::rtl::OUString& _rString, sal_Unicode _nTokenSeparator ) + StringTokenizer::StringTokenizer( const OUString& _rString, sal_Unicode _nTokenSeparator ) :m_sString( _rString ) ,m_nTokenSeparator( _nTokenSeparator ) { @@ -241,7 +239,7 @@ namespace } // ------------------------------------------------------------------------ - void lcl_appendInt32ToBuffer( const sal_Int32 _nValue, ::rtl::OUStringBuffer& _rBuffer, sal_Int16 _nMinDigits ) + void lcl_appendInt32ToBuffer( const sal_Int32 _nValue, OUStringBuffer& _rBuffer, sal_Int16 _nMinDigits ) { if ( ( _nMinDigits >= 4 ) && ( _nValue < 1000 ) ) _rBuffer.append( (sal_Unicode)'0' ); @@ -256,7 +254,7 @@ namespace OUString lcl_toXSD_UNODate_typed( const UNODate& rDate ) { - ::rtl::OUStringBuffer sInfo; + OUStringBuffer sInfo; lcl_appendInt32ToBuffer( rDate.Year, sInfo, 4 ); sInfo.appendAscii( "-" ); lcl_appendInt32ToBuffer( rDate.Month, sInfo, 2 ); @@ -333,7 +331,7 @@ namespace OUString lcl_toXSD_UNOTime_typed( const UNOTime& rTime ) { - ::rtl::OUStringBuffer sInfo; + OUStringBuffer sInfo; lcl_appendInt32ToBuffer( rTime.Hours, sInfo, 2 ); sInfo.appendAscii( ":" ); lcl_appendInt32ToBuffer( rTime.Minutes, sInfo, 2 ); @@ -363,7 +361,7 @@ namespace UNOTime aTime( 0, 0, 0, 0 ); - ::rtl::OUString sString( rString ); + OUString sString( rString ); // see if there's a decimal separator for the seconds, // and if so, handle it separately sal_Int32 nDecimalSepPos = rString.indexOf( '.' ); @@ -373,7 +371,7 @@ namespace if ( nDecimalSepPos != -1 ) { // handle fractional seconds - ::rtl::OUString sFractional = sString.copy( nDecimalSepPos + 1 ); + OUString sFractional = sString.copy( nDecimalSepPos + 1 ); if ( sFractional.getLength() > 2 ) // our precision is HundrethSeconds - it's all a css.util.Time can hold sFractional = sFractional.copy( 0, 2 ); @@ -458,12 +456,12 @@ namespace OSL_VERIFY( rAny >>= aDateTime ); UNODate aDate( aDateTime.Day, aDateTime.Month, aDateTime.Year ); - ::rtl::OUString sDate = lcl_toXSD_UNODate_typed( aDate ); + OUString sDate = lcl_toXSD_UNODate_typed( aDate ); UNOTime aTime( aDateTime.HundredthSeconds, aDateTime.Seconds, aDateTime.Minutes, aDateTime.Hours ); - ::rtl::OUString sTime = lcl_toXSD_UNOTime_typed( aTime ); + OUString sTime = lcl_toXSD_UNOTime_typed( aTime ); - ::rtl::OUStringBuffer sInfo; + OUStringBuffer sInfo; sInfo.append( sDate ); sInfo.append( (sal_Unicode) 'T' ); sInfo.append( sTime ); @@ -534,13 +532,13 @@ Convert::Types_t Convert::getTypes() return aTypes; } -rtl::OUString Convert::toXSD( const Any_t& rAny ) +OUString Convert::toXSD( const Any_t& rAny ) { Map_t::iterator aIter = maMap.find( rAny.getValueType() ); return aIter != maMap.end() ? aIter->second.first( rAny ) : OUString(); } -Convert::Any_t Convert::toAny( const rtl::OUString& rValue, +Convert::Any_t Convert::toAny( const OUString& rValue, const Type_t& rType ) { Map_t::iterator aIter = maMap.find( rType ); @@ -548,9 +546,9 @@ Convert::Any_t Convert::toAny( const rtl::OUString& rValue, } //------------------------------------------------------------------------ -::rtl::OUString Convert::convertWhitespace( const ::rtl::OUString& _rString, sal_Int16 _nWhitespaceTreatment ) +OUString Convert::convertWhitespace( const OUString& _rString, sal_Int16 _nWhitespaceTreatment ) { - ::rtl::OUString sConverted; + OUString sConverted; switch( _nWhitespaceTreatment ) { default: @@ -570,7 +568,7 @@ Convert::Any_t Convert::toAny( const rtl::OUString& rValue, } //------------------------------------------------------------------------ -::rtl::OUString Convert::replaceWhitespace( const ::rtl::OUString& _rString ) +OUString Convert::replaceWhitespace( const OUString& _rString ) { OUStringBuffer aBuffer( _rString ); sal_Int32 nLength = aBuffer.getLength(); @@ -587,7 +585,7 @@ Convert::Any_t Convert::toAny( const rtl::OUString& rValue, } //------------------------------------------------------------------------ -::rtl::OUString Convert::collapseWhitespace( const ::rtl::OUString& _rString ) +OUString Convert::collapseWhitespace( const OUString& _rString ) { sal_Int32 nLength = _rString.getLength(); OUStringBuffer aBuffer( nLength ); diff --git a/forms/source/xforms/convert.hxx b/forms/source/xforms/convert.hxx index 83244988f871..098066327ebf 100644 --- a/forms/source/xforms/convert.hxx +++ b/forms/source/xforms/convert.hxx @@ -47,8 +47,8 @@ class Convert typedef com::sun::star::uno::Any Any_t; // hold conversion objects - typedef rtl::OUString (*fn_toXSD)( const Any_t& ); - typedef Any_t (*fn_toAny)( const rtl::OUString& ); + typedef OUString (*fn_toXSD)( const Any_t& ); + typedef Any_t (*fn_toAny)( const OUString& ); typedef std::pair<fn_toXSD,fn_toAny> Convert_t; typedef std::map<Type_t,Convert_t,TypeLess> Map_t; Map_t maMap; @@ -68,10 +68,10 @@ public: Types_t getTypes(); /// convert any to XML representation - rtl::OUString toXSD( const Any_t& rAny ); + OUString toXSD( const Any_t& rAny ); /// convert XML representation to Any of given type - Any_t toAny( const rtl::OUString&, const Type_t& ); + Any_t toAny( const OUString&, const Type_t& ); /** translates the whitespaces in a given string, according to a given <type scope="com::sun::star::xsd">WhiteSpaceTreatment</type>. @@ -84,19 +84,19 @@ public: @return the converted string */ - static ::rtl::OUString convertWhitespace( - const ::rtl::OUString& _rString, + static OUString convertWhitespace( + const OUString& _rString, sal_Int16 _nWhitespaceTreatment ); /** replace all occurrences 0x08, 0x0A, 0x0D with 0x20 */ - static ::rtl::OUString replaceWhitespace( const ::rtl::OUString& _rString ); + static OUString replaceWhitespace( const OUString& _rString ); /** replace all sequences of 0x08, 0x0A, 0x0D, 0x20 with a single 0x20. also strip leading/trailing whitespace. */ - static ::rtl::OUString collapseWhitespace( const ::rtl::OUString& _rString ); + static OUString collapseWhitespace( const OUString& _rString ); }; } // namespace xforms diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx index c209a7f92c6a..1d2c029808bb 100644 --- a/forms/source/xforms/datatyperepository.cxx +++ b/forms/source/xforms/datatyperepository.cxx @@ -61,7 +61,7 @@ namespace xforms DBG_CTOR( ODataTypeRepository, NULL ); // insert some basic types - ::rtl::OUString sName( FRM_RES_STRING( RID_STR_DATATYPE_STRING ) ); + OUString sName( FRM_RES_STRING( RID_STR_DATATYPE_STRING ) ); m_aRepository[ sName ] = new OStringType( sName, ::com::sun::star::xsd::DataTypeClass::STRING ); sName = FRM_RES_STRING( RID_STR_DATATYPE_URL ); @@ -105,11 +105,11 @@ namespace xforms } //-------------------------------------------------------------------- - ODataTypeRepository::Repository::iterator ODataTypeRepository::implLocate( const ::rtl::OUString& _rName, bool _bAllowMiss ) SAL_THROW( ( NoSuchElementException ) ) + ODataTypeRepository::Repository::iterator ODataTypeRepository::implLocate( const OUString& _rName, bool _bAllowMiss ) SAL_THROW( ( NoSuchElementException ) ) { Repository::iterator aTypePos = m_aRepository.find( _rName ); if ( aTypePos == m_aRepository.end() && !_bAllowMiss ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); return aTypePos; } @@ -129,19 +129,19 @@ namespace xforms } if ( !xReturn.is() ) - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); return xReturn; } //-------------------------------------------------------------------- - Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const ::rtl::OUString& sourceName, const ::rtl::OUString& newName ) throw (NoSuchElementException, ElementExistException, RuntimeException) + Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const OUString& sourceName, const OUString& newName ) throw (NoSuchElementException, ElementExistException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Repository::iterator aTypePos = implLocate( newName, true ); if ( aTypePos != m_aRepository.end() ) - throw ElementExistException( ::rtl::OUString(), *this ); + throw ElementExistException( OUString(), *this ); aTypePos = implLocate( sourceName ); OXSDDataType* pClone = aTypePos->second->clone( newName ); @@ -151,20 +151,20 @@ namespace xforms } //-------------------------------------------------------------------- - void SAL_CALL ODataTypeRepository::revokeDataType( const ::rtl::OUString& typeName ) throw (NoSuchElementException, VetoException, RuntimeException) + void SAL_CALL ODataTypeRepository::revokeDataType( const OUString& typeName ) throw (NoSuchElementException, VetoException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); Repository::iterator aTypePos = implLocate( typeName ); if ( aTypePos->second->getIsBasic() ) - throw VetoException( ::rtl::OUString( "This is a built-in type and cannot be removed." ), *this ); + throw VetoException( OUString( "This is a built-in type and cannot be removed." ), *this ); // TODO: localize this error message m_aRepository.erase( aTypePos ); } //-------------------------------------------------------------------- - Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const ::rtl::OUString& typeName ) throw (NoSuchElementException, RuntimeException) + Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const OUString& typeName ) throw (NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return implLocate( typeName, false )->second.get(); @@ -178,17 +178,17 @@ namespace xforms } //-------------------------------------------------------------------- - Any SAL_CALL ODataTypeRepository::getByName( const ::rtl::OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL ODataTypeRepository::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { return makeAny( getDataType( aName ) ); } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL ODataTypeRepository::getElementNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ODataTypeRepository::getElementNames( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); - Sequence< ::rtl::OUString > aNames( m_aRepository.size() ); + Sequence< OUString > aNames( m_aRepository.size() ); ::std::transform( m_aRepository.begin(), m_aRepository.end(), @@ -199,7 +199,7 @@ namespace xforms } //-------------------------------------------------------------------- - sal_Bool SAL_CALL ODataTypeRepository::hasByName( const ::rtl::OUString& aName ) throw (RuntimeException) + sal_Bool SAL_CALL ODataTypeRepository::hasByName( const OUString& aName ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_aRepository.find( aName ) != m_aRepository.end(); diff --git a/forms/source/xforms/datatyperepository.hxx b/forms/source/xforms/datatyperepository.hxx index 7859a014ee07..dd144539ce6a 100644 --- a/forms/source/xforms/datatyperepository.hxx +++ b/forms/source/xforms/datatyperepository.hxx @@ -41,7 +41,7 @@ namespace xforms { private: typedef ::rtl::Reference< OXSDDataType > DataType; - typedef ::std::map< ::rtl::OUString, DataType > Repository; + typedef ::std::map< OUString, DataType > Repository; ::osl::Mutex m_aMutex; Repository m_aRepository; @@ -54,17 +54,17 @@ namespace xforms // XDataTypeRepository virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getBasicDataType( sal_Int16 dataTypeClass ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL cloneDataType( const ::rtl::OUString& sourceName, const ::rtl::OUString& newName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL revokeDataType( const ::rtl::OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getDataType( const ::rtl::OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL cloneDataType( const OUString& sourceName, const OUString& newName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL revokeDataType( const OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::util::VetoException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xsd::XDataType > SAL_CALL getDataType( const OUString& typeName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); // XEnumerationAccess (base of XDataTypeRepository) virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration( ) throw (::com::sun::star::uno::RuntimeException); // XNameAccess (base of XDataTypeRepository) - 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 (base of XEnumerationAccess and XNameAccess) virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); @@ -77,7 +77,7 @@ namespace xforms private: /** locates the type with the given name in our repository, or throws an exception if there is no such type */ - Repository::iterator implLocate( const ::rtl::OUString& _rName, bool _bAllowMiss = false ) SAL_THROW( ( ::com::sun::star::container::NoSuchElementException ) ); + Repository::iterator implLocate( const OUString& _rName, bool _bAllowMiss = false ) SAL_THROW( ( ::com::sun::star::container::NoSuchElementException ) ); }; //........................................................................ diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 3b9f0414bc7e..e1fcdebecf24 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -60,7 +60,7 @@ namespace xforms //= OXSDDataType //==================================================================== //-------------------------------------------------------------------- - OXSDDataType::OXSDDataType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ) + OXSDDataType::OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass ) :OXSDDataType_PBase( m_aBHelper ) ,m_bIsBasic( sal_True ) ,m_nTypeClass( _nTypeClass ) @@ -96,7 +96,7 @@ namespace xforms } //-------------------------------------------------------------------- - OXSDDataType* OXSDDataType::clone( const ::rtl::OUString& _rNewName ) const + OXSDDataType* OXSDDataType::clone( const OUString& _rNewName ) const { OXSDDataType* pClone = createClone( _rNewName ); pClone->initializeClone( *this ); @@ -114,26 +114,26 @@ namespace xforms OSL_POSTCOND( member == value, "OXSDDataType::setFoo: inconsistency!" ); //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OXSDDataType::getName( ) throw (RuntimeException) + OUString SAL_CALL OXSDDataType::getName( ) throw (RuntimeException) { return m_sName; } //-------------------------------------------------------------------- - void SAL_CALL OXSDDataType::setName( const ::rtl::OUString& aName ) throw (RuntimeException, VetoException) + void SAL_CALL OXSDDataType::setName( const OUString& aName ) throw (RuntimeException, VetoException) { // TODO: check the name for conflicts in the repository SET_PROPERTY( NAME, aName, m_sName ); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OXSDDataType::getPattern() throw (RuntimeException) + OUString SAL_CALL OXSDDataType::getPattern() throw (RuntimeException) { return m_sPattern; } //-------------------------------------------------------------------- - void SAL_CALL OXSDDataType::setPattern( const ::rtl::OUString& _pattern ) throw (RuntimeException) + void SAL_CALL OXSDDataType::setPattern( const OUString& _pattern ) throw (RuntimeException) { SET_PROPERTY( XSD_PATTERN, _pattern, m_sPattern ); } @@ -164,40 +164,40 @@ namespace xforms } //-------------------------------------------------------------------- - sal_Bool OXSDDataType::validate( const ::rtl::OUString& sValue ) throw( RuntimeException ) + sal_Bool OXSDDataType::validate( const OUString& sValue ) throw( RuntimeException ) { return ( _validate( sValue ) == 0 ); } //-------------------------------------------------------------------- - ::rtl::OUString OXSDDataType::explainInvalid( const ::rtl::OUString& sValue ) throw( RuntimeException ) + OUString OXSDDataType::explainInvalid( const OUString& sValue ) throw( RuntimeException ) { // get reason sal_uInt16 nReason = _validate( sValue ); // get resource and return localized string return ( nReason == 0 ) - ? ::rtl::OUString() + ? OUString() : getResource( nReason, sValue, _explainInvalid( nReason ) ); } //-------------------------------------------------------------------- - ::rtl::OUString OXSDDataType::_explainInvalid( sal_uInt16 nReason ) + OUString OXSDDataType::_explainInvalid( sal_uInt16 nReason ) { if ( RID_STR_XFORMS_PATTERN_DOESNT_MATCH == nReason ) { OSL_ENSURE( !m_sPattern.isEmpty(), "OXSDDataType::_explainInvalid: how can this error occur without a regular expression?" ); return m_sPattern; } - return ::rtl::OUString(); + return OUString(); } //-------------------------------------------------------------------- namespace { SAL_WNODEPRECATED_DECLARATIONS_PUSH - static void lcl_initializePatternMatcher( ::std::auto_ptr< RegexMatcher >& _rpMatcher, const ::rtl::OUString& _rPattern ) + static void lcl_initializePatternMatcher( ::std::auto_ptr< RegexMatcher >& _rpMatcher, const OUString& _rPattern ) { UErrorCode nMatchStatus = U_ZERO_ERROR; UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(_rPattern.getStr()), _rPattern.getLength() ); // UChar != sal_Unicode in MinGW @@ -207,7 +207,7 @@ namespace xforms } SAL_WNODEPRECATED_DECLARATIONS_POP - static bool lcl_matchString( RegexMatcher& _rMatcher, const ::rtl::OUString& _rText ) + static bool lcl_matchString( RegexMatcher& _rMatcher, const OUString& _rText ) { UErrorCode nMatchStatus = U_ZERO_ERROR; UnicodeString aInput( reinterpret_cast<const UChar *>(_rText.getStr()), _rText.getLength() ); // UChar != sal_Unicode in MinGW @@ -225,7 +225,7 @@ namespace xforms } //-------------------------------------------------------------------- - sal_uInt16 OXSDDataType::_validate( const ::rtl::OUString& _rValue ) + sal_uInt16 OXSDDataType::_validate( const OUString& _rValue ) { // care for the regular expression if ( !m_sPattern.isEmpty() ) @@ -253,7 +253,7 @@ namespace xforms return sal_False; // sanity checks - ::rtl::OUString sErrorMessage; + OUString sErrorMessage; if ( !checkPropertySanity( _nHandle, _rConvertedValue, sErrorMessage ) ) { IllegalArgumentException aException; @@ -274,11 +274,11 @@ namespace xforms } //-------------------------------------------------------------------- - bool OXSDDataType::checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::rtl::OUString& _rErrorMessage ) + bool OXSDDataType::checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, OUString& _rErrorMessage ) { if ( _nHandle == PROPERTY_ID_XSD_PATTERN ) { - ::rtl::OUString sPattern; + OUString sPattern; OSL_VERIFY( _rNewValue >>= sPattern ); UnicodeString aIcuPattern( reinterpret_cast<const UChar *>(sPattern.getStr()), sPattern.getLength() ); // UChar != sal_Unicode in MinGW @@ -286,7 +286,7 @@ namespace xforms RegexMatcher aMatcher( aIcuPattern, 0, nMatchStatus ); if ( U_FAILURE( nMatchStatus ) ) { - _rErrorMessage = ::rtl::OUString( "This is no valid pattern." ); + _rErrorMessage = OUString( "This is no valid pattern." ); return false; } } @@ -294,37 +294,37 @@ namespace xforms } //-------------------------------------------------------------------- - void SAL_CALL OXSDDataType::setPropertyValue( const ::rtl::OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) + void SAL_CALL OXSDDataType::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { OXSDDataType_PBase::setPropertyValue( aPropertyName, aValue ); } //-------------------------------------------------------------------- - Any SAL_CALL OXSDDataType::getPropertyValue( const ::rtl::OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + Any SAL_CALL OXSDDataType::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { return OXSDDataType_PBase::getPropertyValue( PropertyName ); } //-------------------------------------------------------------------- - void SAL_CALL OXSDDataType::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OXSDDataType::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OXSDDataType_PBase::addPropertyChangeListener( aPropertyName, xListener ); } //-------------------------------------------------------------------- - void SAL_CALL OXSDDataType::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OXSDDataType::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OXSDDataType_PBase::removePropertyChangeListener( aPropertyName, aListener ); } //-------------------------------------------------------------------- - void SAL_CALL OXSDDataType::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OXSDDataType::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OXSDDataType_PBase::addVetoableChangeListener( PropertyName, aListener ); } //-------------------------------------------------------------------- - void SAL_CALL OXSDDataType::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + void SAL_CALL OXSDDataType::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OXSDDataType_PBase::removeVetoableChangeListener( PropertyName, aListener ); } @@ -332,7 +332,7 @@ namespace xforms //==================================================================== //= OValueLimitedType_Base //==================================================================== - OValueLimitedType_Base::OValueLimitedType_Base( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ) + OValueLimitedType_Base::OValueLimitedType_Base( const OUString& _rName, sal_Int16 _nTypeClass ) :OXSDDataType( _rName, _nTypeClass ) ,m_fCachedMaxInclusive( 0 ) ,m_fCachedMaxExclusive( 0 ) @@ -415,7 +415,7 @@ namespace xforms } //-------------------------------------------------------------------- - bool OValueLimitedType_Base::_getValue( const ::rtl::OUString& rValue, double& fValue ) + bool OValueLimitedType_Base::_getValue( const OUString& rValue, double& fValue ) { // convert to double rtl_math_ConversionStatus eStatus; @@ -435,7 +435,7 @@ namespace xforms } //-------------------------------------------------------------------- - sal_uInt16 OValueLimitedType_Base::_validate( const ::rtl::OUString& rValue ) + sal_uInt16 OValueLimitedType_Base::_validate( const OUString& rValue ) { sal_uInt16 nReason = OXSDDataType::_validate( rValue ); if( nReason == 0 ) @@ -460,9 +460,9 @@ namespace xforms } //-------------------------------------------------------------------- - ::rtl::OUString OValueLimitedType_Base::_explainInvalid( sal_uInt16 nReason ) + OUString OValueLimitedType_Base::_explainInvalid( sal_uInt16 nReason ) { - ::rtl::OUStringBuffer sInfo; + OUStringBuffer sInfo; switch( nReason ) { case 0: @@ -501,7 +501,7 @@ namespace xforms //= OStringType //==================================================================== //-------------------------------------------------------------------- - OStringType::OStringType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ) + OStringType::OStringType( const OUString& _rName, sal_Int16 _nTypeClass ) :OStringType_Base( _rName, _nTypeClass ) { } @@ -528,13 +528,13 @@ namespace xforms } //-------------------------------------------------------------------- - bool OStringType::checkPropertySanity( sal_Int32 _nHandle, const Any& _rNewValue, ::rtl::OUString& _rErrorMessage ) + bool OStringType::checkPropertySanity( sal_Int32 _nHandle, const Any& _rNewValue, OUString& _rErrorMessage ) { // let the base class do the conversion if ( !OStringType_Base::checkPropertySanity( _nHandle, _rNewValue, _rErrorMessage ) ) return false; - _rErrorMessage = ::rtl::OUString(); + _rErrorMessage = OUString(); switch ( _nHandle ) { case PROPERTY_ID_XSD_LENGTH: @@ -544,7 +544,7 @@ namespace xforms sal_Int32 nValue( 0 ); OSL_VERIFY( _rNewValue >>= nValue ); if ( nValue <= 0 ) - _rErrorMessage = ::rtl::OUString( "Length limits must denote positive integer values." ); + _rErrorMessage = OUString( "Length limits must denote positive integer values." ); // TODO/eforms: localize the error message } break; @@ -554,7 +554,7 @@ namespace xforms } //-------------------------------------------------------------------- - sal_uInt16 OStringType::_validate( const ::rtl::OUString& rValue ) + sal_uInt16 OStringType::_validate( const OUString& rValue ) { // check regexp, whitespace etc. in parent class sal_uInt16 nReason = OStringType_Base::_validate( rValue ); @@ -581,10 +581,10 @@ namespace xforms } //-------------------------------------------------------------------- - ::rtl::OUString OStringType::_explainInvalid( sal_uInt16 nReason ) + OUString OStringType::_explainInvalid( sal_uInt16 nReason ) { sal_Int32 nValue = 0; - ::rtl::OUStringBuffer sInfo; + OUStringBuffer sInfo; switch( nReason ) { case 0: @@ -617,7 +617,7 @@ namespace xforms //= OBooleanType //==================================================================== //-------------------------------------------------------------------- - OBooleanType::OBooleanType( const ::rtl::OUString& _rName ) + OBooleanType::OBooleanType( const OUString& _rName ) :OBooleanType_Base( _rName, DataTypeClass::BOOLEAN ) { } @@ -631,7 +631,7 @@ namespace xforms } //-------------------------------------------------------------------- - sal_uInt16 OBooleanType::_validate( const ::rtl::OUString& sValue ) + sal_uInt16 OBooleanType::_validate( const OUString& sValue ) { sal_uInt16 nInvalidityReason = OBooleanType_Base::_validate( sValue ); if ( nInvalidityReason ) @@ -642,16 +642,16 @@ namespace xforms } //-------------------------------------------------------------------- - ::rtl::OUString OBooleanType::_explainInvalid( sal_uInt16 nReason ) + OUString OBooleanType::_explainInvalid( sal_uInt16 nReason ) { - return ( nReason == 0 ) ? ::rtl::OUString() : getName(); + return ( nReason == 0 ) ? OUString() : getName(); } //==================================================================== //= ODecimalType //==================================================================== //-------------------------------------------------------------------- - ODecimalType::ODecimalType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ) + ODecimalType::ODecimalType( const OUString& _rName, sal_Int16 _nTypeClass ) :ODecimalType_Base( _rName, _nTypeClass ) { } @@ -679,7 +679,7 @@ namespace xforms // validate decimals and return code for which facets failed // to be used by: ODecimalType::validate and ODecimalType::explainInvalid - sal_uInt16 ODecimalType::_validate( const ::rtl::OUString& rValue ) + sal_uInt16 ODecimalType::_validate( const OUString& rValue ) { sal_Int16 nReason = ODecimalType_Base::_validate( rValue ); @@ -713,10 +713,10 @@ namespace xforms } //-------------------------------------------------------------------- - ::rtl::OUString ODecimalType::_explainInvalid( sal_uInt16 nReason ) + OUString ODecimalType::_explainInvalid( sal_uInt16 nReason ) { sal_Int32 nValue = 0; - ::rtl::OUStringBuffer sInfo; + OUStringBuffer sInfo; switch( nReason ) { case RID_STR_XFORMS_VALUE_TOTAL_DIGITS: @@ -737,11 +737,11 @@ namespace xforms } //-------------------------------------------------------------------- - ::rtl::OUString ODecimalType::typedValueAsHumanReadableString( const Any& _rValue ) const + OUString ODecimalType::typedValueAsHumanReadableString( const Any& _rValue ) const { double fValue( 0 ); normalizeValue( _rValue, fValue ); - return ::rtl::OUString::valueOf( fValue ); + return OUString::valueOf( fValue ); } //-------------------------------------------------------------------- @@ -754,7 +754,7 @@ namespace xforms //= //==================================================================== #define DEFAULT_IMPLEMNENT_SUBTYPE( classname, typeclass ) \ - classname::classname( const ::rtl::OUString& _rName ) \ + classname::classname( const OUString& _rName ) \ :classname##_Base( _rName, DataTypeClass::typeclass ) \ { \ } \ @@ -773,13 +773,13 @@ namespace xforms DEFAULT_IMPLEMNENT_SUBTYPE( ODateType, DATE ) //-------------------------------------------------------------------- - sal_uInt16 ODateType::_validate( const ::rtl::OUString& _rValue ) + sal_uInt16 ODateType::_validate( const OUString& _rValue ) { return ODateType_Base::_validate( _rValue ); } //-------------------------------------------------------------------- - bool ODateType::_getValue( const ::rtl::OUString& value, double& fValue ) + bool ODateType::_getValue( const OUString& value, double& fValue ) { Any aTypeValue = Convert::get().toAny( value, getCppuType() ); @@ -793,7 +793,7 @@ namespace xforms } //-------------------------------------------------------------------- - ::rtl::OUString ODateType::typedValueAsHumanReadableString( const Any& _rValue ) const + OUString ODateType::typedValueAsHumanReadableString( const Any& _rValue ) const { OSL_PRECOND( _rValue.getValueType().equals( getCppuType() ), "ODateType::typedValueAsHumanReadableString: unexpected type" ); return Convert::get().toXSD( _rValue ); @@ -815,13 +815,13 @@ namespace xforms DEFAULT_IMPLEMNENT_SUBTYPE( OTimeType, TIME ) //-------------------------------------------------------------------- - sal_uInt16 OTimeType::_validate( const ::rtl::OUString& _rValue ) + sal_uInt16 OTimeType::_validate( const OUString& _rValue ) { return OTimeType_Base::_validate( _rValue ); } //-------------------------------------------------------------------- - bool OTimeType::_getValue( const ::rtl::OUString& value, double& fValue ) + bool OTimeType::_getValue( const OUString& value, double& fValue ) { Any aTypedValue = Convert::get().toAny( value, getCppuType() ); @@ -835,7 +835,7 @@ namespace xforms } //-------------------------------------------------------------------- - ::rtl::OUString OTimeType::typedValueAsHumanReadableString( const Any& _rValue ) const + OUString OTimeType::typedValueAsHumanReadableString( const Any& _rValue ) const { OSL_PRECOND( _rValue.getValueType().equals( getCppuType() ), "OTimeType::typedValueAsHumanReadableString: unexpected type" ); return Convert::get().toXSD( _rValue ); @@ -857,7 +857,7 @@ namespace xforms DEFAULT_IMPLEMNENT_SUBTYPE( ODateTimeType, DATETIME ) //-------------------------------------------------------------------- - sal_uInt16 ODateTimeType::_validate( const ::rtl::OUString& _rValue ) + sal_uInt16 ODateTimeType::_validate( const OUString& _rValue ) { return ODateTimeType_Base::_validate( _rValue ); } @@ -882,7 +882,7 @@ namespace xforms } //-------------------------------------------------------------------- - bool ODateTimeType::_getValue( const ::rtl::OUString& value, double& fValue ) + bool ODateTimeType::_getValue( const OUString& value, double& fValue ) { Any aTypedValue = Convert::get().toAny( value, getCppuType() ); @@ -895,10 +895,10 @@ namespace xforms } //-------------------------------------------------------------------- - ::rtl::OUString ODateTimeType::typedValueAsHumanReadableString( const Any& _rValue ) const + OUString ODateTimeType::typedValueAsHumanReadableString( const Any& _rValue ) const { OSL_PRECOND( _rValue.getValueType().equals( getCppuType() ), "OTimeType::typedValueAsHumanReadableString: unexpected type" ); - ::rtl::OUString sString = Convert::get().toXSD( _rValue ); + OUString sString = Convert::get().toXSD( _rValue ); // ISO 8601 notation has a "T" to separate between date and time. Our only concession // to the "human readable" in the method name is to replace this T with a whitespace. @@ -918,7 +918,7 @@ namespace xforms //= OShortIntegerType //==================================================================== //-------------------------------------------------------------------- - OShortIntegerType::OShortIntegerType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ) + OShortIntegerType::OShortIntegerType( const OUString& _rName, sal_Int16 _nTypeClass ) :OShortIntegerType_Base( _rName, _nTypeClass ) { } @@ -932,7 +932,7 @@ namespace xforms } //-------------------------------------------------------------------- - bool OShortIntegerType::_getValue( const ::rtl::OUString& value, double& fValue ) + bool OShortIntegerType::_getValue( const OUString& value, double& fValue ) { fValue = (double)(sal_Int16)value.toInt32(); // TODO/eforms @@ -948,11 +948,11 @@ namespace xforms } //-------------------------------------------------------------------- - ::rtl::OUString OShortIntegerType::typedValueAsHumanReadableString( const Any& _rValue ) const + OUString OShortIntegerType::typedValueAsHumanReadableString( const Any& _rValue ) const { sal_Int16 nValue( 0 ); OSL_VERIFY( _rValue >>= nValue ); - return ::rtl::OUString::valueOf( (sal_Int32)nValue ); + return OUString::valueOf( (sal_Int32)nValue ); } //-------------------------------------------------------------------- diff --git a/forms/source/xforms/datatypes.hxx b/forms/source/xforms/datatypes.hxx index 045eb8afa0aa..910a64fbf2ff 100644 --- a/forms/source/xforms/datatypes.hxx +++ b/forms/source/xforms/datatypes.hxx @@ -56,8 +56,8 @@ namespace xforms // <properties> sal_Bool m_bIsBasic; sal_Int16 m_nTypeClass; - ::rtl::OUString m_sName; - ::rtl::OUString m_sPattern; + OUString m_sName; + OUString m_sPattern; sal_uInt16 m_nWST; // </properties> @@ -69,7 +69,7 @@ namespace xforms sal_Bool isBasic() const { return m_bIsBasic; } sal_Int16 getTypeClass() const { return m_nTypeClass; } - const ::rtl::OUString& + const OUString& getName() const { return m_sName; } private: @@ -79,35 +79,35 @@ namespace xforms protected: // create basic data type - OXSDDataType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ); + OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass ); ~OXSDDataType(); public: DECLARE_XINTERFACE() DECLARE_XTYPEPROVIDER() - virtual ::rtl::OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::util::VetoException); - virtual ::rtl::OUString SAL_CALL getPattern() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPattern( const ::rtl::OUString& _pattern ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::util::VetoException); + virtual OUString SAL_CALL getPattern() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPattern( const OUString& _pattern ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getWhiteSpaceTreatment() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); virtual sal_Bool SAL_CALL getIsBasic() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getTypeClass() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL validate( const ::rtl::OUString& value ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL explainInvalid( const ::rtl::OUString& value ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL validate( const OUString& value ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL explainInvalid( const OUString& value ) throw (::com::sun::star::uno::RuntimeException); // XPropertySet - is a base of XDataType and needs to be disambiguated - 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); public: - OXSDDataType* clone( const ::rtl::OUString& _rNewName ) const; + OXSDDataType* clone( const OUString& _rNewName ) const; protected: // XPropertySet and friends @@ -120,15 +120,15 @@ namespace xforms // --- own overridables --- // helper for implementing cloning of data types - virtual OXSDDataType* createClone( const ::rtl::OUString& _rName ) const = 0; + virtual OXSDDataType* createClone( const OUString& _rName ) const = 0; virtual void initializeClone( const OXSDDataType& _rCloneSource ); // helper method for validate and explainInvalid - virtual sal_uInt16 _validate( const ::rtl::OUString& value ); - virtual ::rtl::OUString _explainInvalid( sal_uInt16 nReason ); + virtual sal_uInt16 _validate( const OUString& value ); + virtual OUString _explainInvalid( sal_uInt16 nReason ); // helper method for checking properties values which are to be set - virtual bool checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::rtl::OUString& _rErrorMessage ); + virtual bool checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, OUString& _rErrorMessage ); // register properties implemented by this instance - call the base class when overriding virtual void registerProperties(); @@ -138,12 +138,12 @@ namespace xforms //= helper for deriving from OXSDDataType //==================================================================== #define DECLARE_DEFAULT_CLONING( classname ) \ - virtual OXSDDataType* createClone( const ::rtl::OUString& _rName ) const; \ + virtual OXSDDataType* createClone( const OUString& _rName ) const; \ virtual void initializeClone( const OXSDDataType& _rCloneSource ); \ void initializeTypedClone( const classname& _rCloneSource ); #define IMPLEMENT_DEFAULT_CLONING( classname, baseclass ) \ - OXSDDataType* classname::createClone( const ::rtl::OUString& _rName ) const \ + OXSDDataType* classname::createClone( const OUString& _rName ) const \ { \ return new classname( _rName ); \ } \ @@ -154,7 +154,7 @@ namespace xforms } \ #define IMPLEMENT_DEFAULT_TYPED_CLONING( classname, baseclass ) \ - OXSDDataType* classname::createClone( const ::rtl::OUString& _rName ) const \ + OXSDDataType* classname::createClone( const OUString& _rName ) const \ { \ return new classname( _rName, getTypeClass() ); \ } \ @@ -185,7 +185,7 @@ namespace xforms double m_fCachedMinExclusive; protected: - OValueLimitedType_Base( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ); + OValueLimitedType_Base( const OUString& _rName, sal_Int16 _nTypeClass ); virtual void initializeClone( const OXSDDataType& _rCloneSource ); void initializeTypedClone( const OValueLimitedType_Base& _rCloneSource ); @@ -198,16 +198,16 @@ namespace xforms throw (::com::sun::star::uno::Exception); // OXSDDataType overridables - virtual bool _getValue( const ::rtl::OUString& value, double& fValue ); - virtual sal_uInt16 _validate( const ::rtl::OUString& value ); - virtual ::rtl::OUString _explainInvalid( sal_uInt16 nReason ); + virtual bool _getValue( const OUString& value, double& fValue ); + virtual sal_uInt16 _validate( const OUString& value ); + virtual OUString _explainInvalid( sal_uInt16 nReason ); // own overridables /** translate a given value into a human-readable string The value is guaranteed to be not <NULL/>, and is of type <member>ValueType</member> */ - virtual ::rtl::OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const = 0; + virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const = 0; /** translates a <member>ValueType</member> value into a double value @@ -236,7 +236,7 @@ namespace xforms getCppuType() const { return ::getCppuType( static_cast< ValueType* >( NULL ) ); } protected: - OValueLimitedType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ); + OValueLimitedType( const OUString& _rName, sal_Int16 _nTypeClass ); // OXSDDataType overridables virtual void registerProperties(); @@ -255,7 +255,7 @@ namespace xforms bool m_bPropertiesRegistered; protected: - ODerivedDataType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ); + ODerivedDataType( const OUString& _rName, sal_Int16 _nTypeClass ); protected: // OPropertyArrayUsageHelper @@ -274,14 +274,14 @@ namespace xforms class OBooleanType : public OBooleanType_Base { public: - OBooleanType( const ::rtl::OUString& _rName ); + OBooleanType( const OUString& _rName ); protected: DECLARE_DEFAULT_CLONING( OBooleanType ) // OXSDDataType overridables - virtual sal_uInt16 _validate( const ::rtl::OUString& value ); - virtual ::rtl::OUString _explainInvalid( sal_uInt16 nReason ); + virtual sal_uInt16 _validate( const OUString& value ); + virtual OUString _explainInvalid( sal_uInt16 nReason ); }; //==================================================================== @@ -299,15 +299,15 @@ namespace xforms // </properties> public: - OStringType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass /* = ::com::sun::star::xsd::DataTypeClass::STRING */ ); + OStringType( const OUString& _rName, sal_Int16 _nTypeClass /* = ::com::sun::star::xsd::DataTypeClass::STRING */ ); protected: DECLARE_DEFAULT_CLONING( OStringType ) // OXSDDataType overridables - virtual sal_uInt16 _validate( const ::rtl::OUString& value ); - virtual ::rtl::OUString _explainInvalid( sal_uInt16 nReason ); - virtual bool checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, ::rtl::OUString& _rErrorMessage ); + virtual sal_uInt16 _validate( const OUString& value ); + virtual OUString _explainInvalid( sal_uInt16 nReason ); + virtual bool checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, OUString& _rErrorMessage ); virtual void registerProperties(); }; @@ -323,18 +323,18 @@ namespace xforms ::com::sun::star::uno::Any m_aFractionDigits; public: - ODecimalType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass /* = ::com::sun::star::xsd::DataTypeClass::DECIMAL */ ); + ODecimalType( const OUString& _rName, sal_Int16 _nTypeClass /* = ::com::sun::star::xsd::DataTypeClass::DECIMAL */ ); protected: DECLARE_DEFAULT_CLONING( ODecimalType ) // OXSDDataType overridables - virtual sal_uInt16 _validate( const ::rtl::OUString& value ); - virtual ::rtl::OUString _explainInvalid( sal_uInt16 nReason ); + virtual sal_uInt16 _validate( const OUString& value ); + virtual OUString _explainInvalid( sal_uInt16 nReason ); virtual void registerProperties(); // OValueLimitedType overridables - virtual ::rtl::OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const; + virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const; virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const; private: @@ -350,17 +350,17 @@ namespace xforms class classname : public classname##_Base \ { \ public: \ - classname( const ::rtl::OUString& _rName ); \ + classname( const OUString& _rName ); \ \ protected: \ DECLARE_DEFAULT_CLONING( classname ) \ \ /* OXSDDataType overridables */ \ - virtual sal_uInt16 _validate( const ::rtl::OUString& value ); \ - virtual bool _getValue( const ::rtl::OUString& value, double& fValue ); \ + virtual sal_uInt16 _validate( const OUString& value ); \ + virtual bool _getValue( const OUString& value, double& fValue ); \ \ /* OValueLimitedType overridables */ \ - virtual ::rtl::OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const; \ + virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const; \ virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const; \ \ private: \ @@ -390,16 +390,16 @@ namespace xforms class OShortIntegerType : public OShortIntegerType_Base { public: - OShortIntegerType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ); + OShortIntegerType( const OUString& _rName, sal_Int16 _nTypeClass ); protected: DECLARE_DEFAULT_CLONING( OShortIntegerType ) // OXSDDataType overridables - virtual bool _getValue( const ::rtl::OUString& value, double& fValue ); + virtual bool _getValue( const OUString& value, double& fValue ); // OValueLimitedType overridables - virtual ::rtl::OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const; + virtual OUString typedValueAsHumanReadableString( const ::com::sun::star::uno::Any& _rValue ) const; virtual void normalizeValue( const ::com::sun::star::uno::Any& _rValue, double& _rDoubleValue ) const; private: diff --git a/forms/source/xforms/datatypes_impl.hxx b/forms/source/xforms/datatypes_impl.hxx index 7ccd0dc2a54b..c197196a33ba 100644 --- a/forms/source/xforms/datatypes_impl.hxx +++ b/forms/source/xforms/datatypes_impl.hxx @@ -23,7 +23,7 @@ //-------------------------------------------------------------------- template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > -ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::ODerivedDataType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ) +ODerivedDataType< CONCRETE_DATA_TYPE_IMPL, SUPERCLASS >::ODerivedDataType( const OUString& _rName, sal_Int16 _nTypeClass ) :SUPERCLASS( _rName, _nTypeClass ) ,m_bPropertiesRegistered( false ) { @@ -61,7 +61,7 @@ template< typename CONCRETE_DATA_TYPE_IMPL, typename SUPERCLASS > //-------------------------------------------------------------------- template< typename VALUE_TYPE > -OValueLimitedType< VALUE_TYPE >::OValueLimitedType( const ::rtl::OUString& _rName, sal_Int16 _nTypeClass ) +OValueLimitedType< VALUE_TYPE >::OValueLimitedType( const OUString& _rName, sal_Int16 _nTypeClass ) :OValueLimitedType_Base( _rName, _nTypeClass ) { } diff --git a/forms/source/xforms/mip.cxx b/forms/source/xforms/mip.cxx index 960a2296ad56..e8ccd35a282d 100644 --- a/forms/source/xforms/mip.cxx +++ b/forms/source/xforms/mip.cxx @@ -94,11 +94,11 @@ void MIP::resetRelevant() { mbHasRelevant = false; mbRelevant = true; } bool MIP::hasConstraint() const { return mbHasConstraint; } bool MIP::isConstraint() const { return mbConstraint; } -void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; msConstraintExplanation = rtl::OUString(); } -void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation = rtl::OUString(); } +void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; msConstraintExplanation = OUString(); } +void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation = OUString(); } -void MIP::setConstraintExplanation( const rtl::OUString& s ) { msConstraintExplanation = s; } -rtl::OUString MIP::getConstraintExplanation() const { return msConstraintExplanation; } +void MIP::setConstraintExplanation( const OUString& s ) { msConstraintExplanation = s; } +OUString MIP::getConstraintExplanation() const { return msConstraintExplanation; } bool MIP::hasCalculate() const { return mbHasCalculate; } @@ -106,9 +106,9 @@ void MIP::setHasCalculate( bool b ) { mbHasCalculate = b; } void MIP::resetCalculate() { mbHasCalculate = false; } bool MIP::hasTypeName() const { return mbHasTypeName; } - rtl::OUString MIP::getTypeName() const { return msTypeName; } -void MIP::setTypeName( const rtl::OUString& s ) { msTypeName = s; mbHasTypeName = true; } -void MIP::resetTypeName() { msTypeName = rtl::OUString(); mbHasTypeName = false; } + OUString MIP::getTypeName() const { return msTypeName; } +void MIP::setTypeName( const OUString& s ) { msTypeName = s; mbHasTypeName = true; } +void MIP::resetTypeName() { msTypeName = OUString(); mbHasTypeName = false; } diff --git a/forms/source/xforms/mip.hxx b/forms/source/xforms/mip.hxx index e7c2d4b5f989..f46a7318ae11 100644 --- a/forms/source/xforms/mip.hxx +++ b/forms/source/xforms/mip.hxx @@ -46,9 +46,9 @@ class MIP bool mbHasCalculate; bool mbHasTypeName; - rtl::OUString msTypeName; + OUString msTypeName; - rtl::OUString msConstraintExplanation; + OUString msConstraintExplanation; public: MIP(); @@ -64,8 +64,8 @@ public: // - type (static; default: xsd:string) // (currently default implemented as empty string) bool hasTypeName() const; - rtl::OUString getTypeName() const; - void setTypeName( const rtl::OUString& ); + OUString getTypeName() const; + void setTypeName( const OUString& ); void resetTypeName(); // - readonly (computed XPath; default: false; true if calculate exists) @@ -93,8 +93,8 @@ public: void resetConstraint(); // explain _why_ a constraint failed - void setConstraintExplanation( const rtl::OUString& ); - rtl::OUString getConstraintExplanation() const; + void setConstraintExplanation( const OUString& ); + OUString getConstraintExplanation() const; // - calculate (computed XPath; default: has none (false)) // (for calculate, we only store whether a calculate MIP is present; diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx index b36aac2d2e10..60863373746e 100644 --- a/forms/source/xforms/model.cxx +++ b/forms/source/xforms/model.cxx @@ -58,8 +58,6 @@ using com::sun::star::lang::XMultiServiceFactory; using com::sun::star::lang::XUnoTunnel; using com::sun::star::beans::XPropertySet; using com::sun::star::beans::PropertyValue; -using rtl::OUString; -using rtl::OUStringBuffer; using com::sun::star::beans::PropertyVetoException; using com::sun::star::beans::UnknownPropertyException; using com::sun::star::util::VetoException; @@ -188,12 +186,12 @@ void Model::setForeignSchema( const XDocument_t& rDocument ) mxForeignSchema = rDocument; } -rtl::OUString Model::getSchemaRef() const +OUString Model::getSchemaRef() const { return msSchemaRef; } -void Model::setSchemaRef( const rtl::OUString& rSchemaRef ) +void Model::setSchemaRef( const OUString& rSchemaRef ) { msSchemaRef = rSchemaRef; } @@ -322,7 +320,7 @@ void Model::deferNotifications( bool bDefer ) bool Model::setSimpleContent( const XNode_t& xConstNode, - const rtl::OUString& sValue ) + const OUString& sValue ) { OSL_ENSURE( xConstNode.is(), "need node to set data" ); @@ -454,14 +452,14 @@ bool Model::isValid() const // implement xforms::XModel // -rtl::OUString Model::getID() +OUString Model::getID() throw( RuntimeException ) { DBG_INVARIANT(); return msID; } -void Model::setID( const rtl::OUString& sID ) +void Model::setID( const OUString& sID ) throw( RuntimeException ) { DBG_INVARIANT(); @@ -510,7 +508,7 @@ void Model::refresh() void SAL_CALL Model::submitWithInteraction( - const rtl::OUString& sID, + const OUString& sID, const XInteractionHandler_t& _rxHandler ) throw( VetoException, WrappedTargetException, @@ -531,7 +529,7 @@ void SAL_CALL Model::submitWithInteraction( } } -void Model::submit( const rtl::OUString& sID ) +void Model::submit( const OUString& sID ) throw( VetoException, WrappedTargetException, RuntimeException ) { submitWithInteraction( sID, NULL ); @@ -556,7 +554,7 @@ Model::XSet_t Model::getInstances() return mxInstances; } -Model::XDocument_t Model::getInstanceDocument( const rtl::OUString& rName ) +Model::XDocument_t Model::getInstanceDocument( const OUString& rName ) throw( RuntimeException ) { ensureAtLeastOneInstance(); @@ -600,7 +598,7 @@ Model::XPropertySet_t Model::cloneBinding( const XPropertySet_t& xBinding ) return xNewBinding; } -Model::XPropertySet_t Model::getBinding( const rtl::OUString& sId ) +Model::XPropertySet_t Model::getBinding( const OUString& sId ) throw( RuntimeException ) { DBG_INVARIANT(); @@ -637,7 +635,7 @@ Model::XSubmission_t Model::cloneSubmission(const XPropertySet_t& xSubmission) return xNewSubmission; } -Model::XSubmission_t Model::getSubmission( const rtl::OUString& sId ) +Model::XSubmission_t Model::getSubmission( const OUString& sId ) throw( RuntimeException ) { DBG_INVARIANT(); diff --git a/forms/source/xforms/model.hxx b/forms/source/xforms/model.hxx index 2e989ab1aa87..d4c5672ed994 100644 --- a/forms/source/xforms/model.hxx +++ b/forms/source/xforms/model.hxx @@ -101,7 +101,7 @@ class Model : public Model_t private: - rtl::OUString msID; /// the model ID + OUString msID; /// the model ID BindingCollection* mpBindings; /// the bindings SubmissionCollection* mpSubmissions; /// the submissions InstanceCollection* mpInstances; /// the instance(s) @@ -109,7 +109,7 @@ private: XDataTypeRepository_t mxDataTypes; /// the XSD data-types used XDocument_t mxForeignSchema; /// the XSD-schema part we cannot /// map onto data types - rtl::OUString msSchemaRef; /// xforms:model/@schema attribute + OUString msSchemaRef; /// xforms:model/@schema attribute XNameContainer_t mxNamespaces; /// namespaces for entire model @@ -149,8 +149,8 @@ public: void setForeignSchema( const XDocument_t& ); // get/set the xforms:model/@schema attribute - rtl::OUString getSchemaRef() const; - void setSchemaRef( const rtl::OUString& ); + OUString getSchemaRef() const; + void setSchemaRef( const OUString& ); // get/set namespaces for entire model XNameContainer_t getNamespaces() const; @@ -188,7 +188,7 @@ public: /// set a data value in the instance /// (also defers notifications) - bool setSimpleContent( const XNode_t&, const rtl::OUString& ); + bool setSimpleContent( const XNode_t&, const OUString& ); /// load instance data void loadInstance( sal_Int32 nInstance ); @@ -208,10 +208,10 @@ public: // - virtual rtl::OUString SAL_CALL getID() + virtual OUString SAL_CALL getID() throw( RuntimeException_t ); - virtual void SAL_CALL setID( const rtl::OUString& sID ) + virtual void SAL_CALL setID( const OUString& sID ) throw( RuntimeException_t ); virtual void SAL_CALL initialize() @@ -229,10 +229,10 @@ public: virtual void SAL_CALL refresh() throw( RuntimeException_t ); - virtual void SAL_CALL submit( const rtl::OUString& sID ) + virtual void SAL_CALL submit( const OUString& sID ) throw( VetoException_t, WrappedTargetException_t, RuntimeException_t ); - virtual void SAL_CALL submitWithInteraction( const ::rtl::OUString& id, const XInteractionHandler_t& _rxHandler ) + virtual void SAL_CALL submitWithInteraction( const OUString& id, const XInteractionHandler_t& _rxHandler ) throw( VetoException_t, WrappedTargetException_t, RuntimeException_t ); virtual XDataTypeRepository_t SAL_CALL getDataTypeRepository( ) @@ -244,7 +244,7 @@ public: virtual XSet_t SAL_CALL getInstances() throw( RuntimeException_t ); - virtual XDocument_t SAL_CALL getInstanceDocument( const rtl::OUString& ) + virtual XDocument_t SAL_CALL getInstanceDocument( const OUString& ) throw( RuntimeException_t ); virtual XDocument_t SAL_CALL getDefaultInstance() @@ -260,7 +260,7 @@ public: virtual XPropertySet_t SAL_CALL cloneBinding( const XPropertySet_t& ) throw( RuntimeException_t ); - virtual XPropertySet_t SAL_CALL getBinding( const rtl::OUString& ) + virtual XPropertySet_t SAL_CALL getBinding( const OUString& ) throw( RuntimeException_t ); virtual XSet_t SAL_CALL getBindings() @@ -275,7 +275,7 @@ public: virtual XSubmission_t SAL_CALL cloneSubmission( const XPropertySet_t& ) throw( RuntimeException_t ); - virtual XSubmission_t SAL_CALL getSubmission( const rtl::OUString& ) + virtual XSubmission_t SAL_CALL getSubmission( const OUString& ) throw( RuntimeException_t ); virtual XSet_t SAL_CALL getSubmissions() @@ -283,23 +283,23 @@ public: // XPropertySet - virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p) + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p) throw( css::uno::RuntimeException ) { return PropertySetBase::getPropertyValue(p); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw( css::uno::RuntimeException ) { PropertySetBase::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw( css::uno::RuntimeException ) { PropertySetBase::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw( css::uno::RuntimeException ) { PropertySetBase::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw( css::uno::RuntimeException ) { PropertySetBase::removeVetoableChangeListener(p1, p2); } @@ -307,7 +307,7 @@ public: throw( css::uno::RuntimeException ) { return PropertySetBase::getPropertySetInfo(); } - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) + virtual void SAL_CALL setPropertyValue(const OUString& p1, const com::sun::star::uno::Any& p2) throw( css::uno::RuntimeException ) { PropertySetBase::setPropertyValue(p1, p2); } @@ -318,30 +318,30 @@ public: /// determine a reasonable control service for a given node /// (based on data type MIP assigned to the node) - virtual rtl::OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) throw (RuntimeException_t); + virtual OUString SAL_CALL getDefaultServiceNameForNode( const XNode_t& xNode ) throw (RuntimeException_t); /// call getDefaultBindingExpressionForNode with default evaluation context - virtual rtl::OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw (RuntimeException_t); + virtual OUString SAL_CALL getDefaultBindingExpressionForNode( const XNode_t& xNode ) throw (RuntimeException_t); /// determine a reasonable default binding expression for a given node /// and a given evaluation context /// @returns expression, or empty string if no expression could be derived - rtl::OUString getDefaultBindingExpressionForNode( + OUString getDefaultBindingExpressionForNode( const XNode_t&, const EvaluationContext& ); - virtual rtl::OUString SAL_CALL getNodeDisplayName( const XNode_t&, + virtual OUString SAL_CALL getNodeDisplayName( const XNode_t&, sal_Bool bDetail ) throw( RuntimeException_t ); - virtual rtl::OUString SAL_CALL getNodeName( const XNode_t& ) + virtual OUString SAL_CALL getNodeName( const XNode_t& ) throw( RuntimeException_t ); - virtual rtl::OUString SAL_CALL getBindingName( const XPropertySet_t&, + virtual OUString SAL_CALL getBindingName( const XPropertySet_t&, sal_Bool bDetail ) throw( RuntimeException_t ); - virtual rtl::OUString SAL_CALL getSubmissionName( const XPropertySet_t&, + virtual OUString SAL_CALL getSubmissionName( const XPropertySet_t&, sal_Bool bDetail ) throw( RuntimeException_t ); @@ -351,44 +351,44 @@ public: virtual void SAL_CALL removeBindingIfUseless( const XPropertySet_t& ) throw( RuntimeException_t ); - virtual XDocument_t SAL_CALL newInstance( const rtl::OUString& sName, - const rtl::OUString& sURL, + virtual XDocument_t SAL_CALL newInstance( const OUString& sName, + const OUString& sURL, sal_Bool bURLOnce ) throw( RuntimeException_t ); - virtual void SAL_CALL renameInstance( const rtl::OUString& sFrom, - const rtl::OUString& sTo, - const rtl::OUString& sURL, + virtual void SAL_CALL renameInstance( const OUString& sFrom, + const OUString& sTo, + const OUString& sURL, sal_Bool bURLOnce ) throw( RuntimeException_t ); - virtual void SAL_CALL removeInstance( const rtl::OUString& sName ) + virtual void SAL_CALL removeInstance( const OUString& sName ) throw( RuntimeException_t ); virtual XModel_t SAL_CALL newModel( const Frame_XModel_t& xComponent, - const rtl::OUString& sName ) + const OUString& sName ) throw( RuntimeException_t ); virtual void SAL_CALL renameModel( const Frame_XModel_t& xComponent, - const rtl::OUString& sFrom, - const rtl::OUString& sTo ) + const OUString& sFrom, + const OUString& sTo ) throw( RuntimeException_t ); virtual void SAL_CALL removeModel( const Frame_XModel_t& xComponent, - const rtl::OUString& sName ) + const OUString& sName ) throw( RuntimeException_t ); virtual XNode_t SAL_CALL createElement( const XNode_t& xParent, - const rtl::OUString& sName ) + const OUString& sName ) throw( RuntimeException_t ); virtual XNode_t SAL_CALL createAttribute( const XNode_t& xParent, - const rtl::OUString& sName ) + const OUString& sName ) throw( RuntimeException_t ); virtual XNode_t SAL_CALL renameNode( const XNode_t& xNode, - const rtl::OUString& sName ) + const OUString& sName ) throw( RuntimeException_t ); virtual XPropertySet_t SAL_CALL getBindingForNode( const XNode_t&, @@ -398,21 +398,21 @@ public: virtual void SAL_CALL removeBindingForNode( const XNode_t& ) throw( RuntimeException_t ); - virtual rtl::OUString SAL_CALL getResultForExpression( + virtual OUString SAL_CALL getResultForExpression( const XPropertySet_t& xBinding, sal_Bool bIsBindingExpression, - const rtl::OUString& sExpression ) + const OUString& sExpression ) throw( RuntimeException_t ); - virtual sal_Bool SAL_CALL isValidXMLName( const rtl::OUString& sName ) + virtual sal_Bool SAL_CALL isValidXMLName( const OUString& sName ) throw( RuntimeException_t ); - virtual sal_Bool SAL_CALL isValidPrefixName( const rtl::OUString& sName ) + virtual sal_Bool SAL_CALL isValidPrefixName( const OUString& sName ) throw( RuntimeException_t ); virtual void SAL_CALL setNodeValue( const XNode_t& xNode, - const rtl::OUString& sValue ) + const OUString& sValue ) throw( RuntimeException_t ); diff --git a/forms/source/xforms/model_helper.hxx b/forms/source/xforms/model_helper.hxx index 35fa556af8af..582cb054a43f 100644 --- a/forms/source/xforms/model_helper.hxx +++ b/forms/source/xforms/model_helper.hxx @@ -119,7 +119,7 @@ public: virtual bool isValid( const T& t ) const { const com::sun::star::beans::PropertyValue* pValues = t.getConstArray(); - rtl::OUString sInstance( "Instance" ); + OUString sInstance( "Instance" ); sal_Bool bFound = sal_False; for( sal_Int32 i = 0; ( ! bFound ) && ( i < t.getLength() ); i++ ) { @@ -135,23 +135,23 @@ public: // sal_Int32 lcl_findInstance( const InstanceCollection*, - const rtl::OUString& ); + const OUString& ); // get values from Sequence<PropertyValue> describing an Instance void getInstanceData( const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, - rtl::OUString* pID, + OUString* pID, com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>*, - rtl::OUString* pURL, + OUString* pURL, bool* pURLOnce ); // set values on Sequence<PropertyValue> for an Instance void setInstanceData( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, - const rtl::OUString* pID, + const OUString* pID, const com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocument>*, - const rtl::OUString* pURL, + const OUString* pURL, const bool* pURLOnce ); } // namespace xforms diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index 6b912ce917da..39c269087710 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -53,8 +53,6 @@ #include <com/sun/star/xsd/DataTypeClass.hpp> -using rtl::OUString; -using rtl::OUStringBuffer; using com::sun::star::beans::PropertyValue; using com::sun::star::io::XInputStream; using com::sun::star::io::XActiveDataSink; @@ -413,8 +411,8 @@ void Model::removeBindingIfUseless( const XPropertySet_t& xBinding ) } } -Model::XDocument_t Model::newInstance( const rtl::OUString& sName, - const rtl::OUString& sURL, +Model::XDocument_t Model::newInstance( const OUString& sName, + const OUString& sURL, sal_Bool bURLOnce ) throw( RuntimeException ) { @@ -437,7 +435,7 @@ Model::XDocument_t Model::newInstance( const rtl::OUString& sName, static sal_Int32 lcl_findProp( const PropertyValue* pValues, sal_Int32 nLength, - const rtl::OUString& rName ) + const OUString& rName ) { bool bFound = false; sal_Int32 n = 0; @@ -449,7 +447,7 @@ static sal_Int32 lcl_findProp( const PropertyValue* pValues, } sal_Int32 xforms::lcl_findInstance( const InstanceCollection* pInstances, - const rtl::OUString& rName ) + const OUString& rName ) { sal_Int32 nLength = pInstances->countItems(); sal_Int32 n = 0; @@ -463,9 +461,9 @@ sal_Int32 xforms::lcl_findInstance( const InstanceCollection* pInstances, return bFound ? ( n - 1 ) : -1; } -void Model::renameInstance( const rtl::OUString& sFrom, - const rtl::OUString& sTo, - const rtl::OUString& sURL, +void Model::renameInstance( const OUString& sFrom, + const OUString& sTo, + const OUString& sURL, sal_Bool bURLOnce ) throw( RuntimeException ) { @@ -504,7 +502,7 @@ void Model::renameInstance( const rtl::OUString& sFrom, } } -void Model::removeInstance( const rtl::OUString& sName ) +void Model::removeInstance( const OUString& sName ) throw( RuntimeException ) { sal_Int32 nPos = lcl_findInstance( mpInstances, sName ); @@ -616,7 +614,7 @@ Model::XNode_t Model::createAttribute( const XNode_t& xParent, } Model::XNode_t Model::renameNode( const XNode_t& xNode, - const rtl::OUString& sName ) + const OUString& sName ) throw( RuntimeException ) { // early out if we don't have to change the name @@ -764,14 +762,14 @@ void Model::removeBindingForNode( const XNode_t& ) static OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode ) { - ::rtl::OUString sResult; + OUString sResult; OSL_ENSURE( _rxAttrNode.is(), "lcl_serializeForDisplay( attr ): invalid argument!" ); if ( _rxAttrNode.is() ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( _rxAttrNode->getName() ); aBuffer.appendAscii( "=" ); - ::rtl::OUString sValue = _rxAttrNode->getValue(); + OUString sValue = _rxAttrNode->getValue(); sal_Unicode nQuote = '"'; if ( sValue.indexOf( nQuote ) >= 0 ) nQuote = '\''; @@ -786,7 +784,7 @@ static OUString lcl_serializeForDisplay( const Reference< XAttr >& _rxAttrNode ) static OUString lcl_serializeForDisplay( const Reference<XNodeList>& xNodes ) { - ::rtl::OUString sResult; + OUString sResult; // create document fragment Reference<XDocument> xDocument( getDocumentBuilder()->newDocument() ); @@ -966,7 +964,7 @@ sal_Bool Model::isValidPrefixName( const OUString& sName ) void Model::setNodeValue( const XNode_t& xNode, - const rtl::OUString& sValue ) + const OUString& sValue ) throw( RuntimeException ) { setSimpleContent( xNode, sValue ); diff --git a/forms/source/xforms/namedcollection.hxx b/forms/source/xforms/namedcollection.hxx index 5f9c808ac16d..0505a50f1094 100644 --- a/forms/source/xforms/namedcollection.hxx +++ b/forms/source/xforms/namedcollection.hxx @@ -39,22 +39,22 @@ public: NamedCollection() {} virtual ~NamedCollection() {} - const T& getItem( const rtl::OUString& rName ) const + const T& getItem( const OUString& rName ) const { OSL_ENSURE( hasItem( rName ), "invalid name" ); return *findItem( rName ); } - bool hasItem( const rtl::OUString& rName ) const + bool hasItem( const OUString& rName ) const { return findItem( rName ) != maItems.end(); } - typedef com::sun::star::uno::Sequence<rtl::OUString> Names_t; + typedef com::sun::star::uno::Sequence<OUString> Names_t; Names_t getNames() const { // iterate over members, and collect all those that have names - std::vector<rtl::OUString> aNames; + std::vector<OUString> aNames; for( typename std::vector<T>::const_iterator aIter = maItems.begin(); aIter != maItems.end(); ++aIter ) @@ -67,14 +67,14 @@ public: // copy names to Sequence and return Names_t aResult( aNames.size() ); - rtl::OUString* pStrings = aResult.getArray(); + OUString* pStrings = aResult.getArray(); std::copy( aNames.begin(), aNames.end(), pStrings ); return aResult; } protected: - typename std::vector<T>::const_iterator findItem( const rtl::OUString& rName ) const + typename std::vector<T>::const_iterator findItem( const OUString& rName ) const { for( typename std::vector<T>::const_iterator aIter = maItems.begin(); aIter != maItems.end(); @@ -105,7 +105,7 @@ public: // XNameAccess : XElementAccess virtual typename Collection<T>::Any_t SAL_CALL getByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( typename Collection<T>::NoSuchElementException_t, typename Collection<T>::WrappedTargetException_t, typename Collection<T>::RuntimeException_t ) @@ -124,7 +124,7 @@ public: } virtual sal_Bool SAL_CALL hasByName( - const rtl::OUString& aName ) + const OUString& aName ) throw( typename Collection<T>::RuntimeException_t ) { return hasItem( aName ) ? sal_True : sal_False; diff --git a/forms/source/xforms/pathexpression.cxx b/forms/source/xforms/pathexpression.cxx index 256f11ce895c..af45a3e239a8 100644 --- a/forms/source/xforms/pathexpression.cxx +++ b/forms/source/xforms/pathexpression.cxx @@ -39,8 +39,6 @@ #include <functional> -using rtl::OUString; -using rtl::OUStringBuffer; using com::sun::star::uno::Reference; using com::sun::star::uno::Sequence; using com::sun::star::xml::dom::XNode; @@ -89,7 +87,7 @@ void PathExpression::setExpression( const OUString& rExpression ) maNodes.clear(); } -const rtl::OUString PathExpression::_getExpressionForEvaluation() const +const OUString PathExpression::_getExpressionForEvaluation() const { OUString sExpr = ComputedExpression::_getExpressionForEvaluation(); if( sExpr.isEmpty()) diff --git a/forms/source/xforms/pathexpression.hxx b/forms/source/xforms/pathexpression.hxx index ddfc5362b030..93d187b20e44 100644 --- a/forms/source/xforms/pathexpression.hxx +++ b/forms/source/xforms/pathexpression.hxx @@ -51,7 +51,7 @@ private: protected: /// get expression for evaluation - const rtl::OUString _getExpressionForEvaluation() const; + const OUString _getExpressionForEvaluation() const; public: @@ -61,7 +61,7 @@ public: /// set the expression string /// (overridden to do remove old listeners) /// (also defines simple expressions) - void setExpression( const rtl::OUString& rExpression ); + void setExpression( const OUString& rExpression ); /// evaluate the expression relative to the content node. diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx index ae56f7618e67..daa50bb2af20 100644 --- a/forms/source/xforms/propertysetbase.cxx +++ b/forms/source/xforms/propertysetbase.cxx @@ -108,7 +108,7 @@ void PropertySetBase::notifyAndCachePropertyValue( sal_Int32 nHandle ) { // determine the type of this property ::cppu::IPropertyArrayHelper& rPropertyMetaData = getInfoHelper(); - ::rtl::OUString sPropName; + OUString sPropName; OSL_VERIFY( rPropertyMetaData.fillPropertyMembersByHandle( &sPropName, NULL, nHandle ) ); Property aProperty = rPropertyMetaData.getPropertyByName( sPropName ); // default construct a value of this type @@ -161,7 +161,7 @@ sal_Bool SAL_CALL PropertySetBase::convertFastPropertyValue( Any& rConvertedValu { PropertyAccessorBase& rAccessor = locatePropertyHandler( nHandle ); if ( !rAccessor.approveValue( rValue ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 0 ); + throw IllegalArgumentException( OUString(), *this, 0 ); rAccessor.getValue( rOldValue ); if ( rOldValue != rValue ) diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx index 29899d1b67de..bdbd5ab1406b 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -353,7 +353,7 @@ public: #define PROPERTY_FLAGS( NAME, TYPE, FLAG ) com::sun::star::beans::Property( \ - ::rtl::OUString( #NAME, sizeof( #NAME ) - 1, RTL_TEXTENCODING_ASCII_US ), \ + OUString( #NAME, sizeof( #NAME ) - 1, RTL_TEXTENCODING_ASCII_US ), \ HANDLE_##NAME, getCppuType( static_cast< TYPE* >( NULL ) ), FLAG ) #define PROPERTY( NAME, TYPE ) PROPERTY_FLAGS( NAME, TYPE, com::sun::star::beans::PropertyAttribute::BOUND ) #define PROPERTY_RO( NAME, TYPE ) PROPERTY_FLAGS( NAME, TYPE, com::sun::star::beans::PropertyAttribute::BOUND | com::sun::star::beans::PropertyAttribute::READONLY ) diff --git a/forms/source/xforms/resourcehelper.cxx b/forms/source/xforms/resourcehelper.cxx index 50cd74f54672..ac125380c433 100644 --- a/forms/source/xforms/resourcehelper.cxx +++ b/forms/source/xforms/resourcehelper.cxx @@ -24,7 +24,6 @@ #include <rtl/ustring.hxx> #include <tools/string.hxx> -using rtl::OUString; namespace xforms { diff --git a/forms/source/xforms/resourcehelper.hxx b/forms/source/xforms/resourcehelper.hxx index 486bd5437676..bc54cf800072 100644 --- a/forms/source/xforms/resourcehelper.hxx +++ b/forms/source/xforms/resourcehelper.hxx @@ -23,21 +23,20 @@ #include <frm_resource.hrc> #include <sal/types.h> - -namespace rtl { class OUString; } +#include <rtl/ustring.hxx> namespace xforms { /// get a resource string for the current language - rtl::OUString getResource( sal_uInt16 ); + OUString getResource( sal_uInt16 ); // overloaded: get a resource string, and substitute parameters - rtl::OUString getResource( sal_uInt16, const rtl::OUString& ); - rtl::OUString getResource( sal_uInt16, const rtl::OUString&, - const rtl::OUString& ); - rtl::OUString getResource( sal_uInt16, const rtl::OUString&, - const rtl::OUString&, - const rtl::OUString& ); + OUString getResource( sal_uInt16, const OUString& ); + OUString getResource( sal_uInt16, const OUString&, + const OUString& ); + OUString getResource( sal_uInt16, const OUString&, + const OUString&, + const OUString& ); } // namespace diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index d8bb867d3b13..a9dd5348627e 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -57,8 +57,6 @@ -using rtl::OUString; -using rtl::OUStringBuffer; using com::sun::star::beans::UnknownPropertyException; using com::sun::star::beans::PropertyVetoException; using com::sun::star::lang::IllegalArgumentException; @@ -440,7 +438,7 @@ sal_Bool SAL_CALL Submission::convertFastPropertyValue( { // for convinience reasons (????), we accept a string which contains // a comma-separated list of namespace prefixes - ::rtl::OUString sTokenList; + OUString sTokenList; if ( rValue >>= sTokenList ) { std::vector< OUString > aPrefixes; @@ -448,7 +446,7 @@ sal_Bool SAL_CALL Submission::convertFastPropertyValue( while ( p >= 0 ) aPrefixes.push_back( sTokenList.getToken( 0, ',', p ) ); - Sequence< ::rtl::OUString > aConvertedPrefixes( &aPrefixes[0], aPrefixes.size() ); + Sequence< OUString > aConvertedPrefixes( &aPrefixes[0], aPrefixes.size() ); return PropertySetBase::convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, makeAny( aConvertedPrefixes ) ); } } @@ -498,11 +496,11 @@ void SAL_CALL Submission::submitWithInteraction( // as long as this class is not really threadsafe, we need to copy // the members we're interested in Reference< XModel > xModel( mxModel ); - ::rtl::OUString sID( msID ); + OUString sID( msID ); if ( !xModel.is() || msID.isEmpty() ) throw RuntimeException( - ::rtl::OUString( "This is not a valid submission object." ), + OUString( "This is not a valid submission object." ), *this ); @@ -680,27 +678,27 @@ Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL Submission::getP { return PropertySetBase::getPropertySetInfo(); } -void SAL_CALL Submission::setPropertyValue( const ::rtl::OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL Submission::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { PropertySetBase::setPropertyValue( aPropertyName, aValue ); } -Any SAL_CALL Submission::getPropertyValue( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL Submission::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { return PropertySetBase::getPropertyValue( PropertyName ); } -void SAL_CALL Submission::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL Submission::addPropertyChangeListener( const OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertySetBase::addPropertyChangeListener( aPropertyName, xListener ); } -void SAL_CALL Submission::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL Submission::removePropertyChangeListener( const OUString& aPropertyName, const Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertySetBase::removePropertyChangeListener( aPropertyName, aListener ); } -void SAL_CALL Submission::addVetoableChangeListener( const ::rtl::OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL Submission::addVetoableChangeListener( const OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertySetBase::addVetoableChangeListener( PropertyName, aListener ); } -void SAL_CALL Submission::removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL Submission::removeVetoableChangeListener( const OUString& PropertyName, const Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertySetBase::removeVetoableChangeListener( PropertyName, aListener ); } diff --git a/forms/source/xforms/submission.hxx b/forms/source/xforms/submission.hxx index f811ad2dd524..32485299a2f3 100644 --- a/forms/source/xforms/submission.hxx +++ b/forms/source/xforms/submission.hxx @@ -64,21 +64,21 @@ typedef cppu::ImplInheritanceHelper2< class Submission : public Submission_t { // submission properties - rtl::OUString msID; - rtl::OUString msBind; + OUString msID; + OUString msBind; ComputedExpression maRef; - rtl::OUString msAction; - rtl::OUString msMethod; - rtl::OUString msVersion; + OUString msAction; + OUString msMethod; + OUString msVersion; bool mbIndent; - rtl::OUString msMediaType; - rtl::OUString msEncoding; + OUString msMediaType; + OUString msEncoding; bool mbOmitXmlDeclaration; bool mbStandalone; - rtl::OUString msCDataSectionElement; - rtl::OUString msReplace; - rtl::OUString msSeparator; - com::sun::star::uno::Sequence< rtl::OUString > msIncludeNamespacePrefixes; + OUString msCDataSectionElement; + OUString msReplace; + OUString msSeparator; + com::sun::star::uno::Sequence< OUString > msIncludeNamespacePrefixes; private: @@ -108,32 +108,32 @@ public: void setModel( const com::sun::star::uno::Reference<com::sun::star::xforms::XModel>& ); - rtl::OUString getID() const; /// get ID for this submission - void setID( const rtl::OUString& ); /// set ID for this submission + OUString getID() const; /// get ID for this submission + void setID( const OUString& ); /// set ID for this submission - rtl::OUString getBind() const; - void setBind( const rtl::OUString& ); + OUString getBind() const; + void setBind( const OUString& ); - rtl::OUString getRef() const; - void setRef( const rtl::OUString& ); + OUString getRef() const; + void setRef( const OUString& ); - rtl::OUString getAction() const; - void setAction( const rtl::OUString& ); + OUString getAction() const; + void setAction( const OUString& ); - rtl::OUString getMethod() const; - void setMethod( const rtl::OUString& ); + OUString getMethod() const; + void setMethod( const OUString& ); - rtl::OUString getVersion() const; - void setVersion( const rtl::OUString& ); + OUString getVersion() const; + void setVersion( const OUString& ); bool getIndent() const; void setIndent( bool ); - rtl::OUString getMediaType() const; - void setMediaType( const rtl::OUString& ); + OUString getMediaType() const; + void setMediaType( const OUString& ); - rtl::OUString getEncoding() const; - void setEncoding( const rtl::OUString& ); + OUString getEncoding() const; + void setEncoding( const OUString& ); bool getOmitXmlDeclaration() const; void setOmitXmlDeclaration( bool ); @@ -141,17 +141,17 @@ public: bool getStandalone() const; void setStandalone( bool ); - rtl::OUString getCDataSectionElement() const; - void setCDataSectionElement( const rtl::OUString& ); + OUString getCDataSectionElement() const; + void setCDataSectionElement( const OUString& ); - rtl::OUString getReplace() const; - void setReplace( const rtl::OUString& ); + OUString getReplace() const; + void setReplace( const OUString& ); - rtl::OUString getSeparator() const; - void setSeparator( const rtl::OUString& ); + OUString getSeparator() const; + void setSeparator( const OUString& ); - com::sun::star::uno::Sequence< rtl::OUString > getIncludeNamespacePrefixes() const; - void setIncludeNamespacePrefixes( const com::sun::star::uno::Sequence< rtl::OUString >& ); + com::sun::star::uno::Sequence< OUString > getIncludeNamespacePrefixes() const; + void setIncludeNamespacePrefixes( const com::sun::star::uno::Sequence< OUString >& ); /** perform the submission @@ -207,10 +207,10 @@ public: // get/set name // - virtual rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setName( const rtl::OUString& ) + virtual void SAL_CALL setName( const OUString& ) throw( com::sun::star::uno::RuntimeException ); @@ -249,12 +249,12 @@ public: // (need to disambiguate this) 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); }; diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index 543c6d0bb515..18da787de5f0 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -44,7 +44,7 @@ using namespace com::sun::star::beans; using namespace com::sun::star::task; using namespace com::sun::star::xml::dom; -CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aReplace, const Reference<XDocument>& aDocument, const Reference<XFrame>& aFrame) +CSubmission::SubmissionResult CSubmission::replace(const OUString& aReplace, const Reference<XDocument>& aDocument, const Reference<XFrame>& aFrame) { if (!m_aResultStream.is()) return CSubmission::UNKNOWN_ERROR; @@ -63,13 +63,13 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla // open the stream from the result... // build media descriptor Sequence< PropertyValue > descriptor(2); - descriptor[0] = PropertyValue(::rtl::OUString("InputStream"), + descriptor[0] = PropertyValue(OUString("InputStream"), -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE); - descriptor[1] = PropertyValue(::rtl::OUString("ReadOnly"), + descriptor[1] = PropertyValue(OUString("ReadOnly"), -1, makeAny(sal_True), PropertyState_DIRECT_VALUE); - ::rtl::OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE); - ::rtl::OUString aTarget = ::rtl::OUString("_default"); + OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE); + OUString aTarget = OUString("_default"); xLoader->loadComponentFromURL(aURL, aTarget, FrameSearchFlag::ALL, descriptor); return CSubmission::SUCCESS; @@ -100,7 +100,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla return CSubmission::SUCCESS; } } catch (const Exception& e) { - ::rtl::OString aMsg("Exception during replace:\n"); + OString aMsg("Exception during replace:\n"); aMsg += OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8); OSL_FAIL(aMsg.getStr()); } diff --git a/forms/source/xforms/submission/serialization.hxx b/forms/source/xforms/submission/serialization.hxx index 4e7726d44c31..6a85797e8522 100644 --- a/forms/source/xforms/submission/serialization.hxx +++ b/forms/source/xforms/submission/serialization.hxx @@ -37,7 +37,7 @@ namespace CSS = com::sun::star; Serialize an XObject */ -typedef std::map<rtl::OUString, rtl::OUString> PropMap; +typedef std::map<OUString, OUString> PropMap; class CSerialization { @@ -64,7 +64,7 @@ public: void setProperties(const CSS::uno::Sequence< CSS::beans::NamedValue >& props) { m_properties.clear(); - rtl::OUString aValue; + OUString aValue; for (sal_Int32 i=0; i<props.getLength(); i++) { if (props[i].Value >>= aValue) diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx index fcf80c267112..0cc80e2200fa 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.cxx +++ b/forms/source/xforms/submission/serialization_urlencoded.cxx @@ -70,9 +70,9 @@ sal_Bool CSerializationURLEncoded::is_unreserved(sal_Char c) } return sal_False; } -void CSerializationURLEncoded::encode_and_append(const ::rtl::OUString& aString, ::rtl::OStringBuffer& aBuffer) +void CSerializationURLEncoded::encode_and_append(const OUString& aString, OStringBuffer& aBuffer) { - ::rtl::OString utf8String = OUStringToOString(aString, RTL_TEXTENCODING_UTF8); + OString utf8String = OUStringToOString(aString, RTL_TEXTENCODING_UTF8); const sal_uInt8 *pString = reinterpret_cast< const sal_uInt8 * >( utf8String.getStr() ); sal_Char tmpChar[4]; tmpChar[3] = 0; @@ -119,9 +119,9 @@ void CSerializationURLEncoded::serialize_node(const Reference< XNode >& aNode) // is this an element node? if (aNode->getNodeType() == NodeType_ELEMENT_NODE) { - ::rtl::OUString aName = aNode->getNodeName(); + OUString aName = aNode->getNodeName(); // find any text children - ::rtl::OUStringBuffer aValue; + OUStringBuffer aValue; Reference< XText > aText; for(sal_Int32 i=0; i < aChildList->getLength(); i++) { @@ -136,8 +136,8 @@ void CSerializationURLEncoded::serialize_node(const Reference< XNode >& aNode) // found anything? if (aValue.getLength() > 0) { - ::rtl::OUString aUnencValue = aValue.makeStringAndClear(); - ::rtl::OStringBuffer aEncodedBuffer; + OUString aUnencValue = aValue.makeStringAndClear(); + OStringBuffer aEncodedBuffer; encode_and_append(aName, aEncodedBuffer); aEncodedBuffer.append("="); encode_and_append(aUnencValue, aEncodedBuffer); diff --git a/forms/source/xforms/submission/serialization_urlencoded.hxx b/forms/source/xforms/submission/serialization_urlencoded.hxx index 0eb58872597e..a778d5177082 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.hxx +++ b/forms/source/xforms/submission/serialization_urlencoded.hxx @@ -32,7 +32,7 @@ private: CSS::uno::Reference< CSS::io::XPipe > m_aPipe; sal_Bool is_unreserved(sal_Char); - void encode_and_append(const rtl::OUString& aString, rtl::OStringBuffer& aBuffer); + void encode_and_append(const OUString& aString, OStringBuffer& aBuffer); void serialize_node(const CSS::uno::Reference< CSS::xml::dom::XNode >& aNode); void serialize_nodeset(); diff --git a/forms/source/xforms/submission/submission.hxx b/forms/source/xforms/submission/submission.hxx index 0998b4c46cfc..ac714afb9730 100644 --- a/forms/source/xforms/submission/submission.hxx +++ b/forms/source/xforms/submission/submission.hxx @@ -115,7 +115,7 @@ protected: CSS::uno::Reference< CSS::xml::dom::XDocumentFragment > m_aFragment; CSS::uno::Reference< CSS::io::XInputStream > m_aResultStream; CSS::uno::Reference< CSS::uno::XComponentContext > m_xContext; - rtl::OUString m_aEncoding; + OUString m_aEncoding; ::std::auto_ptr< CSerialization > createSerialization(const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler ,com::sun::star::uno::Reference<com::sun::star::ucb::XCommandEnvironment>& _rOutEnv); @@ -130,7 +130,7 @@ public: UNKNOWN_ERROR }; - CSubmission(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) + CSubmission(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) : m_aURLObj(aURL) , m_aFragment(aFragment) , m_xContext(::comphelper::getProcessComponentContext()) @@ -138,13 +138,13 @@ public: virtual ~CSubmission() {} - virtual void setEncoding(const rtl::OUString& aEncoding) + virtual void setEncoding(const OUString& aEncoding) { m_aEncoding = aEncoding; } virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& ) = 0; - virtual SubmissionResult replace(const rtl::OUString&, const CSS::uno::Reference< CSS::xml::dom::XDocument >&, const CSS::uno::Reference< CSS::frame::XFrame>&); + virtual SubmissionResult replace(const OUString&, const CSS::uno::Reference< CSS::xml::dom::XDocument >&, const CSS::uno::Reference< CSS::frame::XFrame>&); }; diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index bbfd09dcd1bf..62efea1ebbca 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -40,12 +40,9 @@ using namespace osl; using namespace ucbhelper; using namespace std; -using ::rtl::OUString; -using ::rtl::OStringToOUString; -using ::rtl::OStringBuffer; -CSubmissionGet::CSubmissionGet(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) +CSubmissionGet::CSubmissionGet(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) : CSubmission(aURL, aFragment) { } diff --git a/forms/source/xforms/submission/submission_get.hxx b/forms/source/xforms/submission/submission_get.hxx index 2e5e6038edcb..2acd28440b29 100644 --- a/forms/source/xforms/submission/submission_get.hxx +++ b/forms/source/xforms/submission/submission_get.hxx @@ -29,7 +29,7 @@ class CSubmissionGet : public CSubmission private: CSS::uno::Reference< CSS::uno::XComponentContext > m_xContext; public: - CSubmissionGet(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment); + CSubmissionGet(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment); virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler); }; diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index b313bd269cb7..73bdf82c0bf8 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -37,10 +37,9 @@ using namespace osl; using namespace ucbhelper; using namespace std; -using ::rtl::OUString; -CSubmissionPost::CSubmissionPost(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) +CSubmissionPost::CSubmissionPost(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) : CSubmission(aURL, aFragment) { } diff --git a/forms/source/xforms/submission/submission_post.hxx b/forms/source/xforms/submission/submission_post.hxx index c842f35372dd..b9ce66ae87a8 100644 --- a/forms/source/xforms/submission/submission_post.hxx +++ b/forms/source/xforms/submission/submission_post.hxx @@ -25,7 +25,7 @@ class CSubmissionPost : public CSubmission { public: - CSubmissionPost(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment); + CSubmissionPost(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment); virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler); }; diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx index e5ea3154ab1b..5beeb6386c43 100644 --- a/forms/source/xforms/submission/submission_put.cxx +++ b/forms/source/xforms/submission/submission_put.cxx @@ -36,9 +36,8 @@ using namespace osl; using namespace ucbhelper; using namespace std; -using ::rtl::OUString; -CSubmissionPut::CSubmissionPut(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) +CSubmissionPut::CSubmissionPut(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment) : CSubmission(aURL, aFragment) { } diff --git a/forms/source/xforms/submission/submission_put.hxx b/forms/source/xforms/submission/submission_put.hxx index 9f35de3ceb34..d17ad970916d 100644 --- a/forms/source/xforms/submission/submission_put.hxx +++ b/forms/source/xforms/submission/submission_put.hxx @@ -28,7 +28,7 @@ class CSubmissionPut : public CSubmission { public: - CSubmissionPut(const rtl::OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment); + CSubmissionPut(const OUString& aURL, const CSS::uno::Reference< CSS::xml::dom::XDocumentFragment >& aFragment); virtual SubmissionResult submit(const CSS::uno::Reference< CSS::task::XInteractionHandler >& aInteractionHandler); }; diff --git a/forms/source/xforms/unohelper.cxx b/forms/source/xforms/unohelper.cxx index df62262a264b..35273757944f 100644 --- a/forms/source/xforms/unohelper.cxx +++ b/forms/source/xforms/unohelper.cxx @@ -43,7 +43,6 @@ using com::sun::star::beans::Property; using com::sun::star::beans::XPropertySet; using com::sun::star::beans::XPropertySetInfo; using com::sun::star::beans::PropertyAttribute::READONLY; -using rtl::OUString; void xforms::copy( const Reference<XPropertySet>& xFrom, diff --git a/forms/source/xforms/xforms_services.cxx b/forms/source/xforms/xforms_services.cxx index 7e03f9967239..ebd73595bc4c 100644 --- a/forms/source/xforms/xforms_services.cxx +++ b/forms/source/xforms/xforms_services.cxx @@ -36,7 +36,6 @@ using com::sun::star::uno::RuntimeException; using com::sun::star::form::binding::XValueBinding; using com::sun::star::beans::XPropertySet; using com::sun::star::container::XNameContainer; -using rtl::OUString; namespace frm diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx index 11553efd4b23..f4e101440646 100644 --- a/forms/source/xforms/xformsevent.cxx +++ b/forms/source/xforms/xformsevent.cxx @@ -25,7 +25,6 @@ namespace sun { namespace star { namespace xforms { -using rtl::OUString; using com::sun::star::uno::RuntimeException; void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg, diff --git a/forms/source/xforms/xformsevent.hxx b/forms/source/xforms/xformsevent.hxx index 66738d200506..8f1649d908df 100644 --- a/forms/source/xforms/xformsevent.hxx +++ b/forms/source/xforms/xformsevent.hxx @@ -42,7 +42,7 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > { inline XFormsEventConcrete( void ) : m_canceled(sal_False) {} virtual ~XFormsEventConcrete( void ) {} - virtual rtl::OUString SAL_CALL getType() throw (RuntimeException_t); + virtual OUString SAL_CALL getType() throw (RuntimeException_t); virtual XEventTarget_t SAL_CALL getTarget() throw (RuntimeException_t); virtual XEventTarget_t SAL_CALL getCurrentTarget() throw (RuntimeException_t); virtual PhaseType_t SAL_CALL getEventPhase() throw (RuntimeException_t); @@ -53,13 +53,13 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > { virtual void SAL_CALL preventDefault() throw (RuntimeException_t); virtual void SAL_CALL initXFormsEvent( - const rtl::OUString& typeArg, + const OUString& typeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg ) throw (RuntimeException_t); virtual void SAL_CALL initEvent( - const rtl::OUString& eventTypeArg, + const OUString& eventTypeArg, sal_Bool canBubbleArg, sal_Bool cancelableArg) throw (RuntimeException_t); @@ -70,7 +70,7 @@ class XFormsEventConcrete : public cppu::WeakImplHelper1< XFormsEvent > { protected: - rtl::OUString m_eventType; + OUString m_eventType; XEventTarget_t m_target; XEventTarget_t m_currentTarget; PhaseType_t m_phase; diff --git a/forms/source/xforms/xmlhelper.cxx b/forms/source/xforms/xmlhelper.cxx index 5458cd177382..7c55516d12ca 100644 --- a/forms/source/xforms/xmlhelper.cxx +++ b/forms/source/xforms/xmlhelper.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/xml/dom/DocumentBuilder.hpp> #include <comphelper/processfactory.hxx> -using rtl::OUString; using com::sun::star::uno::Reference; using com::sun::star::uno::UNO_QUERY_THROW; using com::sun::star::container::XNameContainer; diff --git a/forms/source/xforms/xmlhelper.hxx b/forms/source/xforms/xmlhelper.hxx index c6eb1658aebb..d55432d6ffc2 100644 --- a/forms/source/xforms/xmlhelper.hxx +++ b/forms/source/xforms/xmlhelper.hxx @@ -21,9 +21,8 @@ #define _XMLHELPER_HXX #include <sal/types.h> +#include <rtl/ustring.hxx> - -namespace rtl { class OUString; } namespace com { namespace sun { namespace star { namespace uno { template<typename T> class Reference; } namespace container { class XNameContainer; } @@ -31,10 +30,10 @@ namespace com { namespace sun { namespace star { } } } -bool isValidQName( const rtl::OUString& sName, +bool isValidQName( const OUString& sName, const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& xNamespaces ); -bool isValidPrefixName( const rtl::OUString& sName, +bool isValidPrefixName( const OUString& sName, const com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>& xNamespaces ); com::sun::star::uno::Reference<com::sun::star::xml::dom::XDocumentBuilder> getDocumentBuilder(); diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 75c6922e109f..6e93845b61bd 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -39,15 +39,15 @@ Reference< XInterface > SAL_CALL CLibxml2XFormsExtension::Create( return aInstance; } -::rtl::OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static() +OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static() { - return ::rtl::OUString("com.sun.star.comp.xml.xpath.XFormsExtension"); + return OUString("com.sun.star.comp.xml.xpath.XFormsExtension"); } -Sequence< ::rtl::OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static() +Sequence< OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static() { - Sequence< ::rtl::OUString > aSequence(1); - aSequence[0] = ::rtl::OUString("com.sun.star.xml.xpath.XPathExtension"); + Sequence< OUString > aSequence(1); + aSequence[0] = OUString("com.sun.star.xml.xpath.XPathExtension"); return aSequence; } diff --git a/forms/source/xforms/xpathlib/extension.hxx b/forms/source/xforms/xpathlib/extension.hxx index 4e1d87f7d68f..b95adb5d1b90 100644 --- a/forms/source/xforms/xpathlib/extension.hxx +++ b/forms/source/xforms/xpathlib/extension.hxx @@ -46,8 +46,8 @@ private: public: static com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL Create( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& aFactory); - static rtl::OUString SAL_CALL getImplementationName_Static(); - static com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames_Static(); + static OUString SAL_CALL getImplementationName_Static(); + static com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(); com::sun::star::uno::Reference< com::sun::star::xforms::XModel > getModel(); com::sun::star::uno::Reference< com::sun::star::xml::dom::XNode > getContextNode(); diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx index 6c35ea7fee90..ed2c5068d8ef 100644 --- a/forms/source/xforms/xpathlib/xpathlib.cxx +++ b/forms/source/xforms/xpathlib/xpathlib.cxx @@ -92,7 +92,7 @@ void xforms_booleanFromStringFunction(xmlXPathParserContextPtr ctxt, int nargs) if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY); xmlChar *pString = xmlXPathPopString(ctxt); if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE); - ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); + OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); if (aString.equalsIgnoreAsciiCase("true") || aString.equalsIgnoreAsciiCase("1")) xmlXPathReturnTrue(ctxt); @@ -224,7 +224,7 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs) if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY); xmlChar* pString = xmlXPathPopString(ctxt); if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE); - ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); + OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); if (aString.equalsIgnoreAsciiCase("version")) xmlXPathReturnString(ctxt, (xmlChar*)_version); else if (aString.equalsIgnoreAsciiCase("conformance-level")) @@ -235,9 +235,9 @@ void xforms_propertyFunction(xmlXPathParserContextPtr ctxt, int nargs) // Date and Time Functions -static ::rtl::OString makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_True) +static OString makeDateTimeString (const DateTime& aDateTime, sal_Bool bUTC = sal_True) { - ::rtl::OStringBuffer aDateTimeString; + OStringBuffer aDateTimeString; aDateTimeString.append((sal_Int32)aDateTime.GetYear()); aDateTimeString.append("-"); if (aDateTime.GetMonth()<10) aDateTimeString.append("0"); @@ -281,19 +281,19 @@ void xforms_nowFunction(xmlXPathParserContextPtr ctxt, int /*nargs*/) indicated by a "Z". */ DateTime aDateTime( DateTime::SYSTEM ); - ::rtl::OString aDateTimeString = makeDateTimeString(aDateTime); + OString aDateTimeString = makeDateTimeString(aDateTime); xmlChar *pString = static_cast<xmlChar*>(xmlMalloc(aDateTimeString.getLength()+1)); strncpy((char*)pString, (char*)aDateTimeString.getStr(), aDateTimeString.getLength()); pString[aDateTimeString.getLength()] = 0; xmlXPathReturnString(ctxt, pString); } -static sal_Bool parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTime) +static sal_Bool parseDateTime(const OUString& aString, DateTime& aDateTime) { // take apart a canonical literal xsd:dateTime string //CCYY-MM-DDThh:mm:ss(Z) - ::rtl::OUString aDateTimeString = aString.trim(); + OUString aDateTimeString = aString.trim(); // check length if (aDateTimeString.getLength() < 19 || aDateTimeString.getLength() > 20) @@ -302,10 +302,10 @@ static sal_Bool parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTim sal_Int32 nDateLength = 10; sal_Int32 nTimeLength = 8; - ::rtl::OUString aUTCString("Z"); + OUString aUTCString("Z"); - ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength); - ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength); + OUString aDateString = aDateTimeString.copy(0, nDateLength); + OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength); sal_Int32 nIndex = 0; sal_Int32 nYear = aDateString.getToken(0, '-', nIndex).toInt32(); @@ -335,7 +335,7 @@ void xforms_daysFromDateFunction(xmlXPathParserContextPtr ctxt, int nargs) if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY); xmlChar* pString = xmlXPathPopString(ctxt); if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE); - ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); + OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); DateTime aDateTime( DateTime::EMPTY ); if (parseDateTime(aString, aDateTime)) @@ -358,7 +358,7 @@ void xforms_secondsFromDateTimeFunction(xmlXPathParserContextPtr ctxt, int nargs if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY); xmlChar* pString = xmlXPathPopString(ctxt); if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE); - ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); + OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); DateTime aDateTime( DateTime::EMPTY ); @@ -507,7 +507,7 @@ void xforms_instanceFuction(xmlXPathParserContextPtr ctxt, int nargs) if (nargs != 1) XP_ERROR(XPATH_INVALID_ARITY); xmlChar *pString = xmlXPathPopString(ctxt); if (xmlXPathCheckError(ctxt)) XP_ERROR(XPATH_INVALID_TYPE); - ::rtl::OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); + OUString aString((char*)pString, strlen((char*)pString), RTL_TEXTENCODING_UTF8); Reference< XModel > aModel = ((CLibxml2XFormsExtension*)ctxt->context->funcLookupData)->getModel(); if (aModel.is()) |