Skip to content

C
core
Kaydet (Commit) c9337a8b authored tarafından Thorsten Behrens's avatar Thorsten Behrens
Dosyalara gözat
Seçenekler

Targeted string re-work xmlhelp/xmlscript

üst 721bb0f9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 78 deletions
xmlhelp/source/cxxhelp/provider/content.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -163,7 +163,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() ...@@ -163,7 +163,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
rtl::OUString SAL_CALL Content::getImplementationName() rtl::OUString SAL_CALL Content::getImplementationName()
throw( uno::RuntimeException ) throw( uno::RuntimeException )
{ {
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "CHelpContent" )); return rtl::OUString( "CHelpContent" );
} }
//========================================================================= //=========================================================================
...@@ -173,7 +173,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() ...@@ -173,7 +173,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
{ {
uno::Sequence< rtl::OUString > aSNS( 1 ); uno::Sequence< rtl::OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] aSNS.getArray()[ 0 ]
= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_SERVICE_NAME )); = rtl::OUString( MYUCP_CONTENT_SERVICE_NAME );
return aSNS; return aSNS;
} }
...@@ -187,7 +187,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() ...@@ -187,7 +187,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames()
rtl::OUString SAL_CALL Content::getContentType() rtl::OUString SAL_CALL Content::getContentType()
throw( uno::RuntimeException ) throw( uno::RuntimeException )
{ {
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MYUCP_CONTENT_TYPE )); return rtl::OUString( MYUCP_CONTENT_TYPE );
} }
//========================================================================= //=========================================================================
...@@ -460,8 +460,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ...@@ -460,8 +460,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if ( rProp.Name == "ContentType" ) if ( rProp.Name == "ContentType" )
xRow->appendString( xRow->appendString(
rProp, rProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
"application/vnd.sun.star.help" )) ); "application/vnd.sun.star.help" ) );
else if ( rProp.Name == "Title" ) else if ( rProp.Name == "Title" )
xRow->appendString ( rProp,m_aURLParameter.get_title() ); xRow->appendString ( rProp,m_aURLParameter.get_title() );
else if ( rProp.Name == "IsReadOnly" ) else if ( rProp.Name == "IsReadOnly" )
...@@ -480,18 +480,18 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ...@@ -480,18 +480,18 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if( m_aURLParameter.isPicture() ) if( m_aURLParameter.isPicture() )
xRow->appendString( xRow->appendString(
rProp, rProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "image/gif" )) ); rtl::OUString( "image/gif" ) );
else if( m_aURLParameter.isActive() ) else if( m_aURLParameter.isActive() )
xRow->appendString( xRow->appendString(
rProp, rProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/plain" )) ); rtl::OUString( "text/plain" ) );
else if( m_aURLParameter.isFile() ) else if( m_aURLParameter.isFile() )
xRow->appendString( xRow->appendString(
rProp,rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/html" )) ); rProp,rtl::OUString( "text/html" ) );
else if( m_aURLParameter.isRoot() ) else if( m_aURLParameter.isRoot() )
xRow->appendString( xRow->appendString(
rProp, rProp,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text/css" )) ); rtl::OUString( "text/css" ) );
else else
xRow->appendVoid( rProp ); xRow->appendVoid( rProp );
else if( m_aURLParameter.isModule() ) else if( m_aURLParameter.isModule() )
...@@ -542,8 +542,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ...@@ -542,8 +542,8 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
else if ( rProp.Name == "SearchScopes" ) else if ( rProp.Name == "SearchScopes" )
{ {
uno::Sequence< rtl::OUString > seq( 2 ); uno::Sequence< rtl::OUString > seq( 2 );
seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Heading" )); seq[0] = rtl::OUString( "Heading" );
seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FullText" )); seq[1] = rtl::OUString( "FullText" );
uno::Any aAny; uno::Any aAny;
aAny <<= seq; aAny <<= seq;
xRow->appendObject( rProp,aAny ); xRow->appendObject( rProp,aAny );
...@@ -562,7 +562,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( ...@@ -562,7 +562,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
} }
else else
xRow->appendVoid( rProp ); xRow->appendVoid( rProp );
else if( rProp.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("AnchorName")) && else if( "AnchorName" == rProp.Name &&
m_aURLParameter.isFile() ) m_aURLParameter.isFile() )
xRow->appendString( rProp,m_aURLParameter.get_tag() ); xRow->appendString( rProp,m_aURLParameter.get_tag() );
else else
......
xmlhelp/source/cxxhelp/provider/provider.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -67,7 +67,7 @@ ContentProvider::ContentProvider( ...@@ -67,7 +67,7 @@ ContentProvider::ContentProvider(
const uno::Reference< lang::XMultiServiceFactory >& rSMgr ) const uno::Reference< lang::XMultiServiceFactory >& rSMgr )
: ::ucbhelper::ContentProviderImplHelper( rSMgr ), : ::ucbhelper::ContentProviderImplHelper( rSMgr ),
isInitialized( false ), isInitialized( false ),
m_aScheme(RTL_CONSTASCII_USTRINGPARAM(MYUCP_URL_SCHEME)), m_aScheme(MYUCP_URL_SCHEME),
m_pDatabases( 0 ) m_pDatabases( 0 )
{ {
} }
...@@ -120,7 +120,7 @@ rtl::OUString SAL_CALL ContentProvider::getImplementationName() ...@@ -120,7 +120,7 @@ rtl::OUString SAL_CALL ContentProvider::getImplementationName()
rtl::OUString ContentProvider::getImplementationName_Static() rtl::OUString ContentProvider::getImplementationName_Static()
{ {
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CHelpContentProvider" )); return rtl::OUString("CHelpContentProvider" );
} }
sal_Bool SAL_CALL sal_Bool SAL_CALL
...@@ -160,11 +160,11 @@ ContentProvider::getSupportedServiceNames_Static() ...@@ -160,11 +160,11 @@ ContentProvider::getSupportedServiceNames_Static()
{ {
uno::Sequence< rtl::OUString > aSNS( 2 ); uno::Sequence< rtl::OUString > aSNS( 2 );
aSNS.getArray()[ 0 ] = aSNS.getArray()[ 0 ] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 )); MYUCP_CONTENT_PROVIDER_SERVICE_NAME1 );
aSNS.getArray()[ 1 ] = aSNS.getArray()[ 1 ] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 )); MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 );
return aSNS; return aSNS;
} }
...@@ -275,7 +275,7 @@ void ContentProvider::init() ...@@ -275,7 +275,7 @@ void ContentProvider::init()
rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) ); rtl::OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) );
if( instPath.isEmpty() ) if( instPath.isEmpty() )
// try to determine path from default // try to determine path from default
instPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "$(instpath)/help" )); instPath = rtl::OUString( "$(instpath)/help" );
// replace anything like $(instpath); // replace anything like $(instpath);
subst( instPath ); subst( instPath );
...@@ -288,7 +288,7 @@ void ContentProvider::init() ...@@ -288,7 +288,7 @@ void ContentProvider::init()
if( xAccess.is() ) if( xAccess.is() )
{ {
uno::Any aAny = uno::Any aAny =
xAccess->getByName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Help" )) ); xAccess->getByName( rtl::OUString( "Help" ) );
aAny >>= m_xContainer; aAny >>= m_xContainer;
if( m_xContainer.is() ) if( m_xContainer.is() )
m_xContainer->addContainerListener( this ); m_xContainer->addContainerListener( this );
...@@ -307,21 +307,21 @@ void ContentProvider::init() ...@@ -307,21 +307,21 @@ void ContentProvider::init()
try try
{ {
uno::Reference< lang::XMultiServiceFactory > xConfigProvider( uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
m_xSMgr ->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationProvider"))), uno::UNO_QUERY_THROW); m_xSMgr ->createInstance(::rtl::OUString("com.sun.star.configuration.ConfigurationProvider")), uno::UNO_QUERY_THROW);
uno::Sequence < uno::Any > lParams(1); uno::Sequence < uno::Any > lParams(1);
beans::PropertyValue aParam ; beans::PropertyValue aParam ;
aParam.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nodepath")); aParam.Name = ::rtl::OUString("nodepath");
aParam.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Setup/Product")); aParam.Value <<= ::rtl::OUString("/org.openoffice.Setup/Product");
lParams[0] = uno::makeAny(aParam); lParams[0] = uno::makeAny(aParam);
// open it // open it
uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess")), ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"),
lParams) ); lParams) );
uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY); uno::Reference< container::XNameAccess > xDirectAccess(xCFG, uno::UNO_QUERY);
uno::Any aRet = xDirectAccess->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupExtension"))); uno::Any aRet = xDirectAccess->getByName(::rtl::OUString("ooSetupExtension"));
aRet >>= setupextension; aRet >>= setupextension;
} }
...@@ -331,7 +331,7 @@ void ContentProvider::init() ...@@ -331,7 +331,7 @@ void ContentProvider::init()
rtl::OUString productversion( rtl::OUString productversion(
setupversion + setupversion +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) + rtl::OUString( " " ) +
setupextension ); setupextension );
uno::Sequence< rtl::OUString > aImagesZipPaths( 2 ); uno::Sequence< rtl::OUString > aImagesZipPaths( 2 );
...@@ -341,7 +341,7 @@ void ContentProvider::init() ...@@ -341,7 +341,7 @@ void ContentProvider::init()
subst( aPath ); subst( aPath );
aImagesZipPaths[ 0 ] = aPath; aImagesZipPaths[ 0 ] = aPath;
aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/share/config")); aPath = rtl::OUString("$BRAND_BASE_DIR/share/config");
rtl::Bootstrap::expandMacros(aPath); rtl::Bootstrap::expandMacros(aPath);
aImagesZipPaths[ 1 ] = aPath; aImagesZipPaths[ 1 ] = aPath;
...@@ -351,7 +351,7 @@ void ContentProvider::init() ...@@ -351,7 +351,7 @@ void ContentProvider::init()
if (xProps.is()) if (xProps.is())
{ {
xProps->getPropertyValue( xProps->getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext; ::rtl::OUString( "DefaultContext" ) ) >>= xContext;
OSL_ASSERT( xContext.is() ); OSL_ASSERT( xContext.is() );
} }
...@@ -374,8 +374,8 @@ ContentProvider::getConfiguration() const ...@@ -374,8 +374,8 @@ ContentProvider::getConfiguration() const
try try
{ {
rtl::OUString sProviderService = rtl::OUString sProviderService =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
"com.sun.star.configuration.ConfigurationProvider" )); "com.sun.star.configuration.ConfigurationProvider" );
sProvider = sProvider =
uno::Reference< lang::XMultiServiceFactory >( uno::Reference< lang::XMultiServiceFactory >(
m_xSMgr->createInstance( sProviderService ), m_xSMgr->createInstance( sProviderService ),
...@@ -401,8 +401,8 @@ ContentProvider::getHierAccess( ...@@ -401,8 +401,8 @@ ContentProvider::getHierAccess(
{ {
uno::Sequence< uno::Any > seq( 1 ); uno::Sequence< uno::Any > seq( 1 );
rtl::OUString sReaderService( rtl::OUString sReaderService(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
"com.sun.star.configuration.ConfigurationAccess" )) ); "com.sun.star.configuration.ConfigurationAccess" ) );
seq[ 0 ] <<= rtl::OUString::createFromAscii( file ); seq[ 0 ] <<= rtl::OUString::createFromAscii( file );
...@@ -479,8 +479,8 @@ void ContentProvider::subst( rtl::OUString& instpath ) const ...@@ -479,8 +479,8 @@ void ContentProvider::subst( rtl::OUString& instpath ) const
xCfgMgr = xCfgMgr =
uno::Reference< frame::XConfigManager >( uno::Reference< frame::XConfigManager >(
m_xSMgr->createInstance( m_xSMgr->createInstance(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( rtl::OUString(
"com.sun.star.config.SpecialConfigManager" )) ), "com.sun.star.config.SpecialConfigManager" ) ),
uno::UNO_QUERY ); uno::UNO_QUERY );
} }
catch( const uno::Exception&) catch( const uno::Exception&)
......
xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -503,12 +503,12 @@ ResultSetBase::getPropertySetInfo() ...@@ -503,12 +503,12 @@ ResultSetBase::getPropertySetInfo()
throw( uno::RuntimeException) throw( uno::RuntimeException)
{ {
uno::Sequence< beans::Property > seq(2); uno::Sequence< beans::Property > seq(2);
seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )); seq[0].Name = rtl::OUString( "RowCount" );
seq[0].Handle = -1; seq[0].Handle = -1;
seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) ); seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
seq[0].Attributes = beans::PropertyAttribute::READONLY; seq[0].Attributes = beans::PropertyAttribute::READONLY;
seq[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )); seq[1].Name = rtl::OUString( "IsRowCountFinal" );
seq[1].Handle = -1; seq[1].Handle = -1;
seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) ); seq[1].Type = getCppuType( static_cast< sal_Bool* >(0) );
seq[1].Attributes = beans::PropertyAttribute::READONLY; seq[1].Attributes = beans::PropertyAttribute::READONLY;
...@@ -529,8 +529,8 @@ void SAL_CALL ResultSetBase::setPropertyValue( ...@@ -529,8 +529,8 @@ void SAL_CALL ResultSetBase::setPropertyValue(
{ {
(void)aValue; (void)aValue;
if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) || if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) ||
aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) ) aPropertyName == rtl::OUString( "RowCount" ) )
return; return;
throw beans::UnknownPropertyException(); throw beans::UnknownPropertyException();
...@@ -543,13 +543,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue( ...@@ -543,13 +543,13 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
lang::WrappedTargetException, lang::WrappedTargetException,
uno::RuntimeException) uno::RuntimeException)
{ {
if( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) ) if( PropertyName == rtl::OUString( "IsRowCountFinal" ) )
{ {
uno::Any aAny; uno::Any aAny;
aAny <<= m_bRowCountFinal; aAny <<= m_bRowCountFinal;
return aAny; return aAny;
} }
else if ( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) ) else if ( PropertyName == rtl::OUString( "RowCount" ) )
{ {
uno::Any aAny; uno::Any aAny;
sal_Int32 count = m_aItems.size(); sal_Int32 count = m_aItems.size();
...@@ -568,7 +568,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( ...@@ -568,7 +568,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
lang::WrappedTargetException, lang::WrappedTargetException,
uno::RuntimeException) uno::RuntimeException)
{ {
if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) ) if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) )
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pIsFinalListeners ) if ( ! m_pIsFinalListeners )
...@@ -577,7 +577,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( ...@@ -577,7 +577,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
m_pIsFinalListeners->addInterface( xListener ); m_pIsFinalListeners->addInterface( xListener );
} }
else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) ) else if ( aPropertyName == rtl::OUString( "RowCount" ) )
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
if ( ! m_pRowCountListeners ) if ( ! m_pRowCountListeners )
...@@ -597,13 +597,13 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener( ...@@ -597,13 +597,13 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
lang::WrappedTargetException, lang::WrappedTargetException,
uno::RuntimeException) uno::RuntimeException)
{ {
if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "IsRowCountFinal" )) && if( aPropertyName == rtl::OUString( "IsRowCountFinal" ) &&
m_pIsFinalListeners ) m_pIsFinalListeners )
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
m_pIsFinalListeners->removeInterface( aListener ); m_pIsFinalListeners->removeInterface( aListener );
} }
else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowCount" )) && else if ( aPropertyName == rtl::OUString( "RowCount" ) &&
m_pRowCountListeners ) m_pRowCountListeners )
{ {
osl::MutexGuard aGuard( m_aMutex ); osl::MutexGuard aGuard( m_aMutex );
......
xmlhelp/source/cxxhelp/provider/resultsetforquery.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -94,7 +94,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF ...@@ -94,7 +94,7 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
m_aURLParameter( aURLParameter ) m_aURLParameter( aURLParameter )
{ {
Reference< XTransliteration > xTrans( Reference< XTransliteration > xTrans(
xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Transliteration" )) ), xMSF->createInstance( rtl::OUString( "com.sun.star.i18n.Transliteration" ) ),
UNO_QUERY ); UNO_QUERY );
Locale aLocale( aURLParameter.get_language(), Locale aLocale( aURLParameter.get_language(),
rtl::OUString(), rtl::OUString(),
...@@ -323,8 +323,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF ...@@ -323,8 +323,8 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
delete pIndexFolderVector; delete pIndexFolderVector;
} }
sal_Int32 replIdx = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" )).getLength(); sal_Int32 replIdx = rtl::OUString( "#HLP#" ).getLength();
rtl::OUString replWith = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" )); rtl::OUString replWith = rtl::OUString( "vnd.sun.star.help://" );
int nResultCount = aCompleteResultVector.size(); int nResultCount = aCompleteResultVector.size();
for( int r = 0 ; r < nResultCount ; ++r ) for( int r = 0 ; r < nResultCount ; ++r )
...@@ -338,16 +338,16 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF ...@@ -338,16 +338,16 @@ ResultSetForQuery::ResultSetForQuery( const uno::Reference< lang::XMultiServiceF
m_aIdents.resize( m_aPath.size() ); m_aIdents.resize( m_aPath.size() );
Command aCommand; Command aCommand;
aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" )); aCommand.Name = rtl::OUString( "getPropertyValues" );
aCommand.Argument <<= m_sProperty; aCommand.Argument <<= m_sProperty;
for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow ) for( m_nRow = 0; sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aPath.size(); ++m_nRow )
{ {
m_aPath[m_nRow] = m_aPath[m_nRow] =
m_aPath[m_nRow] + m_aPath[m_nRow] +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" )) + rtl::OUString( "?Language=" ) +
m_aURLParameter.get_language() + m_aURLParameter.get_language() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" )) + rtl::OUString( "&System=" ) +
m_aURLParameter.get_system(); m_aURLParameter.get_system();
uno::Reference< XContent > content = queryContent(); uno::Reference< XContent > content = queryContent();
......
xmlhelp/source/cxxhelp/provider/resultsetforroot.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -55,17 +55,17 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< lang::XMultiServiceFac ...@@ -55,17 +55,17 @@ ResultSetForRoot::ResultSetForRoot( const uno::Reference< lang::XMultiServiceFac
m_aIdents.resize( m_aPath.size() ); m_aIdents.resize( m_aPath.size() );
Command aCommand; Command aCommand;
aCommand.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "getPropertyValues" )); aCommand.Name = rtl::OUString( "getPropertyValues" );
aCommand.Argument <<= m_sProperty; aCommand.Argument <<= m_sProperty;
for( sal_uInt32 i = 0; i < m_aPath.size(); ++i ) for( sal_uInt32 i = 0; i < m_aPath.size(); ++i )
{ {
m_aPath[i] = m_aPath[i] =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" )) + rtl::OUString( "vnd.sun.star.help://" ) +
m_aPath[i] + m_aPath[i] +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "?Language=" )) + rtl::OUString( "?Language=" ) +
m_aURLParameter.get_language() + m_aURLParameter.get_language() +
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "&System=" )) + rtl::OUString( "&System=" ) +
m_aURLParameter.get_system(); m_aURLParameter.get_system();
m_nRow = sal_Int32( i ); m_nRow = sal_Int32( i );
......
xmlhelp/source/cxxhelp/provider/urlparameter.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -179,7 +179,7 @@ rtl::OUString URLParameter::get_title() ...@@ -179,7 +179,7 @@ rtl::OUString URLParameter::get_title()
m_aTitle = inf->get_title(); m_aTitle = inf->get_title();
} }
else // This must be the root else // This must be the root
m_aTitle = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("root")); m_aTitle = rtl::OUString("root");
return m_aTitle; return m_aTitle;
} }
...@@ -274,7 +274,7 @@ rtl::OUString URLParameter::get_the_jar() ...@@ -274,7 +274,7 @@ rtl::OUString URLParameter::get_the_jar()
return m_aJar; return m_aJar;
} }
else else
return get_module() + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".jar")); return get_module() + rtl::OUString(".jar");
} }
...@@ -282,7 +282,7 @@ rtl::OUString URLParameter::get_the_jar() ...@@ -282,7 +282,7 @@ rtl::OUString URLParameter::get_the_jar()
void URLParameter::readBerkeley() void URLParameter::readBerkeley()
{ {
static rtl::OUString aQuestionMark(RTL_CONSTASCII_USTRINGPARAM("?")); static rtl::OUString aQuestionMark("?");
if( get_id().compareToAscii("") == 0 ) if( get_id().compareToAscii("") == 0 )
return; return;
...@@ -444,7 +444,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr, ...@@ -444,7 +444,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
{ {
Reference< XInputStream > xStream; Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA = Reference< XHierarchicalNameAccess > xNA =
m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )), m_pDatabases->jarFile( rtl::OUString( "picture.jar" ),
get_language() ); get_language() );
rtl::OUString path = get_path(); rtl::OUString path = get_path();
...@@ -514,7 +514,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr, ...@@ -514,7 +514,7 @@ void URLParameter::open( const Reference< XMultiServiceFactory >& rxSMgr,
{ {
Reference< XInputStream > xStream; Reference< XInputStream > xStream;
Reference< XHierarchicalNameAccess > xNA = Reference< XHierarchicalNameAccess > xNA =
m_pDatabases->jarFile( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "picture.jar" )), m_pDatabases->jarFile( rtl::OUString( "picture.jar" ),
get_language() ); get_language() );
rtl::OUString path = get_path(); rtl::OUString path = get_path();
...@@ -568,7 +568,7 @@ bool URLParameter::scheme() ...@@ -568,7 +568,7 @@ bool URLParameter::scheme()
if( aLastStr.compareToAscii( "DbPAR=" ) == 0 ) if( aLastStr.compareToAscii( "DbPAR=" ) == 0 )
{ {
rtl::OUString aNewExpr = m_aExpr.copy( 0, 20 ); rtl::OUString aNewExpr = m_aExpr.copy( 0, 20 );
rtl::OUString aSharedStr(RTL_CONSTASCII_USTRINGPARAM("shared")); rtl::OUString aSharedStr("shared");
aNewExpr += aSharedStr; aNewExpr += aSharedStr;
aNewExpr += m_aExpr.copy( 20 ); aNewExpr += m_aExpr.copy( 20 );
aNewExpr += aSharedStr; aNewExpr += aSharedStr;
...@@ -681,7 +681,7 @@ bool URLParameter::query() ...@@ -681,7 +681,7 @@ bool URLParameter::query()
if( m_aQuery.isEmpty() ) if( m_aQuery.isEmpty() )
m_aQuery = value; m_aQuery = value;
else else
m_aQuery += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( " " )) + value ); m_aQuery += ( rtl::OUString( " " ) + value );
} }
else if( parameter.compareToAscii( "Scope" ) == 0 ) else if( parameter.compareToAscii( "Scope" ) == 0 )
m_aScope = value; m_aScope = value;
...@@ -1006,12 +1006,12 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam, ...@@ -1006,12 +1006,12 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
if (xProps.is()) if (xProps.is())
{ {
xProps->getPropertyValue( xProps->getPropertyValue(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("DefaultContext") ) ) >>= xContext; ::rtl::OUString( "DefaultContext" ) ) >>= xContext;
} }
if( !xContext.is() ) if( !xContext.is() )
{ {
throw RuntimeException( throw RuntimeException(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" )), ::rtl::OUString( "InputStreamTransformer::InputStreamTransformer(), no XComponentContext" ),
Reference< XInterface >() ); Reference< XInterface >() );
} }
......
xmlhelp/source/cxxhelp/test/searchdemo.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -76,21 +76,21 @@ int main( int argc,char* argv[] ) ...@@ -76,21 +76,21 @@ int main( int argc,char* argv[] )
try try
{ {
rtl::OUString installDir(RTL_CONSTASCII_USTRINGPARAM("//./e|/index/")); rtl::OUString installDir("//./e|/index/");
QueryProcessor queryProcessor( installDir ); QueryProcessor queryProcessor( installDir );
std::vector<rtl::OUString> Query(2); std::vector<rtl::OUString> Query(2);
Query[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "text*" )); Query[0] = rtl::OUString( "text*" );
Query[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "abbildung" )); Query[1] = rtl::OUString( "abbildung" );
rtl::OUString Scope = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "headingheading" )); rtl::OUString Scope = rtl::OUString( "headingheading" );
int HitCount = 40; int HitCount = 40;
QueryStatement queryStatement( HitCount,Query,Scope ); QueryStatement queryStatement( HitCount,Query,Scope );
queryResults = queryProcessor.processQuery( queryStatement ); queryResults = queryProcessor.processQuery( queryStatement );
rtl::OUString translations[2]; rtl::OUString translations[2];
translations[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "#HLP#" )); translations[0] = rtl::OUString( "#HLP#" );
translations[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" )); translations[1] = rtl::OUString( "vnd.sun.star.help://" );
PrefixTranslator* translator = PrefixTranslator::makePrefixTranslator( translations,2 ); PrefixTranslator* translator = PrefixTranslator::makePrefixTranslator( translations,2 );
......
xmlhelp/source/treeview/tvfactory.cxx
Dosyayı görüntüle @ c9337a8b
...@@ -145,7 +145,7 @@ TVFactory::createInstance( ...@@ -145,7 +145,7 @@ TVFactory::createInstance(
aAny <<= rtl::OUString(); aAny <<= rtl::OUString();
Sequence< Any > seq( 1 ); Sequence< Any > seq( 1 );
seq[0] <<= PropertyValue( seq[0] <<= PropertyValue(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "nodepath" )), rtl::OUString( "nodepath" ),
-1, -1,
aAny, aAny,
PropertyState_DIRECT_VALUE ); PropertyState_DIRECT_VALUE );
...@@ -206,7 +206,7 @@ TVFactory::getAvailableServiceNames( ) ...@@ -206,7 +206,7 @@ TVFactory::getAvailableServiceNames( )
throw( RuntimeException ) throw( RuntimeException )
{ {
Sequence< rtl::OUString > seq( 1 ); Sequence< rtl::OUString > seq( 1 );
seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.HierarchyDataReadAccess" )); seq[0] = rtl::OUString( "com.sun.star.ucb.HierarchyDataReadAccess" );
return seq; return seq;
} }
...@@ -218,7 +218,7 @@ TVFactory::getAvailableServiceNames( ) ...@@ -218,7 +218,7 @@ TVFactory::getAvailableServiceNames( )
rtl::OUString SAL_CALL rtl::OUString SAL_CALL
TVFactory::getImplementationName_static() TVFactory::getImplementationName_static()
{ {
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.TreeViewImpl" )); return rtl::OUString( "com.sun.star.help.TreeViewImpl" );
} }
...@@ -226,8 +226,8 @@ Sequence< rtl::OUString > SAL_CALL ...@@ -226,8 +226,8 @@ Sequence< rtl::OUString > SAL_CALL
TVFactory::getSupportedServiceNames_static() TVFactory::getSupportedServiceNames_static()
{ {
Sequence< rtl::OUString > seq( 2 ); Sequence< rtl::OUString > seq( 2 );
seq[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.help.TreeView" )); seq[0] = rtl::OUString( "com.sun.star.help.TreeView" );
seq[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.HiearchyDataSource" )); seq[1] = rtl::OUString( "com.sun.star.ucb.HiearchyDataSource" );
return seq; return seq;
} }
......
xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
Dosyayı görüntüle @ c9337a8b
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment