[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_forms binfilter/bf_offmgr binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/binfilterdetect binfilter/filter binfilter/inc
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Nov 18 12:17:27 PST 2010
binfilter/bf_basic/source/basmgr/basmgr.cxx | 2
binfilter/bf_basic/source/classes/sbunoobj.cxx | 2
binfilter/bf_forms/source/component/FormComponent.hxx | 2
binfilter/bf_forms/source/component/forms_ComboBox.cxx | 4
binfilter/bf_forms/source/component/forms_Currency.cxx | 4
binfilter/bf_forms/source/component/forms_DatabaseForm.cxx | 34 ++--
binfilter/bf_forms/source/component/forms_Edit.cxx | 4
binfilter/bf_forms/source/component/forms_Filter.cxx | 22 +--
binfilter/bf_forms/source/component/forms_FormComponent.cxx | 4
binfilter/bf_forms/source/component/forms_FormattedField.cxx | 2
binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx | 2
binfilter/bf_forms/source/component/forms_FormsCollection.cxx | 4
binfilter/bf_forms/source/component/forms_Image.cxx | 4
binfilter/bf_forms/source/component/forms_ImageControl.cxx | 4
binfilter/bf_forms/source/component/forms_ListBox.cxx | 8 -
binfilter/bf_forms/source/misc/forms_formsmodule.cxx | 2
binfilter/bf_forms/source/misc/forms_limitedformats.cxx | 4
binfilter/bf_forms/source/misc/forms_services.cxx | 8 -
binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx | 4
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 8 -
binfilter/bf_sc/source/core/tool/sc_appoptio.cxx | 2
binfilter/bf_sc/source/core/tool/sc_docoptio.cxx | 2
binfilter/bf_sc/source/core/tool/sc_viewopti.cxx | 8 -
binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx | 8 -
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 10 -
binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx | 4
binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx | 2
binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx | 2
binfilter/bf_sch/source/ui/app/sch_schopt.cxx | 4
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx | 10 -
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx | 18 +-
binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx | 2
binfilter/bf_sch/source/ui/unoidl/sch_ChartArea.cxx | 12 -
binfilter/bf_sch/source/ui/unoidl/sch_ChartGrid.cxx | 10 -
binfilter/bf_sch/source/ui/unoidl/sch_ChartLegend.cxx | 16 +-
binfilter/bf_sch/source/ui/unoidl/sch_ChartLine.cxx | 10 -
binfilter/bf_sch/source/ui/unoidl/sch_ChartTitle.cxx | 12 -
binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx | 4
binfilter/bf_sd/source/ui/app/sd_sdlib.cxx | 2
binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx | 2
binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx | 4
binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx | 2
binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx | 2
binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx | 8 -
binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx | 4
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx | 4
binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx | 6
binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx | 6
binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx | 6
binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx | 28 +--
binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx | 2
binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx | 2
binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx | 6
binfilter/bf_so3/source/dialog/insdlg.cxx | 8 -
binfilter/bf_so3/source/inplace/plugin.cxx | 2
binfilter/bf_so3/source/misc/factory.cxx | 18 +-
binfilter/bf_so3/source/persist/binddata.cxx | 8 -
binfilter/bf_so3/source/persist/transprt.cxx | 33 ++--
binfilter/bf_so3/source/persist/transuno.cxx | 4
binfilter/bf_starmath/source/starmath_mathml.cxx | 4
binfilter/bf_svtools/source/config/svt_helpopt.cxx | 2
binfilter/bf_svtools/source/config/svt_itemholder1.cxx | 2
binfilter/bf_svtools/source/config/svt_itemholder2.cxx | 2
binfilter/bf_svtools/source/config/svt_pathoptions.cxx | 4
binfilter/bf_svtools/source/config/svt_saveopt.cxx | 24 +--
binfilter/bf_svtools/source/config/svt_searchopt.cxx | 2
binfilter/bf_svtools/source/config/svt_sourceviewconfig.cxx | 2
binfilter/bf_svtools/source/config/svt_undoopt.cxx | 2
binfilter/bf_svtools/source/config/svt_useroptions.cxx | 2
binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigCache.cxx | 10 -
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx | 6
binfilter/bf_svtools/source/items/svt_globalnameitem.cxx | 2
binfilter/bf_svtools/source/items1/svt_ilstitem.cxx | 2
binfilter/bf_svtools/source/misc1/svt_fstathelper.cxx | 2
binfilter/bf_svtools/source/numbers/svt_numfmuno.cxx | 8 -
binfilter/bf_svtools/source/numbers/svt_supservs.cxx | 4
binfilter/bf_svtools/source/uno/svt_registerservices.cxx | 14 -
binfilter/bf_svx/source/editeng/svx_impedit3.cxx | 2
binfilter/bf_svx/source/form/svx_fmdmod.cxx | 4
binfilter/bf_svx/source/form/svx_fmdpage.cxx | 4
binfilter/bf_svx/source/form/svx_fmpgeimp.cxx | 8 -
binfilter/bf_svx/source/items/svx_frmitems.cxx | 2
binfilter/bf_svx/source/items/svx_numitem.cxx | 2
binfilter/bf_svx/source/items/svx_xmlcnitm.cxx | 4
binfilter/bf_svx/source/svdraw/svx_svdpagv.cxx | 4
binfilter/bf_svx/source/unodraw/svx_unontabl.cxx | 2
binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx | 4
binfilter/bf_svx/source/unoedit/svx_unofield.cxx | 4
binfilter/bf_svx/source/xml/svx_xmlgrhlp.cxx | 2
binfilter/bf_svx/source/xoutdev/svx__xfont.cxx | 2
binfilter/bf_sw/source/core/bastyp/sw_breakit.cxx | 2
binfilter/bf_sw/source/core/bastyp/sw_checkit.cxx | 2
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 2
binfilter/bf_sw/source/core/ole/sw_ndole.cxx | 4
binfilter/bf_sw/source/core/tox/sw_toxhlp.cxx | 3
binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx | 18 +-
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_swxml.cxx | 4
binfilter/bf_sw/source/ui/app/sw_docsh.cxx | 4
binfilter/bf_sw/source/ui/app/sw_swmodule.cxx | 2
binfilter/bf_xmloff/source/chart/xmloff_PropertyMaps.cxx | 10 -
binfilter/bf_xmloff/source/chart/xmloff_SchXMLChartContext.cxx | 28 +--
binfilter/bf_xmloff/source/chart/xmloff_SchXMLExport.cxx | 24 +--
binfilter/bf_xmloff/source/chart/xmloff_SchXMLImport.cxx | 4
binfilter/bf_xmloff/source/chart/xmloff_SchXMLPlotAreaContext.cxx | 72 +++++-----
binfilter/bf_xmloff/source/core/xmloff_unoatrcn.cxx | 6
binfilter/bf_xmloff/source/draw/xmloff_sdxmlexp.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_sdxmlimp.cxx | 4
binfilter/bf_xmloff/source/draw/xmloff_shapeexport.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_shapeexport2.cxx | 2
binfilter/bf_xmloff/source/draw/xmloff_xexptran.cxx | 48 +++---
binfilter/bf_xmloff/source/forms/xmloff_elementimport.cxx | 4
binfilter/bf_xmloff/source/forms/xmloff_eventexport.cxx | 4
binfilter/bf_xmloff/source/forms/xmloff_layerexport.cxx | 4
binfilter/bf_xmloff/source/forms/xmloff_propertyexport.cxx | 2
binfilter/bf_xmloff/source/forms/xmloff_propertyimport.cxx | 18 +-
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx | 2
binfilter/bf_xmloff/source/style/xmloff_xmlnumfi.cxx | 4
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx | 2
binfilter/bf_xmloff/source/text/xmloff_txtfldi.cxx | 2
binfilter/binfilterdetect/source/bindetect.cxx | 6
binfilter/filter/source/bf_migrate/bf_migrateexports.cxx | 4
binfilter/filter/source/bf_migrate/bf_migratefilter.cxx | 16 +-
binfilter/filter/source/bf_offwrp/bf_wrapper.cxx | 2
binfilter/inc/bf_sfx2/sfxuno.hxx | 4
binfilter/inc/bf_starmath/unomodel.hxx | 2
137 files changed, 452 insertions(+), 456 deletions(-)
New commits:
commit 9d22944ee9ac7298d8510db680dca26c603d5979
Author: Kevin Hunter <hunteke at earlham.edu>
Date: Thu Nov 18 08:36:30 2010 -0500
EasyHack: RTL macro from createFromAscii
Compiles cleanly and should take care of the rest of the
createFromAscii cases in binfilter
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index cc1b0e1..04a4bd0 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -2186,7 +2186,7 @@ Any ModuleContainer_Impl::getByName( const OUString& aName )
if( !pMod )
throw NoSuchElementException();
Reference< XStarBasicModuleInfo > xMod = (XStarBasicModuleInfo*)new ModuleInfo_Impl
- ( aName, OUString::createFromAscii( "StarBasic" ), pMod->GetSource32() );
+ ( aName, OUString( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" )), pMod->GetSource32() );
Any aRetAny;
aRetAny <<= xMod;
return aRetAny;
diff --git a/binfilter/bf_basic/source/classes/sbunoobj.cxx b/binfilter/bf_basic/source/classes/sbunoobj.cxx
index 4853691..444f5e4 100644
--- a/binfilter/bf_basic/source/classes/sbunoobj.cxx
+++ b/binfilter/bf_basic/source/classes/sbunoobj.cxx
@@ -2099,7 +2099,7 @@ void SbUnoObject::doIntrospection( void )
Reference< XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory() );
if ( xFactory.is() )
{
- Reference< XInterface > xI = xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") );
+ Reference< XInterface > xI = xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.Introspection" )) );
if (xI.is())
xIntrospection = Reference< XIntrospection >::query( xI );
//xI->queryInterface( ::getCppuType( (const Reference< XIntrospection > *)0 ), xIntrospection );
diff --git a/binfilter/bf_forms/source/component/FormComponent.hxx b/binfilter/bf_forms/source/component/FormComponent.hxx
index 1afdfc3..c6fa47c 100644
--- a/binfilter/bf_forms/source/component/FormComponent.hxx
+++ b/binfilter/bf_forms/source/component/FormComponent.hxx
@@ -69,7 +69,7 @@ const sal_Int16 FRM_DEFAULT_TABINDEX = 0;
// 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); }
// macro for overriding the getInfoServive method of OAggregationArrayUsageHelper
#define IMPLEMENT_INFO_SERVICE() \
diff --git a/binfilter/bf_forms/source/component/forms_ComboBox.cxx b/binfilter/bf_forms/source/component/forms_ComboBox.cxx
index 0fbff97..a80a548 100644
--- a/binfilter/bf_forms/source/component/forms_ComboBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_ComboBox.cxx
@@ -520,7 +520,7 @@ void OComboBoxModel::loadData()
::rtl::OUString aStatement( RTL_CONSTASCII_USTRINGPARAM( "SELECT DISTINCT " ));
aStatement += quoteName(aQuote, aFieldName);
- aStatement += ::rtl::OUString::createFromAscii(" FROM ");
+ aStatement += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " FROM " ));
aStatement += quoteTableName(xMeta, m_aListSource,::dbtools::eInDataManipulation);
xStmt = xConnection->createStatement();
@@ -679,7 +679,7 @@ void OComboBoxModel::_loaded(const EventObject& rEvent)
m_xFormatter->attachNumberFormatsSupplier(xSupplier);
m_nKeyType = getNumberFormatType(xSupplier->getNumberFormats(), m_nFormatKey);
- xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString::createFromAscii("NullDate")) >>= m_aNullDate;
+ xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ))) >>= m_aNullDate;
}
}
diff --git a/binfilter/bf_forms/source/component/forms_Currency.cxx b/binfilter/bf_forms/source/component/forms_Currency.cxx
index 4007657..b248c7d 100644
--- a/binfilter/bf_forms/source/component/forms_Currency.cxx
+++ b/binfilter/bf_forms/source/component/forms_Currency.cxx
@@ -128,11 +128,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/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
index 3ee4b5d..138bb5e 100644
--- a/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
+++ b/binfilter/bf_forms/source/component/forms_DatabaseForm.cxx
@@ -104,7 +104,7 @@ enum DatabaseCursorType
#include "bf_so3/staticbaseurl.hxx"
namespace binfilter {
-#define DATABASEFORM_IMPLEMENTATION_NAME ::rtl::OUString::createFromAscii("com.sun.star.comp.forms.ODatabaseForm")
+#define DATABASEFORM_IMPLEMENTATION_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.ODatabaseForm" ))
using namespace ::dbtools;
using namespace ::comphelper;
@@ -549,7 +549,7 @@ ODatabaseForm::~ODatabaseForm()
aResult += UniString('=');
aResult += pSuccObj->aValue;
if (pSuccObj < aSuccObjList.end() - 1)
- aResult += ::rtl::OUString::createFromAscii("\r\n");
+ aResult += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\r\n" ));
}
@@ -996,7 +996,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;
@@ -1043,7 +1043,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const ::rtl::OUStr
// Header
- ::rtl::OUString aContentDisp = ::rtl::OUString::createFromAscii("form-data; name=\"");
+ ::rtl::OUString aContentDisp = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "form-data; name=\""));
aContentDisp += rName;
aContentDisp += UniString('\"');
pChild->SetContentDisposition( aContentDisp );
@@ -1108,15 +1108,15 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const ::rtl::O
// Header
- ::rtl::OUString aContentDisp = ::rtl::OUString::createFromAscii( "form-data; name=\"" );
+ ::rtl::OUString aContentDisp = ::rtl::OUString( 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
@@ -2166,7 +2166,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
@@ -2199,7 +2199,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);
}
@@ -2217,7 +2217,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
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
@@ -2226,7 +2226,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
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);
@@ -2259,15 +2259,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);
@@ -2297,7 +2297,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
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
@@ -2305,7 +2305,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
Sequence< sal_Int8 > aPostData((sal_Int8*)aSystemEncodedData.GetBuffer(), aSystemEncodedData.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);
@@ -3548,7 +3548,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/binfilter/bf_forms/source/component/forms_Edit.cxx b/binfilter/bf_forms/source/component/forms_Edit.cxx
index 98fa3f1..9a45009 100644
--- a/binfilter/bf_forms/source/component/forms_Edit.cxx
+++ b/binfilter/bf_forms/source/component/forms_Edit.cxx
@@ -554,7 +554,7 @@ void OEditModel::_loaded(const EventObject& rEvent)
m_xFormatter->attachNumberFormatsSupplier(xSupplier);
m_nKeyType = getNumberFormatType(xSupplier->getNumberFormats(), m_nFormatKey);
- xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString::createFromAscii("NullDate"))
+ xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" )))
>>= m_aNullDate;
}
@@ -564,7 +564,7 @@ void OEditModel::_loaded(const EventObject& rEvent)
if ( !m_bMaxTextLenModified )
{
sal_Int32 nFieldLen;
- xField->getPropertyValue(::rtl::OUString::createFromAscii("Precision")) >>= nFieldLen;
+ xField->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Precision" ))) >>= nFieldLen;
if (nFieldLen && nFieldLen <= USHRT_MAX)
{
diff --git a/binfilter/bf_forms/source/component/forms_Filter.cxx b/binfilter/bf_forms/source/component/forms_Filter.cxx
index b4dcab0..8893605 100644
--- a/binfilter/bf_forms/source/component/forms_Filter.cxx
+++ b/binfilter/bf_forms/source/component/forms_Filter.cxx
@@ -158,22 +158,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;
}
@@ -294,10 +294,10 @@ namespace frm
switch (rEvent.Selected)
{
case STATE_CHECK:
- aText = ::rtl::OUString::createFromAscii("1");
+ aText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "1" ));
break;
case STATE_NOCHECK:
- aText = ::rtl::OUString::createFromAscii("0");
+ aText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "0" ));
break;
}
} break;
@@ -456,7 +456,7 @@ namespace frm
sal_Int32 nFormatKey = 0;
try
{
- m_xFormatter->getNumberFormatsSupplier()->getNumberFormatSettings()->getPropertyValue(::rtl::OUString::createFromAscii("NullDate"))
+ m_xFormatter->getNumberFormatsSupplier()->getNumberFormatSettings()->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" )))
>>= aNullDate;
nFormatKey = ::comphelper::getINT32(m_xField->getPropertyValue(PROPERTY_FORMATKEY));
}
@@ -544,9 +544,9 @@ namespace frm
if (xVclWindow.is())
{
Any aValue;
- if (aText.equals(::rtl::OUString::createFromAscii("1")))
+ if (aText.equals(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "1" ))))
aValue <<= (sal_Int32)STATE_CHECK;
- else if (aText.compareTo(::rtl::OUString::createFromAscii("0")) == 0)
+ else if (aText.compareTo(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "0" ))) == 0)
aValue <<= (sal_Int32)STATE_NOCHECK;
else
aValue <<= (sal_Int32)STATE_DONTKNOW;
diff --git a/binfilter/bf_forms/source/component/forms_FormComponent.cxx b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
index 8d6df7e..1e9d729 100644
--- a/binfilter/bf_forms/source/component/forms_FormComponent.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormComponent.cxx
@@ -598,7 +598,7 @@ Sequence<rtl::OUString> SAL_CALL OControlModel::getSupportedServiceNames() throw
aSupported.realloc(aSupported.getLength() + 2);
::rtl::OUString* pArray = aSupported.getArray();
pArray[aSupported.getLength()-2] = FRM_SUN_FORMCOMPONENT;
- pArray[aSupported.getLength()-1] = ::rtl::OUString::createFromAscii("com.sun.star.form.FormControlModel");
+ pArray[aSupported.getLength()-1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.FormControlModel" ));
return aSupported;
}
@@ -1003,7 +1003,7 @@ StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(Run
aSupported.realloc(aSupported.getLength() + 1);
::rtl::OUString* pArray = aSupported.getArray();
- pArray[aSupported.getLength()-1] = ::rtl::OUString::createFromAscii("com.sun.star.form.DataAwareControlModel");
+ pArray[aSupported.getLength()-1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.DataAwareControlModel" ));
return aSupported;
}
diff --git a/binfilter/bf_forms/source/component/forms_FormattedField.cxx b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
index fb4ca5c..a56f6ac 100644
--- a/binfilter/bf_forms/source/component/forms_FormattedField.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
@@ -406,7 +406,7 @@ StringSequence OFormattedModel::getSupportedServiceNames() throw()
aSupported.realloc(aSupported.getLength() + 2);
::rtl::OUString*pArray = aSupported.getArray();
- pArray[aSupported.getLength()-2] = ::rtl::OUString::createFromAscii("com.sun.star.form.component.DatabaseFormattedField");
+ pArray[aSupported.getLength()-2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DatabaseFormattedField" ));
pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_FORMATTEDFIELD;
return aSupported;
}
diff --git a/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx b/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx
index 68cfe20..3595914 100644
--- a/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormattedFieldWrapper.cxx
@@ -214,7 +214,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/binfilter/bf_forms/source/component/forms_FormsCollection.cxx b/binfilter/bf_forms/source/component/forms_FormsCollection.cxx
index 9a3631a..ea10aeb 100644
--- a/binfilter/bf_forms/source/component/forms_FormsCollection.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormsCollection.cxx
@@ -106,7 +106,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" ));
}
//------------------------------------------------------------------------------
@@ -126,7 +126,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/binfilter/bf_forms/source/component/forms_Image.cxx b/binfilter/bf_forms/source/component/forms_Image.cxx
index c4e8795..a2af775 100644
--- a/binfilter/bf_forms/source/component/forms_Image.cxx
+++ b/binfilter/bf_forms/source/component/forms_Image.cxx
@@ -365,7 +365,7 @@ void OImageControl::actionPerformed_Impl(sal_Bool bNotifyListener, 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);
sal_Bool bDispatchUrlInternal = sal_False;
xSet->getPropertyValue(PROPERTY_DISPATCHURLINTERNAL) >>= bDispatchUrlInternal;
@@ -383,7 +383,7 @@ void OImageControl::actionPerformed_Impl(sal_Bool bNotifyListener, const ::com::
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/binfilter/bf_forms/source/component/forms_ImageControl.cxx b/binfilter/bf_forms/source/component/forms_ImageControl.cxx
index 52dd833..af07cc7 100644
--- a/binfilter/bf_forms/source/component/forms_ImageControl.cxx
+++ b/binfilter/bf_forms/source/component/forms_ImageControl.cxx
@@ -233,7 +233,7 @@ void OImageControlModel::_propertyChanged( const PropertyChangeEvent& rEvt )
Reference<XActiveDataSink> xSink(
m_xServiceFactory->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.io.ObjectInputStream")), UNO_QUERY);
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.ObjectInputStream" ))), UNO_QUERY);
if (!xSink.is())
return;
@@ -651,7 +651,7 @@ void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent&
// is this a request for a context menu?
if ( e.PopupTrigger )
{
- Reference< XPopupMenu > xMenu( m_xServiceFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.awt.PopupMenu" ) ), UNO_QUERY );
+ Reference< XPopupMenu > xMenu( m_xServiceFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.PopupMenu" )) ), UNO_QUERY );
DBG_ASSERT( xMenu.is(), "OImageControlControl::mousePressed: could not create a popup menu!" );
Reference< XWindowPeer > xWindowPeer = getPeer();
diff --git a/binfilter/bf_forms/source/component/forms_ListBox.cxx b/binfilter/bf_forms/source/component/forms_ListBox.cxx
index 3039c17..209e177 100644
--- a/binfilter/bf_forms/source/component/forms_ListBox.cxx
+++ b/binfilter/bf_forms/source/component/forms_ListBox.cxx
@@ -643,15 +643,15 @@ void OListBoxModel::loadData()
::rtl::OUString aQuote = xMeta->getIdentifierQuoteString();
::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 " ));
aStatement += quoteTableName(xMeta, sListSource,::dbtools::eInDataManipulation);
xContentSetProperties->setPropertyValue(PROPERTY_COMMAND, makeAny(aStatement));
@@ -777,7 +777,7 @@ void OListBoxModel::loadData()
{
xFormatter->attachNumberFormatsSupplier(xSupplier);
xFormatter->getNumberFormatsSupplier()->getNumberFormatSettings()->getPropertyValue(
- ::rtl::OUString::createFromAscii("NullDate")) >>= aNullDate;
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ))) >>= aNullDate;
nKeyType = getNumberFormatType(xFormatter->getNumberFormatsSupplier()->getNumberFormats(), nFormatKey);
}
}
diff --git a/binfilter/bf_forms/source/misc/forms_formsmodule.cxx b/binfilter/bf_forms/source/misc/forms_formsmodule.cxx
index 833b392..e062891 100644
--- a/binfilter/bf_forms/source/misc/forms_formsmodule.cxx
+++ b/binfilter/bf_forms/source/misc/forms_formsmodule.cxx
@@ -157,7 +157,7 @@ namespace frm
{
::rtl::OUString aMainKeyName(sRootKey);
aMainKeyName += *pImplName;
- aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+ aMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
try
{
diff --git a/binfilter/bf_forms/source/misc/forms_limitedformats.cxx b/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
index 13cbe6b..248d677 100644
--- a/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
+++ b/binfilter/bf_forms/source/misc/forms_limitedformats.cxx
@@ -63,8 +63,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 );
diff --git a/binfilter/bf_forms/source/misc/forms_services.cxx b/binfilter/bf_forms/source/misc/forms_services.cxx
index 9237483..844ee6f 100644
--- a/binfilter/bf_forms/source/misc/forms_services.cxx
+++ b/binfilter/bf_forms/source/misc/forms_services.cxx
@@ -303,7 +303,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)
@@ -395,8 +395,8 @@ void ensureClassInfos()
aServices.realloc(3);
aServices.getArray()[0] = frm::FRM_COMPONENT_FORMATTEDFIELD;
aServices.getArray()[1] = frm::FRM_SUN_COMPONENT_FORMATTEDFIELD;
- aServices.getArray()[2] = ::rtl::OUString::createFromAscii("com.sun.star.form.component.DatabaseFormattedField");
- registerClassInfo(::rtl::OUString::createFromAscii("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
+ aServices.getArray()[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DatabaseFormattedField" ));
+ registerClassInfo(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted" )),
aServices,
frm::OFormattedFieldWrapper_CreateInstance_ForceFormatted);
@@ -445,7 +445,7 @@ void registerServiceProvider(const ::rtl::OUString& _rServiceImplName, const Seq
{
::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
sMainKeyName += _rServiceImplName;
- sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES");
+ sMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
Reference<starregistry::XRegistryKey> xNewKey = _pKey->createKey(sMainKeyName);
OSL_ENSURE(xNewKey.is(), "forms::registerProvider : could not create a registry key !");
if (!xNewKey.is())
diff --git a/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx b/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx
index 1817b6f..0252872 100644
--- a/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx
+++ b/binfilter/bf_offmgr/source/offapp/app/offmgr_app.cxx
@@ -153,8 +153,8 @@ public:
/*N*/ Sequence< ::rtl::OUString > aName( 1 );
/*N*/ Reference< ::com::sun::star::lang::XSingleServiceFactory > xFact;
/*N*/
-/*N*/ aName.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.drawing.ShapeCollection");
-/*N*/ xFact = ::cppu::createSingleFactory( xSMgr, ::rtl::OUString::createFromAscii("ShapeCollection"), SvxShapeCollection_CreateInstance, aName );
+/*N*/ aName.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.ShapeCollection" ));
+/*N*/ xFact = ::cppu::createSingleFactory( xSMgr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ShapeCollection" )), SvxShapeCollection_CreateInstance, aName );
/*N*/ xSet->insert( makeAny(xFact) );
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index c5d58cc..3f973b6 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -527,7 +527,7 @@ public:
/*N*/ }
/*N*/ catch(uno::Exception&)
/*N*/ {
-/*N*/ aLocalU = ::rtl::OUString::createFromAscii( "###" );
+/*N*/ aLocalU = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "###" ));
/*N*/ }
/*N*/ String aLocalName = String( aLocalU );
/*N*/
@@ -539,7 +539,7 @@ public:
/*N*/ }
/*N*/ catch(uno::Exception&)
/*N*/ {
-/*N*/ aDescU = ::rtl::OUString::createFromAscii( "###" );
+/*N*/ aDescU = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "###" ));
/*N*/ }
/*N*/ String aDescription = String( aDescU );
/*N*/
@@ -564,7 +564,7 @@ public:
/*N*/ }
/*N*/ catch(uno::Exception&)
/*N*/ {
-/*N*/ aArgName = ::rtl::OUString::createFromAscii( "###" );
+/*N*/ aArgName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "###" ));
/*N*/ }
/*N*/ ::rtl::OUString aArgDesc;
/*N*/ try
@@ -574,7 +574,7 @@ public:
/*N*/ }
/*N*/ catch(uno::Exception&)
/*N*/ {
-/*N*/ aArgName = ::rtl::OUString::createFromAscii( "###" );
+/*N*/ aArgName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "###" ));
/*N*/ }
/*N*/
/*N*/ BOOL bOptional =
diff --git a/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx b/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx
index df9b03a..ece23e1 100644
--- a/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx
@@ -372,7 +372,7 @@ using namespace ::com::sun::star::uno;
/*N*/
/*N*/ // adjust for metric system
/*N*/ if (ScOptionsUtil::IsMetricSystem())
-/*N*/ pNames[SCLAYOUTOPT_MEASURE] = OUString::createFromAscii( "Other/MeasureUnit/Metric" );
+/*N*/ pNames[SCLAYOUTOPT_MEASURE] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Other/MeasureUnit/Metric" ));
/*N*/
/*N*/ return aNames;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
index 1ea7d15..a87d53c 100644
--- a/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_docoptio.cxx
@@ -286,7 +286,7 @@ inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; }
/*N*/
/*N*/ // adjust for metric system
/*N*/ if (ScOptionsUtil::IsMetricSystem())
-/*N*/ pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString::createFromAscii( "TabStop/Metric" );
+/*N*/ pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString( RTL_CONSTASCII_USTRINGPARAM( "TabStop/Metric" ));
/*N*/
/*N*/ return aNames;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
index 83d97e8..475097a 100644
--- a/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_viewopti.cxx
@@ -475,10 +475,10 @@ using namespace ::com::sun::star::uno;
/*N*/ // adjust for metric system
/*N*/ if (ScOptionsUtil::IsMetricSystem())
/*N*/ {
-/*N*/ pNames[SCGRIDOPT_RESOLU_X] = OUString::createFromAscii( "Resolution/XAxis/Metric" );
-/*N*/ pNames[SCGRIDOPT_RESOLU_Y] = OUString::createFromAscii( "Resolution/YAxis/Metric" );
-/*N*/ pNames[SCGRIDOPT_OPTION_X] = OUString::createFromAscii( "Option/XAxis/Metric" );
-/*N*/ pNames[SCGRIDOPT_OPTION_Y] = OUString::createFromAscii( "Option/YAxis/Metric" );
+/*N*/ pNames[SCGRIDOPT_RESOLU_X] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Resolution/XAxis/Metric" ));
+/*N*/ pNames[SCGRIDOPT_RESOLU_Y] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Resolution/YAxis/Metric" ));
+/*N*/ pNames[SCGRIDOPT_OPTION_X] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Option/XAxis/Metric" ));
+/*N*/ pNames[SCGRIDOPT_OPTION_Y] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Option/YAxis/Metric" ));
/*N*/ }
/*N*/
/*N*/ return aNames;
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
index 2b9a207..6bd3f65 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
@@ -181,7 +181,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance(
::rtl::OUString ScAutoFormatsObj::getImplementationName_Static()
{
- return ::rtl::OUString::createFromAscii( "stardiv.StarCalc.ScAutoFormatsObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScAutoFormatsObj" ));
}
uno::Sequence< ::rtl::OUString> ScAutoFormatsObj::getSupportedServiceNames_Static()
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
index c05b0b1..8f2c918 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx
@@ -170,7 +170,7 @@ void lcl_WriteInfo( registry::XRegistryKey* pRegistryKey,
{
::rtl::OUString aImpl( RTL_CONSTASCII_USTRINGPARAM( "/" ));
aImpl += rImplementationName;
- aImpl += ::rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+ aImpl += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" ));
uno::Reference<registry::XRegistryKey> xNewKey = pRegistryKey->createKey(aImpl);
const ::rtl::OUString* pArray = rServices.getConstArray();
@@ -433,7 +433,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance(
::rtl::OUString ScSpreadsheetSettings::getImplementationName_Static()
{
- return ::rtl::OUString::createFromAscii( "stardiv.StarCalc.ScSpreadsheetSettings" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScSpreadsheetSettings" ));
}
uno::Sequence< ::rtl::OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static()
@@ -692,7 +692,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance(
::rtl::OUString ScRecentFunctionsObj::getImplementationName_Static()
{
- return ::rtl::OUString::createFromAscii( "stardiv.StarCalc.ScRecentFunctionsObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScRecentFunctionsObj" ));
}
uno::Sequence< ::rtl::OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static()
@@ -773,7 +773,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance(
::rtl::OUString ScFunctionListObj::getImplementationName_Static()
{
- return ::rtl::OUString::createFromAscii( "stardiv.StarCalc.ScFunctionListObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionListObj" ));
}
uno::Sequence< ::rtl::OUString> ScFunctionListObj::getSupportedServiceNames_Static()
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
index 48ab97f..3c9582f 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
@@ -2522,7 +2522,7 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, SfxHint*, pHint )
beans::PropertyChangeEvent* pEvent = new beans::PropertyChangeEvent;
pEvent->Source = (cppu::OWeakObject*)this;
- pEvent->PropertyName = ::rtl::OUString::createFromAscii( "Test" );
+ pEvent->PropertyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Test" ));
pEvent->Further = FALSE;
pEvent->PropertyHandle = -1;
pEvent->OldValue = uno::Any();
@@ -4140,7 +4140,7 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException)
::rtl::OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScCellRangesObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScCellRangesObj" ));
}
sal_Bool SAL_CALL ScCellRangesObj::supportsService( const ::rtl::OUString& rServiceName )
@@ -5333,7 +5333,7 @@ const SfxItemPropertyMap* ScCellRangeObj::GetItemPropertyMap()
::rtl::OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScCellRangeObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScCellRangeObj" ));
}
sal_Bool SAL_CALL ScCellRangeObj::supportsService( const ::rtl::OUString& rServiceName )
@@ -5950,7 +5950,7 @@ const SfxItemPropertyMap* ScCellObj::GetItemPropertyMap()
::rtl::OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScCellObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScCellObj" ));
}
sal_Bool SAL_CALL ScCellObj::supportsService( const ::rtl::OUString& rServiceName )
@@ -7390,7 +7390,7 @@ const SfxItemPropertyMap* ScTableSheetObj::GetItemPropertyMap()
::rtl::OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScTableSheetObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScTableSheetObj" ));
}
sal_Bool SAL_CALL ScTableSheetObj::supportsService( const ::rtl::OUString& rServiceName )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
index 8e39b01..d9d64c5 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
@@ -378,7 +378,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration )
::rtl::OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScDocumentConfiguration" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScDocumentConfiguration" ));
}
sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const ::rtl::OUString& rServiceName )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
index 86ee965..df6a643 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_cursuno.cxx
@@ -461,7 +461,7 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName(
::rtl::OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScCellCursorObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScCellCursorObj" ));
}
sal_Bool SAL_CALL ScCellCursorObj::supportsService( const ::rtl::OUString& rServiceName )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
index 87dd6ee..2ffb1b2 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
@@ -1857,7 +1857,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj )
::rtl::OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScDatabaseRangeObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScDatabaseRangeObj" ));
}
sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const ::rtl::OUString& rServiceName )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
index f4c2b2a..203bcd9 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx
@@ -1077,7 +1077,7 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
::rtl::OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScModelObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScModelObj" ));
}
sal_Bool SAL_CALL ScModelObj::supportsService( const ::rtl::OUString& rServiceName )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx
index bbf56c6..97218b9 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx
@@ -844,7 +844,7 @@ ScCellFieldObj* ScCellFieldObj::getImplementation(
::rtl::OUString SAL_CALL ScCellFieldObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScCellFieldObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScCellFieldObj" ));
}
sal_Bool SAL_CALL ScCellFieldObj::supportsService( const ::rtl::OUString& rServiceName )
@@ -1509,7 +1509,7 @@ ScHeaderFieldObj* ScHeaderFieldObj::getImplementation(
::rtl::OUString SAL_CALL ScHeaderFieldObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScHeaderFieldObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScHeaderFieldObj" ));
}
sal_Bool SAL_CALL ScHeaderFieldObj::supportsService( const ::rtl::OUString& rServiceName )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
index af19008..82b7038 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
@@ -228,7 +228,7 @@ uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance(
::rtl::OUString ScFunctionAccess::getImplementationName_Static()
{
- return ::rtl::OUString::createFromAscii( "stardiv.StarCalc.ScFunctionAccess" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "stardiv.StarCalc.ScFunctionAccess" ));
}
uno::Sequence< ::rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Static()
@@ -243,7 +243,7 @@ uno::Sequence< ::rtl::OUString> ScFunctionAccess::getSupportedServiceNames_Stati
::rtl::OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScFunctionAccess" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScFunctionAccess" ));
}
sal_Bool SAL_CALL ScFunctionAccess::supportsService( const ::rtl::OUString& rServiceName )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
index f217117..759330c 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
@@ -222,7 +222,7 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme
::rtl::OUString SAL_CALL ScIndexEnumeration::getImplementationName()
throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii("ScIndexEnumeration");
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScIndexEnumeration" ));
}
sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& ServiceName )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
index 06e1dbd..b68911a 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
@@ -337,7 +337,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangeObj )
::rtl::OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScNamedRangeObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScNamedRangeObj" ));
}
sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const ::rtl::OUString& rServiceName )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
index fff6fd8..2fef796 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
@@ -1888,7 +1888,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScStyleObj )
::rtl::OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( "ScStyleObj" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ScStyleObj" ));
}
sal_Bool SAL_CALL ScStyleObj::supportsService( const ::rtl::OUString& rServiceName )
diff --git a/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx b/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx
index 2382b5e..172d847 100644
--- a/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx
+++ b/binfilter/bf_sch/source/core/sch_SchAddInCollection.cxx
@@ -58,7 +58,7 @@ using namespace ::com::sun::star;
/*N*/ if( xEnumAcc.is())
/*N*/ {
/*N*/ uno::Reference< container::XEnumeration > xEnum =
-/*N*/ xEnumAcc->createContentEnumeration( ::rtl::OUString::createFromAscii( "com.sun.star.chart.Diagram" ));
+/*N*/ xEnumAcc->createContentEnumeration( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.Diagram" )));
/*N*/ if( xEnum.is())
/*N*/ {
/*N*/ // clear possibly existing list
diff --git a/binfilter/bf_sch/source/ui/app/sch_schopt.cxx b/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
index deb0dd1..201d194 100644
--- a/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
+++ b/binfilter/bf_sch/source/ui/app/sch_schopt.cxx
@@ -89,11 +89,11 @@ using namespace ::com::sun::star;
// ====================
/*N*/ SchOptions::SchOptions() :
-/*N*/ ::utl::ConfigItem( ::rtl::OUString::createFromAscii( "Office.Chart" )),
+/*N*/ ::utl::ConfigItem( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Chart" ))),
/*N*/ mbIsInitialized( FALSE )
/*N*/ {
/*N*/ maPropertyNames.realloc( 1 );
-/*N*/ maPropertyNames[ 0 ] = ::rtl::OUString::createFromAscii( "DefaultColor/Series" );
+/*N*/ maPropertyNames[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultColor/Series" ));
/*N*/ }
/*N*/ SchOptions::~SchOptions()
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
index 021e4ad..a6b2dd5 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartAxis.cxx
@@ -90,10 +90,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChXChartAxis::getSupportedServiceNames
SolarMutexGuard aGuard;
uno::Sequence< ::rtl::OUString > aSeq( 4 );
- aSeq[ 0 ] = ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxis" );
- aSeq[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.LineProperties" );
- aSeq[ 2 ] = ::rtl::OUString::createFromAscii( "com.sun.star.style.CharacterProperties" );
- aSeq[ 3 ] = ::rtl::OUString::createFromAscii( "com.sun.star.xml.UserDefinedAttributeSupplier" );
+ aSeq[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxis" ));
+ aSeq[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineProperties" ));
+ aSeq[ 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterProperties" ));
+ aSeq[ 3 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.UserDefinedAttributeSupplier" ));
return aSeq;
}
@@ -207,7 +207,7 @@ uno::Sequence< sal_Int8 > SAL_CALL ChXChartAxis::getImplementationId() throw( un
::rtl::OUString SAL_CALL ChXChartAxis::getShapeType()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartAxis" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartAxis" ));
}
// XUnoTunnel
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
index d2b0c01..9b88261 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
@@ -472,17 +472,17 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChXChartDocument::getAvailableServiceN
aServices.push_back( OUString::createFromAscii( SCH_X_STR_CHTYPE_NAMESPACE SCH_X_STR_CHTYPE_STOCK ));
// style tables (for XML)
- aServices.push_back( OUString::createFromAscii( "com.sun.star.drawing.DashTable" ));
- aServices.push_back( OUString::createFromAscii( "com.sun.star.drawing.GradientTable" ));
- aServices.push_back( OUString::createFromAscii( "com.sun.star.drawing.HatchTable" ));
- aServices.push_back( OUString::createFromAscii( "com.sun.star.drawing.BitmapTable" ));
- aServices.push_back( OUString::createFromAscii( "com.sun.star.drawing.TransparencyGradientTable" ));
- aServices.push_back( OUString::createFromAscii( "com.sun.star.drawing.MarkerTable" ));
+ aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DashTable" )));
+ aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GradientTable" )));
+ aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.HatchTable" )));
+ aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.BitmapTable" )));
+ aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TransparencyGradientTable" )));
+ aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.MarkerTable" )));
// XML namespacemap / object resolver
- aServices.push_back( OUString::createFromAscii( "com.sun.star.xml.NamespaceMap" ));
- aServices.push_back( OUString::createFromAscii( "com.sun.star.document.ExportGraphicObjectResolver" ));
- aServices.push_back( OUString::createFromAscii( "com.sun.star.document.ImportGraphicObjectResolver" ));
+ aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.NamespaceMap" )));
+ aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportGraphicObjectResolver" )));
+ aServices.push_back( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ImportGraphicObjectResolver" )));
// shapes
uno::Sequence< OUString > aDrawServices( SvxUnoDrawMSFactory::getAvailableServiceNames() );
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
index 946386e..e115720 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXDiagram.cxx
@@ -447,7 +447,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL ChXDiagram::getDataPointPropertie
{
::rtl::OUString aMessage( RTL_CONSTASCII_USTRINGPARAM( "DataPointProperties: Invalid Index (col, row): " ));
aMessage += ::rtl::OUString::valueOf( Column );
- aMessage += ::rtl::OUString::createFromAscii( ", " );
+ aMessage += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ", " ));
aMessage += ::rtl::OUString::valueOf( Row );
lang::IndexOutOfBoundsException aEx( aMessage, (::cppu::OWeakObject*)this );
throw aEx;
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChartArea.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChartArea.cxx
index 9ac4e66..84cff3e 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChartArea.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChartArea.cxx
@@ -50,7 +50,7 @@ ChartArea::~ChartArea()
::rtl::OUString SAL_CALL ChartArea::getImplementationName()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "ChartArea" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ChartArea" ));
}
uno::Sequence< ::rtl::OUString > SAL_CALL ChartArea::getSupportedServiceNames()
@@ -59,10 +59,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChartArea::getSupportedServiceNames()
SolarMutexGuard aGuard;
uno::Sequence< ::rtl::OUString > aSeq( 4 );
- aSeq[ 0 ] = ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartArea" );
- aSeq[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.LineProperties" );
- aSeq[ 2 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.FillProperties" );
- aSeq[ 3 ] = ::rtl::OUString::createFromAscii( "com.sun.star.xml.UserDefinedAttributeSupplier" );
+ aSeq[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartArea" ));
+ aSeq[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineProperties" ));
+ aSeq[ 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.FillProperties" ));
+ aSeq[ 3 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.UserDefinedAttributeSupplier" ));
return aSeq;
}
@@ -84,7 +84,7 @@ uno::Sequence< sal_Int8 > SAL_CALL ChartArea::getImplementationId()
::rtl::OUString SAL_CALL ChartArea::getShapeType()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartArea" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartArea" ));
}
// XUnoTunnel
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChartGrid.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChartGrid.cxx
index 48b8649..5c2c3a2 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChartGrid.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChartGrid.cxx
@@ -50,7 +50,7 @@ ChartGrid::~ChartGrid()
::rtl::OUString SAL_CALL ChartGrid::getImplementationName()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "ChartGrid" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ChartGrid" ));
}
uno::Sequence< ::rtl::OUString > SAL_CALL ChartGrid::getSupportedServiceNames()
@@ -59,9 +59,9 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChartGrid::getSupportedServiceNames()
SolarMutexGuard aGuard;
uno::Sequence< ::rtl::OUString > aSeq( 3 );
- aSeq[ 0 ] = ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartGrid" );
- aSeq[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.LineProperties" );
- aSeq[ 2 ] = ::rtl::OUString::createFromAscii( "com.sun.star.xml.UserDefinedAttributeSupplier" );
+ aSeq[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartGrid" ));
+ aSeq[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineProperties" ));
+ aSeq[ 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.UserDefinedAttributeSupplier" ));
return aSeq;
}
@@ -83,7 +83,7 @@ uno::Sequence< sal_Int8 > SAL_CALL ChartGrid::getImplementationId()
::rtl::OUString SAL_CALL ChartGrid::getShapeType()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartGrid" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartGrid" ));
}
// XUnoTunnel
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChartLegend.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChartLegend.cxx
index a0ab36e..3ac62a7 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChartLegend.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChartLegend.cxx
@@ -50,7 +50,7 @@ ChartLegend::~ChartLegend()
::rtl::OUString SAL_CALL ChartLegend::getImplementationName()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "ChartLegend" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ChartLegend" ));
}
uno::Sequence< ::rtl::OUString > SAL_CALL ChartLegend::getSupportedServiceNames()
@@ -59,12 +59,12 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChartLegend::getSupportedServiceNames(
SolarMutexGuard aGuard;
uno::Sequence< ::rtl::OUString > aSeq( 6 );
- aSeq[ 0 ] = ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartLegend" );
- aSeq[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.style.CharacterProperties" );
- aSeq[ 2 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.FillProperties" );
- aSeq[ 3 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.LineProperties" );
- aSeq[ 4 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.Shape" );
- aSeq[ 5 ] = ::rtl::OUString::createFromAscii( "com.sun.star.xml.UserDefinedAttributeSupplier" );
+ aSeq[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartLegend" ));
+ aSeq[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterProperties" ));
+ aSeq[ 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.FillProperties" ));
+ aSeq[ 3 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineProperties" ));
+ aSeq[ 4 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.Shape" ));
+ aSeq[ 5 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.UserDefinedAttributeSupplier" ));
return aSeq;
}
@@ -86,7 +86,7 @@ uno::Sequence< sal_Int8 > SAL_CALL ChartLegend::getImplementationId()
::rtl::OUString SAL_CALL ChartLegend::getShapeType()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartLegend" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartLegend" ));
}
// XUnoTunnel
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChartLine.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChartLine.cxx
index 27eb421..288728b 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChartLine.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChartLine.cxx
@@ -50,7 +50,7 @@ ChartLine::~ChartLine()
::rtl::OUString SAL_CALL ChartLine::getImplementationName()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "ChartLine" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ChartLine" ));
}
uno::Sequence< ::rtl::OUString > SAL_CALL ChartLine::getSupportedServiceNames()
@@ -59,9 +59,9 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChartLine::getSupportedServiceNames()
SolarMutexGuard aGuard;
uno::Sequence< ::rtl::OUString > aSeq( 3 );
- aSeq[ 0 ] = ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartLine" );
- aSeq[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.LineProperties" );
- aSeq[ 2 ] = ::rtl::OUString::createFromAscii( "com.sun.star.xml.UserDefinedAttributeSupplier" );
+ aSeq[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartLine" ));
+ aSeq[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.LineProperties" ));
+ aSeq[ 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.UserDefinedAttributeSupplier" ));
return aSeq;
}
@@ -83,7 +83,7 @@ uno::Sequence< sal_Int8 > SAL_CALL ChartLine::getImplementationId()
::rtl::OUString SAL_CALL ChartLine::getShapeType()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartLine" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartLine" ));
}
// XUnoTunnel
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChartTitle.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChartTitle.cxx
index fe5760b..e61cdca 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChartTitle.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChartTitle.cxx
@@ -58,7 +58,7 @@ ChartTitle::~ChartTitle()
::rtl::OUString SAL_CALL ChartTitle::getImplementationName()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "ChartTitle" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ChartTitle" ));
}
uno::Sequence< ::rtl::OUString > SAL_CALL ChartTitle::getSupportedServiceNames()
@@ -67,10 +67,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL ChartTitle::getSupportedServiceNames()
SolarMutexGuard aGuard;
uno::Sequence< ::rtl::OUString > aSeq( 4 );
- aSeq[ 0 ] = ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartTitle" );
- aSeq[ 1 ] = ::rtl::OUString::createFromAscii( "com.sun.star.drawing.Shape" );
- aSeq[ 2 ] = ::rtl::OUString::createFromAscii( "com.sun.star.style.CharacterProperties" );
- aSeq[ 3 ] = ::rtl::OUString::createFromAscii( "com.sun.star.xml.UserDefinedAttributeSupplier" );
+ aSeq[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTitle" ));
+ aSeq[ 1 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.Shape" ));
+ aSeq[ 2 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.style.CharacterProperties" ));
+ aSeq[ 3 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.UserDefinedAttributeSupplier" ));
return aSeq;
}
@@ -92,7 +92,7 @@ uno::Sequence< sal_Int8 > SAL_CALL ChartTitle::getImplementationId()
::rtl::OUString SAL_CALL ChartTitle::getShapeType()
throw( uno::RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "com.sun.star.chart.ChartTitle" );
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.ChartTitle" ));
}
// XUnoTunnel
diff --git a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
index 215b77c..0e3e164 100644
--- a/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
+++ b/binfilter/bf_sd/source/filter/xml/sd_sdxmlwrp.cxx
@@ -162,7 +162,7 @@ sal_Int32 ReadThroughComponent(
// get parser
Reference< xml::sax::XParser > xParser(
rFactory->createInstance(
- OUString::createFromAscii("com.sun.star.xml.sax.Parser") ),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" )) ),
UNO_QUERY );
DBG_ASSERT( xParser.is(), "Can't create parser" );
if( !xParser.is() )
@@ -361,7 +361,7 @@ sal_Bool SdXMLFilter::Import()
};
uno::Reference< beans::XPropertySet > xInfoSet( GenericPropertySet_CreateInstance( new PropertySetInfo( aImportInfoMap ) ) );
- xInfoSet->setPropertyValue( OUString::createFromAscii( "Preview" ), uno::makeAny( mrDocShell.GetDoc()->IsStarDrawPreviewMode() ) );
+ xInfoSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "Preview" )), uno::makeAny( mrDocShell.GetDoc()->IsStarDrawPreviewMode() ) );
// -------------------------------------
diff --git a/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx b/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
index df39cba..e75dd04 100644
--- a/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
+++ b/binfilter/bf_sd/source/ui/app/sd_sdlib.cxx
@@ -126,7 +126,7 @@ ULONG __EXPORT SdDLL::DetectFilter(SfxMedium& rMedium, const SfxFilter** pFilter
if( *pFilter && (*pFilter)->GetFilterFlags() & SFX_FILTER_PACKED )
{
uno::Reference< lang::XMultiServiceFactory > xSMgr( ::legacy_binfilters::getLegacyProcessServiceFactory() );
- uno::Reference< util::XArchiver > xPacker( xSMgr->createInstance( OUString::createFromAscii( "com.sun.star.util.Archiver" ) ), uno::UNO_QUERY );
+ uno::Reference< util::XArchiver > xPacker( xSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.Archiver" )) ), uno::UNO_QUERY );
if( xPacker.is() )
{
// extract extra data
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx
index 74d16d0..8199915 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unogstyl.cxx
@@ -193,7 +193,7 @@ uno::Any SAL_CALL SdUnoGraphicStyle::getPropertyValue( const ::rtl::OUString& Pr
if( PropertyName == aStyleName )
{
uno::Any aAny;
- aAny <<= OUString::createFromAscii( "graphic" );
+ aAny <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "graphic" ));
return aAny;
}
else
diff --git a/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx b/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx
index baf7620..75365b9 100644
--- a/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx
+++ b/binfilter/bf_sd/source/ui/unoidl/sd_unopstyl.cxx
@@ -351,7 +351,7 @@ uno::Any SAL_CALL SdUnoPseudoStyle::getPropertyValue( const OUString& PropertyNa
{
if( pMap->nWID == WID_STYLE_FAMILY )
{
- aAny <<= OUString::createFromAscii( "presentation" );
+ aAny <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "presentation" ));
}
else if( pMap->nWID == WID_STYLE_DISPNAME )
{
@@ -576,7 +576,7 @@ uno::Any SAL_CALL SdUnoPseudoStyle::getPropertyDefault( const OUString& aPropert
if( pMap->nWID == WID_STYLE_FAMILY )
{
- aAny <<= OUString::createFromAscii( "presentation" );
+ aAny <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "presentation" ));
}
else if( pMap->nWID == SDRATTR_TEXTDIRECTION )
{
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
index c13034a..0ffabb5 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appinit.cxx
@@ -141,7 +141,7 @@ public:
/*N*/ {
/*N*/
/*N*/ Reference < XDesktop > xDesktop ( ::legacy_binfilters::getLegacyProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ), UNO_QUERY );
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ), UNO_QUERY );
/*N*/ xDesktop->addTerminateListener( new SfxTerminateListener_Impl() );
/*N*/
/*N*/ // StarObjects initialisieren
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
index e1db24d..98a7366 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx
@@ -134,7 +134,7 @@ using namespace ::cppu;
/*N*/ {
/*N*/ sal_Bool bIsEncrypted = sal_False;
/*N*/ ::com::sun::star::uno::Any aAny;
-/*N*/ if ( aRef->GetProperty( ::rtl::OUString::createFromAscii("HasEncryptedEntries"), aAny ) )
+/*N*/ if ( aRef->GetProperty( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HasEncryptedEntries" )), aAny ) )
/*N*/ aAny >>= bIsEncrypted;
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
index cb5ff8e..77b20ff 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_appuno.cxx
@@ -909,7 +909,7 @@ extern "C" {
/*N*/ aTempStr = aImpl;
/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
/*N*/ xNewKey = xKey->createKey( aTempStr );
-/*N*/ xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster") );
+/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.GlobalEventBroadcaster" )) );
/*N*/
/*N*/ // standalone document info
/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -918,7 +918,7 @@ extern "C" {
/*N*/ aTempStr = aImpl;
/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
/*N*/ xNewKey = xKey->createKey( aTempStr );
-/*N*/ xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.document.StandaloneDocumentInfo") );
+/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.StandaloneDocumentInfo" )) );
/*N*/
/*N*/ // script library container service
/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -927,7 +927,7 @@ extern "C" {
/*N*/ aTempStr = aImpl;
/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
/*N*/ xNewKey = xKey->createKey( aTempStr );
-/*N*/ xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.script.ScriptLibraryContainer") );
+/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.ScriptLibraryContainer" )) );
/*N*/
/*N*/ // dialog library container service
/*N*/ aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
@@ -936,7 +936,7 @@ extern "C" {
/*N*/ aTempStr = aImpl;
/*N*/ aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
/*N*/ xNewKey = xKey->createKey( aTempStr );
-/*N*/ xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.script.DialogLibraryContainer") );
+/*N*/ xNewKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.DialogLibraryContainer" )) );
/*N*/
/*N*/ return sal_True;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx
index fb2ec1e..06f3701 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_dlgcont.cxx
@@ -189,7 +189,7 @@ Sequence< OUString > SfxDialogLibraryContainer::impl_getStaticSupportedServiceNa
if( bNeedsInit )
{
OUString* pSeq = seqServiceNames.getArray();
- pSeq[0] = OUString::createFromAscii( "com.sun.star.script.DialogLibraryContainer" );
+ pSeq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.DialogLibraryContainer" ));
bNeedsInit = sal_False;
}
return seqServiceNames;
@@ -203,7 +203,7 @@ OUString SfxDialogLibraryContainer::impl_getStaticImplementationName()
MutexGuard aGuard( Mutex::getGlobalMutex() );
if( bNeedsInit )
{
- aImplName = OUString::createFromAscii( "com.sun.star.comp.sfx2.DialogLibraryContainer" );
+ aImplName = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sfx2.DialogLibraryContainer" ));
bNeedsInit = sal_False;
}
return aImplName;
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index b53a326..8efdb32 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -247,13 +247,13 @@ namespace SfxContainer_Impl
/*N*/ }
/*N*/
/*N*/ mxSFI = Reference< XSimpleFileAccess >( mxMSF->createInstance
-/*N*/ ( OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ), UNO_QUERY );
+/*N*/ ( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ), UNO_QUERY );
/*N*/ if( !mxSFI.is() )
/*N*/ {
/*N*/ OSL_ENSURE( 0, "### couln't create SimpleFileAccess component\n" );
/*N*/ }
mxStringSubstitution = Reference< XStringSubstitution >( mxMSF->createInstance
- ( OUString::createFromAscii( "com.sun.star.util.PathSubstitution" ) ), UNO_QUERY );
+ ( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.PathSubstitution" )) ), UNO_QUERY );
OSL_ENSURE( mxStringSubstitution.is(), "### couln't create PathSubstitution component\n" );
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
index 12313d8..7bb4783 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_scriptcont.cxx
@@ -378,7 +378,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
if( nArgCount > 1 )
pArgs[1] >>= aInitialisationParam;
else
- aScriptLanguage = OUString::createFromAscii( "StarBasic" );
+ aScriptLanguage = OUString( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ));
}
init( aInitialisationParam, aScriptLanguage );
@@ -399,7 +399,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
/*N*/ if( bNeedsInit )
/*N*/ {
/*N*/ OUString* pSeq = seqServiceNames.getArray();
-/*N*/ pSeq[0] = OUString::createFromAscii( "com.sun.star.script.ScriptLibraryContainer" );
+/*N*/ pSeq[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.ScriptLibraryContainer" ));
/*N*/ bNeedsInit = sal_False;
/*N*/ }
/*N*/ return seqServiceNames;
@@ -413,7 +413,7 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU
/*N*/ MutexGuard aGuard( Mutex::getGlobalMutex() );
/*N*/ if( bNeedsInit )
/*N*/ {
-/*N*/ aImplName = OUString::createFromAscii( "com.sun.star.comp.sfx2.ScriptLibraryContainer" );
+/*N*/ aImplName = OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.sfx2.ScriptLibraryContainer" ));
/*N*/ bNeedsInit = sal_False;
/*N*/ }
/*N*/ return aImplName;
diff --git a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
index f7e068f..f4ea7cf 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
@@ -284,7 +284,7 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
/*N*/ {
/*N*/ xSupplier = REFERENCE< XEVENTSSUPPLIER >
/*N*/ ( ::legacy_binfilters::getLegacyProcessServiceFactory()->createInstance(
-/*N*/ ::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster" )), UNO_QUERY );
+/*N*/ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.GlobalEventBroadcaster" ))), UNO_QUERY );
/*N*/ }
/*N*/
/*N*/ if ( xSupplier.is() )
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
index 85a991d..e51424e 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx
@@ -1110,7 +1110,7 @@ namespace binfilter {
/*?*/ if ( pContentTypeItem )
/*?*/ aMimeType = pContentTypeItem->GetValue();
/*?*/ else
-/*?*/ aMimeType = ::rtl::OUString::createFromAscii( "application/x-www-form-urlencoded" );
+/*?*/ aMimeType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-www-form-urlencoded" ));
/*?*/
/*?*/ Reference < XInputStream > xPostData;
/*?*/ if ( pPostDataItem )
@@ -1712,11 +1712,11 @@ namespace binfilter {
/*?*/
/*?*/ try
/*?*/ {
-/*?*/ Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) );
+/*?*/ Any aAny = pImp->aContent.getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" )) );
/*?*/ ::rtl::OUString aContentType;
/*?*/ aAny >>= aContentType;
/*?*/
-/*?*/ pImp->xAttributes->Append( SvKeyValue( ::rtl::OUString::createFromAscii( "content-type" ), aContentType ) );
+/*?*/ pImp->xAttributes->Append( SvKeyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "content-type" )), aContentType ) );
/*?*/ }
/*?*/ catch ( ::com::sun::star::uno::Exception& )
/*?*/ {
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
index dfba430..365d035 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objstor.cxx
@@ -612,7 +612,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose()
/*N*/ if( xServiceManager.is() )
/*N*/ {
/*N*/ xFilterCFG = ::com::sun::star::uno::Reference< XNameAccess >(
-/*N*/ xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+/*N*/ xServiceManager->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ),
/*N*/ UNO_QUERY );
/*N*/ }
/*N*/
@@ -628,7 +628,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose()
/*N*/ ::rtl::OUString aServiceName;
/*N*/ sal_Int32 nPropertyCount = aProps.getLength();
/*N*/ for( sal_Int32 nProperty=0; nProperty < nPropertyCount; ++nProperty )
-/*N*/ if( aProps[nProperty].Name.equals( ::rtl::OUString::createFromAscii("UIComponent")) )
+/*N*/ if( aProps[nProperty].Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UIComponent" ))) )
/*N*/ {
/*N*/ ::rtl::OUString aServiceName;
/*N*/ aProps[nProperty].Value >>= aServiceName;
@@ -1306,7 +1306,7 @@ void SfxObjectShell::DoHandsOffNoMediumClose()
/*N*/ const INetURLObject aActName(pActMed->GetName());
/*N*/
/*N*/ if ( aURL == aActName
-/*N*/ && aURL != INetURLObject( OUString::createFromAscii( "private:stream" ) ) )
+/*N*/ && aURL != INetURLObject( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" )) ) )
/*N*/ {
/*?*/ if ( IsReadOnly() )
/*?*/ {
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
index 176560a..5ab09ab 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_objxtor.cxx
@@ -553,20 +553,20 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
/*N*/ SEQUENCE < OUSTRING > aSequence( 14 );
OUSTRING* pNames = aSequence.getArray();
sal_Int32 i=0;
- pNames[i++] = ::rtl::OUString::createFromAscii("OnStartApp");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnCloseApp");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnNew");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnLoad");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnSaveAs");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnSaveAsDone");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnSave");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnSaveDone");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnPrepareUnload");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnUnload");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnFocus");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnUnfocus");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnPrint");
- pNames[i++] = ::rtl::OUString::createFromAscii("OnModifyChanged");
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnStartApp" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnCloseApp" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnNew" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnLoad" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnSaveAs" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnSaveAsDone" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnSave" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnSaveDone" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnPrepareUnload" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnUnload" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnFocus" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnUnfocus" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnPrint" ));
+ pNames[i++] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OnModifyChanged" ));
/*N*/ return aSequence;
/*N*/ }
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
index 3eee360..059408e 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_sfxbasemodel.cxx
@@ -781,7 +781,7 @@ extern sal_Bool supportsMetaFileHandle_Impl();
/*N*/ aSize[3] = aTmpRect.Bottom();
/*N*/
/*N*/ seqArgsNew.realloc( ++nNewLength );
-/*N*/ seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString::createFromAscii( "WinExtent" );
+/*N*/ seqArgsNew[ nNewLength - 1 ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "WinExtent" ));
/*N*/ seqArgsNew[ nNewLength - 1 ].Value <<= aSize;
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx b/binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx
index 09f0415..e86ab64 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx
@@ -319,7 +319,7 @@ sal_Char __FAR_DATA XMLN_VERSIONSLIST[] = "VersionList.xml";
/*?*/
/*?*/ // get parser
/*?*/ Reference< XInterface > xXMLParser = xServiceFactory->createInstance(
-/*?*/ OUString::createFromAscii("com.sun.star.xml.sax.Parser") );
+/*?*/ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Parser" )) );
/*?*/ DBG_ASSERT( xXMLParser.is(),
/*?*/ "XMLReader::Read: com.sun.star.xml.sax.Parser service missing" );
/*?*/
diff --git a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
index 13f6ba3..f0dd57f 100644
--- a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
+++ b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
@@ -377,8 +377,8 @@ namespace binfilter {
/*N*/ // wrong properties
/*N*/ return;
/*N*/
- OUSTRING sApplication( OUSTRING::createFromAscii( "application" ) );
- OUSTRING sDocument( OUSTRING::createFromAscii( "document" ) );
+ OUSTRING sApplication( OUSTRING( RTL_CONSTASCII_USTRINGPARAM( "application" )) );
+ OUSTRING sDocument( OUSTRING( RTL_CONSTASCII_USTRINGPARAM( "document" )) );
if ( aLibrary != sApplication && aLibrary != sDocument )
{
if ( aLibrary == OUSTRING( SFX_APP()->GetName() ) || aLibrary.equalsAscii( "StarDesktop" ) )
@@ -415,7 +415,7 @@ namespace binfilter {
/*N*/ m_refCount++;
/*N*/ pImp = new SfxEvents_Impl( NULL, this );
/*N*/ m_xEvents = pImp;
-/*N*/ m_xJobsBinding = REFERENCE< XJOBEXECUTOR >(xSmgr->createInstance(OUSTRING::createFromAscii("com.sun.star.task.JobExecutor")), UNO_QUERY);
+/*N*/ m_xJobsBinding = REFERENCE< XJOBEXECUTOR >(xSmgr->createInstance(OUSTRING( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.JobExecutor" ))), UNO_QUERY);
/*N*/ m_refCount--;
/*N*/ StartListening(*SFX_APP());
/*N*/ }
diff --git a/binfilter/bf_so3/source/dialog/insdlg.cxx b/binfilter/bf_so3/source/dialog/insdlg.cxx
index 7f9628c..d1f5ad8 100644
--- a/binfilter/bf_so3/source/dialog/insdlg.cxx
+++ b/binfilter/bf_so3/source/dialog/insdlg.cxx
@@ -132,7 +132,7 @@ void SvObjectServerList::FillInsertObjects()
{
OUString sReaderService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ));
Sequence< Any > aArguments( 1 );
- aArguments[0] <<= OUString::createFromAscii( "org.openoffice.Office.Common");
+ aArguments[0] <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common" ));
Reference< XHierarchicalNameAccess > xHierNameAccess(
sProviderMSFactory->createInstanceWithArguments( sReaderService,aArguments ),
@@ -147,14 +147,14 @@ void SvObjectServerList::FillInsertObjects()
if( nameAccess.is())
{
Sequence<OUString> seqNames= nameAccess->getElementNames();
- OUString sSeparator( OUString::createFromAscii("/"));
+ OUString sSeparator( OUString( RTL_CONSTASCII_USTRINGPARAM( "/" )));
for(int i=0; i<seqNames.getLength(); i++)
{
OUString sComponentName= sTagName + sSeparator + seqNames[i] + sSeparator +
- OUString::createFromAscii("Name");
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ));
OUString sKey= sTagName + sSeparator + seqNames[i] + sSeparator +
- OUString::createFromAscii("Key");
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "Key" ));
Any anyName= xHierNameAccess->getByHierarchicalName(sComponentName);
Any anyKey= xHierNameAccess->getByHierarchicalName( sKey);
diff --git a/binfilter/bf_so3/source/inplace/plugin.cxx b/binfilter/bf_so3/source/inplace/plugin.cxx
index 7f1005a..b6a7f59 100644
--- a/binfilter/bf_so3/source/inplace/plugin.cxx
+++ b/binfilter/bf_so3/source/inplace/plugin.cxx
@@ -262,7 +262,7 @@ BOOL SvPlugInObject::StartPlugIn( )
}
Reference< XMultiServiceFactory > xFac( ::utl::getProcessServiceFactory() );
- Reference< XPluginManager > xPMgr( xFac->createInstance( OUString::createFromAscii("com.sun.star.plugin.PluginManager") ), UNO_QUERY );
+ Reference< XPluginManager > xPMgr( xFac->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.plugin.PluginManager" )) ), UNO_QUERY );
if (! xPMgr.is() )
ShowServiceNotAvailableError( NULL, String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "PluginManager" ) ), TRUE );
diff --git a/binfilter/bf_so3/source/misc/factory.cxx b/binfilter/bf_so3/source/misc/factory.cxx
index 4f6a59a..54d3c6f 100644
--- a/binfilter/bf_so3/source/misc/factory.cxx
+++ b/binfilter/bf_so3/source/misc/factory.cxx
@@ -205,35 +205,35 @@ String SvFactory::GetServiceName( const SvGlobalName& rClassName )
::rtl::OUString aServiceName;
if( SvGlobalName(SO3_SC_CLASSID_60) == rClassName )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.comp.Calc.SpreadsheetDocument");
+ aServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.SpreadsheetDocument" ));
}
else if( SvGlobalName(SO3_SW_CLASSID_60) == rClassName )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.comp.Writer.TextDocument");
+ aServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Writer.TextDocument" ));
}
else if( SvGlobalName(SO3_SWWEB_CLASSID_60) == rClassName )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.comp.Writer.WebDocument");
+ aServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Writer.WebDocument" ));
}
else if( SvGlobalName(SO3_SWGLOB_CLASSID_60) == rClassName )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.comp.Writer.GlobalDocument");
+ aServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Writer.GlobalDocument" ));
}
else if( SvGlobalName(SO3_SIMPRESS_CLASSID_60) == rClassName )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.comp.Draw.PresentationDocument");
+ aServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Draw.PresentationDocument" ));
}
else if( SvGlobalName(SO3_SDRAW_CLASSID_60) == rClassName )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.comp.Draw.DrawingDocument");
+ aServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Draw.DrawingDocument" ));
}
else if( SvGlobalName(SO3_SCH_CLASSID_60) == rClassName )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.comp.Chart.ChartDocument");
+ aServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Chart.ChartDocument" ));
}
else if( SvGlobalName(SO3_SM_CLASSID_60) == rClassName )
{
- aServiceName = ::rtl::OUString::createFromAscii("com.sun.star.comp.Math.FormulaDocument");
+ aServiceName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Math.FormulaDocument" ));
}
return aServiceName;
@@ -249,7 +249,7 @@ SvObject* TryCreate( const SvGlobalName& rClassName )
if ( xDoc.is() )
{
com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aProps( 1 );
- aProps[0].Name = ::rtl::OUString::createFromAscii( "SetEmbedded" );
+ aProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SetEmbedded" ));
aProps[0].Value <<= sal_True;
xDoc->attachResource( ::rtl::OUString(), aProps );
diff --git a/binfilter/bf_so3/source/persist/binddata.cxx b/binfilter/bf_so3/source/persist/binddata.cxx
index 7caa604..05750f2 100644
--- a/binfilter/bf_so3/source/persist/binddata.cxx
+++ b/binfilter/bf_so3/source/persist/binddata.cxx
@@ -277,7 +277,7 @@ sal_Bool SvBindingData_Impl::hasHttpCache (void)
if (!m_xCache.is())
{
m_xCache = SvBindingTransport_Impl::createContent (
- OUString::createFromAscii ("private:httpcache"));
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "private:httpcache" )));
Reference<XCommandProcessor> xProcessor (m_xCache, UNO_QUERY);
if (xProcessor.is())
@@ -285,9 +285,9 @@ sal_Bool SvBindingData_Impl::hasHttpCache (void)
Sequence<Property> aProps(3);
aProps[0].Handle = aProps[1].Handle = aProps[2].Handle = -1;
- aProps[0].Name = OUString::createFromAscii ("ConnectionLimit");
- aProps[1].Name = OUString::createFromAscii ("SizeLimit");
- aProps[2].Name = OUString::createFromAscii ("Size");
+ aProps[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ConnectionLimit" ));
+ aProps[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "SizeLimit" ));
+ aProps[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Size" ));
SvBindingTransport_Impl::getProperties (xProcessor, aProps);
}
diff --git a/binfilter/bf_so3/source/persist/transprt.cxx b/binfilter/bf_so3/source/persist/transprt.cxx
index 1be1e0c..72739b8 100644
--- a/binfilter/bf_so3/source/persist/transprt.cxx
+++ b/binfilter/bf_so3/source/persist/transprt.cxx
@@ -1356,9 +1356,9 @@ void UcbTransport_Impl::start (void)
aArgument.Sink = SAL_STATIC_CAST(OWeakObject*, m_xSink.get());
if (m_rCtx.GetBindMode() & SVBIND_NEWESTVERSION)
- m_aCommand.Name = OUString::createFromAscii ("synchronize");
+ m_aCommand.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "synchronize" ));
else
- m_aCommand.Name = OUString::createFromAscii ("open");
+ m_aCommand.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ));
m_aCommand.Handle = -1;
m_aCommand.Argument <<= aArgument;
@@ -1375,7 +1375,7 @@ void UcbTransport_Impl::start (void)
return;
}
- m_aCommand.Name = OUString::createFromAscii ("insert");
+ m_aCommand.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "insert" ));
m_aCommand.Handle = -1;
m_aCommand.Argument <<= InsertCommandArgument( Reference<XInputStream> ( new UcbTransportInputStream_Impl(xLockBytes) ),
sal_False );
@@ -1472,8 +1472,7 @@ void SAL_CALL UcbTransport_Impl::handle ( const Reference<XInteractionRequest> &
= Reference< XInteractionHandler >(
xFactory->
createInstance(
- OUString::createFromAscii(
- "com.sun.star.task.InteractionHandler")),
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ))),
UNO_QUERY);
}
DBG_ASSERT(m_xInteractionHdl.is(),
@@ -1568,7 +1567,7 @@ void SAL_CALL UcbTransport_Impl::propertiesChange ( const Sequence<PropertyChang
for (i = 0; i < n; i++)
{
PropertyChangeEvent evt (rEvent[i]);
- if (evt.PropertyName == OUString::createFromAscii ("ContentType"))
+ if (evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" )))
{
if (evt.NewValue >>= m_aContentType)
{
@@ -1581,7 +1580,7 @@ void SAL_CALL UcbTransport_Impl::propertiesChange ( const Sequence<PropertyChang
}
continue;
}
- if (evt.PropertyName == OUString::createFromAscii ("DocumentBody"))
+ if (evt.PropertyName == OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentBody" )))
{
if (m_xSink.is())
m_xLockBytes = m_xSink->getLockBytes();
@@ -1612,7 +1611,7 @@ OUString UcbTransport_Impl::getContentType_Impl ( const Reference<XCommandProces
OUString aResult;
if (rxProcessor.is())
{
- OUString aName (OUString::createFromAscii ("ContentType"));
+ OUString aName (OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" )));
Sequence<Property> aProps(1);
aProps[0].Name = aName;
@@ -1753,7 +1752,7 @@ void UcbHTTPTransport_Impl::start (void)
sal_Int32 n = aProps.getLength();
aProps.realloc (n + 1);
- aProps[n].Name = OUString::createFromAscii ("Referer");
+ aProps[n].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
aProps[n].Handle = -1;
aProps[n].Value <<= OUString(aUrl);
}
@@ -1772,9 +1771,9 @@ void UcbHTTPTransport_Impl::start (void)
m_xSink = new UcbTransportDataSink_Impl();
if (m_rCtx.GetBindMode() & SVBIND_NEWESTVERSION)
- m_aCommand.Name = OUString::createFromAscii ("synchronize");
+ m_aCommand.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "synchronize" ));
else
- m_aCommand.Name = OUString::createFromAscii ("open");
+ m_aCommand.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "open" ));
m_aCommand.Handle = -1;
OpenCommandArgument2 aArgument;
@@ -1810,7 +1809,7 @@ void UcbHTTPTransport_Impl::start (void)
sal_Int32 n = aProps.getLength();
aProps.realloc (n + 1);
- aProps[n].Name = OUString::createFromAscii ("ContentType");
+ aProps[n].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ContentType" ));
aProps[n].Value <<= OUString(aMimeType);
SvBindingTransport_Impl::setProperties (xProcessor, aProps);
@@ -1819,7 +1818,7 @@ void UcbHTTPTransport_Impl::start (void)
if (eAction == BINDACTION_PUT)
{
- m_aCommand.Name = OUString::createFromAscii ("insert");
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list