summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-10 08:10:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-10 08:10:58 +0100
commit243ab6d5583bdc02de38d62753e1b31ca8c0d162 (patch)
treeb604bcfa3c919b59e8a50ef6c6306e26490d90c4 /sc
parent86215f8c6ba6bc3a83375ea362a608f4f1bcfbe5 (diff)
New loplugin:conststringvar: sc
Change-Id: I5f353f8aaaa82f0f9dcb5af33320dbd7e4a8abb8
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/tiledrendering/tiledrendering.cxx2
-rw-r--r--sc/qa/unit/ucalc_sharedformula.cxx6
-rw-r--r--sc/source/core/opencl/formulagroupcl.cxx2
-rw-r--r--sc/source/filter/dif/difexp.cxx32
-rw-r--r--sc/source/ui/unoobj/dispuno.cxx16
5 files changed, 29 insertions, 29 deletions
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index b6e8b4092bfc..c3e67418509d 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -42,7 +42,7 @@ using namespace css;
namespace
{
-const char* DATA_DIRECTORY = "/sc/qa/unit/tiledrendering/data/";
+const char* const DATA_DIRECTORY = "/sc/qa/unit/tiledrendering/data/";
class ScTiledRenderingTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools
{
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index f5e03c73a974..89025ef5607e 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -1450,9 +1450,9 @@ void Test::testSharedFormulaUpdateOnNamedRangeChange()
m_pDoc->InsertTab(0, "Test");
- const char* pName = "MyRange";
- const char* pExpr1 = "$Test.$A$1:$A$3";
- const char* pExpr2 = "$Test.$A$1:$A$4";
+ const char* const pName = "MyRange";
+ const char* const pExpr1 = "$Test.$A$1:$A$3";
+ const char* const pExpr2 = "$Test.$A$1:$A$4";
RangeNameDef aName;
aName.mpName = pName;
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 54ae0d13ab44..4f8ac4dbe640 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -34,7 +34,7 @@
#define REDUCE_THRESHOLD 201 // set to 4 for correctness testing. priority 1
#define UNROLLING_FACTOR 16 // set to 4 for correctness testing (if no reduce)
-static const char* publicFunc =
+static const char* const publicFunc =
"\n"
"#define IllegalFPOperation 503 // #NUM!\n"
"#define NoValue 519 // #VALUE!\n"
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx
index cbdd8a8a4659..4d0371285f0e 100644
--- a/sc/source/filter/dif/difexp.cxx
+++ b/sc/source/filter/dif/difexp.cxx
@@ -84,12 +84,12 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
bContextOrNotAsciiEncoding = false;
}
- const sal_Char* p2DoubleQuotes_LF = "\"\"\n";
- const sal_Char* pSpecDataType_LF = "-1,0\n";
- const sal_Char* pEmptyData = "1,0\n\"\"\n";
- const sal_Char* pStringData = "1,0\n";
- const sal_Char* pNumData = "0,";
- const sal_Char* pNumDataERROR = "0,0\nERROR\n";
+ const sal_Char p2DoubleQuotes_LF[] = "\"\"\n";
+ const sal_Char pSpecDataType_LF[] = "-1,0\n";
+ const sal_Char pEmptyData[] = "1,0\n\"\"\n";
+ const sal_Char pStringData[] = "1,0\n";
+ const sal_Char pNumData[] = "0,";
+ const sal_Char pNumDataERROR[] = "0,0\nERROR\n";
OUStringBuffer aOS;
OUString aString;
@@ -119,7 +119,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
aOS.append("\n0,");
aOS.append(static_cast<sal_Int32>(nNumCols));
aOS.append('\n');
- aOS.appendAscii(p2DoubleQuotes_LF);
+ aOS.append(p2DoubleQuotes_LF);
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear());
// TUPLES
@@ -127,13 +127,13 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
aOS.append("\n0,");
aOS.append(static_cast<sal_Int32>(nNumRows));
aOS.append('\n');
- aOS.appendAscii(p2DoubleQuotes_LF);
+ aOS.append(p2DoubleQuotes_LF);
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear());
// DATA
aOS.append(pKeyDATA);
aOS.append("\n0,0\n");
- aOS.appendAscii(p2DoubleQuotes_LF);
+ aOS.append(p2DoubleQuotes_LF);
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear());
SCCOL nColCnt;
@@ -142,7 +142,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
for( nRowCnt = rRange.aStart.Row() ; nRowCnt <= nEndRow ; nRowCnt++ )
{
OSL_ASSERT(aOS.getLength() == 0);
- aOS.appendAscii(pSpecDataType_LF);
+ aOS.append(pSpecDataType_LF);
aOS.append(pKeyBOT);
aOS.append('\n');
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear());
@@ -155,10 +155,10 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
switch (aCell.meType)
{
case CELLTYPE_NONE:
- aOS.appendAscii(pEmptyData);
+ aOS.append(pEmptyData);
break;
case CELLTYPE_VALUE:
- aOS.appendAscii(pNumData);
+ aOS.append(pNumData);
pDoc->GetInputString( nColCnt, nRowCnt, nTab, aString );
aOS.append(aString);
aOS.append("\nV\n");
@@ -170,10 +170,10 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
break;
case CELLTYPE_FORMULA:
if (aCell.mpFormula->GetErrCode() != FormulaError::NONE)
- aOS.appendAscii(pNumDataERROR);
+ aOS.append(pNumDataERROR);
else if (aCell.mpFormula->IsValue())
{
- aOS.appendAscii(pNumData);
+ aOS.append(pNumData);
pDoc->GetInputString( nColCnt, nRowCnt, nTab, aString );
aOS.append(aString);
aOS.append("\nV\n");
@@ -198,7 +198,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
// needed just one more time..
OSL_ASSERT(aOS.getLength() == 0);
OUString aTmpStr = aString;
- aOS.appendAscii(pStringData);
+ aOS.append(pStringData);
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear(), eCharSet);
if ( eCharSet == RTL_TEXTENCODING_UNICODE )
{
@@ -258,7 +258,7 @@ void ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc,
}
OSL_ASSERT(aOS.getLength() == 0);
- aOS.appendAscii(pSpecDataType_LF);
+ aOS.append(pSpecDataType_LF);
aOS.append(pKeyEOD);
aOS.append('\n');
rOut.WriteUnicodeOrByteText(aOS.makeStringAndClear());
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 49250b5ca9a8..24957eecc4a8 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -33,8 +33,8 @@
using namespace com::sun::star;
-static const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns"; //data into text
-static const char* cURLDocDataSource = ".uno:DataSourceBrowser/DocumentDataSource";
+static const char cURLInsertColumns[] = ".uno:DataSourceBrowser/InsertColumns"; //data into text
+static const char cURLDocDataSource[] = ".uno:DataSourceBrowser/DocumentDataSource";
static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxViewShell* pViewShell )
{
@@ -98,8 +98,8 @@ uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDi
uno::Reference<frame::XDispatch> xResult;
// create some dispatch ...
if ( pViewShell && (
- aURL.Complete.equalsAscii(cURLInsertColumns) ||
- aURL.Complete.equalsAscii(cURLDocDataSource) ) )
+ aURL.Complete == cURLInsertColumns ||
+ aURL.Complete == cURLDocDataSource ) )
{
if (!m_xMyDispatch.is())
m_xMyDispatch = new ScDispatch( pViewShell );
@@ -221,7 +221,7 @@ void SAL_CALL ScDispatch::dispatch( const util::URL& aURL,
SolarMutexGuard aGuard;
bool bDone = false;
- if ( pViewShell && aURL.Complete.equalsAscii(cURLInsertColumns) )
+ if ( pViewShell && aURL.Complete == cURLInsertColumns )
{
ScViewData& rViewData = pViewShell->GetViewData();
ScAddress aPos( rViewData.GetCurX(), rViewData.GetCurY(), rViewData.GetTabNo() );
@@ -277,7 +277,7 @@ void SAL_CALL ScDispatch::addStatusListener(
aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
aEvent.FeatureURL = aURL;
- if ( aURL.Complete.equalsAscii(cURLDocDataSource) )
+ if ( aURL.Complete == cURLDocDataSource )
{
aDataSourceListeners.push_back( uno::Reference<frame::XStatusListener>( xListener ) );
@@ -306,7 +306,7 @@ void SAL_CALL ScDispatch::removeStatusListener(
{
SolarMutexGuard aGuard;
- if ( aURL.Complete.equalsAscii(cURLDocDataSource) )
+ if ( aURL.Complete == cURLDocDataSource )
{
sal_uInt16 nCount = aDataSourceListeners.size();
for ( sal_uInt16 n=nCount; n--; )
@@ -352,7 +352,7 @@ void SAL_CALL ScDispatch::selectionChanged( const css::lang::EventObject& /* aEv
{
frame::FeatureStateEvent aEvent;
aEvent.Source.set(static_cast<cppu::OWeakObject*>(this));
- aEvent.FeatureURL.Complete = OUString::createFromAscii( cURLDocDataSource );
+ aEvent.FeatureURL.Complete = cURLDocDataSource;
lcl_FillDataSource( aEvent, aNewImport ); // modifies State, IsEnabled