[Libreoffice-commits] .: binfilter/bf_sfx2

[Gert Faller]

 binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx      |   18 ++++++++---------
 binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx     |    4 +--
 binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx |    6 ++---
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 74bee933266c4acad311a82203bf087ce40fe81c
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Fri Dec 3 16:43:01 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM in filters 21

diff --git a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
index f4ea7cf..b66811f 100644
--- a/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
+++ b/binfilter/bf_sfx2/source/config/sfx2_evntconf.cxx
@@ -370,17 +370,17 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
 /*N*/             SEQUENCE < PROPERTYVALUE > aProperties(3);
 /*N*/             PROPERTYVALUE  *pValues = aProperties.getArray();
 /*N*/ 
-/*N*/             OUSTRING    aType   = OUSTRING::createFromAscii( STAR_BASIC );;
+/*N*/             OUSTRING    aType   (RTL_CONSTASCII_USTRINGPARAM( STAR_BASIC ));
 /*N*/             OUSTRING    aLib    = pMacro->GetLibName();
 /*N*/             OUSTRING    aMacro  = pMacro->GetMacName();
 /*N*/ 
-/*N*/             pValues[ 0 ].Name = OUSTRING::createFromAscii( PROP_EVENT_TYPE );
+/*N*/             pValues[ 0 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
 /*N*/             pValues[ 0 ].Value <<= aType;
 /*N*/ 
-/*N*/             pValues[ 1 ].Name = OUSTRING::createFromAscii( PROP_LIBRARY );
+/*N*/             pValues[ 1 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
 /*N*/             pValues[ 1 ].Value <<= aLib;
 /*N*/ 
-/*N*/             pValues[ 2 ].Name = OUSTRING::createFromAscii( PROP_MACRO_NAME );
+/*N*/             pValues[ 2 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
 /*N*/             pValues[ 2 ].Value <<= aMacro;
 /*N*/ 
 /*N*/             aEventData <<= aProperties;
@@ -393,10 +393,10 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
 /*?*/             OUSTRING    aLib    = pMacro->GetLibName();
 /*?*/             OUSTRING    aMacro  = pMacro->GetMacName();
 /*?*/ 
-/*?*/             pValues[ 0 ].Name = OUSTRING::createFromAscii( PROP_EVENT_TYPE );
+/*?*/             pValues[ 0 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
 /*?*/             pValues[ 0 ].Value <<= aLib;
 /*?*/ 
-/*?*/             pValues[ 1 ].Name = OUSTRING::createFromAscii( PROP_SCRIPT );
+/*?*/             pValues[ 1 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
 /*?*/             pValues[ 1 ].Value <<= aMacro;
 /*?*/ 
 /*?*/             aEventData <<= aProperties;
@@ -408,10 +408,10 @@ void SfxEventConfigItem_Impl::Init( SfxConfigManager *pMgr )
 /*?*/ 
 /*?*/             OUSTRING    aMacro  = pMacro->GetMacName();
 /*?*/ 
-/*?*/             pValues[ 0 ].Name = OUSTRING::createFromAscii( PROP_EVENT_TYPE );
-/*?*/             pValues[ 0 ].Value <<= ::rtl::OUString::createFromAscii(SVX_MACRO_LANGUAGE_JAVASCRIPT);
+/*?*/             pValues[ 0 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+/*?*/             pValues[ 0 ].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT));
 /*?*/ 
-/*?*/             pValues[ 1 ].Name = OUSTRING::createFromAscii( PROP_MACRO_NAME );
+/*?*/             pValues[ 1 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
 /*?*/             pValues[ 1 ].Value <<= aMacro;
 /*?*/ 
 /*?*/             aEventData <<= aProperties;
diff --git a/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx b/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
index 4dc3a33..8a8b759 100644
--- a/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
+++ b/binfilter/bf_sfx2/source/control/sfx2_srchitem.cxx
@@ -101,7 +101,7 @@ using namespace ::com::sun::star::uno;
 /*N*/ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
 /*N*/ 
 /*N*/ 	SfxPoolItem( nId ),
-/*N*/ 	ConfigItem( OUString::createFromAscii( CFG_ROOT_NODE ) ),
+/*N*/ 	ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ),
 /*N*/ 
 /*N*/ 	aSearchOpt		(	SearchAlgorithms_ABSOLUTE,
 /*N*/ 						SearchFlags::LEV_RELAXED,
@@ -182,7 +182,7 @@ using namespace ::com::sun::star::uno;
 /*N*/ SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
 /*N*/ 
 /*N*/ 	SfxPoolItem	( rItem ),
-/*N*/ 	ConfigItem( OUString::createFromAscii( CFG_ROOT_NODE ) ),
+/*N*/ 	ConfigItem( OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ),
 /*N*/ 
 /*N*/ 	aSearchOpt		( rItem.aSearchOpt ),
 /*N*/ 	nCommand		( rItem.nCommand ),
diff --git a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
index f0dd57f..117b1ef 100644
--- a/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
+++ b/binfilter/bf_sfx2/source/notify/sfx2_eventsupplier.cxx
@@ -387,11 +387,11 @@ namespace binfilter {
                     aLibrary = sDocument;
             }
 /*N*/ 
-/*N*/ 		aOutProps[1].Name = OUSTRING::createFromAscii( PROP_SCRIPT );
+/*N*/ 		aOutProps[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
 /*N*/ 		aOutProps[1].Value <<= aScript;
-/*N*/ 		aOutProps[2].Name = OUSTRING::createFromAscii( PROP_LIBRARY );
+/*N*/ 		aOutProps[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
 /*N*/ 		aOutProps[2].Value <<= aLibrary;
-/*N*/ 		aOutProps[3].Name = OUSTRING::createFromAscii( PROP_MACRO_NAME );
+/*N*/ 		aOutProps[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
 /*N*/ 		aOutProps[3].Value <<= aMacroName;
 /*N*/ 		rRet <<= aOutProps;
 /*N*/     }