removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b Reviewed-on: https://gerrit.libreoffice.org/2835 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
This commit is contained in:
Thomas Arnhold
parent
5c908d0431
commit
39d45390f4
@ -397,7 +397,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -582,7 +582,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -394,7 +394,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -434,7 +434,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -641,7 +641,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -418,7 +418,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -592,7 +592,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -292,7 +292,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -393,7 +393,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -502,7 +502,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -585,7 +585,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -502,7 +502,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -536,7 +536,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -439,7 +439,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -503,7 +503,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -355,7 +355,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -397,7 +397,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -547,7 +547,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -355,7 +355,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -331,7 +331,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -502,7 +502,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -291,7 +291,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -369,7 +369,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = 0;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -336,7 +336,7 @@ void unoInterfaceProxyDispatch(
|
||||
aParam.bOut = sal_False;
|
||||
|
||||
typelib_TypeDescriptionReference * pReturnTypeRef = NULL;
|
||||
OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aVoidName("void");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
|
||||
|
||||
|
||||
@ -517,7 +517,7 @@ namespace {
|
||||
|
||||
bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
|
||||
css::uno::Sequence< rtl::OUString > const & serviceNames) {
|
||||
rtl::OUString keyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
|
||||
rtl::OUString keyName( "/" );
|
||||
keyName += implementationName;
|
||||
keyName += rtl::OUString( "/UNO/SERVICES" );
|
||||
css::uno::Reference< css::registry::XRegistryKey > key;
|
||||
|
||||
@ -177,7 +177,7 @@ namespace {
|
||||
bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName,
|
||||
css::uno::Sequence< rtl::OUString > const & rServiceNames)
|
||||
{
|
||||
rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
|
||||
rtl::OUString aKeyName( "/" );
|
||||
aKeyName += rtl::OUString::createFromAscii(pImplementationName);
|
||||
aKeyName += rtl::OUString( "/UNO/SERVICES" );
|
||||
css::uno::Reference< css::registry::XRegistryKey > xKey;
|
||||
|
||||
@ -171,7 +171,7 @@ void main()
|
||||
MyTimer timer( "performance - 1000*1000 unicode string construction/destruction" );
|
||||
for( int i = 0 ; i < 1000*1000 ; i ++ )
|
||||
{
|
||||
OUString textEnc( RTL_CONSTASCII_USTRINGPARAM( "this is a test string" ) );
|
||||
OUString textEnc( "this is a test string" );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -672,7 +672,7 @@ void testRemote( const Reference< XInterface > &rRemote )
|
||||
//--------------------
|
||||
// Test attributes
|
||||
//----------------------
|
||||
OUString ow( RTL_CONSTASCII_USTRINGPARAM( "dum didel dum dideldei" ));
|
||||
OUString ow( "dum didel dum dideldei" );
|
||||
rLCallMe->setsAttribute( ow );
|
||||
OSL_ASSERT( rLCallMe->getsAttribute() == ow );
|
||||
|
||||
|
||||
@ -237,7 +237,7 @@ System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD)
|
||||
case typelib_TypeClass_INTERFACE:
|
||||
{
|
||||
//special handling for XInterface, since it does not exist in cli.
|
||||
rtl::OUString usXInterface(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface"));
|
||||
rtl::OUString usXInterface("com.sun.star.uno.XInterface");
|
||||
if (usXInterface.equals(pTD->pTypeName))
|
||||
retVal= System::Object::typeid;
|
||||
else
|
||||
@ -1072,7 +1072,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
|
||||
{
|
||||
typelib_TypeDescriptionReference * member_type= NULL;
|
||||
|
||||
rtl::OUString usUnoException(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception"));
|
||||
rtl::OUString usUnoException("com.sun.star.uno.Exception");
|
||||
for (; nPos < nMembers; ++nPos)
|
||||
{
|
||||
member_type= comp_td->ppTypeRefs[nPos];
|
||||
@ -1092,7 +1092,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
|
||||
// System.Exception property. Type.GetField("Message") returns null
|
||||
if ( ! aField && usUnoException.equals(td.get()->pTypeName))
|
||||
{// get Exception.Message property
|
||||
rtl::OUString usMessageMember(RTL_CONSTASCII_USTRINGPARAM("Message"));
|
||||
rtl::OUString usMessageMember("Message");
|
||||
if (usMessageMember.equals(comp_td->ppMemberNames[nPos]))
|
||||
{
|
||||
sr::PropertyInfo^ pi= cliType->GetProperty(
|
||||
@ -1625,7 +1625,7 @@ void Bridge::map_to_cli(
|
||||
pCTD = pCTD->pBaseTypeDescription;
|
||||
int nPos = -1;
|
||||
|
||||
rtl::OUString usMessageMember(RTL_CONSTASCII_USTRINGPARAM("Message"));
|
||||
rtl::OUString usMessageMember("Message");
|
||||
for (int i = 0; i < pCTD->nMembers; i ++)
|
||||
{
|
||||
#if OSL_DEBUG_LEVEL >= 2
|
||||
@ -1685,7 +1685,7 @@ void Bridge::map_to_cli(
|
||||
((typelib_TypeDescription *)comp_td->pBaseTypeDescription)->pWeakRef, nullptr,
|
||||
true);
|
||||
}
|
||||
rtl::OUString usUnoException(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception"));
|
||||
rtl::OUString usUnoException("com.sun.star.uno.Exception");
|
||||
for (sal_Int32 nPos = comp_td->nMembers; nPos--; )
|
||||
{
|
||||
typelib_TypeDescriptionReference * member_type = comp_td->ppTypeRefs[ nPos ];
|
||||
|
||||
@ -29,8 +29,8 @@ namespace connectivity
|
||||
if ( sStmt.startsWith("INSERT") )
|
||||
{
|
||||
sStatement = m_sGeneratedValueStatement;
|
||||
static const ::rtl::OUString sColumn(RTL_CONSTASCII_USTRINGPARAM("$column"));
|
||||
static const ::rtl::OUString sTable(RTL_CONSTASCII_USTRINGPARAM("$table"));
|
||||
static const ::rtl::OUString sColumn("$column");
|
||||
static const ::rtl::OUString sTable("$table");
|
||||
sal_Int32 nIndex = 0;
|
||||
nIndex = sStatement.indexOf(sColumn,nIndex);
|
||||
if ( -1 != nIndex )
|
||||
|
||||
@ -118,7 +118,7 @@ OConnectionWrapper::~OConnectionWrapper()
|
||||
aSupported = m_xServiceInfo->getSupportedServiceNames();
|
||||
|
||||
// append our own service, if necessary
|
||||
::rtl::OUString sConnectionService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.Connection" ) );
|
||||
::rtl::OUString sConnectionService( "com.sun.star.sdbc.Connection" );
|
||||
if ( 0 == ::comphelper::findValue( aSupported, sConnectionService, sal_True ).getLength() )
|
||||
{
|
||||
sal_Int32 nLen = aSupported.getLength();
|
||||
|
||||
@ -83,8 +83,8 @@ using namespace ::com::sun::star::uno;
|
||||
::rtl::OUString aTemp;
|
||||
_rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aTemp;
|
||||
sal_Int32 nIndex = (sal_Int32)-1;
|
||||
const ::rtl::OUString sQuot(RTL_CONSTASCII_USTRINGPARAM("\'"));
|
||||
const ::rtl::OUString sQuotToReplace(RTL_CONSTASCII_USTRINGPARAM("\'\'"));
|
||||
const ::rtl::OUString sQuot("\'");
|
||||
const ::rtl::OUString sQuotToReplace("\'\'");
|
||||
do
|
||||
{
|
||||
nIndex += 2;
|
||||
@ -258,7 +258,7 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
|
||||
if ((NumberFormat::NUMBER == nRealUsedTypeClass) && (NumberFormat::PERCENT == nTypeClass))
|
||||
{ // formatting should be "percent", but the String provides just a simple number -> adjust
|
||||
::rtl::OUString sExpanded(rString);
|
||||
static ::rtl::OUString s_sPercentSymbol( RTL_CONSTASCII_USTRINGPARAM( "%" ));
|
||||
static ::rtl::OUString s_sPercentSymbol( "%" );
|
||||
// need a method to add a sal_Unicode to a string, 'til then we use a static string
|
||||
sExpanded += s_sPercentSymbol;
|
||||
fValue = xFormatter->convertStringToNumber(nKeyToUse, sExpanded);
|
||||
|
||||
@ -43,7 +43,7 @@ namespace
|
||||
if ( aPropertiesNode.isValid() )
|
||||
{
|
||||
uno::Sequence< ::rtl::OUString > aStringSeq;
|
||||
static const ::rtl::OUString s_sValue(RTL_CONSTASCII_USTRINGPARAM("/Value"));
|
||||
static const ::rtl::OUString s_sValue("/Value");
|
||||
const uno::Sequence< ::rtl::OUString > aProperties = aPropertiesNode.getNodeNames();
|
||||
const ::rtl::OUString* pPropertiesIter = aProperties.getConstArray();
|
||||
const ::rtl::OUString* pPropertiesEnd = pPropertiesIter + aProperties.getLength();
|
||||
@ -96,7 +96,7 @@ void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rx
|
||||
{
|
||||
if ( !m_aInstalled.isValid() )
|
||||
{
|
||||
static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess.Drivers/Installed")); ///Installed
|
||||
static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess.Drivers/Installed"); ///Installed
|
||||
m_aInstalled = ::utl::OConfigurationTreeRoot::createWithComponentContext(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
|
||||
}
|
||||
|
||||
|
||||
@ -1060,8 +1060,8 @@ bool ORowSetValue::getBool() const
|
||||
case DataType::LONGVARCHAR:
|
||||
{
|
||||
const ::rtl::OUString sValue(m_aValue.m_pString);
|
||||
const static ::rtl::OUString s_sTrue(RTL_CONSTASCII_USTRINGPARAM("true"));
|
||||
const static ::rtl::OUString s_sFalse(RTL_CONSTASCII_USTRINGPARAM("false"));
|
||||
const static ::rtl::OUString s_sTrue("true");
|
||||
const static ::rtl::OUString s_sFalse("false");
|
||||
if ( sValue.equalsIgnoreAsciiCase(s_sTrue) )
|
||||
{
|
||||
bRet = sal_True;
|
||||
|
||||
@ -177,7 +177,7 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName
|
||||
return cloneDescriptor( descriptor );
|
||||
|
||||
Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
|
||||
::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
|
||||
::rtl::OUString aSql( "ALTER TABLE " );
|
||||
|
||||
aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
|
||||
aSql += ::rtl::OUString(" ADD ");
|
||||
@ -198,7 +198,7 @@ void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem
|
||||
OSL_ENSURE(m_pTable,"OColumnsHelper::dropByName: Table is null!");
|
||||
if ( m_pTable && !m_pTable->isNew() )
|
||||
{
|
||||
::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "ALTER TABLE " ));
|
||||
::rtl::OUString aSql( "ALTER TABLE " );
|
||||
Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
|
||||
::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString( );
|
||||
|
||||
|
||||
@ -60,7 +60,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName)
|
||||
if ( xResult.is() )
|
||||
{
|
||||
Reference< XRow > xRow(xResult,UNO_QUERY);
|
||||
::rtl::OUString aD(RTL_CONSTASCII_USTRINGPARAM("D"));
|
||||
::rtl::OUString aD("D");
|
||||
while( xResult->next() )
|
||||
{
|
||||
if(xRow->getString(9) == _rName)
|
||||
|
||||
@ -138,7 +138,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName
|
||||
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
|
||||
::rtl::OUStringBuffer aSql( ::rtl::OUString("CREATE "));
|
||||
::rtl::OUString aQuote = m_pTable->getMetaData()->getIdentifierQuoteString( );
|
||||
::rtl::OUString aDot( RTL_CONSTASCII_USTRINGPARAM( "." ));
|
||||
::rtl::OUString aDot( "." );
|
||||
|
||||
if(comphelper::getBOOL(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISUNIQUE))))
|
||||
aSql.appendAscii("UNIQUE ");
|
||||
@ -226,7 +226,7 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem
|
||||
aSchema = _sElementName.copy(0,nLen);
|
||||
aName = _sElementName.copy(nLen+1);
|
||||
|
||||
::rtl::OUString aSql( RTL_CONSTASCII_USTRINGPARAM( "DROP INDEX " ));
|
||||
::rtl::OUString aSql( "DROP INDEX " );
|
||||
|
||||
::rtl::OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true );
|
||||
::rtl::OUString sIndexName,sTemp;
|
||||
|
||||
@ -122,13 +122,13 @@ namespace connectivity
|
||||
Reference<XMultiServiceFactory> xFac(_xConnection,UNO_QUERY);
|
||||
if ( xFac.is() )
|
||||
{
|
||||
static const ::rtl::OUString s_sTableRename(RTL_CONSTASCII_USTRINGPARAM("TableRenameServiceName"));
|
||||
static const ::rtl::OUString s_sTableRename("TableRenameServiceName");
|
||||
m_xRename.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableRename)),UNO_QUERY);
|
||||
static const ::rtl::OUString s_sTableAlteration(RTL_CONSTASCII_USTRINGPARAM("TableAlterationServiceName"));
|
||||
static const ::rtl::OUString s_sTableAlteration("TableAlterationServiceName");
|
||||
m_xAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableAlteration)),UNO_QUERY);
|
||||
static const ::rtl::OUString s_sKeyAlteration(RTL_CONSTASCII_USTRINGPARAM("KeyAlterationServiceName"));
|
||||
static const ::rtl::OUString s_sKeyAlteration("KeyAlterationServiceName");
|
||||
m_xKeyAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sKeyAlteration)),UNO_QUERY);
|
||||
static const ::rtl::OUString s_sIndexAlteration(RTL_CONSTASCII_USTRINGPARAM("IndexAlterationServiceName"));
|
||||
static const ::rtl::OUString s_sIndexAlteration("IndexAlterationServiceName");
|
||||
m_xIndexAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sIndexAlteration)),UNO_QUERY);
|
||||
}
|
||||
}
|
||||
@ -475,7 +475,7 @@ void OTableHelper::refreshIndexes()
|
||||
// -----------------------------------------------------------------------------
|
||||
::rtl::OUString OTableHelper::getRenameStart() const
|
||||
{
|
||||
::rtl::OUString sSql(RTL_CONSTASCII_USTRINGPARAM("RENAME "));
|
||||
::rtl::OUString sSql("RENAME ");
|
||||
if ( m_Type == ::rtl::OUString("VIEW") )
|
||||
sSql += ::rtl::OUString(" VIEW ");
|
||||
else
|
||||
|
||||
@ -35,7 +35,7 @@ namespace dbtools
|
||||
//=====================================================================
|
||||
static const ::rtl::OUString& getActiveConnectionPropertyName()
|
||||
{
|
||||
static const ::rtl::OUString s_sActiveConnectionPropertyName( RTL_CONSTASCII_USTRINGPARAM( "ActiveConnection" ));
|
||||
static const ::rtl::OUString s_sActiveConnectionPropertyName( "ActiveConnection" );
|
||||
return s_sActiveConnectionPropertyName;
|
||||
}
|
||||
|
||||
|
||||
@ -441,7 +441,7 @@ namespace dbtools
|
||||
{
|
||||
// our time struct only supports hundredth seconds
|
||||
sNano = sNano.copy(0,::std::min<sal_Int32>(sNano.getLength(),2));
|
||||
const static ::rtl::OUString s_Zeros(RTL_CONSTASCII_USTRINGPARAM("00"));
|
||||
const static ::rtl::OUString s_Zeros("00");
|
||||
sNano += s_Zeros.copy(0,s_Zeros.getLength() - sNano.getLength());
|
||||
nHundredthSeconds = static_cast<sal_uInt16>(sNano.toInt32());
|
||||
}
|
||||
|
||||
@ -393,7 +393,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
|
||||
|
||||
// build a connection with it's current settings (4. data source name, or 5. URL)
|
||||
|
||||
const ::rtl::OUString sUserProp( RTL_CONSTASCII_USTRINGPARAM( "User" ));
|
||||
const ::rtl::OUString sUserProp( "User" );
|
||||
::rtl::OUString sDataSourceName;
|
||||
xRowSetProps->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName;
|
||||
::rtl::OUString sURL;
|
||||
@ -952,7 +952,7 @@ Reference< XNumberFormatsSupplier> getNumberFormats(
|
||||
// ask the parent of the connection (should be an DatabaseAccess)
|
||||
Reference< XNumberFormatsSupplier> xReturn;
|
||||
Reference< XChild> xConnAsChild(_rxConn, UNO_QUERY);
|
||||
::rtl::OUString sPropFormatsSupplier( RTL_CONSTASCII_USTRINGPARAM( "NumberFormatsSupplier" ));
|
||||
::rtl::OUString sPropFormatsSupplier( "NumberFormatsSupplier" );
|
||||
if (xConnAsChild.is())
|
||||
{
|
||||
Reference< XPropertySet> xConnParentProps(xConnAsChild->getParent(), UNO_QUERY);
|
||||
@ -990,22 +990,22 @@ try
|
||||
Property* pOldProps = aOldProperties.getArray();
|
||||
Property* pNewProps = aNewProperties.getArray();
|
||||
|
||||
::rtl::OUString sPropDefaultControl(RTL_CONSTASCII_USTRINGPARAM("DefaultControl"));
|
||||
::rtl::OUString sPropLabelControl(RTL_CONSTASCII_USTRINGPARAM("LabelControl"));
|
||||
::rtl::OUString sPropFormatsSupplier(RTL_CONSTASCII_USTRINGPARAM("FormatsSupplier"));
|
||||
::rtl::OUString sPropCurrencySymbol(RTL_CONSTASCII_USTRINGPARAM("CurrencySymbol"));
|
||||
::rtl::OUString sPropDecimals(RTL_CONSTASCII_USTRINGPARAM("Decimals"));
|
||||
::rtl::OUString sPropEffectiveMin(RTL_CONSTASCII_USTRINGPARAM("EffectiveMin"));
|
||||
::rtl::OUString sPropEffectiveMax(RTL_CONSTASCII_USTRINGPARAM("EffectiveMax"));
|
||||
::rtl::OUString sPropEffectiveDefault(RTL_CONSTASCII_USTRINGPARAM("EffectiveDefault"));
|
||||
::rtl::OUString sPropDefaultText(RTL_CONSTASCII_USTRINGPARAM("DefaultText"));
|
||||
::rtl::OUString sPropDefaultDate(RTL_CONSTASCII_USTRINGPARAM("DefaultDate"));
|
||||
::rtl::OUString sPropDefaultTime(RTL_CONSTASCII_USTRINGPARAM("DefaultTime"));
|
||||
::rtl::OUString sPropValueMin(RTL_CONSTASCII_USTRINGPARAM("ValueMin"));
|
||||
::rtl::OUString sPropValueMax(RTL_CONSTASCII_USTRINGPARAM("ValueMax"));
|
||||
::rtl::OUString sPropDecimalAccuracy(RTL_CONSTASCII_USTRINGPARAM("DecimalAccuracy"));
|
||||
::rtl::OUString sPropClassId(RTL_CONSTASCII_USTRINGPARAM("ClassId"));
|
||||
::rtl::OUString sFormattedServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FormattedField" ) );
|
||||
::rtl::OUString sPropDefaultControl("DefaultControl");
|
||||
::rtl::OUString sPropLabelControl("LabelControl");
|
||||
::rtl::OUString sPropFormatsSupplier("FormatsSupplier");
|
||||
::rtl::OUString sPropCurrencySymbol("CurrencySymbol");
|
||||
::rtl::OUString sPropDecimals("Decimals");
|
||||
::rtl::OUString sPropEffectiveMin("EffectiveMin");
|
||||
::rtl::OUString sPropEffectiveMax("EffectiveMax");
|
||||
::rtl::OUString sPropEffectiveDefault("EffectiveDefault");
|
||||
::rtl::OUString sPropDefaultText("DefaultText");
|
||||
::rtl::OUString sPropDefaultDate("DefaultDate");
|
||||
::rtl::OUString sPropDefaultTime("DefaultTime");
|
||||
::rtl::OUString sPropValueMin("ValueMin");
|
||||
::rtl::OUString sPropValueMax("ValueMax");
|
||||
::rtl::OUString sPropDecimalAccuracy("DecimalAccuracy");
|
||||
::rtl::OUString sPropClassId("ClassId");
|
||||
::rtl::OUString sFormattedServiceName( "com.sun.star.form.component.FormattedField" );
|
||||
|
||||
for (sal_Int16 i=0; i<aOldProperties.getLength(); ++i)
|
||||
{
|
||||
|
||||
@ -229,7 +229,7 @@ namespace
|
||||
static const ::rtl::OUString sComma(::rtl::OUString(","));
|
||||
|
||||
const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString());
|
||||
::rtl::OUString sSql( RTL_CONSTASCII_USTRINGPARAM( " (" ));
|
||||
::rtl::OUString sSql( " (" );
|
||||
Reference< XPropertySet > xColProp;
|
||||
|
||||
sal_Int32 nColCount = _xColumns->getCount();
|
||||
@ -673,15 +673,15 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
|
||||
Reference< XRow > xCurrentRow(xPrivileges, UNO_QUERY);
|
||||
|
||||
const ::rtl::OUString sUserWorkingFor = _xMetaData->getUserName();
|
||||
static const ::rtl::OUString sSELECT( RTL_CONSTASCII_USTRINGPARAM( "SELECT" ));
|
||||
static const ::rtl::OUString sINSERT( RTL_CONSTASCII_USTRINGPARAM( "INSERT" ));
|
||||
static const ::rtl::OUString sUPDATE( RTL_CONSTASCII_USTRINGPARAM( "UPDATE" ));
|
||||
static const ::rtl::OUString sDELETE( RTL_CONSTASCII_USTRINGPARAM( "DELETE" ));
|
||||
static const ::rtl::OUString sREAD( RTL_CONSTASCII_USTRINGPARAM( "READ" ));
|
||||
static const ::rtl::OUString sCREATE( RTL_CONSTASCII_USTRINGPARAM( "CREATE" ));
|
||||
static const ::rtl::OUString sALTER( RTL_CONSTASCII_USTRINGPARAM( "ALTER" ));
|
||||
static const ::rtl::OUString sREFERENCE( RTL_CONSTASCII_USTRINGPARAM( "REFERENCE" ));
|
||||
static const ::rtl::OUString sDROP( RTL_CONSTASCII_USTRINGPARAM( "DROP" ));
|
||||
static const ::rtl::OUString sSELECT( "SELECT" );
|
||||
static const ::rtl::OUString sINSERT( "INSERT" );
|
||||
static const ::rtl::OUString sUPDATE( "UPDATE" );
|
||||
static const ::rtl::OUString sDELETE( "DELETE" );
|
||||
static const ::rtl::OUString sREAD( "READ" );
|
||||
static const ::rtl::OUString sCREATE( "CREATE" );
|
||||
static const ::rtl::OUString sALTER( "ALTER" );
|
||||
static const ::rtl::OUString sREFERENCE( "REFERENCE" );
|
||||
static const ::rtl::OUString sDROP( "DROP" );
|
||||
|
||||
if ( xCurrentRow.is() )
|
||||
{
|
||||
@ -795,7 +795,7 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
|
||||
}
|
||||
catch(const SQLException& e)
|
||||
{
|
||||
static ::rtl::OUString sNotSupportedState( RTL_CONSTASCII_USTRINGPARAM( "IM001" ));
|
||||
static ::rtl::OUString sNotSupportedState( "IM001" );
|
||||
// some drivers don't support any privileges so we assume that we are allowed to do all we want :-)
|
||||
if(e.SQLState == sNotSupportedState)
|
||||
nPrivileges |= Privilege::DROP |
|
||||
@ -966,19 +966,19 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString&
|
||||
}
|
||||
::rtl::OUString lcl_getReportEngines()
|
||||
{
|
||||
static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/ReportEngines"));
|
||||
static ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/ReportEngines");
|
||||
return s_sNodeName;
|
||||
}
|
||||
// -----------------------------------------------------------------------------
|
||||
::rtl::OUString lcl_getDefaultReportEngine()
|
||||
{
|
||||
static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("DefaultReportEngine"));
|
||||
static ::rtl::OUString s_sNodeName("DefaultReportEngine");
|
||||
return s_sNodeName;
|
||||
}
|
||||
// -----------------------------------------------------------------------------
|
||||
::rtl::OUString lcl_getReportEngineNames()
|
||||
{
|
||||
static ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("ReportEngineNames"));
|
||||
static ::rtl::OUString s_sNodeName("ReportEngineNames");
|
||||
return s_sNodeName;
|
||||
}
|
||||
// -----------------------------------------------------------------------------
|
||||
@ -1000,7 +1000,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString&
|
||||
if ( aReportEngine.isValid() )
|
||||
{
|
||||
::rtl::OUString sRet;
|
||||
const static ::rtl::OUString s_sService(RTL_CONSTASCII_USTRINGPARAM("ServiceName"));
|
||||
const static ::rtl::OUString s_sService("ServiceName");
|
||||
aReportEngine.getNodeValue(s_sService) >>= sRet;
|
||||
return sRet;
|
||||
}
|
||||
|
||||
@ -380,7 +380,7 @@ namespace dbtools
|
||||
// did we find links where the detail field refers to a detail column (instead of a parameter name)?
|
||||
if ( !aAdditionalFilterComponents.empty() )
|
||||
{
|
||||
const static ::rtl::OUString s_sAnd( RTL_CONSTASCII_USTRINGPARAM( " AND " ) );
|
||||
const static ::rtl::OUString s_sAnd( " AND " );
|
||||
// build a conjunction of all the filter components
|
||||
::rtl::OUStringBuffer sAdditionalFilter;
|
||||
for ( ::std::vector< ::rtl::OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin();
|
||||
|
||||
@ -156,8 +156,8 @@ namespace dbtools
|
||||
)
|
||||
)
|
||||
{
|
||||
static const ::rtl::OUString sSingleQuote( RTL_CONSTASCII_USTRINGPARAM( "'" ) );
|
||||
static const ::rtl::OUString sDoubleQuote( RTL_CONSTASCII_USTRINGPARAM( "''" ) );
|
||||
static const ::rtl::OUString sSingleQuote( "'" );
|
||||
static const ::rtl::OUString sDoubleQuote( "''" );
|
||||
|
||||
sal_Int32 nIndex = -1;
|
||||
sal_Int32 nTemp = 0;
|
||||
@ -306,8 +306,8 @@ namespace dbtools
|
||||
if ( bValidQuotedText )
|
||||
{
|
||||
sValue = sValue.copy( 1, sValue.getLength() - 2 );
|
||||
static const ::rtl::OUString sSingleQuote( RTL_CONSTASCII_USTRINGPARAM( "'" ) );
|
||||
static const ::rtl::OUString sDoubleQuote( RTL_CONSTASCII_USTRINGPARAM( "''" ) );
|
||||
static const ::rtl::OUString sSingleQuote( "'" );
|
||||
static const ::rtl::OUString sDoubleQuote( "''" );
|
||||
|
||||
sal_Int32 nIndex = -1;
|
||||
sal_Int32 nTemp = 0;
|
||||
|
||||
@ -115,7 +115,7 @@ namespace connectivity
|
||||
//--------------------------------------------------------------------
|
||||
const ::rtl::OUString& SQLError_Impl::getMessagePrefix()
|
||||
{
|
||||
static ::rtl::OUString s_sMessagePrefix( RTL_CONSTASCII_USTRINGPARAM( "[OOoBase]" ) );
|
||||
static ::rtl::OUString s_sMessagePrefix( "[OOoBase]" );
|
||||
return s_sMessagePrefix;
|
||||
}
|
||||
|
||||
|
||||
@ -180,7 +180,7 @@ namespace dbtools
|
||||
|
||||
// the filter
|
||||
sal_Bool bApplyFilter = sal_True;
|
||||
const ::rtl::OUString sPropApply( RTL_CONSTASCII_USTRINGPARAM( "ApplyFilter" ));
|
||||
const ::rtl::OUString sPropApply( "ApplyFilter" );
|
||||
if ( ::comphelper::hasProperty( sPropApply, xQuery ) )
|
||||
{
|
||||
OSL_VERIFY( xQuery->getPropertyValue( sPropApply ) >>= bApplyFilter );
|
||||
|
||||
@ -53,7 +53,7 @@ namespace
|
||||
//--------------------------------------------------------------------
|
||||
static const ::rtl::OUString& getTimeoutNodeName()
|
||||
{
|
||||
static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "Timeout" ));
|
||||
static ::rtl::OUString s_sNodeName( "Timeout" );
|
||||
return s_sNodeName;
|
||||
}
|
||||
|
||||
|
||||
@ -435,7 +435,7 @@ void OConnection::buildTypeInfo() throw( SQLException)
|
||||
if ( bOk )
|
||||
{
|
||||
// HACK for access
|
||||
static const ::rtl::OUString s_sVarChar(RTL_CONSTASCII_USTRINGPARAM("VarChar"));
|
||||
static const ::rtl::OUString s_sVarChar("VarChar");
|
||||
do
|
||||
{
|
||||
sal_Int32 nPos = 1;
|
||||
|
||||
@ -68,7 +68,7 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInf
|
||||
{ // special handling for parameters
|
||||
/* we recusive replace all occurrences of ? in the statement and replace them with name like "æ¬å" */
|
||||
sal_Int32 nParameterCount = 0;
|
||||
::rtl::OUString sDefaultName( RTL_CONSTASCII_USTRINGPARAM( "parame" ));
|
||||
::rtl::OUString sDefaultName( "parame" );
|
||||
replaceParameterNodeName(pNode,sDefaultName,nParameterCount);
|
||||
pNode->parseNodeToStr( sNewSql, _pConnection );
|
||||
delete pNode;
|
||||
@ -215,7 +215,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn
|
||||
m_pParameters->get_Count(&nCount);
|
||||
if(nCount < (parameterIndex-1))
|
||||
{
|
||||
::rtl::OUString sDefaultName( RTL_CONSTASCII_USTRINGPARAM( "parame" ));
|
||||
::rtl::OUString sDefaultName( "parame" );
|
||||
sDefaultName += ::rtl::OUString::valueOf(parameterIndex);
|
||||
ADOParameter* pParam = m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,_Val);
|
||||
if(pParam)
|
||||
|
||||
@ -1986,7 +1986,7 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata
|
||||
|
||||
++nPos;
|
||||
::rtl::OUStringBuffer aTypes;
|
||||
::rtl::OUString aComma( RTL_CONSTASCII_USTRINGPARAM( "," ));
|
||||
::rtl::OUString aComma( "," );
|
||||
const ::rtl::OUString* pIter = types.getConstArray();
|
||||
const ::rtl::OUString* pEnd = pIter + types.getLength();
|
||||
for( ; pIter != pEnd ; ++pIter)
|
||||
|
||||
@ -53,8 +53,8 @@ void OHCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject
|
||||
void OHCatalog::refreshTables()
|
||||
{
|
||||
TStringVector aVector;
|
||||
static const ::rtl::OUString s_sTableTypeView(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
|
||||
static const ::rtl::OUString s_sTableTypeTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
|
||||
static const ::rtl::OUString s_sTableTypeView("VIEW");
|
||||
static const ::rtl::OUString s_sTableTypeTable("TABLE");
|
||||
|
||||
Sequence< ::rtl::OUString > sTableTypes(2);
|
||||
sTableTypes[0] = s_sTableTypeView;
|
||||
|
||||
@ -757,7 +757,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri
|
||||
// -----------------------------------------------------------------------------
|
||||
::rtl::OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const ::rtl::OUString& _sDriverClass)
|
||||
{
|
||||
static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths"));
|
||||
static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths");
|
||||
::utl::OConfigurationTreeRoot aNamesRoot = ::utl::OConfigurationTreeRoot::createWithComponentContext(
|
||||
m_pDriver->getContext().getUNOContext(), s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
|
||||
::rtl::OUString sURL;
|
||||
|
||||
@ -46,7 +46,7 @@ namespace connectivity
|
||||
com::sun::star::configuration::theDefaultProvider::get(
|
||||
comphelper::getComponentContext( _rxORB ) ) );
|
||||
|
||||
::rtl::OUString sCompleteNodePath(RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.DataAccess/DriverSettings/" ));
|
||||
::rtl::OUString sCompleteNodePath( "/org.openoffice.Office.DataAccess/DriverSettings/" );
|
||||
sCompleteNodePath += OConnection::getDriverImplementationName();
|
||||
|
||||
//=========================================================
|
||||
|
||||
@ -114,8 +114,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
|
||||
{
|
||||
nsCOMPtr<nsILocalFile> binDir;
|
||||
// Note: if path3 construction fails, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2()
|
||||
rtl::OUString path1(
|
||||
RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program"));
|
||||
rtl::OUString path1("$BRAND_BASE_DIR/program");
|
||||
rtl::Bootstrap::expandMacros(path1);
|
||||
rtl::OString path2;
|
||||
if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) ==
|
||||
|
||||
@ -54,9 +54,9 @@ void OMySQLCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfOb
|
||||
void OMySQLCatalog::refreshTables()
|
||||
{
|
||||
TStringVector aVector;
|
||||
static const ::rtl::OUString s_sTableTypeView(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
|
||||
static const ::rtl::OUString s_sTableTypeTable(RTL_CONSTASCII_USTRINGPARAM("TABLE"));
|
||||
static const ::rtl::OUString s_sAll(RTL_CONSTASCII_USTRINGPARAM("%"));
|
||||
static const ::rtl::OUString s_sTableTypeView("VIEW");
|
||||
static const ::rtl::OUString s_sTableTypeTable("TABLE");
|
||||
static const ::rtl::OUString s_sAll("%");
|
||||
|
||||
Sequence< ::rtl::OUString > sTableTypes(3);
|
||||
sTableTypes[0] = s_sTableTypeView;
|
||||
|
||||
@ -164,7 +164,7 @@ OUString ConnectionGetImplementationName()
|
||||
}
|
||||
com::sun::star::uno::Sequence<rtl::OUString> ConnectionGetSupportedServiceNames(void)
|
||||
{
|
||||
OUString serv( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.Connection" ) );
|
||||
OUString serv( "com.sun.star.sdbc.Connection" );
|
||||
return Sequence< OUString> (&serv,1);
|
||||
}
|
||||
|
||||
|
||||
@ -102,8 +102,7 @@ OUString DriverGetImplementationName()
|
||||
if (! p )
|
||||
{
|
||||
MutexGuard guard( osl::Mutex::getGlobalMutex() );
|
||||
static OUString instance(
|
||||
RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.connectivity.pq.Driver.noext" ) );
|
||||
static OUString instance( "org.openoffice.comp.connectivity.pq.Driver.noext" );
|
||||
p = &instance;
|
||||
}
|
||||
return *p;
|
||||
@ -115,7 +114,7 @@ Sequence< OUString > DriverGetSupportedServiceNames()
|
||||
if( ! p )
|
||||
{
|
||||
MutexGuard guard( osl::Mutex::getGlobalMutex() );
|
||||
OUString tmp( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdbc.Driver" ) );
|
||||
OUString tmp( "com.sun.star.sdbc.Driver" );
|
||||
static Sequence< OUString > instance( &tmp,1 );
|
||||
p = &instance;
|
||||
}
|
||||
|
||||
@ -291,7 +291,7 @@ void Test::testVoid() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -389,7 +389,7 @@ void Test::testBoolean() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -488,7 +488,7 @@ void Test::testByte() {
|
||||
}
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -587,7 +587,7 @@ void Test::testShort() {
|
||||
}
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -688,7 +688,7 @@ void Test::testUnsignedShort() {
|
||||
}
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -783,7 +783,7 @@ void Test::testLong() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -878,7 +878,7 @@ void Test::testUnsignedLong() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -973,7 +973,7 @@ void Test::testHyper() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -1068,7 +1068,7 @@ void Test::testUnsignedHyper() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -1163,7 +1163,7 @@ void Test::testFloat() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -1258,7 +1258,7 @@ void Test::testDouble() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -1358,7 +1358,7 @@ void Test::testChar() {
|
||||
}
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -1453,7 +1453,7 @@ void Test::testString() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", (a >>= b) && b == "1" );
|
||||
}
|
||||
{
|
||||
@ -1548,7 +1548,7 @@ void Test::testType() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -1644,7 +1644,7 @@ void Test::testSequence() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -1745,7 +1745,7 @@ void Test::testEnum() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -1844,7 +1844,7 @@ void Test::testStruct() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -1964,7 +1964,7 @@ void Test::testException() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -2080,7 +2080,7 @@ void Test::testInterface() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
@ -2194,7 +2194,7 @@ void Test::testNull() {
|
||||
CPPUNIT_ASSERT_MESSAGE("sal_Unicode", !(a >>= b) && b == '2');
|
||||
}
|
||||
{
|
||||
rtl::OUString b(RTL_CONSTASCII_USTRINGPARAM("2"));
|
||||
rtl::OUString b("2");
|
||||
CPPUNIT_ASSERT_MESSAGE( "rtl::OUString", !(a >>= b) && b == "2" );
|
||||
}
|
||||
{
|
||||
|
||||
@ -46,11 +46,10 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
|
||||
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
|
||||
if (0 == s_type_XCurrentContext)
|
||||
{
|
||||
OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XCurrentContext") );
|
||||
OUString sTypeName("com.sun.star.uno.XCurrentContext");
|
||||
typelib_InterfaceTypeDescription * pTD = 0;
|
||||
typelib_TypeDescriptionReference * pMembers[1] = { 0 };
|
||||
OUString sMethodName0(
|
||||
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XCurrentContext::getValueByName") );
|
||||
OUString sMethodName0("com.sun.star.uno.XCurrentContext::getValueByName");
|
||||
typelib_typedescriptionreference_new(
|
||||
&pMembers[0],
|
||||
typelib_TypeClass_INTERFACE_METHOD,
|
||||
@ -67,18 +66,17 @@ static typelib_InterfaceTypeDescription * get_type_XCurrentContext()
|
||||
|
||||
typelib_InterfaceMethodTypeDescription * pMethod = 0;
|
||||
typelib_Parameter_Init aParameters[1];
|
||||
OUString sParamName0( RTL_CONSTASCII_USTRINGPARAM("Name") );
|
||||
OUString sParamType0( RTL_CONSTASCII_USTRINGPARAM("string") );
|
||||
OUString sParamName0("Name");
|
||||
OUString sParamType0("string");
|
||||
aParameters[0].pParamName = sParamName0.pData;
|
||||
aParameters[0].eTypeClass = typelib_TypeClass_STRING;
|
||||
aParameters[0].pTypeName = sParamType0.pData;
|
||||
aParameters[0].bIn = sal_True;
|
||||
aParameters[0].bOut = sal_False;
|
||||
rtl_uString * pExceptions[1];
|
||||
OUString sExceptionName0(
|
||||
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException") );
|
||||
OUString sExceptionName0("com.sun.star.uno.RuntimeException");
|
||||
pExceptions[0] = sExceptionName0.pData;
|
||||
OUString sReturnType0( RTL_CONSTASCII_USTRINGPARAM("any") );
|
||||
OUString sReturnType0("any");
|
||||
typelib_typedescription_newInterfaceMethod(
|
||||
&pMethod,
|
||||
3, sal_False,
|
||||
|
||||
@ -161,7 +161,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
|
||||
// type
|
||||
if (! s_aTypes[typelib_TypeClass_TYPE])
|
||||
{
|
||||
OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("type") );
|
||||
OUString sTypeName("type");
|
||||
::typelib_typedescriptionreference_new(
|
||||
&s_aTypes[typelib_TypeClass_TYPE], typelib_TypeClass_TYPE, sTypeName.pData );
|
||||
// another static ref:
|
||||
@ -170,7 +170,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
|
||||
// any
|
||||
if (! s_aTypes[typelib_TypeClass_ANY])
|
||||
{
|
||||
OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("any") );
|
||||
OUString sTypeName("any");
|
||||
::typelib_typedescriptionreference_new(
|
||||
&s_aTypes[typelib_TypeClass_ANY], typelib_TypeClass_ANY, sTypeName.pData );
|
||||
// another static ref:
|
||||
@ -179,7 +179,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
|
||||
// string
|
||||
if (! s_aTypes[typelib_TypeClass_STRING])
|
||||
{
|
||||
OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("string") );
|
||||
OUString sTypeName("string");
|
||||
::typelib_typedescriptionreference_new(
|
||||
&s_aTypes[typelib_TypeClass_STRING], typelib_TypeClass_STRING, sTypeName.pData );
|
||||
// another static ref:
|
||||
@ -188,18 +188,18 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
|
||||
// XInterface
|
||||
if (! s_aTypes[typelib_TypeClass_INTERFACE])
|
||||
{
|
||||
OUString sTypeName( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface") );
|
||||
OUString sTypeName("com.sun.star.uno.XInterface");
|
||||
|
||||
typelib_InterfaceTypeDescription * pTD = 0;
|
||||
|
||||
typelib_TypeDescriptionReference * pMembers[3] = { 0,0,0 };
|
||||
OUString sMethodName0( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::queryInterface") );
|
||||
OUString sMethodName0("com.sun.star.uno.XInterface::queryInterface");
|
||||
::typelib_typedescriptionreference_new(
|
||||
&pMembers[0], typelib_TypeClass_INTERFACE_METHOD, sMethodName0.pData );
|
||||
OUString sMethodName1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::acquire") );
|
||||
OUString sMethodName1("com.sun.star.uno.XInterface::acquire");
|
||||
::typelib_typedescriptionreference_new(
|
||||
&pMembers[1], typelib_TypeClass_INTERFACE_METHOD, sMethodName1.pData );
|
||||
OUString sMethodName2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface::release") );
|
||||
OUString sMethodName2("com.sun.star.uno.XInterface::release");
|
||||
::typelib_typedescriptionreference_new(
|
||||
&pMembers[2], typelib_TypeClass_INTERFACE_METHOD, sMethodName2.pData );
|
||||
|
||||
@ -221,16 +221,16 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
|
||||
assert( ! s_aTypes[typelib_TypeClass_EXCEPTION] );
|
||||
{
|
||||
typelib_TypeDescription * pTD1 = 0;
|
||||
OUString sTypeName1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.Exception") );
|
||||
OUString sTypeName1("com.sun.star.uno.Exception");
|
||||
|
||||
typelib_CompoundMember_Init aMembers[2];
|
||||
OUString sMemberType0( RTL_CONSTASCII_USTRINGPARAM("string") );
|
||||
OUString sMemberName0( RTL_CONSTASCII_USTRINGPARAM("Message") );
|
||||
OUString sMemberType0("string");
|
||||
OUString sMemberName0("Message");
|
||||
aMembers[0].eTypeClass = typelib_TypeClass_STRING;
|
||||
aMembers[0].pTypeName = sMemberType0.pData;
|
||||
aMembers[0].pMemberName = sMemberName0.pData;
|
||||
OUString sMemberType1( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.XInterface") );
|
||||
OUString sMemberName1( RTL_CONSTASCII_USTRINGPARAM("Context") );
|
||||
OUString sMemberType1("com.sun.star.uno.XInterface");
|
||||
OUString sMemberName1("Context");
|
||||
aMembers[1].eTypeClass = typelib_TypeClass_INTERFACE;
|
||||
aMembers[1].pTypeName = sMemberType1.pData;
|
||||
aMembers[1].pMemberName = sMemberName1.pData;
|
||||
@ -243,7 +243,7 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
|
||||
// another static ref:
|
||||
++s_aTypes[typelib_TypeClass_EXCEPTION]->nStaticRefCount;
|
||||
// RuntimeException
|
||||
OUString sTypeName2( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException") );
|
||||
OUString sTypeName2("com.sun.star.uno.RuntimeException");
|
||||
::typelib_typedescription_new(
|
||||
&pTD1, typelib_TypeClass_EXCEPTION, sTypeName2.pData, s_aTypes[typelib_TypeClass_EXCEPTION], 0, 0 );
|
||||
::typelib_typedescription_register( &pTD1 );
|
||||
@ -252,24 +252,24 @@ CPPU_DLLPUBLIC typelib_TypeDescriptionReference ** SAL_CALL typelib_static_type_
|
||||
// XInterface members
|
||||
typelib_InterfaceMethodTypeDescription * pMethod = 0;
|
||||
typelib_Parameter_Init aParameters[1];
|
||||
OUString sParamName0( RTL_CONSTASCII_USTRINGPARAM("aType") );
|
||||
OUString sParamType0( RTL_CONSTASCII_USTRINGPARAM("type") );
|
||||
OUString sParamName0("aType");
|
||||
OUString sParamType0("type");
|
||||
aParameters[0].pParamName = sParamName0.pData;
|
||||
aParameters[0].eTypeClass = typelib_TypeClass_TYPE;
|
||||
aParameters[0].pTypeName = sParamType0.pData;
|
||||
aParameters[0].bIn = sal_True;
|
||||
aParameters[0].bOut = sal_False;
|
||||
rtl_uString * pExceptions[1];
|
||||
OUString sExceptionName0( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uno.RuntimeException") );
|
||||
OUString sExceptionName0("com.sun.star.uno.RuntimeException");
|
||||
pExceptions[0] = sExceptionName0.pData;
|
||||
OUString sReturnType0( RTL_CONSTASCII_USTRINGPARAM("any") );
|
||||
OUString sReturnType0("any");
|
||||
typelib_typedescription_newInterfaceMethod(
|
||||
&pMethod, 0, sal_False, sMethodName0.pData,
|
||||
typelib_TypeClass_ANY, sReturnType0.pData,
|
||||
1, aParameters, 1, pExceptions );
|
||||
::typelib_typedescription_register( (typelib_TypeDescription**)&pMethod );
|
||||
|
||||
OUString sReturnType1( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString sReturnType1("void");
|
||||
::typelib_typedescription_newInterfaceMethod(
|
||||
&pMethod, 1, sal_True, sMethodName1.pData,
|
||||
typelib_TypeClass_VOID, sReturnType1.pData, 0, 0, 0, 0 );
|
||||
|
||||
@ -199,10 +199,10 @@ static rtl::OUString getPrefix(rtl::OUString const & str1, rtl::OUString const &
|
||||
return result;
|
||||
}
|
||||
|
||||
// rtl::OUString str1(RTL_CONSTASCII_USTRINGPARAM("abc:def:ghi"));
|
||||
// rtl::OUString str2(RTL_CONSTASCII_USTRINGPARAM("abc:def"));
|
||||
// rtl::OUString str3(RTL_CONSTASCII_USTRINGPARAM("abc"));
|
||||
// rtl::OUString str4(RTL_CONSTASCII_USTRINGPARAM(""));
|
||||
// rtl::OUString str1("abc:def:ghi");
|
||||
// rtl::OUString str2("abc:def");
|
||||
// rtl::OUString str3("abc");
|
||||
// rtl::OUString str4("");
|
||||
|
||||
// rtl::OUString pref;
|
||||
|
||||
|
||||
@ -532,91 +532,91 @@ static typelib_TypeDescription * createCTD(
|
||||
// built in types
|
||||
case TypeClass_VOID:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("void") );
|
||||
OUString aTypeName("void");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_VOID, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_CHAR:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("char") );
|
||||
OUString aTypeName("char");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_CHAR, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_BOOLEAN:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("boolean") );
|
||||
OUString aTypeName("boolean");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_BOOLEAN, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_BYTE:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("byte") );
|
||||
OUString aTypeName("byte");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_BYTE, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_SHORT:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("short") );
|
||||
OUString aTypeName("short");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_SHORT, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_UNSIGNED_SHORT:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned short") );
|
||||
OUString aTypeName("unsigned short");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_SHORT, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_LONG:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("long") );
|
||||
OUString aTypeName("long");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_LONG, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_UNSIGNED_LONG:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned long") );
|
||||
OUString aTypeName("unsigned long");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_LONG, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_HYPER:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("hyper") );
|
||||
OUString aTypeName("hyper");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_HYPER, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_UNSIGNED_HYPER:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("unsigned hyper") );
|
||||
OUString aTypeName("unsigned hyper");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_UNSIGNED_HYPER, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_FLOAT:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("float") );
|
||||
OUString aTypeName("float");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_FLOAT, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_DOUBLE:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("double") );
|
||||
OUString aTypeName("double");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_DOUBLE, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_STRING:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("string") );
|
||||
OUString aTypeName("string");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_STRING, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_TYPE:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("type") );
|
||||
OUString aTypeName("type");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_TYPE, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
case TypeClass_ANY:
|
||||
{
|
||||
OUString aTypeName( RTL_CONSTASCII_USTRINGPARAM("any") );
|
||||
OUString aTypeName("any");
|
||||
typelib_typedescription_new( &pRet, typelib_TypeClass_ANY, aTypeName.pData, 0, 0, 0 );
|
||||
break;
|
||||
}
|
||||
|
||||
@ -53,7 +53,7 @@ namespace cfg_test
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
static Sequence< OUString > impl0_getSupportedServiceNames()
|
||||
{
|
||||
OUString str( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bootstrap.TestComponent0") );
|
||||
OUString str("com.sun.star.bootstrap.TestComponent0");
|
||||
return Sequence< OUString >( &str, 1 );
|
||||
}
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@ -64,7 +64,7 @@ static OUString impl0_getImplementationName()
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
static Sequence< OUString > impl1_getSupportedServiceNames()
|
||||
{
|
||||
OUString str( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.bootstrap.TestComponent1") );
|
||||
OUString str("com.sun.star.bootstrap.TestComponent1");
|
||||
return Sequence< OUString >( &str, 1 );
|
||||
}
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@ -179,7 +179,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
|
||||
rtl::OUString uTmp(pImplName, rtl_str_getLength(pImplName), RTL_TEXTENCODING_ASCII_US);
|
||||
|
||||
rtl::OUString uImplName(cppu::EnvDcp::getTypeName(uTmp));
|
||||
rtl::OUString cmpName(RTL_CONSTASCII_USTRINGPARAM("impl.test.TestComponent"));
|
||||
rtl::OUString cmpName("impl.test.TestComponent");
|
||||
|
||||
if (uImplName.equals(cmpName))
|
||||
{
|
||||
|
||||
@ -99,7 +99,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
|
||||
sal_uInt32 * pnIndex, const OUString & aArg)
|
||||
throw (RuntimeException)
|
||||
{
|
||||
const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
|
||||
const OUString dash("-");
|
||||
if(aArg.indexOf(dash) != 0)
|
||||
return sal_False;
|
||||
|
||||
@ -155,7 +155,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
|
||||
static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
|
||||
sal_uInt32 * pnIndex, const OUString & aArg)
|
||||
{
|
||||
const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
|
||||
const OUString dashdash("--");
|
||||
OUString aOpt = OUString::createFromAscii(pOpt);
|
||||
|
||||
if(aArg.indexOf(dashdash) == 0 && aOpt.equals(aArg.copy(2)))
|
||||
@ -511,7 +511,7 @@ SAL_IMPLEMENT_MAIN()
|
||||
|
||||
rtl_getAppCommandArg(nPos, &arg.pData);
|
||||
|
||||
const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
|
||||
const OUString dashdash("--");
|
||||
if (dashdash == arg)
|
||||
{
|
||||
++nPos;
|
||||
|
||||
@ -159,7 +159,7 @@ static FILE *_tmpfile(void)
|
||||
|
||||
static BOOL GetCrashDataPath( LPTSTR szBuffer )
|
||||
{
|
||||
::rtl::OUString ustrValue(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
|
||||
::rtl::OUString ustrValue("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
|
||||
::rtl::Bootstrap::expandMacros( ustrValue );
|
||||
|
||||
if ( !ustrValue.isEmpty() )
|
||||
|
||||
@ -173,7 +173,7 @@ sal_Int32 HexColorControl::GetColor()
|
||||
{
|
||||
sal_Int32 nColor = -1;
|
||||
|
||||
OUString aStr( RTL_CONSTASCII_USTRINGPARAM( "#" ) );
|
||||
OUString aStr( "#" );
|
||||
aStr += GetText();
|
||||
sal_Int32 nLen = aStr.getLength();
|
||||
if( nLen < 7 )
|
||||
|
||||
@ -825,7 +825,7 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet&
|
||||
::rtl::OUString TPGalleryThemeProperties::addExtension( const ::rtl::OUString& _rDisplayText, const ::rtl::OUString& _rExtension )
|
||||
{
|
||||
::rtl::OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) );
|
||||
::rtl::OUString sOpenBracket( RTL_CONSTASCII_USTRINGPARAM( " (" ) );
|
||||
::rtl::OUString sOpenBracket( " (" );
|
||||
::rtl::OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
|
||||
::rtl::OUString sRet = _rDisplayText;
|
||||
|
||||
@ -901,7 +901,7 @@ void TPGalleryThemeProperties::FillFilterList()
|
||||
}
|
||||
|
||||
// media filters
|
||||
static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
|
||||
static const ::rtl::OUString aWildcard( "*." );
|
||||
::avmedia::FilterNameVector aFilters;
|
||||
::avmedia::MediaWindow::getMediaFilters( aFilters );
|
||||
|
||||
|
||||
@ -311,9 +311,9 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
|
||||
const OUString* pNames = aNames.getConstArray();
|
||||
|
||||
Color aMaskColor( COL_LIGHTMAGENTA );
|
||||
const OUString aProp_LinkDisplayName( RTL_CONSTASCII_USTRINGPARAM( "LinkDisplayName" ) );
|
||||
const OUString aProp_LinkTarget( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.LinkTarget" ) );
|
||||
const OUString aProp_LinkDisplayBitmap( RTL_CONSTASCII_USTRINGPARAM( "LinkDisplayBitmap" ) );
|
||||
const OUString aProp_LinkDisplayName( "LinkDisplayName" );
|
||||
const OUString aProp_LinkTarget( "com.sun.star.document.LinkTarget" );
|
||||
const OUString aProp_LinkDisplayBitmap( "LinkDisplayBitmap" );
|
||||
for( sal_uLong i = 0; i < nLinks; i++ )
|
||||
{
|
||||
uno::Any aAny;
|
||||
|
||||
@ -72,7 +72,7 @@ private:
|
||||
|
||||
void DBAccessTest::createFileURL(const rtl::OUString& aFileBase, const rtl::OUString& aFileExtension, rtl::OUString& rFilePath)
|
||||
{
|
||||
rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM("/"));
|
||||
rtl::OUString aSep("/");
|
||||
rtl::OUStringBuffer aBuffer( getSrcRootURL() );
|
||||
aBuffer.append(m_aBaseString);
|
||||
aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
|
||||
@ -86,8 +86,8 @@ DBAccessTest::DBAccessTest()
|
||||
|
||||
void DBAccessTest::test()
|
||||
{
|
||||
const rtl::OUString aFileNameBase(RTL_CONSTASCII_USTRINGPARAM("testdb."));
|
||||
const rtl::OUString aFileExtension(RTL_CONSTASCII_USTRINGPARAM("odb"));
|
||||
const rtl::OUString aFileNameBase("testdb.");
|
||||
const rtl::OUString aFileExtension("odb");
|
||||
rtl::OUString aFileName;
|
||||
createFileURL(aFileNameBase, aFileExtension, aFileName);
|
||||
uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName);
|
||||
|
||||
@ -1291,7 +1291,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
|
||||
ActivateAggregate( tpScale );
|
||||
pScale->SetMax(::std::max<sal_Int32>(pFieldType->nMaximumScale,pFieldDescr->GetScale()));
|
||||
pScale->SetMin(pFieldType->nMinimumScale);
|
||||
static const ::rtl::OUString s_sPRECISION(RTL_CONSTASCII_USTRINGPARAM("PRECISION"));
|
||||
static const ::rtl::OUString s_sPRECISION("PRECISION");
|
||||
pScale->SetSpecialReadOnly(pFieldType->aCreateParams.isEmpty() || pFieldType->aCreateParams == s_sPRECISION);
|
||||
}
|
||||
else
|
||||
|
||||
@ -285,10 +285,10 @@ void OCollectionView::initCurrentPath()
|
||||
if ( m_xContent.is() )
|
||||
{
|
||||
const ::rtl::OUString sCID = m_xContent->getIdentifier()->getContentIdentifier();
|
||||
const static ::rtl::OUString s_sFormsCID(RTL_CONSTASCII_USTRINGPARAM("private:forms"));
|
||||
const static ::rtl::OUString s_sReportsCID(RTL_CONSTASCII_USTRINGPARAM("private:reports"));
|
||||
const static ::rtl::OUString s_sFormsCID("private:forms");
|
||||
const static ::rtl::OUString s_sReportsCID("private:reports");
|
||||
m_bCreateForm = s_sFormsCID.compareTo(sCID) == 0;
|
||||
::rtl::OUString sPath(RTL_CONSTASCII_USTRINGPARAM("/"));
|
||||
::rtl::OUString sPath("/");
|
||||
if ( m_bCreateForm && sCID.getLength() != s_sFormsCID.getLength())
|
||||
sPath = sCID.copy(s_sFormsCID.getLength());
|
||||
else if ( !m_bCreateForm && sCID.getLength() != s_sReportsCID.getLength() )
|
||||
|
||||
@ -228,7 +228,7 @@ DBG_NAME(OConnectionHelper)
|
||||
break;
|
||||
case ::dbaccess::DST_MSACCESS:
|
||||
{
|
||||
const ::rtl::OUString sExt(RTL_CONSTASCII_USTRINGPARAM("*.mdb"));
|
||||
const ::rtl::OUString sExt("*.mdb");
|
||||
String sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME));
|
||||
::sfx2::FileDialogHelper aFileDlg(
|
||||
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
|
||||
@ -240,7 +240,7 @@ DBG_NAME(OConnectionHelper)
|
||||
break;
|
||||
case ::dbaccess::DST_MSACCESS_2007:
|
||||
{
|
||||
const ::rtl::OUString sAccdb(RTL_CONSTASCII_USTRINGPARAM("*.accdb"));
|
||||
const ::rtl::OUString sAccdb("*.accdb");
|
||||
String sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME));
|
||||
::sfx2::FileDialogHelper aFileDlg(
|
||||
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
|
||||
|
||||
@ -311,8 +311,8 @@ void ODbaseIndexDialog::Init()
|
||||
|
||||
Sequence< ::rtl::OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder));
|
||||
|
||||
::rtl::OUString aIndexExt(RTL_CONSTASCII_USTRINGPARAM("ndx"));
|
||||
::rtl::OUString aTableExt(RTL_CONSTASCII_USTRINGPARAM("dbf"));
|
||||
::rtl::OUString aIndexExt("ndx");
|
||||
::rtl::OUString aTableExt("dbf");
|
||||
|
||||
::std::vector< String > aUsedIndexes;
|
||||
|
||||
|
||||
@ -349,7 +349,7 @@ bool OOdbcManagement::manageDataSources_async()
|
||||
|
||||
// this is done in an external process, due to #i78733#
|
||||
// (and note this whole functionality is supported on Windows only, ATM)
|
||||
::rtl::OUString sExecutableName( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR/program/odbcconfig.exe" ) );
|
||||
::rtl::OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" );
|
||||
::rtl::Bootstrap::expandMacros( sExecutableName ); //TODO: detect failure
|
||||
oslProcess hProcessHandle(0);
|
||||
oslProcessError eError = osl_executeProcess( sExecutableName.pData, NULL, 0, 0, NULL, NULL, NULL, 0, &hProcessHandle );
|
||||
|
||||
@ -328,10 +328,10 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
|
||||
}
|
||||
}
|
||||
xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name;
|
||||
static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction"));
|
||||
static ::rtl::OUString sAgg("AggregateFunction");
|
||||
if ( xInfo->hasPropertyByName(sAgg) )
|
||||
xColumn->getPropertyValue(sAgg) >>= bHaving;
|
||||
static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function"));
|
||||
static ::rtl::OUString sFunction("Function");
|
||||
if ( xInfo->hasPropertyByName(sFunction) )
|
||||
xColumn->getPropertyValue(sFunction) >>= bFunction;
|
||||
}
|
||||
@ -341,7 +341,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
|
||||
_rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name);
|
||||
if ( !sTableName.isEmpty() )
|
||||
{
|
||||
static ::rtl::OUString sSep(RTL_CONSTASCII_USTRINGPARAM("."));
|
||||
static ::rtl::OUString sSep(".");
|
||||
sTableName += sSep;
|
||||
sTableName += _rFilter.Name;
|
||||
_rFilter.Name = sTableName;
|
||||
|
||||
@ -220,8 +220,8 @@ void DlgOrderCrit::EnableLines()
|
||||
DBG_CHKTHIS(DlgOrderCrit,NULL);
|
||||
Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData();
|
||||
::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString();
|
||||
static const ::rtl::OUString sDESC(RTL_CONSTASCII_USTRINGPARAM(" DESC "));
|
||||
static const ::rtl::OUString sASC(RTL_CONSTASCII_USTRINGPARAM(" ASC "));
|
||||
static const ::rtl::OUString sDESC(" DESC ");
|
||||
static const ::rtl::OUString sASC(" ASC ");
|
||||
|
||||
Reference< XNameAccess> xColumns = Reference< XColumnsSupplier >(m_xQueryComposer,UNO_QUERY)->getColumns();
|
||||
|
||||
@ -245,7 +245,7 @@ void DlgOrderCrit::EnableLines()
|
||||
::rtl::OUString sRealName;
|
||||
xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
|
||||
sName = sRealName;
|
||||
static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function"));
|
||||
static ::rtl::OUString sFunction("Function");
|
||||
if ( xColumn->getPropertySetInfo()->hasPropertyByName(sFunction) )
|
||||
xColumn->getPropertyValue(sFunction) >>= bFunction;
|
||||
}
|
||||
|
||||
@ -467,8 +467,8 @@ DBG_NAME(OTableSubscriptionPage)
|
||||
Sequence< ::rtl::OUString > OTableSubscriptionPage::collectDetailedSelection() const
|
||||
{
|
||||
Sequence< ::rtl::OUString > aTableFilter;
|
||||
static const ::rtl::OUString sDot(RTL_CONSTASCII_USTRINGPARAM("."));
|
||||
static const ::rtl::OUString sWildcard(RTL_CONSTASCII_USTRINGPARAM("%"));
|
||||
static const ::rtl::OUString sDot(".");
|
||||
static const ::rtl::OUString sWildcard("%");
|
||||
|
||||
::rtl::OUString sComposedName;
|
||||
const SvTreeListEntry* pAllObjectsEntry = m_aTablesList.getAllObjectsEntry();
|
||||
|
||||
@ -838,9 +838,9 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
|
||||
aSql += sComposedTableName;
|
||||
aSql += ::rtl::OUString(" ( ");
|
||||
// set values and column names
|
||||
::rtl::OUString aValues(RTL_CONSTASCII_USTRINGPARAM(" VALUES ( "));
|
||||
static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,"));
|
||||
static ::rtl::OUString aComma(RTL_CONSTASCII_USTRINGPARAM(","));
|
||||
::rtl::OUString aValues(" VALUES ( ");
|
||||
static ::rtl::OUString aPara("?,");
|
||||
static ::rtl::OUString aComma(",");
|
||||
|
||||
::rtl::OUString aQuote;
|
||||
if ( _xMetaData.is() )
|
||||
|
||||
@ -448,8 +448,8 @@ void fillTypeInfo( const Reference< ::com::sun::star::sdbc::XConnection>& _rxCo
|
||||
// Information for a single SQL type
|
||||
if(xRs.is())
|
||||
{
|
||||
static const ::rtl::OUString aB1(RTL_CONSTASCII_USTRINGPARAM(" [ "));
|
||||
static const ::rtl::OUString aB2(RTL_CONSTASCII_USTRINGPARAM(" ]"));
|
||||
static const ::rtl::OUString aB1(" [ ");
|
||||
static const ::rtl::OUString aB2(" ]");
|
||||
Reference<XResultSetMetaData> xResultSetMetaData = Reference<XResultSetMetaDataSupplier>(xRs,UNO_QUERY)->getMetaData();
|
||||
::connectivity::ORowSetValue aValue;
|
||||
::std::vector<sal_Int32> aTypes;
|
||||
@ -1376,7 +1376,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType
|
||||
}
|
||||
if ( !pTypeInfo )
|
||||
{
|
||||
::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x")),sTypeName;
|
||||
::rtl::OUString sCreate("x"),sTypeName;
|
||||
sal_Bool bForce = sal_True;
|
||||
pTypeInfo = ::dbaui::getTypeInfoFromType(_rTypeInfo,DataType::VARCHAR,sTypeName,sCreate,50,0,sal_False,bForce);
|
||||
}
|
||||
|
||||
@ -97,7 +97,7 @@ OCopyTable::OCopyTable( Window * pParent )
|
||||
|
||||
m_aFT_KeyName.Enable(sal_False);
|
||||
m_edKeyName.Enable(sal_False);
|
||||
::rtl::OUString sKeyName(RTL_CONSTASCII_USTRINGPARAM("ID"));
|
||||
::rtl::OUString sKeyName("ID");
|
||||
sKeyName = m_pParent->createUniqueName(sKeyName);
|
||||
m_edKeyName.SetText(sKeyName);
|
||||
|
||||
|
||||
@ -180,7 +180,7 @@ void ObjectCopySource::copyFilterAndSortingTo( const Reference< XConnection >& _
|
||||
const ::rtl::OUString sTargetName = ::dbtools::composeTableNameForSelect(_xConnection,_rxObject);
|
||||
const String sTargetNameTemp = (sTargetName + ::rtl::OUString("."));
|
||||
|
||||
::rtl::OUString sStatement(RTL_CONSTASCII_USTRINGPARAM("SELECT * FROM "));
|
||||
::rtl::OUString sStatement("SELECT * FROM ");
|
||||
sStatement += sTargetName;
|
||||
sStatement += ::rtl::OUString(" WHERE 0=1");
|
||||
|
||||
@ -1113,7 +1113,7 @@ void OCopyTableWizard::loadData( const ICopyTableSourceObject& _rSourceObject,
|
||||
_rColumns.clear();
|
||||
|
||||
OFieldDescription* pActFieldDescr = NULL;
|
||||
::rtl::OUString sCreateParam(RTL_CONSTASCII_USTRINGPARAM("x"));
|
||||
::rtl::OUString sCreateParam("x");
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
// ReadOnly-Flag
|
||||
// On drop no line must be editable.
|
||||
@ -1612,7 +1612,7 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool&
|
||||
if ( !pType.get() )
|
||||
{
|
||||
_bNotConvert = sal_False;
|
||||
::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x"));
|
||||
::rtl::OUString sCreate("x");
|
||||
pType = ::dbaui::getTypeInfoFromType(m_aDestTypeInfo,DataType::VARCHAR,_pType->aTypeName,sCreate,50,0,sal_False,bForce);
|
||||
if ( !pType.get() )
|
||||
pType = m_pTypeInfo;
|
||||
|
||||
@ -108,7 +108,7 @@ namespace dbaui
|
||||
// -----------------------------------------------------------------------------
|
||||
::rtl::OUString SAL_CALL OConnectionLineAccess::getAccessibleDescription( ) throw (RuntimeException)
|
||||
{
|
||||
static ::rtl::OUString sDescription(RTL_CONSTASCII_USTRINGPARAM("Relation"));
|
||||
static ::rtl::OUString sDescription("Relation");
|
||||
return sDescription;
|
||||
}
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
@ -69,8 +69,8 @@ using namespace ::com::sun::star::container;
|
||||
// please look at the book LargeScale C++ to know why
|
||||
namespace
|
||||
{
|
||||
static const OUString C_AND(RTL_CONSTASCII_USTRINGPARAM(" AND "));
|
||||
static const OUString C_OR(RTL_CONSTASCII_USTRINGPARAM(" OR "));
|
||||
static const OUString C_AND(" AND ");
|
||||
static const OUString C_OR(" OR ");
|
||||
|
||||
// forward declarations
|
||||
sal_Bool InsertJoin( const OQueryDesignView* _pView,
|
||||
@ -302,7 +302,7 @@ namespace
|
||||
{
|
||||
const Reference< XDatabaseMetaData > xMetaData = _xConnection->getMetaData();
|
||||
const OUString aQuote = xMetaData->getIdentifierQuoteString();
|
||||
const OUString sEqual(RTL_CONSTASCII_USTRINGPARAM(" = "));
|
||||
const OUString sEqual(" = ");
|
||||
|
||||
for(;aIter != aEnd;++aIter)
|
||||
{
|
||||
@ -657,8 +657,8 @@ namespace
|
||||
|
||||
OJoinTableView::OTableWindowMap* pTabList = _pView->getTableView()->GetTabWinMap();
|
||||
|
||||
const static OUString sFieldSeparator(RTL_CONSTASCII_USTRINGPARAM(", "));
|
||||
const static OUString s_sAs(RTL_CONSTASCII_USTRINGPARAM(" AS "));
|
||||
const static OUString sFieldSeparator(", ");
|
||||
const static OUString s_sAs(" AS ");
|
||||
|
||||
aIter = _rFieldList.begin();
|
||||
for(;aIter != aEnd;++aIter)
|
||||
@ -1227,7 +1227,7 @@ namespace
|
||||
if ( !aGroupByStr.isEmpty() )
|
||||
{
|
||||
aGroupByStr = aGroupByStr.replaceAt(aGroupByStr.getLength()-1,1, OUString(' ') );
|
||||
OUString aGroupByStr2(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY "));
|
||||
OUString aGroupByStr2(" GROUP BY ");
|
||||
aGroupByStr2 += aGroupByStr;
|
||||
aGroupByStr = aGroupByStr2;
|
||||
}
|
||||
@ -2154,7 +2154,7 @@ namespace
|
||||
{
|
||||
SqlParseError eErrorCode = eOk;
|
||||
sal_Bool bFirstField = sal_True;
|
||||
OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*"));
|
||||
OUString sAsterix("*");
|
||||
OJoinTableView::OTableWindowMap::iterator aIter = _pTabList->begin();
|
||||
OJoinTableView::OTableWindowMap::iterator aEnd = _pTabList->end();
|
||||
for(;aIter != aEnd && eOk == eErrorCode ;++aIter)
|
||||
@ -2932,7 +2932,7 @@ OUString OQueryDesignView::getStatement()
|
||||
GenerateInnerJoinCriterias(xConnection,aJoinCrit,pConnList);
|
||||
if(!aJoinCrit.isEmpty())
|
||||
{
|
||||
OUString aTmp(RTL_CONSTASCII_USTRINGPARAM("( "));
|
||||
OUString aTmp("( ");
|
||||
aTmp += aJoinCrit;
|
||||
aTmp += OUString(RTL_CONSTASCII_USTRINGPARAM(" )"));
|
||||
if(aCriteriaListStr.getLength())
|
||||
|
||||
@ -204,12 +204,12 @@ namespace dbaui
|
||||
Reference < XPropertySet > xPropSet( xBeamerFrame, UNO_QUERY );
|
||||
try
|
||||
{
|
||||
const ::rtl::OUString aLayoutManager( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ));
|
||||
const ::rtl::OUString aLayoutManager( "LayoutManager" );
|
||||
Reference < XPropertySet > xLMPropSet(xPropSet->getPropertyValue( aLayoutManager ),UNO_QUERY);
|
||||
|
||||
if ( xLMPropSet.is() )
|
||||
{
|
||||
const ::rtl::OUString aAutomaticToolbars( RTL_CONSTASCII_USTRINGPARAM( "AutomaticToolbars" ));
|
||||
const ::rtl::OUString aAutomaticToolbars( "AutomaticToolbars" );
|
||||
xLMPropSet->setPropertyValue( aAutomaticToolbars, Any( sal_False ));
|
||||
}
|
||||
}
|
||||
|
||||
@ -873,7 +873,7 @@ void OTableController::loadData()
|
||||
pTabEdRow->SetReadOnly(!bIsAlterAllowed);
|
||||
// search for type
|
||||
sal_Bool bForce;
|
||||
::rtl::OUString sCreate(RTL_CONSTASCII_USTRINGPARAM("x"));
|
||||
::rtl::OUString sCreate("x");
|
||||
TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(m_aTypeInfo,nType,sTypeName,sCreate,nPrecision,nScale,bIsAutoIncrement,bForce);
|
||||
if ( !pTypeInfo.get() )
|
||||
pTypeInfo = m_pTypeInfo;
|
||||
|
||||
@ -91,7 +91,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn)
|
||||
|
||||
m_pActFieldDescr = new OFieldDescription(_xColumn,sal_True);
|
||||
// search for type
|
||||
::rtl::OUString sCreateParam(RTL_CONSTASCII_USTRINGPARAM("x"));
|
||||
::rtl::OUString sCreateParam("x");
|
||||
sal_Bool bForce;
|
||||
TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(*pFieldControl->getTypeInfo(),nType,sTypeName,sCreateParam,nPrecision,nScale,bAutoIncrement,bForce);
|
||||
if ( !pTypeInfo.get() )
|
||||
|
||||
@ -79,7 +79,7 @@ namespace drawinglayer
|
||||
{
|
||||
uno::Sequence< rtl::OUString > XPrimitive2DRenderer_getSupportedServiceNames()
|
||||
{
|
||||
static rtl::OUString aServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.Primitive2DTools" ) );
|
||||
static rtl::OUString aServiceName("com.sun.star.graphic.Primitive2DTools" );
|
||||
static uno::Sequence< rtl::OUString > aServiceNames( &aServiceName, 1 );
|
||||
|
||||
return( aServiceNames );
|
||||
|
||||
@ -84,37 +84,37 @@ namespace drawinglayer
|
||||
// the local UNO API strings
|
||||
const ::rtl::OUString& getNamePropertyObjectTransformation()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ObjectTransformation"));
|
||||
static ::rtl::OUString s_sNameProperty("ObjectTransformation");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyViewTransformation()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ViewTransformation"));
|
||||
static ::rtl::OUString s_sNameProperty("ViewTransformation");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyViewport()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Viewport"));
|
||||
static ::rtl::OUString s_sNameProperty("Viewport");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyTime()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Time"));
|
||||
static ::rtl::OUString s_sNameProperty("Time");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyVisualizedPage()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("VisualizedPage"));
|
||||
static ::rtl::OUString s_sNameProperty("VisualizedPage");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyReducedDisplayQuality()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ReducedDisplayQuality"));
|
||||
static ::rtl::OUString s_sNameProperty("ReducedDisplayQuality");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
|
||||
@ -81,55 +81,55 @@ namespace drawinglayer
|
||||
// the local UNO API strings
|
||||
const ::rtl::OUString& getNamePropertyObjectTransformation()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("ObjectTransformation"));
|
||||
static ::rtl::OUString s_sNameProperty("ObjectTransformation");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyOrientation()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Orientation"));
|
||||
static ::rtl::OUString s_sNameProperty("Orientation");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyProjection()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection"));
|
||||
static ::rtl::OUString s_sNameProperty("Projection");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyProjection_30()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection30"));
|
||||
static ::rtl::OUString s_sNameProperty("Projection30");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyProjection_31()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection31"));
|
||||
static ::rtl::OUString s_sNameProperty("Projection31");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyProjection_32()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection32"));
|
||||
static ::rtl::OUString s_sNameProperty("Projection32");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyProjection_33()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("Projection33"));
|
||||
static ::rtl::OUString s_sNameProperty("Projection33");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyDeviceToView()
|
||||
{
|
||||
static ::rtl::OUString s_sNameProperty(RTL_CONSTASCII_USTRINGPARAM("DeviceToView"));
|
||||
static ::rtl::OUString s_sNameProperty("DeviceToView");
|
||||
return s_sNameProperty;
|
||||
}
|
||||
|
||||
const ::rtl::OUString& getNamePropertyTime()
|
||||
{
|
||||
static ::rtl::OUString s_sNamePropertyTime(RTL_CONSTASCII_USTRINGPARAM("Time"));
|
||||
static ::rtl::OUString s_sNamePropertyTime("Time");
|
||||
return s_sNamePropertyTime;
|
||||
}
|
||||
|
||||
|
||||
@ -841,7 +841,7 @@ rtl::OUString SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat,
|
||||
case SVXTIMEFORMAT_12_HMSH:
|
||||
{
|
||||
// no builtin format available, try to insert or reuse
|
||||
OUString aFormatCode( RTL_CONSTASCII_USTRINGPARAM( "HH:MM:SS.00 AM/PM" ) );
|
||||
OUString aFormatCode( "HH:MM:SS.00 AM/PM" );
|
||||
sal_Int32 nCheckPos;
|
||||
short nType;
|
||||
rFormatter.PutandConvertEntry( aFormatCode, nCheckPos, nType,
|
||||
|
||||
@ -699,7 +699,7 @@ uno::Reference< XDictionary > LinguMgr::GetStandard()
|
||||
if (!xTmpDicList.is())
|
||||
return NULL;
|
||||
|
||||
const OUString aDicName( RTL_CONSTASCII_USTRINGPARAM( "standard.dic" ) );
|
||||
const OUString aDicName( "standard.dic" );
|
||||
uno::Reference< XDictionary > xDic( xTmpDicList->getDictionaryByName( aDicName ),
|
||||
UNO_QUERY );
|
||||
if (!xDic.is())
|
||||
|
||||
@ -666,12 +666,12 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM
|
||||
case WID_PORTIONTYPE:
|
||||
if ( rSet.GetItemState( EE_FEATURE_FIELD, sal_False ) == SFX_ITEM_SET )
|
||||
{
|
||||
OUString aType( RTL_CONSTASCII_USTRINGPARAM("TextField") );
|
||||
OUString aType("TextField");
|
||||
rAny <<= aType;
|
||||
}
|
||||
else
|
||||
{
|
||||
OUString aType( RTL_CONSTASCII_USTRINGPARAM("Text") );
|
||||
OUString aType("Text");
|
||||
rAny <<= aType;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -419,7 +419,7 @@ void SvxWriteXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection&
|
||||
uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( rStream ) );
|
||||
|
||||
/* testcode
|
||||
const OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) );
|
||||
const OUString aURL( "file:///e:/test.xml" );
|
||||
SfxMedium aMedium( aURL, STREAM_WRITE | STREAM_TRUNC, sal_True );
|
||||
aMedium.IsRemote();
|
||||
uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
|
||||
|
||||
@ -167,7 +167,7 @@ void SvxReadXML( EditEngine& rEditEngine, SvStream& rStream, const ESelection& r
|
||||
uno::Reference<io::XInputStream> xInputStream = new utl::OInputStreamWrapper( rStream );
|
||||
|
||||
/* testcode
|
||||
const OUString aURL( RTL_CONSTASCII_USTRINGPARAM( "file:///e:/test.xml" ) );
|
||||
const OUString aURL( "file:///e:/test.xml" );
|
||||
SfxMedium aMedium( aURL, STREAM_READ | STREAM_NOCREATE, sal_True );
|
||||
aMedium.IsRemote();
|
||||
uno::Reference<io::XOutputStream> xOut( new utl::OOutputStreamWrapper( *aMedium.GetOutStream() ) );
|
||||
|
||||
@ -181,7 +181,7 @@ static void TransferMediaType( const uno::Reference< embed::XStorage >& i_rSourc
|
||||
{
|
||||
const uno::Reference< beans::XPropertySet > xSourceProps( i_rSource, uno::UNO_QUERY_THROW );
|
||||
const uno::Reference< beans::XPropertySet > xTargetProps( i_rTarget, uno::UNO_QUERY_THROW );
|
||||
const ::rtl::OUString sMediaTypePropName( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) );
|
||||
const ::rtl::OUString sMediaTypePropName( "MediaType" );
|
||||
xTargetProps->setPropertyValue( sMediaTypePropName, xSourceProps->getPropertyValue( sMediaTypePropName ) );
|
||||
}
|
||||
catch( const uno::Exception& )
|
||||
|
||||
@ -106,8 +106,8 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >&
|
||||
const uno::Reference< frame::XDispatchProvider >& xSourceDisp )
|
||||
{
|
||||
sal_Int32 nInd = 0;
|
||||
::rtl::OUString aModuleIdentPropName( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" ) );
|
||||
::rtl::OUString aDispProvPropName( RTL_CONSTASCII_USTRINGPARAM( "DispatchProvider" ) );
|
||||
::rtl::OUString aModuleIdentPropName( "ModuleIdentifier" );
|
||||
::rtl::OUString aDispProvPropName( "DispatchProvider" );
|
||||
sal_Bool bModuleNameSet = sal_False;
|
||||
sal_Bool bDispProvSet = sal_False;
|
||||
|
||||
|
||||
@ -537,7 +537,7 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea
|
||||
|
||||
for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
|
||||
{
|
||||
::rtl::OUString aStreamName(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres00" ));
|
||||
::rtl::OUString aStreamName( "\002OlePres00" );
|
||||
aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
|
||||
if ( xNameContainer->hasByName( aStreamName ) )
|
||||
xNameContainer->removeByName( aStreamName );
|
||||
@ -605,7 +605,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
|
||||
{
|
||||
for ( sal_uInt8 nInd = 0; nInd < 10 && !bExists; nInd++ )
|
||||
{
|
||||
::rtl::OUString aStreamName(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres00" ));
|
||||
::rtl::OUString aStreamName( "\002OlePres00" );
|
||||
aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
|
||||
try
|
||||
{
|
||||
@ -655,7 +655,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
|
||||
{
|
||||
for ( sal_uInt8 nInd = 0; nInd < 10; nInd++ )
|
||||
{
|
||||
::rtl::OUString aStreamName(RTL_CONSTASCII_USTRINGPARAM( "\002OlePres00" ));
|
||||
::rtl::OUString aStreamName( "\002OlePres00" );
|
||||
aStreamName += ::rtl::OUString::valueOf( (sal_Int32)nInd );
|
||||
uno::Reference< io::XStream > xCachedCopyStream;
|
||||
try
|
||||
@ -692,7 +692,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
|
||||
{
|
||||
if ( bAllowToRepair50 && !xResult.is() )
|
||||
{
|
||||
::rtl::OUString aOrigContName( RTL_CONSTASCII_USTRINGPARAM( "Ole-Object" ) );
|
||||
::rtl::OUString aOrigContName( "Ole-Object" );
|
||||
if ( xNameContainer->hasByName( aOrigContName ) )
|
||||
{
|
||||
uno::Reference< embed::XClassifiedObject > xClassified( xNameContainer, uno::UNO_QUERY_THROW );
|
||||
|
||||
@ -348,8 +348,7 @@ HRESULT DocumentHolder::InPlaceActivate(
|
||||
m_xFrame->activate();
|
||||
else {
|
||||
// create frame and initialize it with with the created window
|
||||
static const ::rtl::OUString aFrameServiceName(
|
||||
RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.frame.Frame" ) );
|
||||
static const ::rtl::OUString aFrameServiceName( "com.sun.star.frame.Frame" );
|
||||
m_xFrame = uno::Reference<frame::XFrame>(
|
||||
m_xFactory->createInstance(aFrameServiceName),
|
||||
uno::UNO_QUERY);
|
||||
@ -1068,8 +1067,7 @@ IDispatch* DocumentHolder::GetIDispatch()
|
||||
if ( !m_pIDispatch && m_xDocument.is() )
|
||||
{
|
||||
const ::rtl::OUString aServiceName (
|
||||
RTL_CONSTASCII_USTRINGPARAM (
|
||||
"com.sun.star.bridge.OleBridgeSupplier2" ) );
|
||||
"com.sun.star.bridge.OleBridgeSupplier2" );
|
||||
uno::Reference< bridge::XBridgeSupplier2 > xSupplier(
|
||||
m_xFactory->createInstance( aServiceName ), uno::UNO_QUERY );
|
||||
|
||||
|
||||
@ -60,8 +60,8 @@ extern ::rtl::OUString getFilterNameFromGUID_Impl( GUID* );
|
||||
// extern CLIPFORMAT getClipFormatFromGUID_Impl( GUID* );
|
||||
::rtl::OUString getTestFileURLFromGUID_Impl( GUID* guid );
|
||||
|
||||
const ::rtl::OUString aOfficeEmbedStreamName( RTL_CONSTASCII_USTRINGPARAM ( "package_stream" ) );
|
||||
const ::rtl::OUString aExtentStreamName( RTL_CONSTASCII_USTRINGPARAM ( "properties_stream" ) );
|
||||
const ::rtl::OUString aOfficeEmbedStreamName( "package_stream" );
|
||||
const ::rtl::OUString aExtentStreamName( "properties_stream" );
|
||||
|
||||
uno::Reference< io::XInputStream > createTempXInStreamFromIStream(
|
||||
uno::Reference< lang::XMultiServiceFactory > xFactory,
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user