summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorGert Faller <gertfaller@aliceadsl.fr>2010-11-21 13:30:02 +0100
committerGert Faller <gertfaller@aliceadsl.fr>2010-11-21 13:30:02 +0100
commit5834ab6d77338d4066ff980108871749b3ee595f (patch)
treef24b25d9490ad35c7fde30ad79de171dcbdfa8ba /svx
parent36210b907b59280574ee49a4dbb62f156833a3ff (diff)
RTL_CONSTASCII_USTRINGPARAM in libs core 39
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/hyprlink.cxx4
-rw-r--r--svx/source/fmcomp/gridctrl.cxx2
-rw-r--r--svx/source/gallery2/gallery1.cxx10
-rw-r--r--svx/source/gallery2/galmisc.cxx12
-rw-r--r--svx/source/gallery2/galtheme.cxx4
-rw-r--r--svx/source/gengal/gengal.cxx8
-rw-r--r--svx/source/stbctrls/modctrl.cxx2
-rw-r--r--svx/source/tbxctrls/layctrl.cxx2
8 files changed, 22 insertions, 22 deletions
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index ed1389ac9b..0b7e8fb3cb 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -69,10 +69,10 @@ public:
};
SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() :
- ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine"))
+ ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Inet/DefaultSearchEngine")))
{
uno::Sequence<OUString> aNames(1);
- aNames.getArray()[0] = OUString::createFromAscii("Name");
+ aNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
uno::Sequence< uno::Any > aValues = GetProperties(aNames);
aValues.getConstArray()[0] >>= sDefaultEngine;
}
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 61db04224b..8d21c21e8b 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1487,7 +1487,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
// retrieve the datebase of the Numberformatter
try
{
- xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString::createFromAscii("NullDate")) >>= m_aNullDate;
+ xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NullDate"))) >>= m_aNullDate;
}
catch(Exception&)
{
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 63a10022e7..b667413da6 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -286,7 +286,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
::ucbhelper::Content aCnt( rBaseURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
uno::Sequence< OUString > aProps( 1 );
- aProps.getArray()[ 0 ] = OUString::createFromAscii( "Url" );
+ aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Url"));
uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
@@ -334,10 +334,10 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
if(aThmURL.GetExtension().equalsIgnoreAsciiCaseAscii("thm"))
{
- INetURLObject aSdgURL( aThmURL); aSdgURL.SetExtension( OUString::createFromAscii( "sdg" ) );
- INetURLObject aSdvURL( aThmURL ); aSdvURL.SetExtension( OUString::createFromAscii( "sdv" ) );
- const OUString aTitleProp( OUString::createFromAscii( "Title" ) );
- const OUString aReadOnlyProp( OUString::createFromAscii( "IsReadOnly" ) );
+ INetURLObject aSdgURL( aThmURL); aSdgURL.SetExtension( OUString(RTL_CONSTASCII_USTRINGPARAM("sdg")) );
+ INetURLObject aSdvURL( aThmURL ); aSdvURL.SetExtension( OUString(RTL_CONSTASCII_USTRINGPARAM("sdv")) );
+ const OUString aTitleProp( RTL_CONSTASCII_USTRINGPARAM("Title") );
+ const OUString aReadOnlyProp( RTL_CONSTASCII_USTRINGPARAM("IsReadOnly") );
OUString aTitle;
sal_Bool bReadOnly = sal_False;
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 7a011b4ba6..d431707fd3 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -285,7 +285,7 @@ BOOL FileExists( const INetURLObject& rURL )
::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
OUString aTitle;
- aCnt.getPropertyValue( OUString::createFromAscii( "Title" ) ) >>= aTitle;
+ aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTitle;
bRet = ( aTitle.getLength() > 0 );
}
catch( const ucb::ContentCreationException& )
@@ -319,11 +319,11 @@ BOOL CreateDir( const INetURLObject& rURL )
uno::Sequence< OUString > aProps( 1 );
uno::Sequence< uno::Any > aValues( 1 );
- aProps.getArray()[ 0 ] = OUString::createFromAscii( "Title" );
+ aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
aValues.getArray()[ 0 ] = uno::makeAny( OUString( aNewFolderURL.GetName() ) );
::ucbhelper::Content aContent( aNewFolderURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv );
- bRet = aParent.insertNewContent( OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-folder" ), aProps, aValues, aContent );
+ bRet = aParent.insertNewContent( OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder")), aProps, aValues, aContent );
}
catch( const ucb::ContentCreationException& )
{
@@ -349,7 +349,7 @@ BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
{
::ucbhelper::Content aDestPath( rDstURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
- aDestPath.executeCommand( OUString::createFromAscii( "transfer" ),
+ aDestPath.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")),
uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ),
rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) );
bRet = TRUE;
@@ -378,7 +378,7 @@ BOOL KillFile( const INetURLObject& rURL )
try
{
::ucbhelper::Content aCnt( rURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
- aCnt.executeCommand( OUString::createFromAscii( "delete" ), uno::makeAny( sal_Bool( sal_True ) ) );
+ aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), uno::makeAny( sal_Bool( sal_True ) ) );
}
catch( const ucb::ContentCreationException& )
{
@@ -409,7 +409,7 @@ GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
if( xMgr.is() )
{
uno::Reference< awt::XProgressMonitor > xMonitor( xMgr->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.awt.XProgressMonitor" ) ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.XProgressMonitor")) ),
uno::UNO_QUERY );
if ( xMonitor.is() )
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 20189c1358..324d5e3366 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -1181,12 +1181,12 @@ BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG
::ucbhelper::Content aCnt( rFileOrDirURL.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment >() );
sal_Bool bFolder = false;
- aCnt.getPropertyValue( OUString::createFromAscii( "IsFolder" ) ) >>= bFolder;
+ aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder")) ) >>= bFolder;
if( bFolder )
{
uno::Sequence< OUString > aProps( 1 );
- aProps.getArray()[ 0 ] = OUString::createFromAscii( "Url" );
+ aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM("Url"));
uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
if( xResultSet.is() )
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 13fe12a16d..0b4235aa31 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -240,7 +240,7 @@ void GalApp::Init()
lastSlash = fileName.lastIndexOf( '\\' );
#endif
rtl::OUString baseBinDir = fileName.copy( 0, lastSlash );
- rtl::OUString installPrefix = baseBinDir + rtl::OUString::createFromAscii( "/../.." );
+ rtl::OUString installPrefix = baseBinDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/../.."));
rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("OOO_INSTALL_PREFIX"));
osl_setEnvironment(envVar.pData, installPrefix.pData);
@@ -266,9 +266,9 @@ void GalApp::InitUCB()
<<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY1_LOCAL);
aArgs[1]
<<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY2_OFFICE);
- aArgs[2] <<= rtl::OUString::createFromAscii("PIPE");
+ aArgs[2] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE"));
aArgs[3] <<= aEmpty;
- aArgs[4] <<= rtl::OUString::createFromAscii("PORTAL");
+ aArgs[4] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PORTAL"));
aArgs[5] <<= aEmpty;
if (! ::ucbhelper::ContentBroker::initialize( xMSF, aArgs ) )
@@ -279,7 +279,7 @@ void GalApp::Main()
{
bool bHelp = false;
rtl::OUString aPath, aDestDir;
- rtl::OUString aName = rtl::OUString::createFromAscii( "Default name" );
+ rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Default name"));
UINT32 nNumFrom = 0;
FileNameList aFiles;
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index b3d165aa13..ca6cd0ed6d 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -145,7 +145,7 @@ void SvxModifyControl::DoubleClick()
return;
Sequence<PropertyValue> aArgs;
- execute(OUString::createFromAscii(".uno:Save"), aArgs);
+ execute(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")), aArgs);
}
ULONG SvxModifyControl::GetDefItemWidth(const StatusBar& rStb)
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 1dc7ea450a..e5a5ec7ecd 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -382,7 +382,7 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs )
{
com::sun::star::util::URL aTargetURL;
Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )),
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
UNO_QUERY );
aTargetURL.Complete = maCommand;
xTrans->parseStrict( aTargetURL );