[Libreoffice-commits] .: sfx2/qa sfx2/source
Gert Faller
gfaller at kemper.freedesktop.org
Sat Nov 20 15:28:41 PST 2010
sfx2/qa/cppunit/test_metadatable.cxx | 12 +++++-----
sfx2/source/appl/xpackcreator.cxx | 6 ++---
sfx2/source/control/unoctitm.cxx | 4 +--
sfx2/source/dialog/tabdlg.cxx | 2 -
sfx2/source/dialog/templdlg.cxx | 8 +++----
sfx2/source/doc/SfxDocumentMetaData.cxx | 26 +++++++++++------------
sfx2/source/menu/thessubmenu.cxx | 2 -
sfx2/source/toolbox/tbxitem.cxx | 20 ++++++++---------
sfx2/source/view/viewfrm.cxx | 36 ++++++++++++++++----------------
sfx2/source/view/viewfrm2.cxx | 2 -
sfx2/source/view/viewprn.cxx | 8 +++----
sfx2/source/view/viewsh.cxx | 8 +++----
12 files changed, 67 insertions(+), 67 deletions(-)
New commits:
commit d68a9675a5179198d2da10c128ce39e8ed21c770
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Nov 21 00:16:43 2010 +0100
TL_CONSTASCII_USTRINGPARAM in libs core 32
diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx
index f8e6913..2dcfb08 100644
--- a/sfx2/qa/cppunit/test_metadatable.cxx
+++ b/sfx2/qa/cppunit/test_metadatable.cxx
@@ -116,12 +116,12 @@ void MetadatableTest::test()
MockMetadatable m4(*pReg);
MockMetadatable m5(*pReg);
::rtl::OUString empty;
- ::rtl::OUString content( ::rtl::OUString::createFromAscii("content.xml") );
- ::rtl::OUString styles ( ::rtl::OUString::createFromAscii("styles.xml") );
- ::rtl::OUString sid1( ::rtl::OUString::createFromAscii("id1") );
- ::rtl::OUString sid2( ::rtl::OUString::createFromAscii("id2") );
- ::rtl::OUString sid3( ::rtl::OUString::createFromAscii("id3") );
- ::rtl::OUString sid4( ::rtl::OUString::createFromAscii("id4") );
+ ::rtl::OUString content( RTL_CONSTASCII_USTRINGPARAM("content.xml") );
+ ::rtl::OUString styles( RTL_CONSTASCII_USTRINGPARAM("styles.xml") );
+ ::rtl::OUString sid1( RTL_CONSTASCII_USTRINGPARAM("id1") );
+ ::rtl::OUString sid2( RTL_CONSTASCII_USTRINGPARAM("id2") );
+ ::rtl::OUString sid3( RTL_CONSTASCII_USTRINGPARAM("id3") );
+ ::rtl::OUString sid4( RTL_CONSTASCII_USTRINGPARAM("id4") );
beans::StringPair id1(content, sid1);
beans::StringPair id2(content, sid2);
beans::StringPair id3(content, sid3);
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 92d5555..863c778 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -48,15 +48,15 @@ using namespace ::com::sun::star;
uno::Sequence< ::rtl::OUString > SAL_CALL OPackageStructureCreator::impl_getStaticSupportedServiceNames()
{
uno::Sequence< ::rtl::OUString > aRet(2);
- aRet[0] = ::rtl::OUString::createFromAscii("com.sun.star.embed.PackageStructureCreator");
- aRet[1] = ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.PackageStructureCreator");
+ aRet[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.PackageStructureCreator"));
+ aRet[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.PackageStructureCreator"));
return aRet;
}
//-------------------------------------------------------------------------
::rtl::OUString SAL_CALL OPackageStructureCreator::impl_getStaticImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.embed.PackageStructureCreator");
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.embed.PackageStructureCreator"));
}
//-------------------------------------------------------------------------
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 6a767c7..10716ab 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -109,7 +109,7 @@ SfxUnoControllerItem::SfxUnoControllerItem( SfxControllerItem *pItem, SfxBinding
DBG_ASSERT( !pCtrlItem || !pCtrlItem->IsBound(), "ControllerItem fehlerhaft!" );
aCommand.Complete = rCmd;
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+ Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
xTrans->parseStrict( aCommand );
pBindings->RegisterUnoController_Impl( this );
}
@@ -512,7 +512,7 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
ByteString aTmp(".uno:");
aTmp += pUnoName;
aDispatchURL.Complete = ::rtl::OUString::createFromAscii( aTmp.GetBuffer() );
- Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+ Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
xTrans->parseStrict( aDispatchURL );
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 13775e3..a0e8880 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -63,7 +63,7 @@
using namespace ::com::sun::star::uno;
using namespace ::rtl;
-#define USERITEM_NAME OUString::createFromAscii( "UserItem" )
+#define USERITEM_NAME OUString(RTL_CONSTASCII_USTRINGPARAM("UserItem"))
TYPEINIT1(LAYOUT_NS_SFX_TABDIALOG SfxTabDialogItem,SfxSetItem);
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index ff7d461..02fc0da 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2624,7 +2624,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
uno::Reference< container::XNameAccess > xUICommands;
if ( xNameAccess.is() )
{
- rtl::OUString sTextDoc = ::rtl::OUString::createFromAscii("com.sun.star.text.TextDocument");
+ rtl::OUString sTextDoc(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"));
if(xNameAccess->hasByName(sTextDoc))
{
uno::Any a = xNameAccess->getByName( sTextDoc );
@@ -2636,18 +2636,18 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
try
{
uno::Sequence< beans::PropertyValue > aPropSeq;
- uno::Any aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleNewByExample"));
+ uno::Any aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StyleNewByExample")));
::rtl::OUString sLabel = lcl_GetLabel( aCommand );
pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel );
pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE);
- aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleUpdateByExample"));
+ aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:StyleUpdateByExample")));
sLabel = lcl_GetLabel( aCommand );
pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel );
pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE);
- aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:LoadStyles"));
+ aCommand = xUICommands->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:LoadStyles")));
sLabel = lcl_GetLabel( aCommand );
pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel );
pMenu->SetHelpId(SID_TEMPLATE_LOAD, SID_TEMPLATE_LOAD);
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index f9111cb..a19fd81 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -1227,21 +1227,21 @@ void SAL_CALL SfxDocumentMetaData::init(
css::uno::Reference<css::xml::dom::XElement> xRElem(
i_xDoc->createElementNS(
::rtl::OUString::createFromAscii(s_nsODF),
- ::rtl::OUString::createFromAscii("office:document-meta")));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:document-meta"))));
css::uno::Reference<css::xml::dom::XNode> xRNode(xRElem,
css::uno::UNO_QUERY_THROW);
// NB: the following is a _bad_idea_ with our DOM implementation
// do _not_ create attributes with xmlns prefix!
-// xRElem->setAttribute(::rtl::OUString::createFromAscii("xmlns:office"),
+// xRElem->setAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xmlns:office")),
// ::rtl::OUString::createFromAscii(s_nsODF));
xRElem->setAttributeNS(::rtl::OUString::createFromAscii(s_nsODF),
- ::rtl::OUString::createFromAscii("office:version"),
- ::rtl::OUString::createFromAscii("1.0"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:version")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1.0")));
i_xDoc->appendChild(xRNode);
css::uno::Reference<css::xml::dom::XNode> xParent (
i_xDoc->createElementNS(
::rtl::OUString::createFromAscii(s_nsODF),
- ::rtl::OUString::createFromAscii("office:meta")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("office:meta"))),
css::uno::UNO_QUERY_THROW);
xRNode->appendChild(xParent);
m_xParent = xParent;
@@ -1266,7 +1266,7 @@ void SAL_CALL SfxDocumentMetaData::init(
// application-specific.
css::uno::Reference<css::xml::dom::XNode> xNode =
xPath->selectSingleNode(m_xParent,
- ::rtl::OUString::createFromAscii("child::") + name);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("child::")) + name);
// Do not create an empty element if it is missing;
// for certain elements, such as dateTime, this would be invalid
m_meta[name] = xNode;
@@ -1277,7 +1277,7 @@ void SAL_CALL SfxDocumentMetaData::init(
::rtl::OUString name = ::rtl::OUString::createFromAscii(*pName);
css::uno::Reference<css::xml::dom::XNodeList> nodes =
xPath->selectNodeList(m_xParent,
- ::rtl::OUString::createFromAscii("child::") + name);
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("child::")) + name);
std::vector<css::uno::Reference<css::xml::dom::XNode> > v;
for (sal_Int32 i = 0; i < nodes->getLength(); ++i) {
v.push_back(nodes->item(i));
@@ -1298,7 +1298,7 @@ void SAL_CALL SfxDocumentMetaData::init(
std::vector<css::uno::Reference<css::xml::dom::XNode> > & vec =
- m_metaList[::rtl::OUString::createFromAscii("meta:user-defined")];
+ m_metaList[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta:user-defined"))];
m_xUserDefined.clear(); // #i105826#: reset (may be re-initialization)
if ( !vec.empty() )
{
@@ -1316,7 +1316,7 @@ void SAL_CALL SfxDocumentMetaData::init(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("name")));
::rtl::OUString type = xElem->getAttributeNS(
::rtl::OUString::createFromAscii(s_nsODFMeta),
- ::rtl::OUString::createFromAscii("value-type"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value-type")));
::rtl::OUString text = getNodeText(*it);
if (type.equalsAscii("float")) {
double d;
@@ -1574,7 +1574,7 @@ SfxDocumentMetaData::setLanguage(const css::lang::Locale & the_value)
{
::rtl::OUString text = the_value.Language;
if (the_value.Country.getLength() > 0) {
- text += ::rtl::OUString::createFromAscii("-").concat(the_value.Country);
+ text += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-")).concat(the_value.Country);
}
setMetaTextAndNotify("dc:language", text);
}
@@ -1891,7 +1891,7 @@ SfxDocumentMetaData::resetUserData(const ::rtl::OUString & the_value)
dateTimeToText(css::util::DateTime()));
bModified |= setMetaText("meta:editing-duration", durationToText(0));
bModified |= setMetaText("meta:editing-cycles",
- ::rtl::OUString::createFromAscii("1"));
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1")));
if (bModified) {
g.clear();
@@ -1960,7 +1960,7 @@ SfxDocumentMetaData::loadFromStorage(
try {
xPropArg->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")))
>>= input.sSystemId;
- input.sSystemId += ::rtl::OUString::createFromAscii("/").concat(
+ input.sSystemId += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")).concat(
::rtl::OUString::createFromAscii(s_metaXml));
} catch (css::uno::Exception &) {
input.sSystemId = ::rtl::OUString::createFromAscii(s_metaXml);
@@ -2017,7 +2017,7 @@ SfxDocumentMetaData::storeToStorage(
css::uno::UNO_QUERY_THROW);
xStreamProps->setPropertyValue(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")),
- css::uno::makeAny(::rtl::OUString::createFromAscii("text/xml")));
+ css::uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("text/xml"))));
xStreamProps->setPropertyValue(
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Compressed")),
css::uno::makeAny(static_cast<sal_Bool> (sal_False)));
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index 284345c..a62f642 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -261,7 +261,7 @@ String SfxThesSubMenuHelper::GetThesImplName( const lang::Locale &rLocale ) cons
if (m_xLngMgr.is())
{
uno::Sequence< OUString > aServiceNames = m_xLngMgr->getConfiguredServices(
- OUString::createFromAscii("com.sun.star.linguistic2.Thesaurus"), rLocale );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.Thesaurus")), rLocale );
// there should be at most one thesaurus configured for each language
DBG_ASSERT( aServiceNames.getLength() <= 1, "more than one thesaurus found. Should not be possible" );
if (aServiceNames.getLength() == 1)
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index c511782..519709a 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -153,7 +153,7 @@ svt::ToolboxController* SAL_CALL SfxToolBoxControllerFactory( const Reference< X
URL aTargetURL;
aTargetURL.Complete = aCommandURL;
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+ Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
xTrans->parseStrict( aTargetURL );
if ( aTargetURL.Arguments.getLength() )
return NULL;
@@ -450,7 +450,7 @@ void SfxToolBoxControl::Dispatch(
::com::sun::star::util::URL aTargetURL;
aTargetURL.Complete = rCommand;
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 );
xTrans->parseStrict( aTargetURL );
@@ -483,7 +483,7 @@ void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::s
::rtl::OUString sAppName;
try
{
- static ::rtl::OUString our_aModuleManagerName = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager");
+ static ::rtl::OUString our_aModuleManagerName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager =
::comphelper::getProcessServiceFactory();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager(
@@ -494,7 +494,7 @@ void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::s
sAppName = xModuleManager->identify(xFrame);
} catch(::com::sun::star::uno::Exception&) {}
Sequence<PropertyValue> source;
- ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString::createFromAscii("SfxToolBoxControl"));
+ ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxToolBoxControl")));
::comphelper::UiEventsLogger::logDispatch(aTargetURL, source);
}
xDispatch->dispatch( aTargetURL, aArgs );
@@ -1027,7 +1027,7 @@ void SfxToolBoxControl::Select( BOOL /*bMod1*/ )
::rtl::OUString sAppName;
try
{
- static ::rtl::OUString our_aModuleManagerName = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager");
+ static ::rtl::OUString our_aModuleManagerName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager =
::comphelper::getProcessServiceFactory();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager(
@@ -1036,7 +1036,7 @@ void SfxToolBoxControl::Select( BOOL /*bMod1*/ )
sAppName = xModuleManager->identify(m_xFrame);
} catch(::com::sun::star::uno::Exception&) {}
Sequence<PropertyValue> vSource;
- ::comphelper::UiEventsLogger::appendDispatchOrigin(vSource, sAppName, ::rtl::OUString::createFromAscii("SfxToolBoxControl"));
+ ::comphelper::UiEventsLogger::appendDispatchOrigin(vSource, sAppName, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SfxToolBoxControl")));
URL aURL;
aURL.Complete = m_aCommandURL;
::comphelper::UiEventsLogger::logDispatch(aURL, vSource);
@@ -1707,7 +1707,7 @@ void SfxAppToolBoxControl_Impl::Select( BOOL bMod1 )
aTargetURL.Complete = aLastURL;
getURLTransformer()->parseStrict( aTargetURL );
- ::rtl::OUString aTarget( ::rtl::OUString::createFromAscii( "_default" ));
+ ::rtl::OUString aTarget( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")));
if ( pMenu )
{
::framework::MenuConfiguration::Attributes* pMenuAttributes =
@@ -1723,7 +1723,7 @@ void SfxAppToolBoxControl_Impl::Select( BOOL bMod1 )
{
Sequence< PropertyValue > aArgs( 1 );
- aArgs[0].Name = ::rtl::OUString::createFromAscii( "Referer" );
+ aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
aArgs[0].Value = makeAny( ::rtl::OUString::createFromAscii( SFX_REFERER_USER ));
ExecuteInfo* pExecuteInfo = new ExecuteInfo;
@@ -1755,7 +1755,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
URL aTargetURL;
aTargetURL.Complete = aURL;
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 );
xTrans->parseStrict( aTargetURL );
@@ -1767,7 +1767,7 @@ long Select_Impl( void* /*pHdl*/, void* pVoid )
xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
else
{
- ::rtl::OUString aTargetFrame( ::rtl::OUString::createFromAscii( "_blank" ) );
+ ::rtl::OUString aTargetFrame( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_blank")) );
::framework::MenuConfiguration::Attributes* pMenuAttributes =
(::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( pMenu->GetCurItemId() );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3f9693b..e4009e7 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -716,7 +716,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
if (!pInteractionItem)
{
- Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.comp.uui.UUIInteractionHandler")), UNO_QUERY );
+ Reference < ::com::sun::star::task::XInteractionHandler > xHdl( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))), UNO_QUERY );
if (xHdl.is())
pNewSet->Put( SfxUnoAnyItem(SID_INTERACTIONHANDLER,::com::sun::star::uno::makeAny(xHdl)) );
}
@@ -2171,7 +2171,7 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc
sURL = i_rDoc.GetFactory().GetFactoryURL();
Reference< XComponentLoader > xLoader( i_rFrame, UNO_QUERY_THROW );
- xLoader->loadComponentFromURL( sURL, ::rtl::OUString::createFromAscii( "_self" ), 0,
+ xLoader->loadComponentFromURL( sURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0,
aTransformLoadArgs.getPropertyValues() );
SfxViewShell* pViewShell = SfxViewShell::Get( i_rFrame->getController() );
@@ -2543,16 +2543,16 @@ void SfxViewFrame::ExecView_Impl
*/
sal_Bool impl_maxOpenDocCountReached()
{
- static ::rtl::OUString SERVICE_DESKTOP = ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop");
+ static ::rtl::OUString SERVICE_DESKTOP(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop"));
try
{
css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
xSMGR,
- ::rtl::OUString::createFromAscii("org.openoffice.Office.Common/"),
- ::rtl::OUString::createFromAscii("Misc"),
- ::rtl::OUString::createFromAscii("MaxOpenDocuments"),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.Common/")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Misc")),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxOpenDocuments")),
::comphelper::ConfigurationHelper::E_READONLY);
// NIL means: count of allowed documents = infinite !
@@ -2860,7 +2860,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
String aLocation;
Reference< XMultiServiceFactory > xSMgr = ::comphelper::getProcessServiceFactory();
Reference< com::sun::star::uri::XUriReferenceFactory > xFactory( xSMgr->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.uri.UriReferenceFactory" ) ), UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uri.UriReferenceFactory")) ), UNO_QUERY );
if ( xFactory.is() )
{
Reference< com::sun::star::uri::XVndSunStarScriptUrl > xUrl( xFactory->parse( aScriptURL ), UNO_QUERY );
@@ -2877,7 +2877,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const ::rtl::OUString& sMacro )
aMacroName = aName.getToken( 0, cTok, nIndex );
// get location
- ::rtl::OUString aLocKey = ::rtl::OUString::createFromAscii( "location" );
+ ::rtl::OUString aLocKey(RTL_CONSTASCII_USTRINGPARAM("location"));
if ( xUrl->hasParameter( aLocKey ) )
aLocation = xUrl->getParameter( aLocKey );
}
@@ -3042,7 +3042,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
case SID_RECORDMACRO :
{
// try to find any active recorder on this frame
- ::rtl::OUString sProperty = rtl::OUString::createFromAscii("DispatchRecorderSupplier");
+ ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
com::sun::star::uno::Reference< com::sun::star::frame::XFrame > xFrame(
GetFrame().GetFrameInterface(),
com::sun::star::uno::UNO_QUERY);
@@ -3087,11 +3087,11 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
com::sun::star::uno::UNO_QUERY);
xRecorder = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >(
- xFactory->createInstance(rtl::OUString::createFromAscii("com.sun.star.frame.DispatchRecorder")),
+ xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchRecorder"))),
com::sun::star::uno::UNO_QUERY);
xSupplier = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorderSupplier >(
- xFactory->createInstance(rtl::OUString::createFromAscii("com.sun.star.frame.DispatchRecorderSupplier")),
+ xFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.DispatchRecorderSupplier"))),
com::sun::star::uno::UNO_QUERY);
xSupplier->setDispatchRecorder(xRecorder);
@@ -3252,7 +3252,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
break;
}
- ::rtl::OUString sProperty = rtl::OUString::createFromAscii("DispatchRecorderSupplier");
+ ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
GetFrame().GetFrameInterface(),
com::sun::star::uno::UNO_QUERY);
@@ -3277,7 +3277,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
break;
}
- ::rtl::OUString sProperty = rtl::OUString::createFromAscii("DispatchRecorderSupplier");
+ ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
GetFrame().GetFrameInterface(),
com::sun::star::uno::UNO_QUERY);
@@ -3383,20 +3383,20 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
else
{
::com::sun::star::util::URL aTargetURL;
- aTargetURL.Complete = ::rtl::OUString::createFromAscii(".component:DB/DataSourceBrowser");
- Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" )), UNO_QUERY );
+ aTargetURL.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/DataSourceBrowser"));
+ Reference < ::com::sun::star::util::XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
xTrans->parseStrict( aTargetURL );
Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY );
Reference < ::com::sun::star::frame::XDispatch > xDisp;
if ( xProv.is() )
- xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString::createFromAscii("_beamer"), 31 );
+ xDisp = xProv->queryDispatch( aTargetURL, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_beamer")), 31 );
if ( xDisp.is() )
{
Sequence < ::com::sun::star::beans::PropertyValue > aArgs(1);
::com::sun::star::beans::PropertyValue* pArg = aArgs.getArray();
- pArg[0].Name = rtl::OUString::createFromAscii("Referer");
- pArg[0].Value <<= ::rtl::OUString::createFromAscii("private:user");
+ pArg[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
+ pArg[0].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:user"));
xDisp->dispatch( aTargetURL, aArgs );
}
}
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 8271b1d..a85c3fc 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -77,7 +77,7 @@ using ::com::sun::star::lang::XComponent;
static ::rtl::OUString GetModuleName_Impl( const ::rtl::OUString& sDocService )
{
- uno::Reference< container::XNameAccess > xMM( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager")), uno::UNO_QUERY );
+ uno::Reference< container::XNameAccess > xMM( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"))), uno::UNO_QUERY );
::rtl::OUString sVar;
if ( !xMM.is() )
return sVar;
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 98a331d..abca884 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -750,19 +750,19 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )
for ( sal_Int32 nProp=0; nProp<aProps.getLength(); nProp++ )
{
if ( aProps[nProp].Name.equalsAscii("Copies") )
- aProps[nProp]. Name = rtl::OUString::createFromAscii("CopyCount");
+ aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CopyCount"));
else if ( aProps[nProp].Name.equalsAscii("RangeText") )
- aProps[nProp]. Name = rtl::OUString::createFromAscii("Pages");
+ aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pages"));
if ( aProps[nProp].Name.equalsAscii("Asynchron") )
{
- aProps[nProp]. Name = rtl::OUString::createFromAscii("Wait");
+ aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait"));
sal_Bool bAsynchron = sal_False;
aProps[nProp].Value >>= bAsynchron;
aProps[nProp].Value <<= (sal_Bool) (!bAsynchron);
}
if ( aProps[nProp].Name.equalsAscii("Silent") )
{
- aProps[nProp]. Name = rtl::OUString::createFromAscii("MonitorVisible");
+ aProps[nProp]. Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MonitorVisible"));
sal_Bool bPrintSilent = sal_False;
aProps[nProp].Value >>= bPrintSilent;
aProps[nProp].Value <<= (sal_Bool) (!bPrintSilent);
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 6524707..6fa144a 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -277,11 +277,11 @@ static ::rtl::OUString impl_retrieveFilterNameFromTypeAndModule(
{
::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() );
::rtl::OUString aFilterName = aFilterPropsHM.getUnpackedValueOrDefault(
- ::rtl::OUString::createFromAscii( "Name" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),
::rtl::OUString() );
sal_Int32 nFilterFlags = aFilterPropsHM.getUnpackedValueOrDefault(
- ::rtl::OUString::createFromAscii( "Flags" ),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")),
sal_Int32( 0 ) );
if ( nFilterFlags & nFlags )
@@ -307,7 +307,7 @@ enum ETypeFamily
::rtl::OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFrame >& xFrame ,
ETypeFamily eTypeFamily)
{
- static ::rtl::OUString SERVICENAME_MODULEMANAGER = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager");
+ static ::rtl::OUString SERVICENAME_MODULEMANAGER(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.ModuleManager"));
try
{
@@ -639,7 +639,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
}
::com::sun::star::uno::Reference< XSystemShellExecute > xSystemShellExecute( xSMGR->createInstance(
- ::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )),
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.system.SystemShellExecute"))),
css::uno::UNO_QUERY );
BOOL bRet( TRUE );
More information about the Libreoffice-commits
mailing list