summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authornccuong <cao.cuong.ngo@gmail.com>2013-03-04 15:25:02 +0100
committerEike Rathke <erack@redhat.com>2013-03-06 12:59:26 +0000
commita6b91730053fc61416716ae176081b91de52532b (patch)
tree192e578875f9abe82ca535e3cb794944bac9d9aa /sc
parent6374ae0721a5e5da9ed1a477f9642feba01199a6 (diff)
fdo#60148 Clean up warnings from the Clang compiler plugin
Change-Id: I08d755677c46c476710ecbd067ed9f7e2f54a671 loplugin: clean warnings: unused variables, incorrect indentation and log area. Reviewed-on: https://gerrit.libreoffice.org/2544 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/helper/qahelper.hxx1
-rw-r--r--sc/qa/unit/subsequent_export-test.cxx1
-rw-r--r--sc/qa/unit/subsequent_filters-test.cxx3
-rw-r--r--sc/source/core/tool/compiler.cxx16
-rw-r--r--sc/source/filter/oox/extlstcontext.cxx11
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx16
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx2
-rw-r--r--sc/source/ui/vba/vbafont.cxx2
8 files changed, 18 insertions, 34 deletions
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 94d761abcaf5..0d77c0b0e67a 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -233,7 +233,6 @@ public:
}
ScDocShellRef saveAndReload( ScDocShell* pShell, sal_Int32 nFormat )
{
- OUString aFileExtension(aFileFormats[nFormat].pName, strlen(aFileFormats[nFormat].pName), RTL_TEXTENCODING_UTF8 );
OUString aFilterName(aFileFormats[nFormat].pFilterName, strlen(aFileFormats[nFormat].pFilterName), RTL_TEXTENCODING_UTF8) ;
OUString aFilterType(aFileFormats[nFormat].pTypeName, strlen(aFileFormats[nFormat].pTypeName), RTL_TEXTENCODING_UTF8);
ScDocShellRef xDocSh = saveAndReload(pShell, aFilterName, OUString(), aFilterType, aFileFormats[nFormat].nFormatType);
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx
index 76d88d0d4e9c..621a6d77f8c5 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -136,7 +136,6 @@ void ScExportTest::testPasswordExport()
CPPUNIT_ASSERT(pDoc);
sal_Int32 nFormat = ODS;
- OUString aFileExtension(aFileFormats[nFormat].pName, strlen(aFileFormats[nFormat].pName), RTL_TEXTENCODING_UTF8 );
OUString aFilterName(aFileFormats[nFormat].pFilterName, strlen(aFileFormats[nFormat].pFilterName), RTL_TEXTENCODING_UTF8) ;
OUString aFilterType(aFileFormats[nFormat].pTypeName, strlen(aFileFormats[nFormat].pTypeName), RTL_TEXTENCODING_UTF8);
ScDocShellRef xDocSh = saveAndReloadPassword(pShell, aFilterName, OUString(), aFilterType, aFileFormats[nFormat].nFormatType);
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index a5d5a5a767b1..cdaaa3e8c777 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -484,14 +484,12 @@ void testDBRanges_Impl(ScDocument* pDoc, sal_Int32 nFormat)
{
double aValue;
pDoc->GetValue(0,10,1, aValue);
- OUString aString;
CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet2: A11: formula result is incorrect", 4.0, aValue);
pDoc->GetValue(1, 10, 1, aValue);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet2: B11: formula result is incorrect", 2.0, aValue);
}
double aValue;
pDoc->GetValue(3,10,1, aValue);
- OUString aString;
CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet2: D11: formula result is incorrect", 4.0, aValue);
pDoc->GetValue(4, 10, 1, aValue);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Sheet2: E11: formula result is incorrect", 2.0, aValue);
@@ -611,7 +609,6 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, ScDocument* pDoc, sal_Int32 n
//test Sheet3 only for ods
if ( nFormat == ODS || nFormat == XLSX )
{
- OUString aCondString = getConditionalFormatString(pDoc, 3,0,2);
pFiltersTest->createCSVPath(OUString(RTL_CONSTASCII_USTRINGPARAM("conditionalFormatting.")), aCSVFileName);
testCondFile(aCSVFileName, pDoc, 2);
// test parent cell style import ( fdo#55198 )
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 09e61c9fa7b8..74a496e3cbbb 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -310,13 +310,13 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv )
/* */ t[32] = SC_COMPILER_C_CHAR_DONTCARE | SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_VALUE_SEP;
/* ! */ t[33] = SC_COMPILER_C_CHAR | SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_VALUE_SEP;
- if (FormulaGrammar::CONV_ODF == meConv)
-/* ! */ t[33] |= SC_COMPILER_C_ODF_LABEL_OP;
+ if (FormulaGrammar::CONV_ODF == meConv)
+/* ! */ t[33] |= SC_COMPILER_C_ODF_LABEL_OP;
/* " */ t[34] = SC_COMPILER_C_CHAR_STRING | SC_COMPILER_C_STRING_SEP;
/* # */ t[35] = SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_CHAR_ERRCONST;
/* $ */ t[36] = SC_COMPILER_C_CHAR_WORD | SC_COMPILER_C_WORD | SC_COMPILER_C_CHAR_IDENT | SC_COMPILER_C_IDENT;
- if (FormulaGrammar::CONV_ODF == meConv)
-/* $ */ t[36] |= SC_COMPILER_C_ODF_NAME_MARKER;
+ if (FormulaGrammar::CONV_ODF == meConv)
+/* $ */ t[36] |= SC_COMPILER_C_ODF_NAME_MARKER;
/* % */ t[37] = SC_COMPILER_C_VALUE;
/* & */ t[38] = SC_COMPILER_C_CHAR | SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_VALUE_SEP;
/* ' */ t[39] = SC_COMPILER_C_NAME_SEP;
@@ -329,8 +329,8 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv )
/* . */ t[46] = SC_COMPILER_C_WORD | SC_COMPILER_C_CHAR_VALUE | SC_COMPILER_C_VALUE | SC_COMPILER_C_IDENT | SC_COMPILER_C_NAME;
/* / */ t[47] = SC_COMPILER_C_CHAR | SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_VALUE_SEP;
- for (i = 48; i < 58; i++)
-/* 0-9 */ t[i] = SC_COMPILER_C_CHAR_VALUE | SC_COMPILER_C_WORD | SC_COMPILER_C_VALUE | SC_COMPILER_C_VALUE_EXP | SC_COMPILER_C_VALUE_VALUE | SC_COMPILER_C_IDENT | SC_COMPILER_C_NAME;
+ for (i = 48; i < 58; i++)
+/* 0-9 */ t[i] = SC_COMPILER_C_CHAR_VALUE | SC_COMPILER_C_WORD | SC_COMPILER_C_VALUE | SC_COMPILER_C_VALUE_EXP | SC_COMPILER_C_VALUE_VALUE | SC_COMPILER_C_IDENT | SC_COMPILER_C_NAME;
/* : */ t[58] = SC_COMPILER_C_CHAR | SC_COMPILER_C_WORD;
/* ; */ t[59] = SC_COMPILER_C_CHAR | SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_VALUE_SEP;
@@ -359,8 +359,8 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv )
/* _ */ t[95] = SC_COMPILER_C_CHAR_WORD | SC_COMPILER_C_WORD | SC_COMPILER_C_CHAR_IDENT | SC_COMPILER_C_IDENT | SC_COMPILER_C_CHAR_NAME | SC_COMPILER_C_NAME;
/* ` */ // FREE
- for (i = 97; i < 123; i++)
-/* a-z */ t[i] = SC_COMPILER_C_CHAR_WORD | SC_COMPILER_C_WORD | SC_COMPILER_C_CHAR_IDENT | SC_COMPILER_C_IDENT | SC_COMPILER_C_CHAR_NAME | SC_COMPILER_C_NAME;
+ for (i = 97; i < 123; i++)
+/* a-z */ t[i] = SC_COMPILER_C_CHAR_WORD | SC_COMPILER_C_WORD | SC_COMPILER_C_CHAR_IDENT | SC_COMPILER_C_IDENT | SC_COMPILER_C_CHAR_NAME | SC_COMPILER_C_NAME;
/* { */ t[123] = SC_COMPILER_C_CHAR | SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_VALUE_SEP; // array open
/* | */ t[124] = SC_COMPILER_C_CHAR | SC_COMPILER_C_WORD_SEP | SC_COMPILER_C_VALUE_SEP; // array row sep (Should be OOo specific)
diff --git a/sc/source/filter/oox/extlstcontext.cxx b/sc/source/filter/oox/extlstcontext.cxx
index 43a3859ddaa8..5e20e2f6c9ae 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -218,17 +218,8 @@ ContextHandlerRef ExtGlobalContext::onCreateContext( sal_Int32 nElement, const A
}
}
-void ExtGlobalContext::onStartElement( const AttributeList& rAttribs )
+void ExtGlobalContext::onStartElement( const AttributeList& /*rAttribs*/ )
{
- if(rAttribs.hasAttribute( XML_id ))
- {
- rtl::OUString aId = rAttribs.getString( XML_id, rtl::OUString() );
- }
-
- if(rAttribs.hasAttribute( XML_uri ))
- {
- rtl::OUString aUri = rAttribs.getString( XML_uri, rtl::OUString() );
- }
}
ExtLstGlobalContext::ExtLstGlobalContext( WorksheetFragment& rFragment ):
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 6e11f33919e8..b748f81898ac 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -360,14 +360,14 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, sal_uInt16 nTabPage )
if( bHasMarked )
pView->MergeAttrFromMarked( aNewAttr, false );
- SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
- OSL_ENSURE(pFact, "Dialogdiet Factory fail!");
- SfxAbstractTabDialog * pDlg = pFact->CreateSvxLineTabDialog( pViewData->GetDialogParent(),
- &aNewAttr,
- pViewData->GetDocument()->GetDrawLayer(),
- pObj,
- bHasMarked);
- OSL_ENSURE(pDlg, "Dialogdiet fail!");
+ SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
+ OSL_ENSURE(pFact, "Dialogdiet Factory fail!");
+ SfxAbstractTabDialog * pDlg = pFact->CreateSvxLineTabDialog( pViewData->GetDialogParent(),
+ &aNewAttr,
+ pViewData->GetDocument()->GetDrawLayer(),
+ pObj,
+ bHasMarked);
+ OSL_ENSURE(pDlg, "Dialogdiet fail!");
if ( nTabPage != 0xffff )
pDlg->SetCurPageId( nTabPage );
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 34a1534cf902..a6bbe6e676a0 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -632,7 +632,6 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
aWndCenter.GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPagesField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara,aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
pTextObj.reset(aWndCenter.GetEditEngine()->CreateTextObject());
aWndCenter.SetText(*pTextObj);
- XubString aEntry(pTextObj.get()->GetText(0));
if(!bTravelling)
aWndCenter.GrabFocus();
}
@@ -677,7 +676,6 @@ void ScHFEditPage::ProcessDefinedListSel(ScHFEntryId eSel, bool bTravelling)
aWndCenter.GetEditEngine()->QuickInsertField(SvxFieldItem(SvxPageField(), EE_FEATURE_FIELD), ESelection(aSel.nEndPara,aSel.nEndPos, aSel.nEndPara, aSel.nEndPos));
pTextObj.reset(aWndCenter.GetEditEngine()->CreateTextObject());
aWndCenter.SetText(*pTextObj);
- XubString aEntry2(pTextObj.get()->GetText(0));
if(!bTravelling)
aWndCenter.GrabFocus();
}
diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx
index f07a73cc167d..17939060c89e 100644
--- a/sc/source/ui/vba/vbafont.cxx
+++ b/sc/source/ui/vba/vbafont.cxx
@@ -223,7 +223,7 @@ ScVbaFont::getSize() throw ( uno::RuntimeException )
if ( GetDataSet() )
if ( GetDataSet()->GetItemState( ATTR_FONT_HEIGHT, sal_True, NULL) == SFX_ITEM_DONTCARE )
return aNULL();
- return ScVbaFont_BASE::getSize();
+ return ScVbaFont_BASE::getSize();
}
void SAL_CALL