[Libreoffice-commits] .: 16 commits - chart2/source sc/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Oct 20 05:01:16 PDT 2010
chart2/source/tools/InternalDataProvider.cxx | 3 +--
sc/source/core/data/documen2.cxx | 2 +-
sc/source/core/tool/interpr4.cxx | 2 +-
sc/source/filter/excel/excimp8.cxx | 1 -
sc/source/filter/excel/excrecds.cxx | 2 +-
sc/source/filter/excel/read.cxx | 1 -
sc/source/filter/excel/xepivot.cxx | 12 ++++++++++--
sc/source/filter/excel/xlescher.cxx | 2 +-
sc/source/filter/xml/XMLStylesImportHelper.cxx | 8 ++++----
sc/source/ui/miscdlgs/datafdlg.cxx | 4 +---
sc/source/ui/optdlg/tpcompatibility.cxx | 2 +-
sc/source/ui/vba/vbaformat.cxx | 2 +-
sc/source/ui/vba/vbaquerytable.cxx | 6 +++---
sc/source/ui/view/dbfunc.cxx | 2 +-
sc/source/ui/view/viewfun3.cxx | 1 -
15 files changed, 26 insertions(+), 24 deletions(-)
New commits:
commit a28a0b3bdcf9d5fc16518ad2c589782eb4fcbba0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 12:07:10 2010 +0100
WaE, misordered init list
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 9efa4db..73b1cab 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -158,8 +158,8 @@ ScDocument::ScDocument( ScDocumentMode eMode,
pCacheFieldEditEngine( NULL ),
pDocProtection( NULL ),
mpClipParam( NULL),
- mpMacroMgr( NULL ),
pExternalRefMgr( NULL ),
+ mpMacroMgr( NULL ),
pViewOptions( NULL ),
pDocOptions( NULL ),
pExtDocOptions( NULL ),
commit d43dad0ab30fedcfac1794a1076fac370c639117
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 12:04:07 2010 +0100
remove unused variables
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index b5d910f..2e38152 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -257,10 +257,8 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
{
//ScViewData* pViewData = pTabViewShell->GetViewData();
- //pDoc = pViewData->GetDocument();
String aFieldName;
- int nRecordNum = nEndRow - nStartRow;
- for(sal_uInt16 i = 0; i < aColLength; i++)
+ for (sal_uInt16 i = 0; i < aColLength; ++i)
{
if (pEdits[i])
{
commit fe974ca4c6b725af94f239152388e20125cd5ea5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 12:02:56 2010 +0100
WaE, unused parameter
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 1dfcafb..476941e 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -83,7 +83,7 @@ BOOL ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs)
return false;
}
-void ScTpCompatOptions::Reset(const SfxItemSet &rCoreAttrs)
+void ScTpCompatOptions::Reset(const SfxItemSet &/*rCoreAttrs*/)
{
ScOptionsUtil::KeyBindingType eKeyB = mpOldOptions->GetKeyBindingType();
switch (eKeyB)
commit 59f66a4d3cb55bb4f1828ab3ff04cf5b1b20ff14
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 12:01:55 2010 +0100
WaE, unused parameter
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index d4f3be5..8a26dde 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -367,7 +367,7 @@ bool XclControlHelper::FillMacroDescriptor( ScriptEventDescriptor& rDescriptor,
}
String XclControlHelper::ExtractFromMacroDescriptor(
- const ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, SfxObjectShell* pShell )
+ const ScriptEventDescriptor& rDescriptor, XclTbxEventType eEventType, SfxObjectShell* /*pShell*/ )
{
if( (rDescriptor.ScriptCode.getLength() > 0) &&
rDescriptor.ScriptType.equalsIgnoreAsciiCaseAscii( "Script" ) &&
commit 93082e0bc131fd665cd8ec49ba4083db20d3faa7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 11:55:16 2010 +0100
WaE, silence warnings
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index b951d51..ac34151 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -737,7 +737,11 @@ void XclExpPivotCache::Save( XclExpStream& rStrm )
WriteCacheStream();
}
-void XclExpPivotCache::SaveXml( XclExpXmlStream& rStrm )
+void XclExpPivotCache::SaveXml( XclExpXmlStream&
+#ifdef XLSX_PIVOT_CACHE
+ rStrm
+#endif
+)
{
DBG_ASSERT( mbValid, "XclExpPivotCache::Save - invalid pivot cache" );
#ifdef XLSX_PIVOT_CACHE /* <pivotCache> without xl/pivotCaches/ cacheStream
@@ -1869,7 +1873,11 @@ void XclExpPivotTableManager::WritePivotCaches( XclExpStream& rStrm )
maPCacheList.Save( rStrm );
}
-void XclExpPivotTableManager::WritePivotCachesXml( XclExpXmlStream& rStrm )
+void XclExpPivotTableManager::WritePivotCachesXml( XclExpXmlStream&
+#ifdef XLSX_PIVOT_CACHE
+ rStrm
+#endif
+)
{
#ifdef XLSX_PIVOT_CACHE /* <pivotCache> without xl/pivotCaches/ cacheStream
results in a broken .xlsx */
commit fe78d55ed69990d673486f15861dd38a68a80edc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 11:52:06 2010 +0100
WaE, unused variable
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 5985867..e2737ec 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -1240,7 +1240,6 @@ FltError ImportExcel8::Read( void )
std::vector < SCTAB >::iterator it_end = nTabsWithNoCodeName.end();
for ( std::vector < SCTAB >::iterator it = nTabsWithNoCodeName.begin(); it != it_end; ++it )
{
- bool bGotCodeName = false;
SCTAB nTab = 1;
OSL_TRACE("Trying to find suitable codename for %d", *it );
while ( true )
commit 7f3a905e0f6ed5b2a0e68c5e4c7ad6ffef0ecd87
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 11:49:34 2010 +0100
WaE, unused parameter
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index facfe89..469e549 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -155,7 +155,7 @@ void ExcRecord::WriteBody( XclExpStream& rStrm )
SaveCont( rStrm );
}
-void ExcRecord::SaveXml( XclExpXmlStream& rStrm )
+void ExcRecord::SaveXml( XclExpXmlStream& /*rStrm*/ )
{
}
commit f58e3c9fb5e1acb2c656813e98af628886930f36
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 11:48:41 2010 +0100
WaE, remove warning
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 18b36c4..7f2a772 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -251,7 +251,6 @@ void ImportExcel8::ReadBasic( void )
if ( !bAsComment )
{
- ScDocument& rDoc = GetDoc();
#if 1
// see if we have the XCB stream
SvStorageStreamRef xXCB = xRootStrg->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM( "XCB" ) ), STREAM_STD_READ | STREAM_NOCREATE );
commit b362efae4cbca5a2b5b908e0e22de126a5662d37
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 11:26:42 2010 +0100
unused variables
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 50b6945..d70c9d1 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -491,7 +491,6 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::lcl_createDataSeq
OUString aRangeRepresentation = rRangeRepresentation;
if( aRangeRepresentation.indexOf('{') >= 0 )
{
- sal_Int32 i, m, n;
::std::vector< double > aNewData;
::std::vector< OUString > aNewLabels;
OUString aToken;
@@ -502,7 +501,7 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::lcl_createDataSeq
OUString str = aRangeRepresentation.replace('{',' ').replace('}',' ');
m_aInternalData.clearDefaultData();
- n = m_aInternalData.getColumnCount();
+ sal_Int32 n = m_aInternalData.getColumnCount();
if( n )
n = n - 1;
commit 9554bab9c4dc8fcd7cfff78c403180e148146ad8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 11:25:25 2010 +0100
WaE unused parameters
diff --git a/sc/source/ui/vba/vbaquerytable.cxx b/sc/source/ui/vba/vbaquerytable.cxx
index 82761c8..d3a16cd 100644
--- a/sc/source/ui/vba/vbaquerytable.cxx
+++ b/sc/source/ui/vba/vbaquerytable.cxx
@@ -38,7 +38,7 @@ using namespace com::sun::star;
ScVbaQueryTable::ScVbaQueryTable(const css::uno::Reference< ov::XHelperInterface >& /*xParent*/,
- const css::uno::Reference< css::uno::XComponentContext > & xContext,
+ const css::uno::Reference< css::uno::XComponentContext > & /*xContext*/,
ScDocument *pDocument ,
ScVbaRange *pParent
)
commit cdaa2ccb9268d0bdaf2045b8706241da10a0527c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 11:23:22 2010 +0100
WaE unused parameters
diff --git a/sc/source/ui/vba/vbaquerytable.cxx b/sc/source/ui/vba/vbaquerytable.cxx
index d08fd30..82761c8 100644
--- a/sc/source/ui/vba/vbaquerytable.cxx
+++ b/sc/source/ui/vba/vbaquerytable.cxx
@@ -37,7 +37,7 @@
using namespace com::sun::star;
-ScVbaQueryTable::ScVbaQueryTable(const css::uno::Reference< ov::XHelperInterface >& xParent,
+ScVbaQueryTable::ScVbaQueryTable(const css::uno::Reference< ov::XHelperInterface >& /*xParent*/,
const css::uno::Reference< css::uno::XComponentContext > & xContext,
ScDocument *pDocument ,
ScVbaRange *pParent
@@ -54,7 +54,7 @@ ScVbaQueryTable::~ScVbaQueryTable()
}
::sal_Bool SAL_CALL
-ScVbaQueryTable::Refresh( const ::com::sun::star::uno::Any& aBackgroundQuery ) throw (::com::sun::star::uno::RuntimeException)
+ScVbaQueryTable::Refresh( const ::com::sun::star::uno::Any& /*aBackgroundQuery*/ ) throw (::com::sun::star::uno::RuntimeException)
{
//Get parent Info
commit 4d6fb7b3ea074fd9ab50a82c2fcdbfb44d2bb9d3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 11:18:39 2010 +0100
WaE, silence warning
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index d7fc04f..a38c7f3 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vba/vbaformat.cxx
@@ -121,7 +121,7 @@ ScVbaFormat<Ifc1>::getVerticalAlignment( ) throw (script::BasicErrorException,
{
if (!isAmbiguous( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) )
{
- sal_Int32 aAPIAlignment;
+ sal_Int32 aAPIAlignment = table::CellVertJustify2::STANDARD;
mxPropertySet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLVJUS ) ) ) >>= aAPIAlignment;
switch( aAPIAlignment )
{
commit 4b8c2b555e917688806dab6f564f3468e71ec91d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 11:00:40 2010 +0100
WaE, unused variable
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 3467b74..f9e854e 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -100,7 +100,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName )
// aktuellen Datenbereich fuer Sortieren / Filtern suchen
-ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection eSel, bool bShrinkToData, bool bExpandRows )
+ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection eSel, bool /*bShrinkToData*/, bool bExpandRows )
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDBData* pData = NULL;
commit 10c35431b006764c45b14dbcc897a9c4de6ccc57
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 10:58:41 2010 +0100
WaE, unused variable
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 46b62aa..e374252 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -1872,7 +1872,6 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow ,
const BOOL bRecord( pDoc->IsUndoEnabled());
ScDocument* pUndoDoc = NULL;
ScDocument* pRedoDoc = NULL;
- ScDocument* pRefUndoDoc = NULL;
ScRefUndoData* pUndoData = NULL;
SCTAB nTab = GetViewData()->GetTabNo();
SCTAB nStartTab = nTab;
commit b59d2c013a219ca842b43b296d9bb24b72f22dc6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 10:56:04 2010 +0100
WaE, unused parameters
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx
index bbe8f15..83f8632 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx
@@ -177,8 +177,8 @@ void ScMyStyleRanges::AddRange(const ScRange& rRange,
}
void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange,
- const rtl::OUString* pStyleName, const rtl::OUString* pCurrency,
- ScXMLImport& rImport, const sal_uInt32 nMaxRanges)
+ const rtl::OUString* /*pStyleName*/, const rtl::OUString* pCurrency,
+ ScXMLImport& /*rImport*/, const sal_uInt32 /*nMaxRanges*/)
{
if (!pCurrencyList)
pCurrencyList = new ScMyCurrencyStylesSet();
@@ -199,7 +199,7 @@ void ScMyStyleRanges::AddCurrencyRange(const ScRange& rRange,
aItr->mpRanges->addRange(rRange);
}
-void ScMyStyleRanges::InsertRow(const sal_Int32 nRow, const sal_Int32 nTab, ScDocument* pDoc)
+void ScMyStyleRanges::InsertRow(const sal_Int32 nRow, const sal_Int32 nTab, ScDocument* /*pDoc*/)
{
if (mpTextList)
mpTextList->insertRow(static_cast<SCROW>(nRow), static_cast<SCTAB>(nTab));
@@ -228,7 +228,7 @@ void ScMyStyleRanges::InsertRow(const sal_Int32 nRow, const sal_Int32 nTab, ScDo
}
}
-void ScMyStyleRanges::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* pDoc)
+void ScMyStyleRanges::InsertCol(const sal_Int32 nCol, const sal_Int32 nTab, ScDocument* /*pDoc*/)
{
if (mpTextList)
mpTextList->insertCol(static_cast<SCCOL>(nCol), static_cast<SCTAB>(nTab));
commit c7e11450db0b8648f21951182444a8f891a10479
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 20 10:37:21 2010 +0100
WaE, silence warning
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 8ae9649..f5e0068 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -2103,7 +2103,7 @@ double ScInterpreter::GetDoubleFromMatrix(const ScMatrixRef& pMat)
double ScInterpreter::GetDouble()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetDouble" );
- double nVal;
+ double nVal(0.0);
switch( GetRawStackType() )
{
case svDouble:
More information about the Libreoffice-commits
mailing list