[Libreoffice-commits] .: svx/source
Gert Faller
gfaller at kemper.freedesktop.org
Sun Nov 21 04:21:43 PST 2010
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 2 -
svx/source/dialog/docrecovery.cxx | 10 ++++----
svx/source/dialog/fntctrl.cxx | 2 -
svx/source/fmcomp/fmgridif.cxx | 8 +++---
svx/source/form/fmshimp.cxx | 4 +--
svx/source/form/fmsrcimp.cxx | 12 ++++-----
svx/source/form/formcontroller.cxx | 20 ++++++++--------
7 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 36210b907b59280574ee49a4dbb62f156833a3ff
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sun Nov 21 13:15:06 2010 +0100
TL_CONSTASCII_USTRINGPARAM in libs core 38
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index dabe89d..11304d1 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -868,7 +868,7 @@ Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::GetBreakIterator
if ( !mxBreakIterator.is() )
{
Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
- Reference < XInterface > xI = xMSF->createInstance( rtl::OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) );
+ Reference < XInterface > xI = xMSF->createInstance( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) );
if ( xI.is() )
{
Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XBreakIterator >*)0) );
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 5b8de39..987f902 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -557,7 +557,7 @@ void SAL_CALL RecoveryCore::statusChanged(const css::frame::FeatureStateEvent& a
aNew.RecoveryState = E_NOT_RECOVERED_YET;
// patch DisplayName! Because the document title contain more then the file name ...
- sal_Int32 i = aNew.DisplayName.indexOf(::rtl::OUString::createFromAscii(" - "));
+ sal_Int32 i = aNew.DisplayName.indexOf(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" - ")));
if (i > 0)
aNew.DisplayName = aNew.DisplayName.copy(0, i);
@@ -2020,16 +2020,16 @@ void BrokenRecoveryDialog::impl_askForSavePath()
{
#if defined(WNT) || defined(OS2)
- OUString ustrValue = OUString::createFromAscii("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}");
+ OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"));
#elif defined( MACOSX )
- OUString ustrValue = OUString::createFromAscii("~");
+ OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("~"));
#else
- OUString ustrValue = OUString::createFromAscii("$SYSUSERCONFIG");
+ OUString ustrValue = OUString(RTL_CONSTASCII_USTRINGPARAM("$SYSUSERCONFIG"));
#endif
Bootstrap::expandMacros( ustrValue );
#if defined(WNT) || defined(OS2)
- ustrValue += OUString::createFromAscii("/user/crashdata");
+ ustrValue += OUString(RTL_CONSTASCII_USTRINGPARAM("/user/crashdata"));
#endif
return ustrValue;
}
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 2ae386c..b22ba53 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/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 6941fd6..1b8300e 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;
}
@@ -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/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 2c351ed..c1fbafb 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -3610,7 +3610,7 @@ void FmXFormShell::CreateExternalView()
aColumnProps.realloc(pColumnProps - aColumnProps.getArray());
// columns props are a dispatch argument
- pDispatchArgs->Name = ::rtl::OUString::createFromAscii("ColumnProperties"); // TODO : fmurl.*
+ pDispatchArgs->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnProperties")); // TODO : fmurl.*
pDispatchArgs->Value = makeAny(aColumnProps);
++pDispatchArgs;
DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
@@ -3697,7 +3697,7 @@ void FmXFormShell::CreateExternalView()
++pDispatchArgs;
// the
- pDispatchArgs->Name = ::rtl::OUString::createFromAscii("ColumnProperties"); // TODO : fmurl.*
+ pDispatchArgs->Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ColumnProperties")); // TODO : fmurl.*
pDispatchArgs->Value = makeAny(aListBoxDescription);
++pDispatchArgs;
DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index b836e29..b364953 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -218,8 +218,8 @@ CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckB
{
switch ((TriState)m_xBox->getState())
{
- case STATE_NOCHECK: return rtl::OUString::createFromAscii("0");
- case STATE_CHECK: return rtl::OUString::createFromAscii("1");
+ case STATE_NOCHECK: return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0"));
+ case STATE_CHECK: return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1"));
default: break;
}
return rtl::OUString();
@@ -1011,14 +1011,14 @@ void FmSearchEngine::SearchNextImpl()
switch (m_nPosition)
{
case MATCHING_ANYWHERE :
- strSearchExpression = ::rtl::OUString::createFromAscii("*") + strSearchExpression
- + ::rtl::OUString::createFromAscii("*");
+ strSearchExpression = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) + strSearchExpression
+ + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
break;
case MATCHING_BEGINNING :
- strSearchExpression = strSearchExpression + ::rtl::OUString::createFromAscii("*");
+ strSearchExpression = strSearchExpression + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*"));
break;
case MATCHING_END :
- strSearchExpression = ::rtl::OUString::createFromAscii("*") + strSearchExpression;
+ strSearchExpression = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) + strSearchExpression;
break;
case MATCHING_WHOLETEXT :
break;
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index cb65e17..eacf3b5 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -479,7 +479,7 @@ class FmXAutoControl: public UnoControl
public:
FmXAutoControl(){}
- virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString::createFromAscii("Edit");}
+ virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit"));}
virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw( RuntimeException );
protected:
@@ -709,7 +709,7 @@ sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& Service
//------------------------------------------------------------------------------
::rtl::OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException )
{
- return ::rtl::OUString::createFromAscii( "org.openoffice.comp.svx.FormController" );
+ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svx.FormController"));
}
//------------------------------------------------------------------------------
@@ -747,7 +747,7 @@ Sequence< ::rtl::OUString> FormController::getSupportedServiceNames_Static(void)
{
aServices.realloc(2);
aServices.getArray()[0] = FM_FORM_CONTROLLER;
- aServices.getArray()[1] = ::rtl::OUString::createFromAscii("com.sun.star.awt.control.TabController");
+ aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.control.TabController"));
}
return aServices;
}
@@ -3176,7 +3176,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
xQueryColumns->getByName(pRefValues[j].Name) >>= xSet;
// get the RealName
- xSet->getPropertyValue(::rtl::OUString::createFromAscii("RealName")) >>= aRealName;
+ xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RealName"))) >>= aRealName;
// compare the condition field name and the RealName
if (aCompare(aRealName, pRefValues[j].Name))
@@ -3189,7 +3189,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
for (sal_Int32 n = 0, nCount = xColumnsByIndex->getCount(); n < nCount; n++)
{
xColumnsByIndex->getByIndex(n) >>= xSet;
- xSet->getPropertyValue(::rtl::OUString::createFromAscii("RealName")) >>= aRealName;
+ xSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RealName"))) >>= aRealName;
if (aCompare(aRealName, pRefValues[j].Name))
{
// get the column by its alias
@@ -3217,10 +3217,10 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
if (aRow.find((*iter).xText) != aRow.end())
{
::rtl::OUString aCompText = aRow[(*iter).xText];
- aCompText += ::rtl::OUString::createFromAscii(" ");
+ aCompText += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
::rtl::OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND);
aCompText += ::rtl::OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US);
- aCompText += ::rtl::OUString::createFromAscii(" ");
+ aCompText += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
aCompText += ::comphelper::getString(pRefValues[j].Value);
aRow[(*iter).xText] = aCompText;
}
@@ -3367,9 +3367,9 @@ void FormController::startFiltering()
{
// create a filter control
Sequence< Any > aCreationArgs( 3 );
- aCreationArgs[ 0 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "MessageParent" ), makeAny( VCLUnoHelper::GetInterface( getDialogParentWindow() ) ) );
- aCreationArgs[ 1 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "NumberFormatter" ), makeAny( xFormatter ) );
- aCreationArgs[ 2 ] <<= NamedValue( ::rtl::OUString::createFromAscii( "ControlModel" ), makeAny( xModel ) );
+ aCreationArgs[ 0 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MessageParent")), makeAny( VCLUnoHelper::GetInterface( getDialogParentWindow() ) ) );
+ aCreationArgs[ 1 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberFormatter")), makeAny( xFormatter ) );
+ aCreationArgs[ 2 ] <<= NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlModel")), makeAny( xModel ) );
Reference< XControl > xFilterControl(
m_aContext.createComponentWithArguments( "com.sun.star.form.control.FilterControl", aCreationArgs ),
UNO_QUERY
More information about the Libreoffice-commits
mailing list