summaryrefslogtreecommitdiff
path: root/ucbhelper/workben
diff options
context:
space:
mode:
Diffstat (limited to 'ucbhelper/workben')
-rw-r--r--ucbhelper/workben/myucp/myucp_content.cxx14
-rw-r--r--ucbhelper/workben/myucp/myucp_services.cxx4
-rw-r--r--ucbhelper/workben/ucbexplorer/ucbexplorer.cxx28
3 files changed, 23 insertions, 23 deletions
diff --git a/ucbhelper/workben/myucp/myucp_content.cxx b/ucbhelper/workben/myucp/myucp_content.cxx
index a787ed64467f..23f885de94a7 100644
--- a/ucbhelper/workben/myucp/myucp_content.cxx
+++ b/ucbhelper/workben/myucp/myucp_content.cxx
@@ -179,7 +179,7 @@ rtl::OUString SAL_CALL Content::getImplementationName()
{
// @@@ Adjust implementation name.
// Prefix with reversed company domain name.
- return rtl::OUString::createFromAscii( "com.sun.star.comp.myucp.Content" );
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.myucp.Content"));
}
//=========================================================================
@@ -571,27 +571,27 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
{
// Append all Core Properties.
xRow->appendString (
- beans::Property( rtl::OUString::createFromAscii( "ContentType" ),
+ beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType")),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.aContentType );
xRow->appendString (
- beans::Property( rtl::OUString::createFromAscii( "Title" ),
+ beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
-1,
getCppuType( static_cast< const rtl::OUString * >( 0 ) ),
beans::PropertyAttribute::BOUND ),
rData.aTitle );
xRow->appendBoolean(
- beans::Property( rtl::OUString::createFromAscii( "IsDocument" ),
+ beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::READONLY ),
rData.bIsDocument );
xRow->appendBoolean(
- beans::Property( rtl::OUString::createFromAscii( "IsFolder" ),
+ beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")),
-1,
getCppuBooleanType(),
beans::PropertyAttribute::BOUND
@@ -820,7 +820,7 @@ void Content::queryChildren( ContentRefList& rChildren )
if ( nPos != ( aURL.getLength() - 1 ) )
{
// No trailing slash found. Append.
- aURL += ::rtl::OUString::createFromAscii( "/" );
+ aURL += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
}
sal_Int32 nLen = aURL.getLength();
@@ -895,7 +895,7 @@ void Content::insert(
ucb::IOErrorCode_ALREADY_EXISTING,
uno::Sequence< uno::Any >(&aProps, 1),
Environment,
- rtl::OUString::createFromAscii( "content already existing!!" ),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content already existing!!")),
this );
// Unreachable
}
diff --git a/ucbhelper/workben/myucp/myucp_services.cxx b/ucbhelper/workben/myucp/myucp_services.cxx
index 7ab10a200535..56be6f1a4243 100644
--- a/ucbhelper/workben/myucp/myucp_services.cxx
+++ b/ucbhelper/workben/myucp/myucp_services.cxx
@@ -44,9 +44,9 @@ sal_Bool writeInfo( void * pRegistryKey,
const rtl::OUString & rImplementationName,
uno::Sequence< rtl::OUString > const & rServiceNames )
{
- rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) );
+ rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
aKeyName += rImplementationName;
- aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+ aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
uno::Reference< registry::XRegistryKey > xKey;
try
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
index cd8b03453c44..f647feb959fd 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
@@ -587,7 +587,7 @@ void UcbExplorerTreeListBox::RequestingChilds( SvLBoxEntry* pParent )
{
Sequence< OUString > aPropertyNames( 0 );
// OUString* pNames = aPropertyNames.getArray();
-// pNames[ 0 ] = OUString::createFromAscii( "Title" );
+// pNames[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
uno::Reference< XResultSet > xResultSet
= pEntry->m_aContent.createCursor(
@@ -689,7 +689,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
{
Property aProp =
pEntry->m_aContent.getProperties()->getPropertyByName(
- OUString::createFromAscii( "Title" ) );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) );
bEnable = !( aProp.Attributes & PropertyAttribute::READONLY );
}
catch( UnknownPropertyException const & )
@@ -750,7 +750,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
try
{
pEntry->m_aContent.getPropertyValue(
- OUString::createFromAscii( "Title" ) )
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) )
>>= aNewTitle;
}
catch ( CommandAbortedException const & )
@@ -769,7 +769,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
StringInputDialog* pDlg
= new StringInputDialog(
*xManager.get(),
- OUString::createFromAscii( "Title" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
aNewTitle );
USHORT nRet = pDlg->Execute();
@@ -794,7 +794,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
try
{
pEntry->m_aContent.setPropertyValue(
- OUString::createFromAscii( "Title" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
aValue );
bOK = sal_True;
}
@@ -818,7 +818,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
try
{
pEntry->m_aContent.getPropertyValue(
- OUString::createFromAscii( "TargetURL" ) )
+ OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) )
>>= aTargetURL;
}
catch ( CommandAbortedException const & )
@@ -836,7 +836,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
if ( aTargetURL.getLength() > 0 )
{
// Insert link.
- aText += OUString::createFromAscii( " --> " );
+ aText += OUString(RTL_CONSTASCII_USTRINGPARAM(" --> "));
aText += aTargetURL;
}
@@ -853,7 +853,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
try
{
pEntry->m_aContent.executeCommand(
- OUString::createFromAscii( "delete" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("delete")),
makeAny( sal_True ) );
}
catch ( CommandAbortedException const & )
@@ -917,9 +917,9 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
{
OUString aTitle;
rContent.getPropertyValue(
- OUString::createFromAscii( "Title" ) ) >>= aTitle;
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTitle;
if ( !aTitle.getLength() )
- aTitle = OUString::createFromAscii( "/" );
+ aTitle = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
UcbExplorerListBoxEntry* pEntry = 0;
@@ -940,7 +940,7 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
try
{
rContent.getPropertyValue(
- OUString::createFromAscii( "TargetURL" ) ) >>= aTargetURL;
+ OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")) ) >>= aTargetURL;
}
catch ( CommandAbortedException const & )
{
@@ -957,7 +957,7 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
if ( aTargetURL.getLength() > 0 )
{
// Insert link.
- aTitle += OUString::createFromAscii( " --> " );
+ aTitle += OUString(RTL_CONSTASCII_USTRINGPARAM(" --> "));
aTitle += aTargetURL;
pEntry = static_cast< UcbExplorerListBoxEntry * >(
SvTreeListBox::InsertEntry( aTitle,
@@ -1122,8 +1122,8 @@ void MyApp::Main()
::ucbhelper::ContentProviderDataList aProviders;
aProviders.push_back(
::ucbhelper::ContentProviderData(
- OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ),
- OUString::createFromAscii( "file" ),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("file")),
OUString() ) );
sal_Bool bSuccess = ::ucbhelper::ContentBroker::initialize( xFac, aProviders );
#endif