[Libreoffice-commits] .: 3 commits - sc/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Thu Jan 20 02:27:52 PST 2011
sc/source/ui/vba/vbaapplication.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 792321095f149b21fa8cb61583817d5cf73a5f32
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jan 20 10:29:32 2011 +0100
Replace suitable equalsAscii calls with equalsAsciiL.
Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 3ca08e0..e0a6e90 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1631,7 +1631,7 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi
::rtl::OUString sFileExtension = aURLObj.GetExtension();
if ( sFileExtension.equalsAscii("") )
{
- sFileExtension = sFirstFilter.equalsAscii("*.*") ? sFileExtension : sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 );
+ sFileExtension = sFirstFilter.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*.*")) ? sFileExtension : sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 );
aPathStr = sFileExtension.equalsAscii("") ? aPathStr : aPathStr + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + sFileExtension;
}
else
@@ -1659,7 +1659,7 @@ ScVbaApplication::GetSaveAsFilename( const ::com::sun::star::uno::Any& InitialFi
}
if ( !bValidFilter )
{
- sFileExtension = sFirstFilter.equalsAscii("*.*") ? rtl::OUString()
+ sFileExtension = sFirstFilter.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("*.*")) ? rtl::OUString()
: sFirstFilter.copy( sFirstFilter.indexOfAsciiL("*.", 2) + 2 );
aPathStr = sFileExtension.equalsAscii("") ? aPathStr
: aPathStr + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")) + sFileExtension;
commit 6090092db505e6ae07e29944651926db12329c38
Merge: 2907108... c2f8267...
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Jan 20 10:28:05 2011 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/calc
commit 290710800fa7cf89d79eb59a1d8d5c35b1ccda3c
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed Jan 19 23:12:18 2011 +0100
Replace suitable equalsAscii calls with equalsAsciiL.
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 43a9e65..849044c 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -309,7 +309,7 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat
if( m_apSelectorListBox.get() )
{
SolarMutexGuard aSolarMutexGuard;
- if( rEvent.FeatureURL.Path.equalsAscii( "ChartElementSelector" ) )
+ if( rEvent.FeatureURL.Path.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ChartElementSelector" ) ) )
{
Reference< frame::XController > xChartController;
rEvent.State >>= xChartController;
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index 0bb3e3c..abeea28 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -137,37 +137,37 @@ void ShapeToolbarController::initialize( const Sequence< uno::Any >& rArguments
break;
}
}
- if ( m_aCommandURL.equalsAscii( ".uno:BasicShapes" ) )
+ if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:BasicShapes" ) ) )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BasicShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_BASIC;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
- else if ( m_aCommandURL.equalsAscii( ".uno:SymbolShapes" ) )
+ else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:SymbolShapes" ) ) )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SymbolShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_SYMBOL;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
- else if ( m_aCommandURL.equalsAscii( ".uno:ArrowShapes" ) )
+ else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:ArrowShapes" ) ) )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ArrowShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_ARROW;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox) );
}
- else if ( m_aCommandURL.equalsAscii( ".uno:FlowChartShapes" ) )
+ else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:FlowChartShapes" ) ) )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FlowChartShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_FLOWCHART;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
- else if ( m_aCommandURL.equalsAscii( ".uno:CalloutShapes" ) )
+ else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:CalloutShapes" ) ) )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CalloutShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_CALLOUT;
m_pToolbarController = TToolbarHelper::createFromQuery( new SvxTbxCtlCustomShapes( m_nSlotId, m_nToolBoxId, *pToolBox ) );
}
- else if ( m_aCommandURL.equalsAscii( ".uno:StarShapes" ) )
+ else if ( m_aCommandURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:StarShapes" ) ) )
{
m_aStates.insert( TCommandState::value_type( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StarShapes" ) ), sal_True ) );
m_nSlotId = SID_DRAWTBX_CS_STAR;
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 9677111..1183341 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -864,8 +864,8 @@ ScBaseCell* ScColumn::CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestD
// #TODO #FIXME do we have a localisation issue here?
rForm.GetFormula( aBuf );
rtl::OUString aVal( aBuf.makeStringAndClear() );
- if ( aVal.equalsAscii( "=TRUE()" )
- || aVal.equalsAscii( "=FALSE()" ) )
+ if ( aVal.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "=TRUE()" ) )
+ || aVal.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "=FALSE()" ) ) )
bForceFormula = true;
}
if (bForceFormula || bCloneFormula)
diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx
index 0a32ca3..4964c90 100644
--- a/sc/source/core/tool/addinhelpid.cxx
+++ b/sc/source/core/tool/addinhelpid.cxx
@@ -171,12 +171,12 @@ void ScUnoAddInHelpIdGenerator::SetServiceName( const ::rtl::OUString& rServiceN
pCurrHelpIds = NULL;
sal_uInt32 nSize = 0;
- if( rServiceName.equalsAscii( "com.sun.star.sheet.addin.Analysis" ) )
+ if( rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.addin.Analysis" ) ) )
{
pCurrHelpIds = pAnalysisHelpIds;
nSize = sizeof( pAnalysisHelpIds );
}
- else if( rServiceName.equalsAscii( "com.sun.star.sheet.addin.DateFunctions" ) )
+ else if( rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.sheet.addin.DateFunctions" ) ) )
{
pCurrHelpIds = pDateFuncHelpIds;
nSize = sizeof( pDateFuncHelpIds );
diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx
index dce5ece..b9d34a5 100644
--- a/sc/source/core/tool/docoptio.cxx
+++ b/sc/source/core/tool/docoptio.cxx
@@ -154,7 +154,7 @@ void ScDocOptions::ResetFormulaSeparators()
const Locale& rLocale = *ScGlobal::GetLocale();
const OUString& rLang = rLocale.Language;
- if (rLang.equalsAscii("ru"))
+ if (rLang.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ru")))
// Don't do automatic guess for these languages, and fall back to
// the old separator set.
return;
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 5f5fec8..ffcd066 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -712,7 +712,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
pExport->SetSharedData(pSharedData);
// if there are sheets to copy, get the source stream
- if ( sName.equalsAscii("content.xml") && lcl_HasValidStream(rDoc) &&
+ if ( sName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("content.xml")) && lcl_HasValidStream(rDoc) &&
( pExport->getExportFlags() & EXPORT_OASIS ) )
{
// old stream is still in this file's storage - open read-only
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index 50c5a66..cf02614 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -375,7 +375,7 @@ namespace calc
NamedValue aValue;
if ( *pLoop >>= aValue )
{
- if ( aValue.Name.equalsAscii( "CellRange" ) )
+ if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CellRange" ) ) )
{
if ( aValue.Value >>= aRangeAddress )
bFoundAddress = sal_True;
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index 67fc11f..bc1cb74 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -592,7 +592,7 @@ namespace calc
NamedValue aValue;
if ( *pLoop >>= aValue )
{
- if ( aValue.Name.equalsAscii( "BoundCell" ) )
+ if ( aValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BoundCell" ) ) )
{
if ( aValue.Value >>= aAddress )
bFoundAddress = sal_True;
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 31fc978..1b56b70 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -318,17 +318,17 @@ void ScPrintUIOptions::SetDefaults()
for (sal_Int32 nPropPos=0; nPropPos<aUIProp.getLength(); ++nPropPos)
{
rtl::OUString aName = aUIProp[nPropPos].Name;
- if ( aName.equalsAscii("Property") )
+ if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Property" ) ) )
{
beans::PropertyValue aPropertyValue;
if ( aUIProp[nPropPos].Value >>= aPropertyValue )
{
- if ( aPropertyValue.Name.equalsAscii( "PrintContent" ) )
+ if ( aPropertyValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PrintContent" ) ) )
{
aPropertyValue.Value <<= nContent;
aUIProp[nPropPos].Value <<= aPropertyValue;
}
- else if ( aPropertyValue.Name.equalsAscii( "IsIncludeEmptyPages" ) )
+ else if ( aPropertyValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsIncludeEmptyPages") ) )
{
ScUnoHelpFunctions::SetBoolInAny( aPropertyValue.Value, ! bSuppress );
aUIProp[nPropPos].Value <<= aPropertyValue;
@@ -758,28 +758,28 @@ BOOL ScModelObj::FillRenderMarkData( const uno::Any& aSelection,
for( sal_Int32 i = 0, nLen = rOptions.getLength(); i < nLen; i++ )
{
- if( rOptions[i].Name.equalsAscii( "IsOnlySelectedSheets" ) )
+ if( rOptions[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsOnlySelectedSheets" ) ) )
{
rOptions[i].Value >>= bSelectedSheetsOnly;
}
- else if( rOptions[i].Name.equalsAscii( "IsIncludeEmptyPages" ) )
+ else if( rOptions[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsIncludeEmptyPages" ) ) )
{
rOptions[i].Value >>= bIncludeEmptyPages;
}
- else if( rOptions[i].Name.equalsAscii( "PageRange" ) )
+ else if( rOptions[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PageRange" ) ) )
{
rOptions[i].Value >>= aPageRange;
}
- else if( rOptions[i].Name.equalsAscii( "PrintRange" ) )
+ else if( rOptions[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PrintRange" ) ) )
{
rOptions[i].Value >>= nPrintRange;
}
- else if( rOptions[i].Name.equalsAscii( "PrintContent" ) )
+ else if( rOptions[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PrintContent" ) ) )
{
bHasPrintContent = true;
rOptions[i].Value >>= nPrintContent;
}
- else if( rOptions[i].Name.equalsAscii( "View" ) )
+ else if( rOptions[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "View" ) ) )
{
rOptions[i].Value >>= xView;
}
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 3db6167..07171c8 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -279,7 +279,7 @@ BOOL lcl_GetCaptionPoint( uno::Reference< drawing::XShape >& xShape, awt::Point&
{
BOOL bReturn = FALSE;
rtl::OUString sType(xShape->getShapeType());
- sal_Bool bCaptionShape(sType.equalsAscii("com.sun.star.drawing.CaptionShape"));
+ sal_Bool bCaptionShape(sType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.CaptionShape")));
if (bCaptionShape)
{
uno::Reference < beans::XPropertySet > xShapeProp (xShape, uno::UNO_QUERY);
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 6ff7bb3..3ca08e0 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -1440,7 +1440,8 @@ ScVbaApplication::GetOpenFilename(const uno::Any& FileFilter, const uno::Any& Fi
if ( xServiceInfo.is() )
{
rtl::OUString sImplName = xServiceInfo->getImplementationName();
- if ( sImplName.equalsAscii("com.sun.star.comp.fpicker.VistaFileDialog") || sImplName.equalsAscii("com.sun.star.ui.dialogs.SalGtkFilePicker") )
+ if ( sImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.fpicker.VistaFileDialog")) ||
+ sImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.ui.dialogs.SalGtkFilePicker")) )
{
bUseXFilePicker2 = sal_True;
}
diff --git a/sc/source/ui/vba/vbafiledialog.cxx b/sc/source/ui/vba/vbafiledialog.cxx
index 3f634d5..04b27a8 100644
--- a/sc/source/ui/vba/vbafiledialog.cxx
+++ b/sc/source/ui/vba/vbafiledialog.cxx
@@ -108,8 +108,8 @@ ScVbaFileDialog::Show( ) throw (::com::sun::star::uno::RuntimeException)
if (xServiceInfo.is())
{
rtl::OUString sImplName = xServiceInfo->getImplementationName();
- if (sImplName.equalsAscii("com.sun.star.comp.fpicker.VistaFileDialog") ||
- sImplName.equalsAscii("com.sun.star.ui.dialogs.SalGtkFilePicker"))
+ if (sImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.comp.fpicker.VistaFileDialog")) ||
+ sImplName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.ui.dialogs.SalGtkFilePicker")))
{
bUseXFilePicker2 = sal_True;
}
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index a93db91..012b72e 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -135,52 +135,52 @@ ScVbaWorkbook::getFileFormat( ) throw (::uno::RuntimeException)
// #FIXME - seems suspect should we not walk through the properties
// to find the FilterName
- if (aArgs[0].Name.equalsAscii( "FilterName")) {
+ if (aArgs[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterName"))) {
aArgs[0].Value >>= aFilterName;
} else {
aArgs[1].Value >>= aFilterName;
}
- if (aFilterName.equalsAscii("Text - txt - csv (StarCalc)")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Text - txt - csv (StarCalc)"))) {
aFileFormat = excel::XlFileFormat::xlCSV; //xlFileFormat.
}
- if (aFilterName.equalsAscii("DBF")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DBF"))) {
aFileFormat = excel::XlFileFormat::xlDBF4;
}
- if (aFilterName.equalsAscii("DIF")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DIF"))) {
aFileFormat = excel::XlFileFormat::xlDIF;
}
- if (aFilterName.equalsAscii("Lotus")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Lotus"))) {
aFileFormat = excel::XlFileFormat::xlWK3;
}
- if (aFilterName.equalsAscii("MS Excel 4.0")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MS Excel 4.0"))) {
aFileFormat = excel::XlFileFormat::xlExcel4Workbook;
}
- if (aFilterName.equalsAscii("MS Excel 5.0/95")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MS Excel 5.0/95"))) {
aFileFormat = excel::XlFileFormat::xlExcel5;
}
- if (aFilterName.equalsAscii("MS Excel 97")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("MS Excel 97"))) {
aFileFormat = excel::XlFileFormat::xlExcel9795;
}
- if (aFilterName.equalsAscii("HTML (StarCalc)")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("HTML (StarCalc)"))) {
aFileFormat = excel::XlFileFormat::xlHtml;
}
- if (aFilterName.equalsAscii("calc_StarOffice_XML_Calc_Template")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc_StarOffice_XML_Calc_Template"))) {
aFileFormat = excel::XlFileFormat::xlTemplate;
}
- if (aFilterName.equalsAscii("StarOffice XML (Calc)")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StarOffice XML (Calc)"))) {
aFileFormat = excel::XlFileFormat::xlWorkbookNormal;
}
- if (aFilterName.equalsAscii("calc8")) {
+ if (aFilterName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc8"))) {
aFileFormat = excel::XlFileFormat::xlWorkbookNormal;
}
More information about the Libreoffice-commits
mailing list