MPL 1.1 / GPLv3+ / LGPLv3+
Joost
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index 467cc97..c4e6e10 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -228,7 +228,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu
aParserInput.aInputStream = xInputStream;
// get parser
- Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance(
OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), UNO_QUERY );
+ Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ), UNO_QUERY );
DBG_ASSERT( xParser.is(), "Can't create parser" );
// prepare filter arguments
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 32bfaae..1028482 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -605,7 +605,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) ),
aAny );
}
- const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType ==
::rtl::OUString::createFromAscii( "image/tiff" ) ) );
+ const sal_Bool bCompressed = ( ( 0 == aMimeType.getLength() ) || ( aMimeType ==
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "image/tiff" )) ) );
aAny <<= bCompressed;
xProps->setPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "Compressed" ) ), aAny
);
@@ -946,7 +946,7 @@ Reference< XOutputStream > SAL_CALL SvXMLGraphicHelper::createOutputStream()
if( aId.getLength() )
{
- aRet = ::rtl::OUString::createFromAscii( XML_GRAPHICOBJECT_URL_BASE );
+ aRet = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
XML_GRAPHICOBJECT_URL_BASE ));
aRet += aId;
}
}
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 6941fd6..18476ef 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -431,7 +431,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service
//------------------------------------------------------------------------------
::rtl::OUString SAL_CALL FmXGridControl::getImplementationName() throw()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.form.FmXGridControl");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FmXGridControl"));
}
//------------------------------------------------------------------------------
@@ -439,7 +439,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service
{
Sequence< ::rtl::OUString > aServiceNames(2);
aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
- aServiceNames[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControl");
+ aServiceNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControl"));
return aServiceNames;
}
@@ -460,7 +460,7 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException )
//------------------------------------------------------------------------------
::rtl::OUString FmXGridControl::GetComponentServiceName()
{
- ::rtl::OUString aName = ::rtl::OUString::createFromAscii("DBGrid");
+ ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("DBGrid"));
return aName;
}
@@ -1121,7 +1121,7 @@ namespace fmgridif
{
const ::rtl::OUString getDataModeIdentifier()
{
- static ::rtl::OUString s_sDataModeIdentifier = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) );
+ static ::rtl::OUString s_sDataModeIdentifier( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) );
return s_sDataModeIdentifier;
}
}
@@ -2798,7 +2798,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs()
// let an ::com::sun::star::util::URL-transformer normalize the URLs
Reference< ::com::sun::star::util::XURLTransformer > xTransformer(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
UNO_QUERY);
pSupported = aSupported.getArray();
if (xTransformer.is())
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 6941fd6..18476ef 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -431,7 +431,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service
//------------------------------------------------------------------------------
::rtl::OUString SAL_CALL FmXGridControl::getImplementationName() throw()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.form.FmXGridControl");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.FmXGridControl"));
}
//------------------------------------------------------------------------------
@@ -439,7 +439,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service
{
Sequence< ::rtl::OUString > aServiceNames(2);
aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
- aServiceNames[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControl");
+ aServiceNames[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControl"));
return aServiceNames;
}
@@ -460,7 +460,7 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException )
//------------------------------------------------------------------------------
::rtl::OUString FmXGridControl::GetComponentServiceName()
{
- ::rtl::OUString aName = ::rtl::OUString::createFromAscii("DBGrid");
+ ::rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("DBGrid"));
return aName;
}
@@ -1121,7 +1121,7 @@ namespace fmgridif
{
const ::rtl::OUString getDataModeIdentifier()
{
- static ::rtl::OUString s_sDataModeIdentifier = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) );
+ static ::rtl::OUString s_sDataModeIdentifier( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) );
return s_sDataModeIdentifier;
}
}
@@ -2798,7 +2798,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs()
// let an ::com::sun::star::util::URL-transformer normalize the URLs
Reference< ::com::sun::star::util::XURLTransformer > xTransformer(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))),
UNO_QUERY);
pSupported = aSupported.getArray();
if (xTransformer.is())
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 13fe12a..4ea0eb1 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);
@@ -263,12 +263,12 @@ void GalApp::InitUCB()
rtl::OUString aEmpty;
Sequence< Any > aArgs(6);
aArgs[0]
- <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY1_LOCAL);
+ <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_LOCAL));
aArgs[1]
- <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY2_OFFICE);
- aArgs[2] <<= rtl::OUString::createFromAscii("PIPE");
+ <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE));
+ 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/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 13fe12a..4ea0eb1 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);
@@ -263,12 +263,12 @@ void GalApp::InitUCB()
rtl::OUString aEmpty;
Sequence< Any > aArgs(6);
aArgs[0]
- <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY1_LOCAL);
+ <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_LOCAL));
aArgs[1]
- <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY2_OFFICE);
- aArgs[2] <<= rtl::OUString::createFromAscii("PIPE");
+ <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE));
+ 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/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 13fe12a..4ea0eb1 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);
@@ -263,12 +263,12 @@ void GalApp::InitUCB()
rtl::OUString aEmpty;
Sequence< Any > aArgs(6);
aArgs[0]
- <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY1_LOCAL);
+ <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY1_LOCAL));
aArgs[1]
- <<= rtl::OUString::createFromAscii(UCB_CONFIGURATION_KEY2_OFFICE);
- aArgs[2] <<= rtl::OUString::createFromAscii("PIPE");
+ <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UCB_CONFIGURATION_KEY2_OFFICE));
+ 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/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 2ae386c..7046ada 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -223,7 +223,7 @@ void FontPrevWin_Impl::_CheckScript()
{
Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
xBreak = Reference< XBreakIterator >(xMSF->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ),UNO_QUERY);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" ))
),UNO_QUERY);
}
if( xBreak.is() )
{
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index ed1389a..645d0bd 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/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx
index 768d110..910b649 100644
--- a/svx/source/dialog/pfiledlg.cxx
+++ b/svx/source/dialog/pfiledlg.cxx
@@ -88,7 +88,7 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) :
if( xMgr.is() )
{
uno::Reference< plugin::XPluginManager > rPluginManager( xMgr->createInstance(
- OUString::createFromAscii( "com.sun.star.plugin.PluginManager" ) ), uno::UNO_QUERY );
+ OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.plugin.PluginManager" )) ),
uno::UNO_QUERY );
if ( rPluginManager.is() )
{
const uno::Sequence<plugin::PluginDescription > aSeq(
rPluginManager->getPluginDescriptions() );
@@ -233,7 +233,7 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind)
if( xMgr.is() )
{
- uno::Reference< plugin::XPluginManager > rPluginManager = uno::Reference<
plugin::XPluginManager > ( xMgr->createInstance( OUString::createFromAscii(
"com.sun.star.plugin.PluginManager" ) ), uno::UNO_QUERY );
+ uno::Reference< plugin::XPluginManager > rPluginManager = uno::Reference<
plugin::XPluginManager > ( xMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.plugin.PluginManager" )) ), uno::UNO_QUERY );
if( rPluginManager.is() )
{
const uno::Sequence<plugin::PluginDescription > aSeq(
rPluginManager->getPluginDescriptions() );
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 63a1002..10a37af 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 7a011b4..79cd2bd 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 20189c1..b5ad724 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() )
Context
- [Libreoffice] [PATCH] RTL_CONSTASCII_USTRINGPARAM in svx · Joost Eekhoorn
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.