diff options
Diffstat (limited to 'forms')
36 files changed, 105 insertions, 160 deletions
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index d64ebab3ed8c..9bc330360e56 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -94,8 +94,8 @@ const StringSequence& getColumnTypes() //------------------------------------------------------------------------------ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName) { - const ::rtl::OUString aModelPrefix = ::rtl::OUString::createFromAscii("com.sun.star.form.component."); - const ::rtl::OUString aCompatibleModelPrefix = ::rtl::OUString::createFromAscii("stardiv.one.form.component."); + const ::rtl::OUString aModelPrefix (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.") ); + const ::rtl::OUString aCompatibleModelPrefix (RTL_CONSTASCII_USTRINGPARAM("stardiv.one.form.component.") ); sal_Int32 nTypeId = -1; if (aModelName == FRM_COMPONENT_EDIT) diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx index efcbaeae18e1..ed919f60b0d6 100644 --- a/forms/source/component/Currency.cxx +++ b/forms/source/component/Currency.cxx @@ -121,11 +121,11 @@ void OCurrencyModel::implConstruct() bPrependCurrencySymbol = sal_False; break; case 2: // $ 1 - sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString::createFromAscii(" "); + sCurrencySymbol = ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ); bPrependCurrencySymbol = sal_True; break; case 3: // 1 $ - sCurrencySymbol = ::rtl::OUString::createFromAscii(" ") + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())); + sCurrencySymbol = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ") ) + ::rtl::OUString(String(aLocaleInfo.getCurrSymbol())); bPrependCurrencySymbol = sal_False; break; } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 248fbb44c0b9..d6dbf397b029 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -995,7 +995,7 @@ void ODatabaseForm::Encode( ::rtl::OUString& rString ) const switch( nCharCode ) { case 13: // CR - aResult += ::rtl::OUString::createFromAscii("%0D%0A"); // Hex-Darstellung CR LF + aResult += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%0D%0A") ); // Hex-Darstellung CR LF break; @@ -1042,7 +1042,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUStr // Header - ::rtl::OUString aContentDisp = ::rtl::OUString::createFromAscii("form-data; name=\""); + ::rtl::OUString aContentDisp (RTL_CONSTASCII_USTRINGPARAM("form-data; name=\"") ); aContentDisp += rName; aContentDisp += UniString('\"'); pChild->SetContentDisposition( aContentDisp ); @@ -1107,15 +1107,15 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::O // Header - ::rtl::OUString aContentDisp = ::rtl::OUString::createFromAscii( "form-data; name=\"" ); + ::rtl::OUString aContentDisp (RTL_CONSTASCII_USTRINGPARAM( "form-data; name=\"") ); aContentDisp += rName; aContentDisp += UniString('\"'); - aContentDisp += ::rtl::OUString::createFromAscii("; filename=\""); + aContentDisp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("; filename=\"") ); aContentDisp += aFileName; aContentDisp += UniString('\"'); pChild->SetContentDisposition( aContentDisp ); pChild->SetContentType( aContentType ); - pChild->SetContentTransferEncoding( UniString(::rtl::OUString::createFromAscii("8bit")) ); + pChild->SetContentTransferEncoding( UniString(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("8bit") ) ) ); // Body @@ -2186,7 +2186,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor if (xDisp.is()) { Sequence<PropertyValue> aArgs(2); - aArgs.getArray()[0].Name = ::rtl::OUString::createFromAscii("Referer"); + aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); aArgs.getArray()[0].Value <<= aReferer; // build a sequence from the to-be-submitted string @@ -2195,7 +2195,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor Sequence< sal_Int8 > aPostData((sal_Int8*)a8BitData.GetBuffer(), a8BitData.Len()); Reference< XInputStream > xPostData = new SequenceInputStream(aPostData); - aArgs.getArray()[1].Name = ::rtl::OUString::createFromAscii("PostData"); + aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") ); aArgs.getArray()[1].Value <<= xPostData; xDisp->dispatch(aURL, aArgs); @@ -2254,7 +2254,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: Reference<XURLTransformer> xTransformer(m_xServiceFactory->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")), UNO_QUERY); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer") ) ), UNO_QUERY); DBG_ASSERT(xTransformer.is(), "ODatabaseForm::submit_impl : could not create an URL transformer !"); // URL-Encoding @@ -2283,7 +2283,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: if (xDisp.is()) { Sequence<PropertyValue> aArgs(1); - aArgs.getArray()->Name = ::rtl::OUString::createFromAscii("Referer"); + aArgs.getArray()->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); aArgs.getArray()->Value <<= aReferer; xDisp->dispatch(aURL, aArgs); } @@ -2316,15 +2316,15 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: return; Sequence<PropertyValue> aArgs(3); - aArgs.getArray()[0].Name = ::rtl::OUString::createFromAscii("Referer"); + aArgs.getArray()[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); aArgs.getArray()[0].Value <<= aReferer; - aArgs.getArray()[1].Name = ::rtl::OUString::createFromAscii("ContentType"); + aArgs.getArray()[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("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::createFromAscii("PostData"); + aArgs.getArray()[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PostData") ); aArgs.getArray()[2].Value <<= xPostData; xDisp->dispatch(aURL, aArgs); @@ -3826,7 +3826,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Stati ::rtl::OUString* pServices = aServices.getArray(); *pServices++ = FRM_SUN_FORMCOMPONENT; - *pServices++ = ::rtl::OUString::createFromAscii("com.sun.star.form.FormComponents"); + *pServices++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") ); *pServices++ = FRM_SUN_COMPONENT_FORM; *pServices++ = FRM_SUN_COMPONENT_HTMLFORM; *pServices++ = FRM_SUN_COMPONENT_DATAFORM; diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 229ae6e0a954..e5f5375f0e1a 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -629,7 +629,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm ) if ( !m_bMaxTextLenModified ) { sal_Int32 nFieldLen = 0; - xField->getPropertyValue(::rtl::OUString::createFromAscii("Precision")) >>= nFieldLen; + xField->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Precision") ) ) >>= nFieldLen; if (nFieldLen && nFieldLen <= USHRT_MAX) { diff --git a/forms/source/component/EventThread.cxx b/forms/source/component/EventThread.cxx index 7e16c62715e0..c729ae4350d4 100644 --- a/forms/source/component/EventThread.cxx +++ b/forms/source/component/EventThread.cxx @@ -147,25 +147,16 @@ void OComponentEventThread::addEvent( const EventObject* _pEvt, m_aCond.set(); } -//--------------------------------------------------------------------- -//--- 22.08.01 15:48:15 ----------------------------------------------- - void OComponentEventThread::implStarted( ) { acquire( ); } -//--------------------------------------------------------------------- -//--- 22.08.01 15:48:16 ----------------------------------------------- - void OComponentEventThread::implTerminated( ) { release( ); } -//--------------------------------------------------------------------- -//--- 22.08.01 15:47:31 ----------------------------------------------- - void SAL_CALL OComponentEventThread::kill() { OComponentEventThread_TBASE::terminate(); @@ -174,9 +165,6 @@ void SAL_CALL OComponentEventThread::kill() implTerminated( ); } -//--------------------------------------------------------------------- -//--- 22.08.01 15:47:33 ----------------------------------------------- - void SAL_CALL OComponentEventThread::onTerminated() { OComponentEventThread_TBASE::onTerminated(); diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 362c0fc77097..ca75f26b0e03 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -168,22 +168,22 @@ namespace frm switch (m_nControlClass) { case FormComponentType::RADIOBUTTON: - aServiceName = ::rtl::OUString::createFromAscii("radiobutton"); + aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("radiobutton") ); break; case FormComponentType::CHECKBOX: - aServiceName = ::rtl::OUString::createFromAscii("checkbox"); + aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("checkbox") ); break; case FormComponentType::COMBOBOX: - aServiceName = ::rtl::OUString::createFromAscii("combobox"); + aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("combobox") ); break; case FormComponentType::LISTBOX: - aServiceName = ::rtl::OUString::createFromAscii("listbox"); + aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("listbox") ); break; default: if (m_bMultiLine) - aServiceName = ::rtl::OUString::createFromAscii("MultiLineEdit"); + aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLineEdit") ); else - aServiceName = ::rtl::OUString::createFromAscii("Edit"); + aServiceName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit") ); } return aServiceName; } @@ -711,10 +711,10 @@ namespace frm try { Sequence< Any > aArgs(2); - aArgs[0] <<= PropertyValue(::rtl::OUString::createFromAscii("SQLException"), 0, makeAny( _rExcept ), PropertyState_DIRECT_VALUE); - aArgs[1] <<= PropertyValue(::rtl::OUString::createFromAscii("ParentWindow"), 0, makeAny( m_xMessageParent ), PropertyState_DIRECT_VALUE); + aArgs[0] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQLException") ), 0, makeAny( _rExcept ), PropertyState_DIRECT_VALUE); + aArgs[1] <<= PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow") ), 0, makeAny( m_xMessageParent ), PropertyState_DIRECT_VALUE); - static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.ErrorMessageDialog" ); + static ::rtl::OUString s_sDialogServiceName (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ErrorMessageDialog") ); Reference< XExecutableDialog > xErrorDialog( m_aContext.createComponentWithArguments( s_sDialogServiceName, aArgs ), UNO_QUERY ); if ( xErrorDialog.is() ) diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 768eaca5f489..1e37ae8ae474 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -784,7 +784,7 @@ Sequence< ::rtl::OUString > SAL_CALL OControlModel::getSupportedServiceNames_Sta { Sequence< ::rtl::OUString > aServiceNames( 2 ); aServiceNames[ 0 ] = FRM_SUN_FORMCOMPONENT; - aServiceNames[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.form.FormControlModel" ); + aServiceNames[ 1 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormControlModel") ); return aServiceNames; } @@ -1654,7 +1654,7 @@ StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(Run Sequence< ::rtl::OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException ) { Sequence< ::rtl::OUString > aOwnServiceNames( 1 ); - aOwnServiceNames[ 0 ] = ::rtl::OUString::createFromAscii( "com.sun.star.form.DataAwareControlModel" ); + aOwnServiceNames[ 0 ] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.DataAwareControlModel") ); return ::comphelper::concatSequences( OControlModel::getSupportedServiceNames_Static(), diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 8bafb3f893b4..145671a6e120 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -790,7 +790,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::createFromAscii("NullDate") ) >>= m_aNullDate; + xSupplier->getNumberFormatSettings()->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate") ) ) >>= m_aNullDate; OEditBaseModel::onConnectedDbColumn( _rxForm ); } @@ -852,7 +852,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) ::rtl::OUString sFormatDescription; LanguageType eFormatLanguage = LANGUAGE_DONTKNOW; - static const ::rtl::OUString s_aLocaleProp = ::rtl::OUString::createFromAscii("Locale"); + static const ::rtl::OUString s_aLocaleProp (RTL_CONSTASCII_USTRINGPARAM("Locale") ); Reference<com::sun::star::beans::XPropertySet> xFormat = xFormats->getByKey(nKey); if (hasProperty(s_aLocaleProp, xFormat)) { @@ -865,7 +865,7 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) } } - static const ::rtl::OUString s_aFormatStringProp = ::rtl::OUString::createFromAscii("FormatString"); + static const ::rtl::OUString s_aFormatStringProp (RTL_CONSTASCII_USTRINGPARAM("FormatString") ); if (hasProperty(s_aFormatStringProp, xFormat)) xFormat->getPropertyValue(s_aFormatStringProp) >>= sFormatDescription; diff --git a/forms/source/component/FormattedFieldWrapper.cxx b/forms/source/component/FormattedFieldWrapper.cxx index 53f340fd9d70..6ac7740f78b0 100644 --- a/forms/source/component/FormattedFieldWrapper.cxx +++ b/forms/source/component/FormattedFieldWrapper.cxx @@ -205,7 +205,7 @@ Any SAL_CALL OFormattedFieldWrapper::queryAggregation(const Type& _rType) throw //------------------------------------------------------------------ ::rtl::OUString SAL_CALL OFormattedFieldWrapper::getImplementationName( ) throw (RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.forms.OFormattedFieldWrapper"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper") ); } //------------------------------------------------------------------ diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx index b6629e91cb94..2b72d8e42f57 100644 --- a/forms/source/component/FormsCollection.cxx +++ b/forms/source/component/FormsCollection.cxx @@ -119,7 +119,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(Runtim //------------------------------------------------------------------------------ ::rtl::OUString SAL_CALL OFormsCollection::getImplementationName() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.forms.OFormsCollection"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormsCollection") ); } //------------------------------------------------------------------------------ @@ -139,7 +139,7 @@ StringSequence SAL_CALL OFormsCollection::getSupportedServiceNames() throw(Runti StringSequence aReturn(2); aReturn.getArray()[0] = FRM_SUN_FORMS_COLLECTION; - aReturn.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.form.FormComponents"); + aReturn.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FormComponents") ); return aReturn; } diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx index c9b8e4616e73..7704af43018e 100644 --- a/forms/source/component/GroupManager.cxx +++ b/forms/source/component/GroupManager.cxx @@ -121,11 +121,11 @@ OGroupComp::OGroupComp(const OGroupComp& _rSource) //------------------------------------------------------------------ OGroupComp::OGroupComp(const Reference<XPropertySet>& rxSet, sal_Int32 nInsertPos ) - :m_xComponent( rxSet ) - ,m_xControlModel(rxSet,UNO_QUERY) - ,m_nPos( nInsertPos ) - ,m_nTabIndex(0) - ,m_aName( OGroupManager::GetGroupName( rxSet ) ) + : m_aName( OGroupManager::GetGroupName( rxSet ) ) + , m_xComponent( rxSet ) + , m_xControlModel(rxSet,UNO_QUERY) + , m_nPos( nInsertPos ) + , m_nTabIndex(0) { if (m_xComponent.is()) { @@ -269,7 +269,7 @@ Sequence< Reference<XControlModel> > OGroup::GetControlModels() const DBG_NAME(OGroupManager); //------------------------------------------------------------------ OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer) - :m_pCompGroup( new OGroup( ::rtl::OUString::createFromAscii( "AllComponentGroup" ) ) ) + :m_pCompGroup( new OGroup( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AllComponentGroup") ) ) ) ,m_xContainer(_rxContainer) { DBG_CTOR(OGroupManager,NULL); diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 3be8f97f112b..734704c33c76 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -744,17 +744,17 @@ namespace frm Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData(); ::rtl::OUString aQuote = xMeta->getIdentifierQuoteString(); - ::rtl::OUString aStatement = ::rtl::OUString::createFromAscii("SELECT "); + ::rtl::OUString aStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT ")); if (!aBoundFieldName.getLength()) // act like a combobox - aStatement += ::rtl::OUString::createFromAscii("DISTINCT "); + aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DISTINCT ") ); aStatement += quoteName(aQuote,aFieldName); if (aBoundFieldName.getLength()) { - aStatement += ::rtl::OUString::createFromAscii(", "); + aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(", ") ); aStatement += quoteName(aQuote, aBoundFieldName); } - aStatement += ::rtl::OUString::createFromAscii(" FROM "); + aStatement += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ") ); ::rtl::OUString sCatalog, sSchema, sTable; qualifiedNameComponents( xMeta, sListSource, sCatalog, sSchema, sTable, eInDataManipulation ); @@ -846,7 +846,7 @@ namespace frm try { Reference< XPropertySet > xBoundField( xColumns->getByIndex( nBoundColumn ), UNO_QUERY_THROW ); - OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= m_nBoundColumnType ); + OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Type") ) ) >>= m_nBoundColumnType ); } catch( const Exception& ) { diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index abf2e33ae11b..68dbd633c85f 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -89,7 +89,7 @@ void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit> // (formerly this switch-off was done in the toolkit - but the correct place is here ...) // Reference< XVclWindowPeer > xVclWindowPeer( getPeer(), UNO_QUERY ); // if (xVclWindowPeer.is()) -// xVclWindowPeer->setProperty(::rtl::OUString::createFromAscii("AutoToggle"), ::cppu::bool2any(sal_False)); +// xVclWindowPeer->setProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoToggle")), ::cppu::bool2any(sal_False)); // new order: do _not_ switch off the auto toggle because: // * today, it is not necessary anymore to handle the toggling ourself (everything works fine without it) // * without auto toggle, the AccessibleEvents as fired by the radio buttons are diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index 2c62e7960f69..f37c6bbeb89f 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -317,7 +317,7 @@ namespace frm Sequence<PropertyValue> aArgs(1); PropertyValue& rProp = aArgs.getArray()[0]; - rProp.Name = ::rtl::OUString::createFromAscii("Referer"); + rProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer") ); rProp.Value <<= xModel->getURL(); if (xDisp.is()) diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx index c8025bb66f1a..6b3599678543 100644 --- a/forms/source/helper/commandimageprovider.cxx +++ b/forms/source/helper/commandimageprovider.cxx @@ -82,7 +82,7 @@ namespace frm } // ICommandImageProvider - virtual CommandImages getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge, const bool _bHiContrast ) const; + virtual CommandImages getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const; private: void impl_init_nothrow( const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument ); @@ -130,15 +130,14 @@ namespace frm } //-------------------------------------------------------------------- - CommandImages DocumentCommandImageProvider::getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge, const bool _bHiContrast ) const + CommandImages DocumentCommandImageProvider::getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const { const size_t nCommandCount = _rCommandURLs.getLength(); CommandImages aImages( nCommandCount ); try { - const sal_Int16 nImageType = - ( _bLarge ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT ) - + ( _bHiContrast ? ImageType::COLOR_HIGHCONTRAST : ImageType::COLOR_NORMAL ); + const sal_Int16 nImageType = ImageType::COLOR_NORMAL + + ( _bLarge ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT ); Sequence< Reference< XGraphic > > aDocImages( nCommandCount ); Sequence< Reference< XGraphic > > aModImages( nCommandCount ); diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index d9f009ce21ae..a1771caf15c4 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -104,7 +104,7 @@ namespace frm // 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::createFromAscii("com.sun.star.comp.forms.") + ::rtl::OUString::createFromAscii(#ImplName); } + { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.") ) + ::rtl::OUString::createFromAscii(#ImplName); } class OControlModel; diff --git a/forms/source/inc/commandimageprovider.hxx b/forms/source/inc/commandimageprovider.hxx index 8fece35e50e9..caf19b4f2c5f 100644 --- a/forms/source/inc/commandimageprovider.hxx +++ b/forms/source/inc/commandimageprovider.hxx @@ -54,8 +54,7 @@ namespace frm public: virtual CommandImages getCommandImages( const CommandURLs& _rCommandURLs, - const bool _bLarge, - const bool _bHiContrast + const bool _bLarge ) const = 0; virtual ~ICommandImageProvider() { } diff --git a/forms/source/inc/forms_module_impl.hxx b/forms/source/inc/forms_module_impl.hxx index 3269eec68df0..b3063b30546f 100644 --- a/forms/source/inc/forms_module_impl.hxx +++ b/forms/source/inc/forms_module_impl.hxx @@ -135,7 +135,7 @@ namespace FORMS_MODULE_NAMESPACE { ::rtl::OUString aMainKeyName(sRootKey); aMainKeyName += *pImplName; - aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); + aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); try { diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 9235b085d14a..4d481274a681 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -96,7 +96,7 @@ lcl_hasVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents ) const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() ); for ( ; pDesc != pEnd; ++pDesc ) { - if ( pDesc->ScriptType.equals( rtl::OUString::createFromAscii( "VBAInterop" ) ) ) + if ( pDesc->ScriptType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBAInterop") ) ) ) return true; } return false; @@ -112,7 +112,7 @@ lcl_stripVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents ) sal_Int32 nCopied = 0; for ( ; pDesc != pEnd; ++pDesc ) { - if ( !pDesc->ScriptType.equals( rtl::OUString::createFromAscii( "VBAInterop" ) ) ) + if ( !pDesc->ScriptType.equals( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VBAInterop") ) ) ) { sStripped[ nCopied++ ] = *pDesc; } @@ -134,7 +134,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::createFromAscii( "ooo.vba.VBACodeNameProvider" ) ), UNO_QUERY ); + Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBACodeNameProvider") ) ), UNO_QUERY ); if ( !xNameQuery.is() ) break; @@ -152,9 +152,9 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow( const sal_Int32 i_nIn Reference< XPropertySet > xProps( xElement, UNO_QUERY_THROW ); ::rtl::OUString sServiceName; - xProps->getPropertyValue( rtl::OUString::createFromAscii("DefaultControl" ) ) >>= sServiceName; + xProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultControl") ) ) >>= sServiceName; - Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBAToOOEventDesc" ) ), UNO_QUERY_THROW ); + Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( m_xServiceFactory->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooo.vba.VBAToOOEventDesc") ) ), UNO_QUERY_THROW ); Reference< XInterface > xInterface = m_xServiceFactory->createInstance( sServiceName ); Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( xInterface, sCodeName ); // register the vba script events diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx index 8d2e13e0ea69..a4707f03a25d 100644 --- a/forms/source/misc/limitedformats.cxx +++ b/forms/source/misc/limitedformats.cxx @@ -64,8 +64,8 @@ namespace frm //--------------------------------------------------------------------- static const Locale& getLocale(LocaleType _eType) { - static const Locale s_aEnglishUS( ::rtl::OUString::createFromAscii("en"), ::rtl::OUString::createFromAscii("us"), ::rtl::OUString() ); - static const Locale s_aGerman( ::rtl::OUString::createFromAscii("de"), ::rtl::OUString::createFromAscii("DE"), ::rtl::OUString() ); + static const Locale s_aEnglishUS( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en") ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("us") ), ::rtl::OUString() ); + static const Locale s_aGerman( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("de") ), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DE") ), ::rtl::OUString() ); static const ::rtl::OUString s_sEmptyString; static const Locale s_aSystem( s_sEmptyString, s_sEmptyString, s_sEmptyString ); @@ -342,7 +342,7 @@ namespace frm if (!bFoundIt) { // somebody gave us an format which we can't translate - ::rtl::OUString sMessage = ::rtl::OUString::createFromAscii("This control supports only a very limited number of formats."); + ::rtl::OUString sMessage (RTL_CONSTASCII_USTRINGPARAM("This control supports only a very limited number of formats.") ); throw IllegalArgumentException(sMessage, NULL, 2); } diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 2732b86bfc8f..597cb2effb9d 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -134,7 +134,7 @@ void registerClassInfo( //....................................................................................... #define REGISTER_CLASS_CORE(classImplName) \ registerClassInfo( \ - ::rtl::OUString::createFromAscii("com.sun.star.form.") + ::rtl::OUString::createFromAscii(#classImplName), \ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.") ) + ::rtl::OUString::createFromAscii(#classImplName), \ aServices, \ frm::classImplName##_CreateInstance) @@ -229,7 +229,7 @@ void ensureClassInfos() aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD; aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD; - registerClassInfo(::rtl::OUString::createFromAscii("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"), + registerClassInfo(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted") ), aServices, frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted); @@ -287,9 +287,9 @@ void ensureClassInfos() //--------------------------------------------------------------------------------------- void registerServiceProvider(const ::rtl::OUString& _rServiceImplName, const Sequence< ::rtl::OUString >& _rServices, XRegistryKey* _pKey) { - ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/"); + ::rtl::OUString sMainKeyName (RTL_CONSTASCII_USTRINGPARAM("/") ); sMainKeyName += _rServiceImplName; - sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); + sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") ); Reference< XRegistryKey > xNewKey = _pKey->createKey(sMainKeyName); OSL_ENSURE(xNewKey.is(), "forms::registerProvider : could not create a registry key !"); if (!xNewKey.is()) diff --git a/forms/source/resource/makefile.mk b/forms/source/resource/makefile.mk index cde68a98a339..39ffdca28daf 100644 --- a/forms/source/resource/makefile.mk +++ b/forms/source/resource/makefile.mk @@ -42,7 +42,9 @@ SRC1FILES= \ strings.src \ xforms.src -SLOFILES= $(SLO)$/frm_resource.obj \ +EXCEPTIONSFILES= $(SLO)$/frm_resource.obj + +SLOFILES= $(EXCEPTIONSFILES) # --- Targets ---------------------------------- diff --git a/forms/source/richtext/makefile.mk b/forms/source/richtext/makefile.mk index 5c62a1a9e675..b7d08ef379e6 100644 --- a/forms/source/richtext/makefile.mk +++ b/forms/source/richtext/makefile.mk @@ -38,21 +38,21 @@ TARGET=richtext # --- Files ------------------------------------- EXCEPTIONSFILES=\ - $(SLO)$/richtextunowrapper.obj \ - $(SLO)$/richtextmodel.obj \ - $(SLO)$/richtextcontrol.obj \ - $(SLO)$/featuredispatcher.obj \ - $(SLO)$/clipboarddispatcher.obj \ $(SLO)$/attributedispatcher.obj \ + $(SLO)$/clipboarddispatcher.obj \ + $(SLO)$/featuredispatcher.obj \ $(SLO)$/parametrizedattributedispatcher.obj \ - $(SLO)$/specialdispatchers.obj \ + $(SLO)$/richtextcontrol.obj \ $(SLO)$/richtextengine.obj \ - $(SLO)$/richtextimplcontrol.obj - -SLOFILES= $(EXCEPTIONSFILES) \ + $(SLO)$/richtextimplcontrol.obj \ + $(SLO)$/richtextmodel.obj \ + $(SLO)$/richtextunowrapper.obj \ $(SLO)$/richtextvclcontrol.obj \ $(SLO)$/richtextviewport.obj \ $(SLO)$/rtattributehandler.obj \ + $(SLO)$/specialdispatchers.obj + +SLOFILES= $(EXCEPTIONSFILES) # --- Targets ---------------------------------- diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index dd71a80f9172..527e20cc75f3 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -375,7 +375,7 @@ namespace frm void ORichTextPeer::dispose( ) throw(RuntimeException) { { - ::osl::SolarGuard aGuard( GetMutex() ); + SolarMutexGuard aGuard; RichTextControl* pRichTextControl = static_cast< RichTextControl* >( GetWindow() ); if ( pRichTextControl ) diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index 601af810779b..7744168f9ef4 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -414,7 +414,7 @@ namespace frm ::rtl::OUString sValue = ::rtl::OUString::valueOf( sal_Int32( nCount ) ); if ( !bFinalCount ) - sValue += ::rtl::OUString::createFromAscii( " *" ); + sValue += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" *") ); aState.State <<= sValue; aState.Enabled = sal_True; diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 7e5974971283..b1c6f0d3a588 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -369,8 +369,6 @@ namespace frm if ( !m_pImageProvider ) return; - const bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - const USHORT nItemCount = m_pToolbar->GetItemCount(); // collect the FormFeatures in the toolbar @@ -396,7 +394,7 @@ namespace frm } // retrieve the images for the command URLs - CommandImages aCommandImages = m_pImageProvider->getCommandImages( aCommandURLs, m_eImageSize == eLarge, bIsHighContrast ); + CommandImages aCommandImages = m_pImageProvider->getCommandImages( aCommandURLs, m_eImageSize == eLarge ); // and set them at the toolbar CommandImages::const_iterator commandImage = aCommandImages.begin(); @@ -547,9 +545,6 @@ namespace frm m_pToolbar->SetControlBackground(); forEachItemWindow( &NavigationToolBar::setItemBackground, NULL ); - // the contrast of the background color may have changed, so force - // the images to be rebuild (high contrast requires a possibly different - // image set) implUpdateImages(); } @@ -560,9 +555,6 @@ namespace frm m_pToolbar->SetControlBackground( _rColor ); forEachItemWindow( &NavigationToolBar::setItemBackground, &_rColor ); - // the contrast of the background color may have changed, so force - // the images to be rebuild (high contrast requires a possibly different - // image set) implUpdateImages(); } diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx index 244e1443e6cb..20509dd30040 100644 --- a/forms/source/xforms/model_ui.cxx +++ b/forms/source/xforms/model_ui.cxx @@ -954,7 +954,7 @@ OUString Model::getResultForExpression( pBinding->getMIPEvaluationContexts(); for( std::vector<EvaluationContext>::iterator aIter = aContext.begin(); aIter != aContext.end(); - aIter ++ ) + ++aIter ) { aExpression.evaluate( *aIter ); aBuffer.append( lcl_serializeForDisplay(aExpression.getXPath()) ); diff --git a/forms/source/xforms/submission.cxx b/forms/source/xforms/submission.cxx index deafc88cb5e9..aece48afe574 100644 --- a/forms/source/xforms/submission.cxx +++ b/forms/source/xforms/submission.cxx @@ -665,7 +665,7 @@ Reference< XDocumentFragment > Submission::createSubmissionDocument(const Refere { using namespace com::sun::star::xml::xpath; Reference< XDocumentBuilder > aDocBuilder(m_aFactory->createInstance( - OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")), UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder"))), UNO_QUERY); Reference< XDocument > aDocument = aDocBuilder->newDocument(); Reference< XDocumentFragment > aFragment = aDocument->createDocumentFragment(); diff --git a/forms/source/xforms/submission/replace.cxx b/forms/source/xforms/submission/replace.cxx index da5968bc0123..cfcdb1626439 100644 --- a/forms/source/xforms/submission/replace.cxx +++ b/forms/source/xforms/submission/replace.cxx @@ -67,19 +67,18 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla if (!xLoader.is()) xLoader = Reference< XComponentLoader >(xFactory->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY_THROW); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop") ) ), UNO_QUERY_THROW); // open the stream from the result... // build media descriptor Sequence< PropertyValue > descriptor(2); - descriptor[0] = PropertyValue(::rtl::OUString::createFromAscii( - "InputStream"), -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE); - descriptor[1] = PropertyValue(::rtl::OUString::createFromAscii( - "ReadOnly"), -1, makeAny(sal_True), PropertyState_DIRECT_VALUE); + descriptor[0] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream") ), + -1, makeAny(m_aResultStream), PropertyState_DIRECT_VALUE); + descriptor[1] = PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly") ), + -1, makeAny(sal_True), PropertyState_DIRECT_VALUE); - //::rtl::OUString aURL = ::rtl::OUString::createFromAscii("private:stream"); ::rtl::OUString aURL = m_aURLObj.GetMainURL(INetURLObject::NO_DECODE); - ::rtl::OUString aTarget = ::rtl::OUString::createFromAscii("_default"); + ::rtl::OUString aTarget = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default") ); xLoader->loadComponentFromURL(aURL, aTarget, FrameSearchFlag::ALL, descriptor); return CSubmission::SUCCESS; @@ -88,7 +87,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla if (aDocument.is()) { // parse the result stream into a new document Reference< XDocumentBuilder > xBuilder(xFactory->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")), UNO_QUERY_THROW); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.DocumentBuilder") ) ), UNO_QUERY_THROW); Reference< XDocument > aNewDocument = xBuilder->parse(m_aResultStream); if (aNewDocument.is()) { @@ -96,7 +95,6 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla Reference< XElement > oldRoot = aDocument->getDocumentElement(); Reference< XElement > newRoot = aNewDocument->getDocumentElement(); - // aDocument->removeChild(Reference< XNode >(oldRoot, UNO_QUERY_THROW)); Reference< XNode > aImportedNode = aDocument->importNode(Reference< XNode >(newRoot, UNO_QUERY_THROW), sal_True); Reference< XNode >(aDocument, UNO_QUERY_THROW)->replaceChild(aImportedNode, Reference< XNode >(oldRoot, UNO_QUERY_THROW)); return CSubmission::SUCCESS; @@ -131,7 +129,7 @@ CSubmission::SubmissionResult CSubmission::replace(const ::rtl::OUString& aRepla pHelper->m_aInteractionHandler = _xHandler; else pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler")), UNO_QUERY); + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), UNO_QUERY); OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler"); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; diff --git a/forms/source/xforms/submission/serialization_app_xml.cxx b/forms/source/xforms/submission/serialization_app_xml.cxx index 76989ad7fdfb..c3e2ab545668 100644 --- a/forms/source/xforms/submission/serialization_app_xml.cxx +++ b/forms/source/xforms/submission/serialization_app_xml.cxx @@ -45,7 +45,7 @@ CSerializationAppXML::CSerializationAppXML() : m_aFactory(utl::getProcessServiceFactory()) , m_aPipe(CSS::uno::Reference< CSS::io::XOutputStream > (m_aFactory->createInstance( - rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), CSS::uno::UNO_QUERY)) + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) ), CSS::uno::UNO_QUERY)) { OSL_ENSURE(m_aPipe.is(), "cannot create Pipe"); } diff --git a/forms/source/xforms/submission/serialization_urlencoded.cxx b/forms/source/xforms/submission/serialization_urlencoded.cxx index cb6403c8d13e..e5ab54533e61 100644 --- a/forms/source/xforms/submission/serialization_urlencoded.cxx +++ b/forms/source/xforms/submission/serialization_urlencoded.cxx @@ -52,7 +52,7 @@ using namespace CSS::xml::dom; CSerializationURLEncoded::CSerializationURLEncoded() : m_aFactory(getProcessServiceFactory()) , m_aPipe(Reference< XOutputStream > (m_aFactory->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY)) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe") ) ), UNO_QUERY)) { } diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx index 95d1ce3ce2be..c8e87fa68a04 100644 --- a/forms/source/xforms/submission/submission_get.cxx +++ b/forms/source/xforms/submission/submission_get.cxx @@ -71,7 +71,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< pHelper->m_aInteractionHandler = aInteractionHandler; else pHelper->m_aInteractionHandler = CSS::uno::Reference< XInteractionHandler >(m_aFactory->createInstance( - OUString::createFromAscii("com.sun.star.task.InteractionHandler")), UNO_QUERY); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler"))), UNO_QUERY); OSL_ENSURE(pHelper->m_aInteractionHandler.is(), "failed to create IntreractionHandler"); CProgressHandlerHelper *pProgressHelper = new CProgressHandlerHelper; pHelper->m_aProgressHandler = CSS::uno::Reference< XProgressHandler >(pProgressHelper); @@ -98,7 +98,7 @@ CSubmission::SubmissionResult CSubmissionGet::submit(const CSS::uno::Reference< OUString aQueryURL = OStringToOUString(aUTF8QueryURL.makeStringAndClear(), RTL_TEXTENCODING_UTF8); ucbhelper::Content aContent(aQueryURL, aEnvironment); CSS::uno::Reference< XOutputStream > aPipe(m_aFactory->createInstance( - OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY_THROW); + OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe"))), UNO_QUERY_THROW); aContent.openStream(aPipe); // get reply try { diff --git a/forms/source/xforms/submission/submission_post.cxx b/forms/source/xforms/submission/submission_post.cxx index fc2fde7d3668..c76d492873d9 100644 --- a/forms/source/xforms/submission/submission_post.cxx +++ b/forms/source/xforms/submission/submission_post.cxx @@ -67,15 +67,12 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const CSS::uno::Reference< // use post command - OUString aCommandName = OUString::createFromAscii("post"); + OUString aCommandName(RTL_CONSTASCII_USTRINGPARAM("post")); PostCommandArgument2 aPostArgument; aPostArgument.Source = apSerialization->getInputStream(); - //CSS::uno::Reference< XInterface > aSink( m_aFactory->createInstance( - // OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY_THROW); CSS::uno::Reference< XActiveDataSink > aSink(new ucbhelper::ActiveDataSink); - // OUString::createFromAscii("com.sun.star.io.Pipe")), UNO_QUERY_THROW); aPostArgument.Sink = aSink; - aPostArgument.MediaType = OUString::createFromAscii("application/xml"); + aPostArgument.MediaType = OUString(RTL_CONSTASCII_USTRINGPARAM("application/xml")); aPostArgument.Referer = OUString(); Any aCommandArgument; aCommandArgument <<= aPostArgument; diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx index 26bc2b7640fc..28ff7941996c 100644 --- a/forms/source/xforms/xpathlib/extension.cxx +++ b/forms/source/xforms/xpathlib/extension.cxx @@ -46,22 +46,19 @@ using com::sun::star::xml::dom::XNode; Reference< XInterface > SAL_CALL CLibxml2XFormsExtension::Create( const Reference< XMultiServiceFactory >& /*aFactory*/) { - // printf("_create_\n"); Reference< XInterface > aInstance(static_cast< XXPathExtension* >(new CLibxml2XFormsExtension(/*aFactory*/))); return aInstance; } ::rtl::OUString SAL_CALL CLibxml2XFormsExtension::getImplementationName_Static() { - // printf("_implname_\n"); - return ::rtl::OUString::createFromAscii("com.sun.star.comp.xml.xpath.XFormsExtension"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.xml.xpath.XFormsExtension") ); } Sequence< ::rtl::OUString > SAL_CALL CLibxml2XFormsExtension::getSupportedServiceNames_Static() { - // printf("_services_\n"); Sequence< ::rtl::OUString > aSequence(1); - aSequence[0] = ::rtl::OUString::createFromAscii("com.sun.star.xml.xpath.XPathExtension"); + aSequence[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.xpath.XPathExtension") ); return aSequence; } diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx index 49918c7c8b6f..9a6f59a1592f 100644 --- a/forms/source/xforms/xpathlib/xpathlib.cxx +++ b/forms/source/xforms/xpathlib/xpathlib.cxx @@ -211,7 +211,7 @@ void xforms_countNonEmptyFunction(xmlXPathParserContextPtr ctxt, int nargs) for (int i = 0; i < xmlXPathNodeSetGetLength(pNodeSet); i++) { aString = xmlXPathCastNodeToString(xmlXPathNodeSetItem(pNodeSet, i)); - if (strlen((char*)aString) > 0) nNotEmpty++; + if (*aString != 0) nNotEmpty++; } xmlXPathReturnNumber(ctxt, nNotEmpty); } @@ -311,10 +311,10 @@ static sal_Bool parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTim sal_Int32 nDateLength = 10; sal_Int32 nTimeLength = 8; - ::rtl::OUString aDateTimeSep = ::rtl::OUString::createFromAscii("T"); - ::rtl::OUString aDateSep = ::rtl::OUString::createFromAscii("-"); - ::rtl::OUString aTimeSep = ::rtl::OUString::createFromAscii(":"); - ::rtl::OUString aUTCString = ::rtl::OUString::createFromAscii("Z"); + ::rtl::OUString aDateTimeSep(RTL_CONSTASCII_USTRINGPARAM("T")); + ::rtl::OUString aDateSep(RTL_CONSTASCII_USTRINGPARAM("-")); + ::rtl::OUString aTimeSep(RTL_CONSTASCII_USTRINGPARAM(":")); + ::rtl::OUString aUTCString(RTL_CONSTASCII_USTRINGPARAM("Z")); ::rtl::OUString aDateString = aDateTimeString.copy(0, nDateLength); ::rtl::OUString aTimeString = aDateTimeString.copy(nDateLength+1, nTimeLength); diff --git a/forms/source/xforms/xpathlib/xpathlib.hxx b/forms/source/xforms/xpathlib/xpathlib.hxx index 109f32837591..2a74c1899bc8 100644 --- a/forms/source/xforms/xpathlib/xpathlib.hxx +++ b/forms/source/xforms/xpathlib/xpathlib.hxx @@ -16,38 +16,11 @@ * An XPath parser context. It contains pure parsing informations, * an xmlXPathContext, and the stack of objects. */ -#if 0 -// for reference from xpath.h -struct _xmlXPathParserContext { - const xmlChar *cur; /* the current char being parsed */ - const xmlChar *base; /* the full expression */ - - int error; /* error code */ - - xmlXPathContextPtr context; /* the evaluation context */ - xmlXPathObjectPtr value; /* the current value */ - int valueNr; /* number of values stacked */ - int valueMax; /* max number of values stacked */ - xmlXPathObjectPtr *valueTab; /* stack of values */ - - xmlXPathCompExprPtr comp; /* the precompiled expression */ - int xptr; /* it this an XPointer expression */ - xmlNodePtr ancestor; /* used for walking preceding axis */ -}; - -#endif extern "C" { // XForms -/* -void xforms_getInstanceDocumentFunction(xmlXPathParserContextPtr ctxt, int nargs); -void xforms_rebuildFunction(xmlXPathParserContextPtr ctxt, int nargs); -void xforms_recalculateFunction(xmlXPathParserContextPtr ctxt, int nargs); -void xforms_revalidateFunction(xmlXPathParserContextPtr ctxt, int nargs); -void xforms_refreshFunction(xmlXPathParserContextPtr ctxt, int nargs); -*/ // XForms Core Functions // boolean functions |