strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RTL_CONSTASCII_USTRINGPARAM

Browse source
This commit is contained in:
serval 2010-12-22 16:20:58 +00:00 committed by Caolán McNamara
parent abc856e6ca
commit 5365b69ea4
10 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dtrans/source/win32/ftransl/ftransl.cxx
View file

@ -58,8 +58,7 @@
#define CPPUTYPE_DEFAULT CPPUTYPE_SEQSALINT8
#define CPPUTYPE_OUSTR getCppuType( (const ::rtl::OUString*) 0 )
#define CPPUTYPE_SALINT32 getCppuType( ( sal_Int32 * ) 0 )
#define OUSTR( str ) OUString::createFromAscii( #str )
#define OUSTR_( str ) OUString::createFromAscii( str )
#define OUSTR( str ) OUString(RTL_CONSTASCII_USTRINGPARAM( #str ))
#define EMPTY_OUSTR OUString()
const rtl::OUString Windows_FormatName (RTL_CONSTASCII_USTRINGPARAM("windows_formatname"));

2
i18npool/source/transliteration/transliteration_body.cxx
View file

@ -48,8 +48,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::rtl;
#define A2OU(x) OUString::createFromAscii(x)
namespace com { namespace sun { namespace star { namespace i18n {

13
svl/source/config/asiancfg.cxx
View file

@ -45,10 +45,7 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
#define C2U(cChar) OUString::createFromAscii(cChar)
const sal_Char sStartEndCharacters[] = "StartEndCharacters";
const sal_Char sStartCharacters[] = "StartCharacters";
const sal_Char sEndCharacters[] = "EndCharacters";
#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
//-----------------------------------------------------------------------------
struct SvxForbiddenStruct_Impl
@ -106,7 +103,7 @@ void SvxAsianConfig::Load()
pValues[1] >>= pImpl->nCharDistanceCompression;
pImpl->aForbiddenArr.DeleteAndDestroy(0, pImpl->aForbiddenArr.Count());
OUString sPropPrefix(C2U(sStartEndCharacters));
OUString sPropPrefix(C2U("StartEndCharacters"));
Sequence<OUString> aNodes = GetNodeNames(sPropPrefix);
Sequence<OUString> aPropNames(aNodes.getLength() * 2);
@ -153,7 +150,7 @@ void SvxAsianConfig::Commit()
PutProperties(lcl_GetPropertyNames(), aValues);
OUString sNode(C2U(sStartEndCharacters));
OUString sNode(C2U("StartEndCharacters"));
if(!pImpl->aForbiddenArr.Count())
ClearNodeSet(sNode);
else
@ -161,8 +158,8 @@ void SvxAsianConfig::Commit()
Sequence<PropertyValue> aSetValues(2 * pImpl->aForbiddenArr.Count());
PropertyValue* pSetValues = aSetValues.getArray();
sal_Int32 nSetValue = 0;
const OUString sStartChars(C2U(sStartCharacters));
const OUString sEndChars(C2U(sEndCharacters));
const OUString sStartChars(C2U("StartCharacters"));
const OUString sEndChars(C2U("EndCharacters"));
for(sal_uInt16 i = 0; i < pImpl->aForbiddenArr.Count(); i++)
{
OUString sPrefix(sNode);

2
svl/source/config/cjkoptions.cxx
View file

@ -45,7 +45,7 @@
using namespace ::com::sun::star::uno;
using namespace ::rtl;
#define C2U(cChar) OUString::createFromAscii(cChar)
#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
#define CFG_READONLY_DEFAULT sal_False
class SvtCJKOptions_Impl : public utl::ConfigItem

2
svl/source/config/srchcfg.cxx
View file

@ -44,7 +44,7 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
#define C2U(cChar) OUString::createFromAscii(cChar)
#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
//-----------------------------------------------------------------------------
typedef SvxSearchEngineData* SvxSearchEngineDataPtr;

2
unotools/source/config/configitem.cxx
View file

@ -61,7 +61,7 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::container;
using namespace com::sun::star::configuration;
#define C2U(cChar) OUString::createFromAscii(cChar)
#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
#include <cppuhelper/implbase1.hxx> // helper for implementations
#ifdef DBG_UTIL

4
unotools/source/config/fltrcfg.cxx
View file

@ -40,7 +40,7 @@ using namespace utl;
using namespace rtl;
using namespace com::sun::star::uno;
#define C2U(cChar) OUString::createFromAscii(cChar)
#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
// -----------------------------------------------------------------------
#define FILTERCFG_WORD_CODE 0x0001
@ -350,7 +350,7 @@ const Sequence<OUString>& SvtFilterOptions::GetPropertyNames()
};
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
pNames[i] = C2U(aPropNames[i]);
pNames[i] = OUString::createFromAscii(aPropNames[i]);
}
return aNames;
}

2
unotools/source/config/javaoptions.cxx
View file

@ -38,7 +38,7 @@
using namespace ::com::sun::star::uno;
using namespace ::rtl;
#define C2U(cChar) OUString::createFromAscii(cChar)
#define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
#define CFG_READONLY_DEFAULT sal_False
class SvtExecAppletsItem_Impl : public utl::ConfigItem

4
unotools/source/config/lingucfg.cxx
View file

@ -54,7 +54,7 @@
using namespace rtl;
using namespace com::sun::star;
#define A2OU(x) ::rtl::OUString::createFromAscii( x )
#define A2OU(x) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
#define EXPAND_PROTOCOL "vnd.sun.star.expand:"
#define FILE_PROTOCOL "file:///"
@ -303,7 +303,7 @@ const uno::Sequence< OUString > & SvtLinguConfigItem::GetPropertyNames()
{
const sal_Char *pFullPropName = aNamesToHdl[i].pFullPropName;
if (pFullPropName)
pNames[ nIdx++ ] = A2OU( pFullPropName );
pNames[ nIdx++ ] = ::rtl::OUString::createFromAscii( pFullPropName );
}
aNames.realloc( nIdx );
bInitialized = sal_True;

4
unotools/source/config/misccfg.cxx
View file

@ -49,8 +49,6 @@
using namespace rtl;
using namespace com::sun::star::uno;
#define C2U(cChar) OUString::createFromAscii(cChar)
namespace utl
{
@ -90,7 +88,7 @@ public:
};
SfxMiscCfg::SfxMiscCfg() :
ConfigItem(C2U("Office.Common") ),
ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common")) ),
bPaperSize(FALSE),
bPaperOrientation (FALSE),
bNotFound (FALSE),