diff options
author | Szabolcs Dezsi <dezsiszabi@hotmail.com> | 2012-04-06 14:09:04 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-04-08 19:24:00 +0200 |
commit | e4fb171d3ad15ae9abbc93d9db956674498c9dd5 (patch) | |
tree | 6d297c3054a7de5a8baee08db9237d0f01fffb52 /sc | |
parent | 8e5318b0b971580f8dabecc1318c74e799e84d53 (diff) |
Replaced a few equal calls with ==
Diffstat (limited to 'sc')
-rw-r--r-- | sc/qa/extras/macros-test.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xcl97/xcl97rec.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/vba/vbachart.cxx | 16 | ||||
-rw-r--r-- | sc/source/ui/vba/vbarange.cxx | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx index 9a68b7706fa2..c5aa5a2e002a 100644 --- a/sc/qa/extras/macros-test.cxx +++ b/sc/qa/extras/macros-test.cxx @@ -158,7 +158,7 @@ void ScMacrosTest::testVba() rtl::OUString aStringRes; aRet >>= aStringRes; std::cout << "value of Ret " << rtl::OUStringToOString( aStringRes, RTL_TEXTENCODING_UTF8 ).getStr() << std::endl; - CPPUNIT_ASSERT_MESSAGE("script reported failure",aStringRes.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OK") )) ); + CPPUNIT_ASSERT_MESSAGE( "script reported failure",aStringRes == "OK" ); pFoundShell->DoClose(); } } diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 911cd406488e..f1f8a4053afe 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -1003,7 +1003,7 @@ void XclObjAny::SaveXml( XclExpXmlStream& rStrm ) { // ignore group shapes at the moment, we don't process them correctly // leading to ms2010 rejecting the content - if( !mxShape.is() || mxShape->getShapeType().equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.GroupShape") ) ) ) + if( !mxShape.is() || mxShape->getShapeType() == "com.sun.star.drawing.GroupShape" ) return; sax_fastparser::FSHelperPtr pDrawing = rStrm.GetCurrentStream(); diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index e2b121672ec5..1b58d21bd153 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -66,7 +66,7 @@ XMLTableShapeImportHelper::~XMLTableShapeImportHelper() void XMLTableShapeImportHelper::SetLayer(uno::Reference<drawing::XShape>& rShape, sal_Int16 nLayerID, const rtl::OUString& sType) const { - if (sType.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")))) + if ( sType == "com.sun.star.drawing.ControlShape" ) nLayerID = SC_LAYER_CONTROLS; if (nLayerID != -1) { diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index f706b3cd66b2..7c0c93345f54 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -115,7 +115,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce try { rtl::OUString sDiagramType = mxChartDocument->getDiagram()->getDiagramType(); - if (sDiagramType.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.chart.AreaDiagram" )))) + if ( sDiagramType == "com.sun.star.chart.AreaDiagram" ) { if (is3D()) { @@ -126,14 +126,14 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce nChartType = getStackedType(xlAreaStacked, xlAreaStacked100, xlArea); } } - else if (sDiagramType.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.PieDiagram")))) + else if ( sDiagramType == "com.sun.star.chart.PieDiagram" ) { if (is3D()) nChartType = xl3DPie; else nChartType = xlPie; /*TODO XlChartType xlPieExploded, XlChartType xlPieOfPie */ } - else if (sDiagramType.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.BarDiagram")))) + else if ( sDiagramType == "com.sun.star.chart.BarDiagram" ) { sal_Int32 nSolidType = chart::ChartSolidType::RECTANGULAR_SOLID; if (mxDiagramPropertySet->getPropertySetInfo()->hasPropertyByName(SOLIDTYPE)) @@ -164,7 +164,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce break; } } - else if (sDiagramType.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.StockDiagram")))) + else if ( sDiagramType == "com.sun.star.chart.StockDiagram" ) { sal_Bool bVolume = false; mxDiagramPropertySet->getPropertyValue(VOLUME) >>= bVolume; @@ -177,7 +177,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce nChartType = getStockUpDownValue(xlStockOHLC, xlStockHLC); } } - else if (sDiagramType.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.XYDiagram")))) + else if ( sDiagramType == "com.sun.star.chart.XYDiagram" ) { sal_Bool bHasLines = false; mxDiagramPropertySet->getPropertyValue(LINES) >>= bHasLines; @@ -196,7 +196,7 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce nChartType = xlXYScatter; } } - else if (sDiagramType.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.LineDiagram")))) + else if ( sDiagramType == "com.sun.star.chart.LineDiagram" ) { if (is3D()) { @@ -211,11 +211,11 @@ ScVbaChart::getChartType() throw ( uno::RuntimeException, script::BasicErrorExce nChartType = getStackedType(xlLineStacked, xlLineStacked100, xlLine); } } - else if (sDiagramType.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.DonutDiagram")))) + else if ( sDiagramType == "com.sun.star.chart.DonutDiagram" ) { nChartType = xlDoughnut; // TODO DoughnutExploded ?? } - else if (sDiagramType.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart.NetDiagram")))) + else if ( sDiagramType == "com.sun.star.chart.NetDiagram" ) { nChartType = getMarkerType(xlRadarMarkers, xlRadar); } diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index dda593ca8f78..27de1e8bf5da 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -808,9 +808,9 @@ void CellValueGetter::visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< { rtl::OUString sFormula = xCell->getFormula(); - if ( sFormula.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("=TRUE()") ) ) ) + if ( sFormula == "=TRUE()" ) aValue <<= sal_True; - else if ( sFormula.equals( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("=FALSE()") ) ) ) + else if ( sFormula == "=FALSE()" ) aValue <<= false; else { |