[Libreoffice-commits] .: 5 commits - binfilter/bf_sc
Pierre-André Jacquod
pjacquod at kemper.freedesktop.org
Fri Dec 24 07:10:04 PST 2010
binfilter/bf_sc/source/core/tool/sc_addinlis.cxx | 2
binfilter/bf_sc/source/core/tool/sc_autoform.cxx | 19 ----
binfilter/bf_sc/source/core/tool/sc_callform.cxx | 35 -------
binfilter/bf_sc/source/core/tool/sc_chartarr.cxx | 4
binfilter/bf_sc/source/core/tool/sc_chartlis.cxx | 6 -
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx | 26 ++---
binfilter/bf_sc/source/core/tool/sc_collect.cxx | 4
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 7 -
binfilter/bf_sc/source/core/tool/sc_consoli.cxx | 6 -
binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx | 14 +-
binfilter/bf_sc/source/core/tool/sc_ddelink.cxx | 4
binfilter/bf_sc/source/core/tool/sc_detfunc.cxx | 11 +-
binfilter/bf_sc/source/core/tool/sc_editutil.cxx | 8 -
binfilter/bf_sc/source/core/tool/sc_inputopt.cxx | 2
binfilter/bf_sc/source/core/tool/sc_interpr1.cxx | 15 ---
binfilter/bf_sc/source/core/tool/sc_interpr5.cxx | 3
binfilter/bf_sc/source/core/tool/sc_interpr6.cxx | 2
binfilter/bf_sc/source/core/tool/sc_printopt.cxx | 3
binfilter/bf_sc/source/core/tool/sc_rangelst.cxx | 2
binfilter/bf_sc/source/core/tool/sc_rangenam.cxx | 6 -
binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx | 2
binfilter/bf_sc/source/ui/app/sc_sclib.cxx | 40 +-------
binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx | 4
binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx | 30 +-----
binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx | 24 -----
binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx | 40 --------
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 29 +-----
binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx | 2
binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx | 23 ----
binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx | 54 ++---------
binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx | 38 --------
binfilter/bf_sc/source/ui/docshell/sc_editable.cxx | 12 --
binfilter/bf_sc/source/ui/docshell/sc_impex.cxx | 56 -----------
binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx | 19 +---
binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx | 9 -
binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx | 7 -
binfilter/bf_sc/source/ui/unoobj/sc_appluno.cxx | 23 +---
binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx | 89 ++++++-------------
binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx | 14 --
binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx | 26 -----
binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx | 29 ------
binfilter/bf_sc/source/ui/unoobj/sc_defltuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_docuno.cxx | 48 +++-------
binfilter/bf_sc/source/ui/unoobj/sc_drdefuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx | 6 -
binfilter/bf_sc/source/ui/unoobj/sc_fielduno.cxx | 34 +------
binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx | 6 -
binfilter/bf_sc/source/ui/unoobj/sc_forbiuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx | 7 -
binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx | 24 +----
binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx | 14 --
binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx | 18 ---
binfilter/bf_sc/source/ui/unoobj/sc_notesuno.cxx | 14 --
binfilter/bf_sc/source/ui/unoobj/sc_shapeuno.cxx | 2
binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx | 31 ++----
binfilter/bf_sc/source/ui/unoobj/sc_textuno.cxx | 8 -
binfilter/bf_sc/source/ui/unoobj/sc_unodoc.cxx | 2
58 files changed, 219 insertions(+), 752 deletions(-)
New commits:
commit 34b49860abcdb3efac5f3223f05133bbe6055a57
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 18 23:16:37 2010 +0100
fix warning in binfilter bf_sc ui/app and commented code deletion
diff --git a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
index 0ccdd87..545ef28 100644
--- a/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_sclib.cxx
@@ -104,7 +104,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ };
-void ScLibOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ) {}
+void ScLibOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& /*aPropertyNames*/ ) {}
void ScLibOptions::Commit() {}
#define CFGPATH_LIBFILTER "Office.Calc/Filter/Import/Lotus123"
@@ -136,36 +136,14 @@ extern "C" { static void SAL_CALL thisModule() {} }
/*N*/
/*N*/ const String aEmptyStr;
/*N*/ // Clipboard-IDs:
-/*N*/ const ULONG nSc50Format = SOT_FORMATSTR_ID_STARCALC_50;
+/*N*/ SOT_FORMATSTR_ID_STARCALC_50;
/*N*/
/*N*/ String aVndCalc = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(CONTENT_TYPE_STR_APP_VND_CALC));
/*N*/
/*N*/ Factory().GetFilterContainer()->SetDetectFilter( ScDLL::DetectFilter );
/*N*/
/*N*/ // 5.0 muss mit vnd-Mime-Type registriert werden, aeltere mit dem alten x-starcalc
-/*
- SFX_OWN_FILTER_REGISTRATION( ScDLL::DetectFilter,
- String::CreateFromAscii(pFilterSc50),
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("*.sdc")),
- SFX_FILTER_OWN | SFX_FILTER_TEMPLATE |
- SFX_FILTER_IMPORT | SFX_FILTER_EXPORT,
- nSc50Format,
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("SVsc0.sdc")),
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("StarCalc 5.0")),
- RID_SCICN_DOCUMENT,
- aVndCalc, aEmptyStr );
-
- SFX_OWN_FILTER_REGISTRATION( ScDLL::DetectFilter,
- String::CreateFromAscii(pFilterSc50Temp),
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("*.vor")),
- SFX_FILTER_OWN | SFX_FILTER_TEMPLATE | SFX_FILTER_TEMPLATEPATH |
- SFX_FILTER_IMPORT | SFX_FILTER_EXPORT,
- nSc50Format,
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("SVsc1.vor")),
- String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("StarCalc 5.0")),
- RID_SCICN_TEMPLATE,
- aVndCalc, aEmptyStr );
-*/
+
/*N*/ // alle Im-/Exportfilter werden nur noch per install.ini registriert,
/*N*/ // damit sie bei der Installation weggelassen werden koennen.
/*N*/ }
@@ -301,14 +279,14 @@ SfxModule* ScModuleDummy::Load()
/*N*/ return ( nEndFlag == 0x0d );
/*N*/ }
-BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
+BOOL lcl_IsAnyXMLFilter( const SfxFilter* /*pFilter*/ )
{
DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if ( !pFilter )
return FALSE;
}
/*N*/ ULONG ScDLL::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter,
-/*N*/ SfxFilterFlags nMust, SfxFilterFlags nDont )
+/*N*/ SfxFilterFlags /*nMust*/, SfxFilterFlags /*nDont*/ )
/*N*/ {
/*N*/ // #59915# laut MBA darf hier nur ERRCODE_NONE, ERRCODE_ABORT und ERRCODE_FORCEQUIET
/*N*/ // zurueckgegeben werden...
@@ -633,14 +611,6 @@ BOOL lcl_IsAnyXMLFilter( const SfxFilter* pFilter )
// test for HTML
// #97832#; we don't have a flat xml filter
-/* if ( aHeader.CompareTo( "<?xml", 5 ) == COMPARE_EQUAL )
- {
- // if XML template is set, don't modify
- if (!lcl_IsAnyXMLFilter(*ppFilter))
- *ppFilter = SFX_APP()->GetFilter( ScDocShell::Factory(),
- String::CreateFromAscii(pFilterXML) );
- return ERRCODE_NONE;
- }*/
// dBase cannot safely be recognized - only test if the filter was set
/*N*/ if ( aPresetFilterName.EqualsAscii(pFilterDBase) && lcl_MayBeDBase( rStr ) )
commit 97dfe4c733754db5c6ecc90c19cb01a847343149
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 18 23:10:20 2010 +0100
fix warnings in binfilter bf_sc core/tools
trivial conservative fixes, letting behind function calls that may
not be needed any more. Fix warning:
unused parameter
and remove commentet code
diff --git a/binfilter/bf_sc/source/core/tool/sc_addinlis.cxx b/binfilter/bf_sc/source/core/tool/sc_addinlis.cxx
index cf46c0b..b972743 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addinlis.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addinlis.cxx
@@ -155,7 +155,7 @@ using namespace ::com::sun::star;
// XEventListener
-/*N*/ void SAL_CALL ScAddInListener::disposing( const ::com::sun::star::lang::EventObject& Source )
+/*N*/ void SAL_CALL ScAddInListener::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ )
/*N*/ throw(::com::sun::star::uno::RuntimeException)
/*N*/ {
/*N*/ // hold a ref so this is not deleted at removeResultListener
diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
index 9978549..b63298c 100644
--- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
@@ -249,9 +249,9 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ {
/*N*/ }
-/*N*/ void ScAutoFormatDataField::SetAdjust( const SvxAdjustItem& rAdjust )
+/*N*/ void ScAutoFormatDataField::SetAdjust( const SvxAdjustItem& /*rAdjust*/ )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 aAdjust.SetAdjust( rAdjust.GetAdjust() );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ #define READ( aItem, ItemType, nVers ) \
@@ -393,8 +393,6 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ }
-// ---------------------------------------------------------------------------
-
/*N*/ ScAutoFormatData::ScAutoFormatData()
/*N*/ {
/*N*/ nStrResId = USHRT_MAX;
@@ -516,12 +514,6 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ }
/*N*/ }
-
-
-
-
-
-
/*N*/ BOOL ScAutoFormatData::Load( SvStream& rStream, const ScAfVersions& rVersions )
/*N*/ {
/*N*/ BOOL bRet = TRUE;
@@ -531,7 +523,7 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ if( bRet && (nVer == AUTOFORMAT_DATA_ID_X ||
/*N*/ (AUTOFORMAT_DATA_ID_504 <= nVer && nVer <= AUTOFORMAT_DATA_ID)) )
/*N*/ {
-/*N*/ CharSet eSysSet = gsl_getSystemTextEncoding();
+/*N*/ gsl_getSystemTextEncoding();
/*N*/ CharSet eSrcSet = rStream.GetStreamCharSet();
/*N*/
/*N*/ BOOL b;
@@ -615,8 +607,6 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ return bRet;
/*N*/ }
-//---------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------
/*N*/ ScAutoFormat::ScAutoFormat(USHORT nLim, USHORT nDel, BOOL bDup):
/*N*/ SortedCollection (nLim, nDel, bDup),
@@ -755,8 +745,6 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ BYTE nChrSet, nCnt;
/*N*/ long nPos = rStream.Tell();
/*N*/ rStream >> nCnt >> nChrSet;
-/*N*/ // if( 4 <= nCnt )
-/*N*/ // rStream >> nFileVers;
/*N*/ if( rStream.Tell() != ULONG(nPos + nCnt) )
/*N*/ {
/*N*/ DBG_ERRORFILE( "Der Header enthaelt mehr/neuere Daten" );
@@ -859,7 +847,6 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ ScAfVersions::Write(rStream); // Item-Versionen
/*N*/
/*N*/ bRet = (rStream.GetError() == 0);
-/*N*/ //-----------------------------------------------------------
/*N*/ rStream << (USHORT)(nCount - 1);
/*N*/ bRet = (rStream.GetError() == 0);
/*N*/ for (USHORT i=1; bRet && (i < nCount); i++)
diff --git a/binfilter/bf_sc/source/core/tool/sc_callform.cxx b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
index 294db28..de87adf 100644
--- a/binfilter/bf_sc/source/core/tool/sc_callform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
@@ -30,7 +30,6 @@
#pragma hdrstop
#endif
-// INCLUDE ---------------------------------------------------------------
#include <osl/module.hxx>
@@ -39,7 +38,6 @@
namespace binfilter {
-//------------------------------------------------------------------------
extern "C" {
@@ -99,12 +97,10 @@ typedef void (CALLTYPE* FARPROC) ( void );
#define LIBFUNCNAME( name ) \
(String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( name ) ))
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
/*N*/ FuncData::FuncData(const String& rIName) :
/*N*/ pModuleData (NULL),
/*N*/ aInternalName (rIName),
-/*N*/ // aFuncName (""),
/*N*/ nNumber (0),
/*N*/ nParamCount (0),
/*N*/ eAsyncType (NONE)
@@ -116,7 +112,6 @@ typedef void (CALLTYPE* FARPROC) ( void );
//------------------------------------------------------------------------
-//------------------------------------------------------------------------
/*N*/ FuncData::FuncData(const FuncData& rData) :
/*N*/ pModuleData (rData.pModuleData),
@@ -130,22 +125,18 @@ typedef void (CALLTYPE* FARPROC) ( void );
/*N*/ eParamType[i] = rData.eParamType[i];
/*N*/ }
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
/*N*/ short FuncCollection::Compare(DataObject* pKey1, DataObject* pKey2) const
/*N*/ {
DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 return (short) ScGlobal::pTransliteration->compareString(
/*N*/ }
-//------------------------------------------------------------------------
-
/*N*/ BOOL FuncCollection::SearchFunc( const String& rName, USHORT& rIndex ) const
/*N*/ {
/*N*/ FuncData aDataObj(rName);
/*N*/ return Search( &aDataObj, rIndex );
/*N*/ }
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
class ModuleData : public DataObject
{
friend class ModuleCollection;
@@ -162,7 +153,6 @@ public:
void FreeInstance() { delete pInstance; pInstance = 0; }
};
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
/*N*/ class ModuleCollection : public SortedCollection
/*N*/ {
/*N*/ public:
@@ -171,7 +161,7 @@ public:
/*N*/
/*N*/ virtual DataObject* Clone() const { return new ModuleCollection(*this); }
/*N*/ ModuleData* operator[]( const USHORT nIndex) const {return (ModuleData*)At(nIndex);}
- virtual short Compare(DataObject* pKey1, DataObject* pKey2) const{DBG_BF_ASSERT(0, "STRIP"); return 0;} //STRIP001 virtual short Compare(DataObject* pKey1, DataObject* pKey2) const;
+ virtual short Compare(DataObject* pKey1, DataObject* pKey2) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}
/*N*/ };
/*N*/ #ifdef _MSC_VER
@@ -184,16 +174,6 @@ public:
/*N*/ #pragma code_seg()
/*N*/ #endif
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-
-//------------------------------------------------------------------------
/*N*/ void ExitExternalFunc()
/*N*/ {
@@ -205,7 +185,6 @@ public:
/*N*/ }
/*N*/ }
-//------------------------------------------------------------------------
/*N*/ BOOL FuncData::Call(void** ppParam)
/*N*/ {
@@ -300,18 +279,6 @@ public:
/*N*/ return bRet;
/*N*/ }
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
index f3ffd7b..b6c9a1b 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
@@ -282,7 +282,7 @@ namespace binfilter {
/*?*/ }
/*?*/ return;
/*N*/ }
-/*N*/ ULONG nOldPos = aRangeListRef->GetCurPos();
+/*N*/ aRangeListRef->GetCurPos();
/*N*/
/*N*/ pR = aRangeListRef->First();
/*N*/ nStartCol = pR->aStart.Col();
@@ -597,7 +597,6 @@ namespace binfilter {
/*N*/ {
/*N*/ aString = ScGlobal::GetRscString(STR_COLUMN);
/*N*/ aString += ' ';
-/*N*/ // aString += String::CreateFromInt32( pCols[nCol]+1 );
/*N*/ ScAddress aPos( pCols[ nCol ], 0, 0 );
/*N*/ aPos.Format( aColStr, SCA_VALID_COL, NULL );
/*N*/ aString += aColStr;
@@ -745,7 +744,6 @@ namespace binfilter {
/*?*/ nPosCol++;
/*?*/ ScAddress aPos( nPosCol - 1, 0, 0 );
/*?*/ aPos.Format( aColStr, SCA_VALID_COL, NULL );
-/*?*/ // aString += String::CreateFromInt32( nPosCol );
/*?*/ aString += aColStr;
/*N*/ }
/*N*/ pMemChart->SetColText(nCol, aString);
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
index 1a06804..4a60036 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
@@ -137,7 +137,7 @@ using namespace ::com::sun::star;
/*N*/ return uno::Reference< chart::XChartData >();
/*N*/ }
-/*N*/ void ScChartListener::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+/*N*/ void ScChartListener::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
/*N*/ {
/*N*/ const ScHint* p = PTR_CAST( ScHint, &rHint );
/*N*/ if( p && (p->GetId() & (SC_HINT_DATACHANGED | SC_HINT_DYING)) )
@@ -240,8 +240,8 @@ using namespace ::com::sun::star;
/*N*/ }
-/*N*/ void ScChartListenerCollection::ChangeListening( const String& rName,
-/*N*/ const ScRangeListRef& rRangeListRef, BOOL bDirty )
+/*N*/ void ScChartListenerCollection::ChangeListening( const String& /*rName*/,
+/*N*/ const ScRangeListRef& /*rRangeListRef*/, BOOL /*bDirty*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScChartListener aCLSearcher( rName, pDoc, rRangeListRef );
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
index cc2f075..3fb3f47 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
@@ -127,8 +127,8 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ aDateTime.ConvertToUTC();
/*N*/ }
-/*N*/ ScChangeAction::ScChangeAction( SvStream& rStrm, ScMultipleReadHeader& rHdr,
-/*N*/ ScChangeTrack* pTrack )
+/*N*/ ScChangeAction::ScChangeAction( SvStream& rStrm, ScMultipleReadHeader& /*rHdr*/,
+/*N*/ ScChangeTrack* /*pTrack*/ )
/*N*/ :
/*N*/ pNext( NULL ),
/*N*/ pPrev( NULL ),
@@ -157,7 +157,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ }
-/*N*/ BOOL ScChangeAction::Store( SvStream& rStrm, ScMultipleWriteHeader& rHdr ) const
+/*N*/ BOOL ScChangeAction::Store( SvStream& rStrm, ScMultipleWriteHeader& /*rHdr*/ ) const
/*N*/ {
/*N*/ // ScChangeTrack speichert aUser als Index auf Collection und eType selber
/*N*/ rStrm << aBigRange;
@@ -338,7 +338,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ }
-/*N*/ void ScChangeAction::UpdateReference( const ScChangeTrack* pTrack,
+/*N*/ void ScChangeAction::UpdateReference( const ScChangeTrack* /*pTrack*/,
/*N*/ UpdateRefMode eMode, const ScBigRange& rRange,
/*N*/ INT32 nDx, INT32 nDy, INT32 nDz )
/*N*/ {
@@ -654,7 +654,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ BOOL ScChangeAction::LoadCellList( ScChangeAction* pOfAction,
-/*N*/ ScChangeActionCellListEntry*& pFirstCell, SvStream& rStrm,
+/*N*/ ScChangeActionCellListEntry*& /*pFirstCell*/, SvStream& rStrm,
/*N*/ ScChangeTrack* pTrack )
/*N*/ {
/*N*/ UINT32 nCount;
@@ -734,7 +734,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ void ScChangeActionIns::GetDescription( String& rStr, ScDocument* pDoc,
-/*N*/ BOOL bSplitRange ) const
+/*N*/ BOOL /*bSplitRange*/ ) const
/*N*/ {
/*N*/ USHORT nWhatId;
/*N*/ switch ( GetType() )
@@ -826,7 +826,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ ScChangeActionDel::ScChangeActionDel( SvStream& rStrm,
-/*N*/ ScMultipleReadHeader& rHdr, ScDocument* pDoc, USHORT nVer,
+/*N*/ ScMultipleReadHeader& rHdr, ScDocument* /*pDoc*/, USHORT /* nVer*/,
/*N*/ ScChangeTrack* pTrackP )
/*N*/ :
/*N*/ ScChangeAction( rStrm, rHdr, pTrackP ),
@@ -990,7 +990,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ }
-/*N*/ void ScChangeActionDel::UpdateReference( const ScChangeTrack* pTrack,
+/*N*/ void ScChangeActionDel::UpdateReference( const ScChangeTrack* /*pTrack*/,
/*N*/ UpdateRefMode eMode, const ScBigRange& rRange,
/*N*/ INT32 nDx, INT32 nDy, INT32 nDz )
/*N*/ {
@@ -1287,7 +1287,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ }
-/*N*/ void ScChangeActionMove::UpdateReference( const ScChangeTrack* pTrack,
+/*N*/ void ScChangeActionMove::UpdateReference( const ScChangeTrack* /*pTrack*/,
/*N*/ UpdateRefMode eMode, const ScBigRange& rRange,
/*N*/ INT32 nDx, INT32 nDy, INT32 nDz )
/*N*/ {
@@ -1307,7 +1307,7 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi
/*N*/ void ScChangeActionMove::GetDescription( String& rStr, ScDocument* pDoc,
-/*N*/ BOOL bSplitRange ) const
+/*N*/ BOOL /*bSplitRange*/ ) const
/*N*/ {
/*N*/ BOOL bFlag3D = ( GetFromRange().aStart.Tab() != GetBigRange().aStart.Tab() );
/*N*/
@@ -1594,7 +1594,7 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ void ScChangeActionContent::GetDescription( String& rStr, ScDocument* pDoc,
-/*N*/ BOOL bSplitRange ) const
+/*N*/ BOOL /*bSplitRange*/ ) const
/*N*/ {
/*N*/
/*N*/ String aRsc( ScGlobal::GetRscString( STR_CHANGED_CELL ) );
@@ -2081,7 +2081,7 @@ const USHORT nMemPoolChangeActionContent = (0x8000 - 64) / sizeof(ScChangeAction
/*N*/ BOOL ScChangeActionReject::Store( SvStream& rStrm, ScMultipleWriteHeader& rHdr ) const
/*N*/ {
-/*N*/ BOOL bOk = ScChangeAction::Store( rStrm, rHdr );
+/*N*/ ScChangeAction::Store( rStrm, rHdr );
/*N*/ return TRUE;
/*N*/ }
@@ -2218,7 +2218,7 @@ const USHORT ScChangeTrack::nContentSlots =
/*N*/ }
-/*N*/ void ScChangeTrack::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+/*N*/ void ScChangeTrack::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
/*N*/ {
/*N*/ if ( !pDoc->IsInDtorClear() )
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_collect.cxx b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
index 19116fd..d1c196a 100644
--- a/binfilter/bf_sc/source/core/tool/sc_collect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
@@ -356,10 +356,10 @@ namespace binfilter {
/*N*/ }
-/*N*/ short TypedStrCollection::Compare( DataObject* pKey1, DataObject* pKey2 ) const
+/*N*/ short TypedStrCollection::Compare( DataObject* /*pKey1*/, DataObject* /*pKey2*/ ) const
/*N*/ {
/*N*/ short nResult = 0;
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 if ( pKey1 && pKey2 )
+ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return nResult;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index c238b63..22ea325 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -1970,15 +1970,10 @@ namespace binfilter {
/*N*/ }
/*N*/ else if( pToken->GetType() == svSingleRef )
/*N*/ {
-/*N*/ // if (!pDoc->HasTable( pToken->aRef.Ref1.nTab ) )
-/*N*/ // SetError(errNoRef);
/*N*/ pArr->nRefs++;
/*N*/ }
/*N*/ else if( pToken->GetType() == svDoubleRef )
/*N*/ {
-/*N*/ // if (!pDoc->HasTable( pToken->aRef.Ref1.nTab ) ||
-/*N*/ // !pDoc->HasTable( pToken->aRef.Ref2.nTab ))
-/*N*/ // SetError(errNoRef);
/*N*/ pArr->nRefs++;
/*N*/ }
/*N*/ return TRUE;
@@ -2802,7 +2797,7 @@ namespace binfilter {
/*N*/ return pRangeData;
/*N*/ }
-/*N*/ ScRangeData* ScCompiler::UpdateDeleteTab(USHORT nTable, BOOL bIsMove, BOOL bIsName,
+/*N*/ ScRangeData* ScCompiler::UpdateDeleteTab(USHORT nTable, BOOL /*bIsMove*/, BOOL bIsName,
/*N*/ BOOL& rChanged)
/*N*/ {
/*N*/ ScRangeData* pRangeData = NULL;
diff --git a/binfilter/bf_sc/source/core/tool/sc_consoli.cxx b/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
index 6b0a27d..8023dbf 100644
--- a/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
@@ -500,7 +500,7 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc
/*N*/
/*N*/ // Daten
/*N*/
-/*N*/ BOOL bAnyCell = ( eFunction == SUBTOTAL_FUNC_CNT2 );
+/*N*/ ( eFunction == SUBTOTAL_FUNC_CNT2 );
/*N*/ for (nCol=nCol1; nCol<=nCol2; nCol++)
/*N*/ {
/*N*/ USHORT nArrX = nCol-nCol1;
@@ -520,12 +520,10 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc
/*N*/ void ScConsData::OutputToDocument( ScDocument* pDestDoc, USHORT nCol, USHORT nRow, USHORT nTab )
/*N*/ {
-/*N*/ OpCode eOpCode = eOpCodeTable[eFunction];
+/*N*/ eOpCodeTable[eFunction];
/*N*/
/*N*/ USHORT nArrX;
/*N*/ USHORT nArrY;
-/*N*/ USHORT nCount;
-/*N*/ USHORT nPos;
/*N*/ USHORT i;
/*N*/
/*N*/ // Ecke links oben
diff --git a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
index 61bed28..e360b8e 100644
--- a/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_dbcolect.cxx
@@ -848,12 +848,12 @@ namespace binfilter {
// IsEqual - alles gleich
-/*N*/ ScDBData* ScDBCollection::GetDBAtCursor(USHORT nCol, USHORT nRow, USHORT nTab, BOOL bStartOnly) const
+/*N*/ ScDBData* ScDBCollection::GetDBAtCursor(USHORT /*nCol*/, USHORT /*nRow*/, USHORT /*nTab*/, BOOL /*bStartOnly*/) const
/*N*/ {
/*N*/ ScDBData* pNoNameData = NULL;
/*N*/ if (pItems)
/*N*/ {
-/*N*/ const String& rNoName = ScGlobal::GetRscString( STR_DB_NONAME );
+/*N*/ ScGlobal::GetRscString( STR_DB_NONAME );
/*N*/
/*N*/ for (USHORT i = 0; i < nCount; i++)
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 if (((ScDBData*)pItems[i])->IsDBAtCursor(nCol, nRow, nTab, bStartOnly))
@@ -861,7 +861,7 @@ namespace binfilter {
/*N*/ return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden
/*N*/ }
-/*N*/ ScDBData* ScDBCollection::GetDBAtArea(USHORT nTab, USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2) const
+/*N*/ ScDBData* ScDBCollection::GetDBAtArea(USHORT /*nTab*/, USHORT /*nCol1*/, USHORT /*nRow1*/, USHORT /*nCol2*/, USHORT /*nRow2*/) const
/*N*/ {
/*N*/ ScDBData* pNoNameData = NULL;
/*N*/ if (pItems)
@@ -931,10 +931,10 @@ namespace binfilter {
/*N*/ return bSuccess;
/*N*/ }
-/*N*/ void ScDBCollection::UpdateReference(UpdateRefMode eUpdateRefMode,
-/*N*/ USHORT nCol1, USHORT nRow1, USHORT nTab1,
-/*N*/ USHORT nCol2, USHORT nRow2, USHORT nTab2,
-/*N*/ short nDx, short nDy, short nDz )
+/*N*/ void ScDBCollection::UpdateReference(UpdateRefMode /*eUpdateRefMode*/,
+/*N*/ USHORT /*nCol1*/, USHORT /*nRow1*/, USHORT /*nTab1*/,
+/*N*/ USHORT /*nCol2*/, USHORT /*nRow2*/, USHORT /*nTab2*/,
+/*N*/ short /*nDx*/, short /*nDy*/, short /*nDz*/ )
/*N*/ {
/*N*/ for (USHORT i=0; i<nCount; i++)
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
index f63d7b7..f4a4b04 100644
--- a/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_ddelink.cxx
@@ -123,8 +123,8 @@ namespace binfilter {
/*N*/ rHdr.EndEntry();
/*N*/ }
-/*N*/ void ScDdeLink::DataChanged( const String& rMimeType,
-/*N*/ const ::com::sun::star::uno::Any & rValue )
+/*N*/ void ScDdeLink::DataChanged( const String& /*rMimeType*/,
+/*N*/ const ::com::sun::star::uno::Any & /*rValue*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 // wir koennen nur Strings...
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
index 1e677ad..0f11e2d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_detfunc.cxx
@@ -1380,7 +1380,7 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/ }
/*N*/ SdrObject* ScDetectiveFunc::ShowCommentUser( USHORT nCol, USHORT nRow, const String& rUserText,
-/*N*/ const Rectangle& rVisible, BOOL bLeft, BOOL bForce,
+/*N*/ const Rectangle& /*rVisible*/, BOOL /*bLeft*/, BOOL bForce,
/*N*/ SdrPage* pDestPage )
/*N*/ {
/*N*/ ScDrawLayer* pModel = pDoc->GetDrawLayer();
@@ -1465,7 +1465,6 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*?*/
/*?*/ SfxItemSet& rAttrSet = aData.GetCaptionSet();
/*?*/
-/*?*/ //-/ pCaption->SetAttributes( rAttrSet, FALSE );
/*?*/ pCaption->SetItemSetAndBroadcast(rAttrSet);
/*?*/
/*?*/ pCaption->SetSpecialTextBoxShadow();
@@ -1644,11 +1643,11 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level
/*N*/ return eType;
/*N*/ }
-/*N*/ void ScDetectiveFunc::InsertObject( ScDetectiveObjType eType,
-/*N*/ const ScAddress& rPosition, const ScRange& rSource,
-/*N*/ BOOL bRedLine )
+/*N*/ void ScDetectiveFunc::InsertObject( ScDetectiveObjType /*eType*/,
+/*N*/ const ScAddress& /*rPosition*/, const ScRange& /*rSource*/,
+/*N*/ BOOL /*bRedLine*/ )
/*N*/ {
-DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDrawLayer* pModel = pDoc->GetDrawLayer();
+ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
// static
diff --git a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
index 12f4f93..e2e4de9 100644
--- a/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_editutil.cxx
@@ -396,8 +396,8 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
/*N*/ }
/*N*/ String ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField,
-/*N*/ USHORT nPara, USHORT nPos,
-/*N*/ Color*& rTxtColor, Color*& rFldColor )
+/*N*/ USHORT /*nPara*/, USHORT /*nPos*/,
+/*N*/ Color*& /*rTxtColor*/, Color*& /*rFldColor*/ )
/*N*/ {
/*N*/ String aRet;
/*N*/ const SvxFieldData* pFieldData = rField.GetField();
@@ -463,8 +463,8 @@ const sal_Char ScEditUtil::pCalcDelimiters[] = "=();+-*/^&<>";
/*N*/ }
/*N*/ String ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField,
-/*N*/ USHORT nPara, USHORT nPos,
-/*N*/ Color*& rTxtColor, Color*& rFldColor )
+/*N*/ USHORT /*nPara*/, USHORT /*nPos*/,
+/*N*/ Color*& rTxtColor, Color*& /*rFldColor*/ )
/*N*/ {
/*N*/ String aRet;
/*N*/ const SvxFieldData* pFieldData = rField.GetField();
diff --git a/binfilter/bf_sc/source/core/tool/sc_inputopt.cxx b/binfilter/bf_sc/source/core/tool/sc_inputopt.cxx
index 2b4e93b..d96c603 100644
--- a/binfilter/bf_sc/source/core/tool/sc_inputopt.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_inputopt.cxx
@@ -256,7 +256,7 @@ using namespace ::com::sun::star::uno;
/*N*/ }
-void ScInputCfg::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ) {}
+void ScInputCfg::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& /*aPropertyNames*/ ) {}
void ScInputCfg::Commit() {}
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 6cb607a..7064490 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -1021,7 +1021,7 @@ void ScInterpreter::ScIsNonString()
}
-void ScInterpreter::ScIsLogical(UINT16 aOldNumType)
+void ScInterpreter::ScIsLogical(UINT16 /*aOldNumType*/)
{
short nRes = 0;
switch ( GetStackType() )
@@ -4591,19 +4591,6 @@ BOOL ScInterpreter::GetDBParams(USHORT& rTab, ScQueryParam& rParam,
void ScInterpreter::ScIndirect()
{
BYTE nParamCount = GetByte();
-/*
- if (nParamCount == 2)
- {
- double fBool = GetDouble();
- if (fBool == 0.0) // nur TRUE erlaubt!!
- {
- SetIllegalParameter();
- return;
- }
- else
- nParamCount = 1;
- }
-*/
if ( MustHaveParamCount( nParamCount, 1 ) )
{
USHORT nTab = aPos.Tab();
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
index 1af8655..c7b0f66 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
@@ -762,7 +762,7 @@ void ScInterpreter::MFastTrans(ScMatrix* pA, ScMatrix* pR,
}
BOOL ScInterpreter::MFastBackSubst(ScMatrix* pA, ScMatrix* pR, USHORT n, BOOL bIsUpper)
- // Führt Rückwaertsersetzung der Dreickesmatrix Mat a nach Mat r durch
+ // F�hrt R�ckwaertsersetzung der Dreickesmatrix Mat a nach Mat r durch
// 2 Versionen fuer obere (U) oder untere (L- Unit) Dreiecksmatrizen
{
short i, j, k;
@@ -2601,7 +2601,6 @@ void ScInterpreter::ScRGP()
SetIllegalParameter();
return;
}
- BOOL bVariancesOk = TRUE;
ScMatrix* pQ = GetNewMat(M+1, M+2, nMatInd10);
ScMatrix* pE = GetNewMat(M+2, 1, nMatInd12);
ScMatrix* pV = GetNewMat(M+1, 1, nMatInd13);
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr6.cxx b/binfilter/bf_sc/source/core/tool/sc_interpr6.cxx
index 8e66b0c..1d103c8 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr6.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr6.cxx
@@ -61,8 +61,6 @@ double ScInterpreter::GetGammaDist(double x, double alpha, double beta)
-0.139243221690590111E1
};
- int ipr = 6;
-
double dx = x;
double dgamma = gamma;
int maxit = 10000;
diff --git a/binfilter/bf_sc/source/core/tool/sc_printopt.cxx b/binfilter/bf_sc/source/core/tool/sc_printopt.cxx
index b7c98cc..735b9ca 100644
--- a/binfilter/bf_sc/source/core/tool/sc_printopt.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_printopt.cxx
@@ -92,9 +92,10 @@ using namespace ::com::sun::star::uno;
/*N*/ }
-void ScPrintCfg::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames )
+void ScPrintCfg::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& /*aPropertyNames*/ )
{
}
+
void ScPrintCfg::Commit()
{
}
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx b/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx
index 235614b..47c2353 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangelst.cxx
@@ -220,7 +220,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ BOOL ScRangeList::Load( SvStream& rStream, USHORT nVer )
+/*N*/ BOOL ScRangeList::Load( SvStream& rStream, USHORT /*nVer*/ )
/*N*/ {
/*N*/ BOOL bOk = TRUE;
/*N*/ ScReadHeader aHdr( rStream );
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx b/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
index ee8426d..1586e8c 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangenam.cxx
@@ -324,7 +324,7 @@ namespace binfilter {
-/*N*/ void ScRangeData::ReplaceRangeNamesInUse( const ScIndexMap& rMap )
+/*N*/ void ScRangeData::ReplaceRangeNamesInUse( const ScIndexMap& /*rMap*/ )
/*N*/ {
/*N*/ BOOL bCompile = FALSE;
/*N*/ for ( ScToken* p = pCode->First(); p; p = pCode->Next() )
@@ -564,10 +564,10 @@ namespace binfilter {
-/*N*/ void ScRangeName::UpdateTabRef(USHORT nOldTable, USHORT nFlag, USHORT nNewTable)
+/*N*/ void ScRangeName::UpdateTabRef(USHORT /*nOldTable*/, USHORT /*nFlag*/, USHORT /*nNewTable*/)
/*N*/ {
/*N*/ for (USHORT i=0; i<nCount; i++)
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ((ScRangeData*)pItems[i])->UpdateTabRef(nOldTable, nFlag, nNewTable);
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx b/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx
index 392942d..0411540 100644
--- a/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_refreshtimer.cxx
@@ -55,7 +55,7 @@ namespace binfilter {
/*N*/ }
-/*N*/ void ScRefreshTimer::SetRefreshDelay( ULONG nSeconds )
+/*N*/ void ScRefreshTimer::SetRefreshDelay( ULONG /*nSeconds*/ )
/*N*/ {
/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 BOOL bActive = IsActive();
/*N*/ }
commit 356f4c5043860f023a11551c3cf83849a80f9ace
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 18 22:25:26 2010 +0100
fix warnings in binfilter bf_sc ui/docshell
trivial conservative fixes, letting behind function calls that may
not be needed any more. Fix warning:
unused parameter
and delete some commented code
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx b/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
index 797cf2e..f3bda62 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_arealink.cxx
@@ -221,8 +221,8 @@ namespace binfilter {
/*N*/ {
/*N*/ ScDocShellModificator aModificator( *pDocShell );
/*N*/
-/*N*/ USHORT nStartX = aDestPos.Col();
-/*N*/ USHORT nStartY = aDestPos.Row();
+/*N*/ aDestPos.Col();
+/*N*/ aDestPos.Row();
/*N*/ USHORT nOldEndX = aOldRange.aEnd.Col();
/*N*/ USHORT nOldEndY = aOldRange.aEnd.Row();
/*N*/ USHORT nNewEndX = aNewRange.aEnd.Col();
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
index 0005524..a9825d8 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocfun.cxx
@@ -50,9 +50,8 @@
#include "editable.hxx"
namespace binfilter {
-// -----------------------------------------------------------------
-/*N*/ BOOL ScDBDocFunc::AddDBRange( const String& rName, const ScRange& rRange, BOOL bApi )
+/*N*/ BOOL ScDBDocFunc::AddDBRange( const String& rName, const ScRange& rRange, BOOL /*bApi*/ )
/*N*/ {
/*N*/
/*N*/ ScDocShellModificator aModificator( rDocShell );
@@ -79,7 +78,7 @@ namespace binfilter {
/*N*/ return TRUE;
/*N*/ }
/*N*/
-/*N*/ BOOL ScDBDocFunc::DeleteDBRange( const String& rName, BOOL bApi )
+/*N*/ BOOL ScDBDocFunc::DeleteDBRange( const String& rName, BOOL /*bApi*/ )
/*N*/ {
/*N*/ BOOL bDone = FALSE;
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
@@ -102,7 +101,7 @@ namespace binfilter {
/*N*/ return bDone;
/*N*/ }
-/*N*/ BOOL ScDBDocFunc::RenameDBRange( const String& rOld, const String& rNew, BOOL bApi )
+/*N*/ BOOL ScDBDocFunc::RenameDBRange( const String& rOld, const String& rNew, BOOL /*bApi*/ )
/*N*/ {
/*N*/ BOOL bDone = FALSE;
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
@@ -143,7 +142,7 @@ namespace binfilter {
/*N*/ return bDone;
/*N*/ }
-/*N*/ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL bApi )
+/*N*/ BOOL ScDBDocFunc::ModifyDBData( const ScDBData& rNewData, BOOL /*bApi*/)
/*N*/ {
/*N*/ BOOL bDone = FALSE;
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
@@ -173,7 +172,6 @@ namespace binfilter {
/*N*/ return bDone;
/*N*/ }
-// -----------------------------------------------------------------
/*N*/ BOOL ScDBDocFunc::RepeatDB( const String& rDBName, BOOL bRecord, BOOL bApi )
/*N*/ {
@@ -225,7 +223,6 @@ namespace binfilter {
/*N*/ pDBData->GetArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow );
/*N*/
/*N*/ ScDocument* pUndoDoc = NULL;
-/*N*/ ScOutlineTable* pUndoTab = NULL;
/*N*/ ScRangeName* pUndoRange = NULL;
/*N*/ ScDBCollection* pUndoDB = NULL;
/*N*/
@@ -236,7 +233,7 @@ namespace binfilter {
/*N*/ ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
/*N*/ if (pTable)
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pUndoTab = new ScOutlineTable( *pTable );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ else
/*N*/ pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE );
@@ -305,7 +302,6 @@ namespace binfilter {
/*N*/ return bDone;
/*N*/ }
-// -----------------------------------------------------------------
/*N*/ BOOL ScDBDocFunc::Sort( USHORT nTab, const ScSortParam& rSortParam,
/*N*/ BOOL bRecord, BOOL bPaint, BOOL bApi )
@@ -315,7 +311,6 @@ namespace binfilter {
/*N*/ ScDocument* pDoc = rDocShell.GetDocument();
/*N*/ if (bRecord && !pDoc->IsUndoEnabled())
/*N*/ bRecord = FALSE;
-/*N*/ USHORT nSrcTab = nTab;
/*N*/
/*N*/ ScDBData* pDBData = pDoc->GetDBAtArea( nTab, rSortParam.nCol1, rSortParam.nRow1,
/*N*/ rSortParam.nCol2, rSortParam.nRow2 );
@@ -475,7 +470,6 @@ namespace binfilter {
/*N*/ return TRUE;
/*N*/ }
-// -----------------------------------------------------------------
/*N*/ BOOL ScDBDocFunc::Query( USHORT nTab, const ScQueryParam& rQueryParam,
/*N*/ const ScRange* pAdvSource, BOOL bRecord, BOOL bApi )
@@ -713,10 +707,9 @@ namespace binfilter {
/*N*/ return TRUE;
/*N*/ }
-// -----------------------------------------------------------------
/*N*/ BOOL ScDBDocFunc::DoSubTotals( USHORT nTab, const ScSubTotalParam& rParam,
-/*N*/ const ScSortParam* pForceNewSort, BOOL bRecord, BOOL bApi )
+/*N*/ const ScSortParam* /*pForceNewSort*/, BOOL bRecord, BOOL bApi )
/*N*/ {
/*N*/ //! auch fuer ScDBFunc::DoSubTotals benutzen!
/*N*/ // dann bleibt aussen:
@@ -754,9 +747,8 @@ namespace binfilter {
/*N*/ }
/*N*/
/*N*/ BOOL bOk = TRUE;
-/*N*/ BOOL bDelete = FALSE;
/*N*/ if (rParam.bReplace)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 if (pDoc->TestRemoveSubTotals( nTab, rParam ))
+/*?*/ {DBG_BF_ASSERT(0, "STRIP"); }
/*N*/
/*N*/ if (bOk)
/*N*/ {
@@ -765,7 +757,6 @@ namespace binfilter {
/*N*/
/*N*/ ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert
/*N*/ ScDocument* pUndoDoc = NULL;
-/*N*/ ScOutlineTable* pUndoTab = NULL;
/*N*/ ScRangeName* pUndoRange = NULL;
/*N*/ ScDBCollection* pUndoDB = NULL;
/*N*/ USHORT nTabCount = 0; // fuer Referenz-Undo
@@ -779,7 +770,7 @@ namespace binfilter {
/*N*/ ScOutlineTable* pTable = pDoc->GetOutlineTable( nTab );
/*N*/ if (pTable)
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pUndoTab = new ScOutlineTable( *pTable );
+/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ else
/*N*/ pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, bOldFilter );
@@ -801,7 +792,6 @@ namespace binfilter {
/*N*/ pUndoDB = new ScDBCollection( *pDocDB );
/*N*/ }
/*N*/
-/*N*/ // pDoc->SetOutlineTable( nTab, NULL );
/*N*/ ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab );
/*N*/ if (pOut)
/*?*/ { DBG_BF_ASSERT(0, "STRIP"); }//STRIP001 pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen
@@ -820,7 +810,6 @@ namespace binfilter {
/*N*/
/*N*/ if (bRecord)
/*N*/ {
-/*N*/ // ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL;
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 rDocShell.GetUndoManager()->AddUndoAction(
/*N*/ }
/*N*/
@@ -845,8 +834,6 @@ namespace binfilter {
/*N*/ return bRet;
/*N*/ }
-//==================================================================
-
/*N*/ BOOL ScDBDocFunc::DataPilotUpdate( ScDPObject* pOldObj, const ScDPObject* pNewObj,
/*N*/ BOOL bRecord, BOOL bApi )
/*N*/ {
@@ -854,7 +841,6 @@ namespace binfilter {
/*N*/ WaitObject aWait( rDocShell.GetDialogParent() );
/*N*/
/*N*/ BOOL bDone = FALSE;
-/*N*/ BOOL bUndoSelf = FALSE;
/*N*/ USHORT nErrId = 0;
/*N*/
/*N*/ ScDocument* pOldUndoDoc = NULL;
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
index 09f6e90..f7a55f1 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_dbdocimp.cxx
@@ -34,7 +34,6 @@
#pragma hdrstop
#endif
-// INCLUDE ---------------------------------------------------------
#include <comphelper/processfactory.hxx>
#include <comphelper/types.hxx>
@@ -90,7 +89,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
#define SC_DBPROP_SELECTION "Selection"
#define SC_DBPROP_CURSOR "Cursor"
-// -----------------------------------------------------------------
/*M*/ BOOL ScDBDocFunc::DoImport( USHORT nTab, const ScImportParam& rParam,
/*M*/ const uno::Reference< sdbc::XResultSet >& xResultSet,
@@ -119,7 +117,6 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/ ScDocShellModificator aModificator( rDocShell );
/*M*/
/*M*/ BOOL bSuccess = FALSE;
-/*M*/ BOOL bApi = FALSE; //! pass as argument
/*M*/ BOOL bTruncated = FALSE; // for warning
/*M*/ USHORT nErrStringId = 0;
/*M*/ String aErrorMessage;
@@ -537,33 +534,12 @@ SV_DECL_IMPL_REF(SbaSelectionList)
/*M*/
/*M*/ if (pWaitWin)
/*M*/ pWaitWin->LeaveWait();
-/*M*/
-//*M*/ if ( bTruncated && !bApi ) // show warning
-//*M*/ ErrorHandler::HandleError(SCWARN_IMPORT_RANGE_OVERFLOW);
/*M*/ }
-//*M*/ else if ( !bApi )
-//*M*/ {
-//*M*/ if (pWaitWin)
-//*M*/ pWaitWin->LeaveWait();
-//*M*/
-//*M*/ if (!aErrorMessage.Len())
-//*M*/ {
-//*M*/ if (!nErrStringId)
-//*M*/ nErrStringId = STR_MSSG_IMPORTDATA_0;
-//*M*/ aErrorMessage = ScGlobal::GetRscString( nErrStringId );
-//*M*/ }
-//*M*/ InfoBox aInfoBox( rDocShell.GetDialogParent(), aErrorMessage );
-//*M*/ aInfoBox.Execute();
-//*M*/ }
-/*M*/
/*M*/ delete pImportDoc;
/*M*/
/*M*/ return bSuccess;
/*M*/ }
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index a543723..b26dbde 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -30,7 +30,6 @@
#pragma hdrstop
#endif
-// INCLUDE ---------------------------------------------------------------
#define ITEMID_FIELD EE_FEATURE_FIELD
@@ -81,9 +80,6 @@ using namespace ::com::sun::star;
// STATIC DATA -----------------------------------------------------------
-//========================================================================
-
-
// Zeile ueber dem Range painten (fuer Linien nach AdjustRowHeight)
/*N*/ void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange )
@@ -97,7 +93,6 @@ using namespace ::com::sun::star;
/*N*/ }
/*N*/ }
-//------------------------------------------------------------------------
/*N*/ BOOL ScDocFunc::AdjustRowHeight( const ScRange& rRange, BOOL bPaint )
/*N*/ {
@@ -795,15 +790,8 @@ using namespace ::com::sun::star;
/*N*/ else
/*N*/ rMark.GetMarkArea( aMultiRange );
/*N*/
-/*N*/
-/*N*/ // BOOL bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
-/*N*/ // pDoc->ApplySelectionPattern( rPattern, rMark );
-/*N*/
/*N*/ pDoc->ApplySelectionStyle( (ScStyleSheet&)*pStyleSheet, rMark );
/*N*/
-/*N*/ // if (!bPaintExt)
-/*N*/ // bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
-/*N*/ // USHORT nExtFlags = bPaintExt ? SC_PF_LINES : 0;
/*N*/ USHORT nExtFlags = 0;
/*N*/ if (!AdjustRowHeight( aMultiRange ))
/*N*/ rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags );
@@ -1193,7 +1181,7 @@ using namespace ::com::sun::star;
//------------------------------------------------------------------------
-/*N*/ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL bApi )
+/*N*/ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* /*pWhich*/, BOOL bApi )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
/*N*/
@@ -1218,7 +1206,7 @@ using namespace ::com::sun::star;
/*N*/ return TRUE;
/*N*/ }
-/*N*/ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bApi )
+/*N*/ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL /*bIncrement*/, BOOL bApi )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
/*N*/
@@ -1278,13 +1266,6 @@ using namespace ::com::sun::star;
/*N*/
/*N*/ if (bSize)
/*N*/ {
-/* USHORT nCols[2];
- nCols[0] = nStartCol;
- nCols[1] = nEndCol;
- USHORT nRows[2];
- nRows[0] = nStartRow;
- nRows[1] = nEndRow;
-*/
/*N*/ USHORT nCols[2] = { nStartCol, nEndCol };
/*N*/ USHORT nRows[2] = { nStartRow, nEndRow };
/*N*/
@@ -1321,8 +1302,6 @@ using namespace ::com::sun::star;
/*N*/ return bSuccess;
/*N*/ }
-//------------------------------------------------------------------------
-
/*N*/ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
/*N*/ const String& rString, BOOL bApi, BOOL bEnglish )
/*N*/ {
@@ -1381,8 +1360,6 @@ using namespace ::com::sun::star;
/*N*/ return bSuccess;
/*N*/ }
-//------------------------------------------------------------------------
-
/*N*/ inline ScDirection DirFromFillDir( FillDir eDir )
/*N*/ {
/*N*/ if (eDir==FILL_TO_BOTTOM)
@@ -1395,8 +1372,6 @@ using namespace ::com::sun::star;
/*N*/ return DIR_LEFT;
/*N*/ }
-//------------------------------------------------------------------------
-
/*N*/ BOOL ScDocFunc::MergeCells( const ScRange& rRange, BOOL bContents, BOOL bRecord, BOOL bApi )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
@@ -1451,8 +1426,6 @@ using namespace ::com::sun::star;
/*N*/ return TRUE;
/*N*/ }
-//------------------------------------------------------------------------
-
/*N*/ BOOL ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
@@ -1469,8 +1442,6 @@ using namespace ::com::sun::star;
/*N*/ return TRUE;
/*N*/ }
-//------------------------------------------------------------------------
-
/*N*/ void ScDocFunc::CreateOneName( ScRangeName& rList,
/*N*/ USHORT nPosX, USHORT nPosY, USHORT nTab,
/*N*/ USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2,
@@ -1622,8 +1593,6 @@ using namespace ::com::sun::star;
/*N*/ return bDone;
/*N*/ }
-//------------------------------------------------------------------------
-
/*N*/ BOOL ScDocFunc::InsertNameList( const ScAddress& rStartPos, BOOL bApi )
/*N*/ {
/*N*/ ScDocShellModificator aModificator( rDocShell );
@@ -1700,11 +1669,6 @@ using namespace ::com::sun::star;
/*N*/ return bDone;
/*N*/ }
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
/*N*/ BOOL ScDocFunc::InsertAreaLink( const String& rFile, const String& rFilter,
/*N*/ const String& rOptions, const String& rSource,
/*N*/ const ScRange& rDestRange, ULONG nRefresh,
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index 1792794..e402ef8 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -183,13 +183,6 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ DBG_ERROR("wat fuer ne Version?");
/*N*/ }
-//------------------------------------------------------------------
-
-
-//------------------------------------------------------------------
-
-
-//------------------------------------------------------------------
/*N*/ BOOL ScDocShell::LoadCalc( SvStorage* pStor ) // StarCalc 3, 4 or 5 file
/*N*/ {
@@ -331,7 +324,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
else
{
USHORT nPos=0;
- bool bActive = aWinData.GetToken( 3, cToken, nPos ).ToInt32();
+ aWinData.GetToken( 3, cToken, nPos ).ToInt32();
aUserData = aWinData.Copy( nPos );
}
// aUserData is used in ScModelObj::getViewData
@@ -524,8 +517,9 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ ScColumn::bDoubleAlloc = sal_True;
/*N*/ }
-/*N*/ void ScDocShell::AfterXMLLoading(sal_Bool bRet)
-/*N*/ {DBG_BF_ASSERT(0, "STRIP"); //STRIP001
+/*N*/ void ScDocShell::AfterXMLLoading(sal_Bool /*bRet*/)
+/*N*/ {
+ DBG_BF_ASSERT(0, "STRIP"); //STRIP001
aDocument.SetInsertingFromOtherDoc( FALSE );
aDocument.SetImportingXML( FALSE );
@@ -631,7 +625,7 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)";
/*N*/ }
-/*N*/ void ScDocShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
+/*N*/ void ScDocShell::SFX_NOTIFY( SfxBroadcaster& /*rBC*/, const TypeId& rBCType,
/*N*/ const SfxHint& rHint, const TypeId& rHintType )
/*N*/ {
/*N*/ if (rHint.ISA(SfxSimpleHint)) // ohne Parameter
@@ -888,12 +882,6 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ nWidth + (USHORT)ScGlobal::nLastColWidthExtra );
/*N*/ }
/*N*/ }
-/*N*/ // if ( bSetRowHeights )
-/*N*/ // {
-/*N*/ // // nExtra must be 0
-/*N*/ // aDocument.SetOptimalHeight( 0, nEndRow, nTab, 0, &aVirtDev,
-/*N*/ // nPPTX, nPPTY, aZoom, aZoom, FALSE );
-/*N*/ // }
/*N*/ }
/*N*/ if ( bSetRowHeights )
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 UpdateAllRowHeights(); // with vdev or printer, depending on configuration
@@ -1230,7 +1218,7 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ void ScDocShell::SetDrawModified( BOOL bIsModified /* = TRUE */ )
/*N*/ {
-/*N*/ BOOL bUpdate = ( bIsModified != IsModified() );
+/*N*/ bIsModified != IsModified() ;
/*N*/
/*N*/ SetModified( bIsModified );
/*N*/
@@ -1245,11 +1233,6 @@ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 //STRIP001 /*N*/ // SvStream* pStream =
/*N*/ }
/*N*/ }
-
-
-
-
-
/*N*/ Window* ScDocShell::GetDialogParent()
/*N*/ {
/*N*/ return Application::GetDefDialogParent();
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx
index 674ea04..9c05429 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh2.cxx
@@ -144,7 +144,7 @@ using namespace ::com::sun::star;
/*?*/ rtl::Reference<SvxForbiddenCharactersTable> xForbiddenTable =
/*?*/ new SvxForbiddenCharactersTable( aDocument.GetServiceManager() );
/*?*/
-/*?*/ const lang::Locale* pLocales = aLocales.getConstArray();
+/*?*/ aLocales.getConstArray();
/*?*/ for (sal_Int32 i = 0; i < aLocales.getLength(); i++)
/*?*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 i18n::ForbiddenCharacters aForbidden;
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
index abcc381..fb55cd8 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh4.cxx
@@ -78,30 +78,18 @@ namespace binfilter {
#define SC_PREVIEW_SIZE_Y 12400
-//------------------------------------------------------------------
-
-
-//------------------------------------------------------------------
-
-
-//------------------------------------------------------------------
-
-/*N*/ void ScDocShell::DoRecalc( BOOL bApi )
+/*N*/ void ScDocShell::DoRecalc( BOOL /*bApi*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScInputHandler* pHdl = SC_MOD()->GetInputHdl(pSh);
/*N*/ }
-/*N*/ void ScDocShell::DoHardRecalc( BOOL bApi )
+/*N*/ void ScDocShell::DoHardRecalc( BOOL /*bApi*/ )
/*N*/ {
/*N*/ aDocument.CalcAll();
/*N*/ GetDocFunc().DetectiveRefresh(); // erzeugt eigenes Undo
/*N*/ PostPaintGridAll();
/*N*/ }
-//------------------------------------------------------------------
-
-
-//------------------------------------------------------------------
/*N*/ void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
/*N*/ {
@@ -202,18 +190,11 @@ namespace binfilter {
/*N*/ }
-
-
-
-//------------------------------------------------------------------
-
/*N*/ ScViewData* ScDocShell::GetViewData()
/*N*/ {
/*N*/ return NULL;
/*N*/ }
-//------------------------------------------------------------------
-
/*N*/ USHORT ScDocShell::GetCurTab()
/*N*/ {
/*N*/ //! this must be made non-static and use a ViewShell from this document!
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
index a6b818c..aeae803 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh5.cxx
@@ -31,77 +31,48 @@
#define _BASEDLGS_HXX
#define _BIGINT_HXX
#define _CACHESTR_HXX
-//#define _CLIP_HXX
#define _CONFIG_HXX
#define _CURSOR_HXX
-//#define _COLOR_HXX
-//#define _CTRLBOX_HXX
-//#define _CTRLTOOL_HXX
#define _DIALOGS_HXX
#define _DLGCFG_HXX
#define _DYNARR_HXX
#define _EXTATTR_HXX
-//#define _FIELD_HXX
#define _FILDLG_HXX
-//#define _FILTER_HXX
#define _FONTDLG_HXX
#define _FRM3D_HXX
-//#define _GRAPH_HXX
-//#define _GDIMTF_HXX
#define _INTRO_HXX
#define _ISETBWR_HXX
#define _NO_SVRTF_PARSER_HXX
-//#define _MDIFRM_HXX
#define _MACRODLG_HXX
#define _MODALDLG_HXX
#define _MOREBUTTON_HXX
-//#define _MAPMOD_HXX
#define _OUTLINER_HXX
-//#define _PAL_HXX
#define _PASSWD_HXX
-//#define _PRNDLG_HXX //
#define _POLY_HXX
#define _PVRWIN_HXX
#define _QUEUE_HXX
#define _RULER_HXX
#define _SCRWIN_HXX
-//#define _SELENG_HXX
#define _SETBRW_HXX
-//#define _SOUND_HXX
#define _STACK_HXX
-//#define _STATUS_HXX ***
#define _STDMENU_HXX
-//#define _STDCTRL_HXX
-//#define _SYSDLG_HXX
-//#define _TAB_HXX
#define _TABBAR_HXX
-//#define _TREELIST_HXX
-//#define _VALUESET_HXX
#define _VCBRW_HXX
#define _VCTRLS_HXX
-//#define _VCATTR_HXX
#define _VCSBX_HXX
#define _VCONT_HXX
#define _VDRWOBJ_HXX
-//#define _VIEWFAC_HXX
#define _SFX_PRNMON_HXX
#define _SFX_RESMGR_HXX
-//#define _SFX_SAVEOPT_HXX
#define _SFX_TEMPLDLG_HXX
-//#define _SFXAPP_HXX
#define _SFXBASIC_HXX
-//#define _SFXCTRLITEM_HXX
-//#define _SFXDISPATCH_HXX
#define _SFXFILEDLG_HXX
#define _SFXIMGMGR_HXX
#define _SFXMNUMGR_HXX
-//#define _SFXMSG_HXX
#define _SFXMSGDESCR_HXX
#define _SFXMSGPOOL_HXX
-//#define _SFXOBJFACE_HXX
-//#define _SFXREQUEST_HXX
#define _SFXSTBITEM_HXX
#define _SFXSTBMGR_HXX
#define _SFXTBXCTRL_HXX
@@ -166,7 +137,7 @@ namespace binfilter {
// ehemalige viewfunc/dbfunc Methoden
//
-/*N*/ void ScDocShell::ErrorMessage( USHORT nGlobStrId )
+/*N*/ void ScDocShell::ErrorMessage( USHORT /*nGlobStrId*/ )
/*N*/ {
/*N*/ //! StopMarking an der (aktiven) View?
/*N*/
@@ -180,7 +151,7 @@ namespace binfilter {
/*N*/ return !IsReadOnly() || aDocument.IsImportingXML();
/*N*/ }
-/*N*/ void ScDocShell::DBAreaDeleted( USHORT nTab, USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2 )
+/*N*/ void ScDocShell::DBAreaDeleted( USHORT /*nTab*/, USHORT /*nX1*/, USHORT /*nY1*/, USHORT /*nX2*/, USHORT /*nY2*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( *this );
/*N*/ }
@@ -274,7 +245,6 @@ namespace binfilter {
/*N*/ {
/*N*/ if ( bSelected )
/*N*/ {
-/*N*/ // bMark = FALSE;
/*N*/ }
/*N*/ else
/*N*/ { // zusammenhaengender Bereich
@@ -354,9 +324,6 @@ namespace binfilter {
/*N*/ pData = pNoNameData;
/*N*/ }
/*N*/
-/*N*/ // if (bMark)
-/*N*/ // MarkRange( ScRange( nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab ), FALSE );
-/*N*/
/*N*/ return pData;
/*N*/ }
@@ -468,9 +435,8 @@ namespace binfilter {
/*N*/ aData.GetSize( nColSize, nRowSize );
/*N*/ if (bRecord && nColSize && nRowSize)
/*N*/ {
-/*N*/ ScDBData* pUndoData = pDestData ? new ScDBData(*pDestData) : NULL;
+/*N*/ pDestData ? new ScDBData(*pDestData) : NULL;
/*N*/
-/*N*/ USHORT nDestTab = rParam.nTab;
/*N*/ ScArea aDestArea( rParam.nTab, rParam.nCol, rParam.nRow,
/*N*/ rParam.nCol+nColSize-1, rParam.nRow+nRowSize-1 );
/*N*/ if (rParam.bByCol) ++aDestArea.nColEnd;
@@ -524,7 +490,7 @@ namespace binfilter {
/*N*/ aModificator.SetDocumentModified();
/*N*/ }
-/*N*/ void ScDocShell::UseScenario( USHORT nTab, const String& rName, BOOL bRecord )
+/*N*/ void ScDocShell::UseScenario( USHORT nTab, const String& rName, BOOL /*bRecord*/ )
/*N*/ {
/*N*/ if (!aDocument.IsScenario(nTab))
/*N*/ {
@@ -557,21 +523,21 @@ namespace binfilter {
/*N*/ DBG_ERROR( "UseScenario auf Szenario-Blatt" );
/*N*/ }
-/*N*/ void ScDocShell::ModifyScenario( USHORT nTab, const String& rName, const String& rComment,
-/*N*/ const Color& rColor, USHORT nFlags )
+/*N*/ void ScDocShell::ModifyScenario( USHORT /*nTab*/, const String& /*rName*/, const String& /*rComment*/,
+/*N*/ const Color& /*rColor*/, USHORT /*nFlags*/ )
/*N*/ {
/*?*/ // Undo
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 String aOldName;
/*N*/ }
-/*N*/ USHORT ScDocShell::MakeScenario( USHORT nTab, const String& rName, const String& rComment,
-/*N*/ const Color& rColor, USHORT nFlags,
-/*N*/ ScMarkData& rMark, BOOL bRecord )
+/*N*/ USHORT ScDocShell::MakeScenario( USHORT /*nTab*/, const String& /*rName*/, const String& /*rComment*/,
+/*N*/ const Color& /*rColor*/, USHORT /*nFlags*/,
+/*N*/ ScMarkData& /*rMark*/, BOOL /*bRecord*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0; //STRIP001 rMark.MarkToMulti();
/*N*/ }
-/*N*/ BOOL ScDocShell::MoveTable( USHORT nSrcTab, USHORT nDestTab, BOOL bCopy, BOOL bRecord )
+/*N*/ BOOL ScDocShell::MoveTable( USHORT /*nSrcTab*/, USHORT /*nDestTab*/, BOOL /*bCopy*/, BOOL /*bRecord*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocShellModificator aModificator( *this );
/*?*/ return TRUE;
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx b/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx
index e4e1891..1e7999b 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh6.cxx
@@ -28,80 +28,51 @@
// System - Includes -----------------------------------------------------
-//#define _BASEDLGS_HXX ***
#define _BIGINT_HXX
#define _CACHESTR_HXX
-//#define _CLIP_HXX
#define _CONFIG_HXX
#define _CURSOR_HXX
-//#define _COLOR_HXX
-//#define _CTRLBOX_HXX
-//#define _CTRLTOOL_HXX
#define _DIALOGS_HXX
#define _DLGCFG_HXX
#define _DYNARR_HXX
#define _EXTATTR_HXX
-//#define _FIELD_HXX
#define _FILDLG_HXX
-//#define _FILTER_HXX
#define _FONTDLG_HXX
#define _FRM3D_HXX
-//#define _GRAPH_HXX
-//#define _GDIMTF_HXX
#define _INTRO_HXX
#define _ISETBWR_HXX
#define _NO_SVRTF_PARSER_HXX
-//#define _MDIFRM_HXX
#define _MACRODLG_HXX
#define _MODALDLG_HXX
#define _MOREBUTTON_HXX
-//#define _MAPMOD_HXX
#define _OUTLINER_HXX
-//#define _PAL_HXX
#define _PASSWD_HXX
-//#define _PRNDLG_HXX //
#define _POLY_HXX
#define _PVRWIN_HXX
#define _QUEUE_HXX
#define _RULER_HXX
#define _SCRWIN_HXX
-//#define _SELENG_HXX
#define _SETBRW_HXX
-//#define _SOUND_HXX
#define _STACK_HXX
-//#define _STATUS_HXX ***
#define _STDMENU_HXX
-//#define _STDCTRL_HXX
-//#define _SYSDLG_HXX
-//#define _TAB_HXX
#define _TABBAR_HXX
-//#define _TREELIST_HXX
-//#define _VALUESET_HXX
#define _VCBRW_HXX
#define _VCTRLS_HXX
-//#define _VCATTR_HXX
#define _VCSBX_HXX
#define _VCONT_HXX
#define _VDRWOBJ_HXX
-//#define _VIEWFAC_HXX
#define _SFX_PRNMON_HXX
#define _SFX_RESMGR_HXX
-//#define _SFX_SAVEOPT_HXX
#define _SFX_TEMPLDLG_HXX
-//#define _SFXAPP_HXX
#define _SFXBASIC_HXX
-//#define _SFXCTRLITEM_HXX
#define _SFXDISPATCH_HXX
#define _SFXFILEDLG_HXX
#define _SFXIMGMGR_HXX
#define _SFXMNUMGR_HXX
-//#define _SFXMSG_HXX
#define _SFXMSGDESCR_HXX
#define _SFXMSGPOOL_HXX
-//#define _SFXOBJFACE_HXX
-//#define _SFXREQUEST_HXX
#define _SFXSTBITEM_HXX
#define _SFXSTBMGR_HXX
#define _SFXTBXCTRL_HXX
@@ -167,13 +138,6 @@ namespace binfilter {
/*N*/ };
-// STATIC DATA -----------------------------------------------------------
-
-//----------------------------------------------------------------------
-
-//
-// Ole
-//
/*N*/ void ScDocShell::SetVisArea( const Rectangle & rVisArea )
@@ -231,7 +195,7 @@ namespace binfilter {
// muessen die SetItems (ATTR_PAGE_HEADERSET, ATTR_PAGE_FOOTERSET) auf den richtigen
// Pool umgesetzt werden, bevor der Quell-Pool geloescht wird.
-/*N*/ void lcl_AdjustPool( SfxStyleSheetBasePool* pStylePool )
+/*N*/ void lcl_AdjustPool( SfxStyleSheetBasePool* /*pStylePool*/ )
/*N*/ {
/*N*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 pStylePool->SetSearchMask(SFX_STYLE_FAMILY_PAGE, 0xffff);
/*N*/ }
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_editable.cxx b/binfilter/bf_sc/source/ui/docshell/sc_editable.cxx
index f729f1a..b88e83c 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_editable.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_editable.cxx
@@ -37,7 +37,6 @@
namespace binfilter {
-//------------------------------------------------------------------
/*N*/ ScEditableTester::ScEditableTester() :
/*N*/ bIsEditable( TRUE ),
@@ -63,21 +62,19 @@ namespace binfilter {
/*N*/ TestSelectedBlock( pDoc, nStartCol, nStartRow, nEndCol, nEndRow, rMark );
/*N*/ }
-/*N*/ ScEditableTester::ScEditableTester( ScDocument* pDoc, const ScRange& rRange ) :
+/*N*/ ScEditableTester::ScEditableTester( ScDocument* /*pDoc*/, const ScRange& /*rRange*/ ) :
/*N*/ bIsEditable( TRUE ),
/*N*/ bOnlyMatrix( TRUE )
/*N*/ {
/*N*/ }
-/*N*/ ScEditableTester::ScEditableTester( ScDocument* pDoc, const ScMarkData& rMark ) :
+/*N*/ ScEditableTester::ScEditableTester( ScDocument* /*pDoc*/, const ScMarkData& /*rMark*/ ) :
/*N*/ bIsEditable( TRUE ),
/*N*/ bOnlyMatrix( TRUE )
/*N*/ {
/*N*/ }
-//------------------------------------------------------------------
-
/*N*/ void ScEditableTester::TestBlock( ScDocument* pDoc, USHORT nTab,
/*N*/ USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow )
/*N*/ {
@@ -103,11 +100,6 @@ namespace binfilter {
/*N*/ TestBlock( pDoc, nTab, nStartCol, nStartRow, nEndCol, nEndRow );
/*N*/ }
-
-
-
-//------------------------------------------------------------------
-
/*N*/ USHORT ScEditableTester::GetMessageId() const
/*N*/ {
/*N*/ if (bIsEditable)
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
index 56f967e..d93f58e 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
@@ -26,7 +26,6 @@
*
************************************************************************/
-// System - Includes -----------------------------------------------------
class StarBASIC;
@@ -39,7 +38,6 @@ class StarBASIC;
#define GLOBALOVERFLOW
#endif
-// INCLUDE ---------------------------------------------------------------
#include <stdio.h>
#include <ctype.h>
@@ -115,35 +113,14 @@ namespace binfilter {
/*N*/ cStr = rOpt.GetTextSep();
/*N*/ }
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-
// Vorbereitung fuer Undo: Undo-Dokument erzeugen
-
-
// Nachbereitung Insert: Undo/Redo-Aktionen erzeugen, Invalidate/Repaint
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
// static
-
-
-
-
-
-
-
/*N*/ BOOL ScImportExport::ImportStream( SvStream& rStrm, ULONG nFmt )
/*N*/ {
/*N*/ if( nFmt == FORMAT_STRING )
@@ -247,18 +224,9 @@ enum DoubledQuoteMode
/*N*/ return p;
/*N*/ }
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-
-
-
//
// erweiterter Ascii-Import
//
-
-
/*M*/ void lcl_PutString( ScDocument* pDoc, USHORT nCol, USHORT nRow, USHORT nTab,
/*M*/ const String& rStr, BYTE nColFormat,
/*M*/ ::utl::TransliterationWrapper& rTransliteration,
@@ -530,7 +498,7 @@ enum DoubledQuoteMode
/*N*/ if ( rStrm.IsEof() )
/*N*/ break;
/*N*/
-/*N*/ xub_StrLen nLineLen = aLine.Len();
+/*N*/ aLine.Len();
/*N*/ USHORT nCol = nStartCol;
/*N*/ if ( bFixed ) // Feste Satzlaenge
/*N*/ {
@@ -615,28 +583,6 @@ enum DoubledQuoteMode
/*N*/ return p;
/*N*/ }
- //
- //
- //
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx b/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx
index e3ef463..6136eed 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_olinefun.cxx
@@ -30,8 +30,6 @@
#pragma hdrstop
#endif
-// INCLUDE ---------------------------------------------------------------
-
#include "olinefun.hxx"
@@ -41,26 +39,25 @@
namespace binfilter {
-//========================================================================
-/*N*/ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi )
+/*N*/ BOOL ScOutlineDocFunc::MakeOutline( const ScRange& /*rRange*/, BOOL /*bColumns*/, BOOL /*bRecord*/, BOOL /*bApi*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bSuccess = FALSE;
/*N*/ }
-/*N*/ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, BOOL bColumns, BOOL bRecord, BOOL bApi )
+/*N*/ BOOL ScOutlineDocFunc::RemoveOutline( const ScRange& /*rRange*/, BOOL /*bColumns*/, BOOL /*bRecord*/, BOOL /*bApi*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bDone = FALSE;
/*N*/ }
-/*N*/ BOOL ScOutlineDocFunc::RemoveAllOutlines( USHORT nTab, BOOL bRecord, BOOL bApi )
+/*N*/ BOOL ScOutlineDocFunc::RemoveAllOutlines( USHORT /*nTab*/, BOOL /*bRecord*/, BOOL /*bApi*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bSuccess = FALSE;
/*N*/ }
//------------------------------------------------------------------------
-/*N*/ BOOL ScOutlineDocFunc::AutoOutline( const ScRange& rRange, BOOL bRecord, BOOL bApi )
+/*N*/ BOOL ScOutlineDocFunc::AutoOutline( const ScRange& /*rRange*/, BOOL /*bRecord*/, BOOL /*bApi*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 USHORT nStartCol = rRange.aStart.Col();
/*N*/ return TRUE;
@@ -68,8 +65,8 @@ namespace binfilter {
//------------------------------------------------------------------------
-/*N*/ BOOL ScOutlineDocFunc::SelectLevel( USHORT nTab, BOOL bColumns, USHORT nLevel,
-/*N*/ BOOL bRecord, BOOL bPaint, BOOL bApi )
+/*N*/ BOOL ScOutlineDocFunc::SelectLevel( USHORT /*nTab*/, BOOL /*bColumns*/, USHORT /*nLevel*/,
+/*N*/ BOOL /*bRecord*/, BOOL /*bPaint*/, BOOL /*bApi*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); //STRIP001 ScDocument* pDoc = rDocShell.GetDocument();
/*N*/ return TRUE;
@@ -77,12 +74,12 @@ namespace binfilter {
//------------------------------------------------------------------------
-/*N*/ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi )
+/*N*/ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& /*rRange*/, BOOL /*bRecord*/, BOOL /*bApi*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE;//STRIP001 BOOL bDone = FALSE;
/*N*/ }
-/*N*/ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, BOOL bRecord, BOOL bApi )
+/*N*/ BOOL ScOutlineDocFunc::HideMarkedOutlines( const ScRange& /*rRange*/, BOOL/* bRecord*/, BOOL /*bApi*/ )
/*N*/ {
/*?*/ DBG_BF_ASSERT(0, "STRIP"); return FALSE; //STRIP001 BOOL bDone = FALSE;
/*N*/ }
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx b/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx
index d8a4b96..42f5816 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_tablink.cxx
@@ -167,8 +167,6 @@ namespace binfilter {
/*N*/ if (!aNewOpt.Len())
/*N*/ aNewOpt = aOptions;
/*N*/
-/*N*/ BOOL bFirst = TRUE;
-/*N*/
/*N*/ // Tabellen kopieren
/*N*/
/*N*/ ScDocShellModificator aModificator( *pDocShell );
@@ -216,7 +214,6 @@ namespace binfilter {
/*N*/ else
/*N*/ {
/*N*/ pDoc->DeleteAreaTab( 0,0,MAXCOL,MAXROW, nTab, IDF_ALL );
-/*N*/ // pDoc->ClearDrawPage(nTab);
/*N*/ // Fehler eintragen
/*N*/ pDoc->SetString( 0,0,nTab, ScGlobal::GetRscString(STR_LINKERROR) );
/*N*/ pDoc->SetString( 0,1,nTab, ScGlobal::GetRscString(STR_LINKERRORFILE) );
@@ -246,7 +243,6 @@ namespace binfilter {
/*N*/
/*N*/ // aufraeumen
/*N*/
-/*N*/ // pSrcShell->DoClose();
/*N*/ aRef->DoClose();
/*N*/
/*N*/ // Paint (koennen mehrere Tabellen sein)
@@ -352,7 +348,7 @@ namespace binfilter {
/*M*/ ScDocumentLoader::ScDocumentLoader( const String& rFileName,
/*M*/ String& rFilterName, String& rOptions,
-/*M*/ UINT32 nRekCnt, BOOL bWithInteraction ) :
+/*M*/ UINT32 /*nRekCnt*/, BOOL bWithInteraction ) :
/*M*/ pDocShell(0),
/*M*/ pMedium(0)
/*M*/ {
@@ -392,9 +388,6 @@ namespace binfilter {
/*N*/
/*N*/ ScDocumentLoader::~ScDocumentLoader()
/*N*/ {
-/* if ( pDocShell )
- pDocShell->DoClose();
-*/
/*N*/ if ( aRef.Is() )
/*N*/ aRef->DoClose();
/*N*/ else if ( pMedium )
commit aa0968085285956c239a5ad2ce1de0b31a7506c1
Author: Pierre-André Jacquod <pjacquod at alumni.ethz.ch>
Date: Sat Dec 18 18:56:55 2010 +0100
fix warnings in binfilter bf_sc ui/unoobj (2)
trivial conservative fixes, letting behind function calls that may
not be needed any more. Fix warning:
unused parameter
and delete some commented code
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
index 13b3ff7..dca8879 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_afmtuno.cxx
@@ -476,7 +476,7 @@ ScAutoFormatObj* ScAutoFormatObj::getImplementation(
return pRet;
}
-void ScAutoFormatObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScAutoFormatObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/ )
{
// spaeter...
}
@@ -681,7 +681,6 @@ uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const ::rtl::OUString& aPro
SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAutoFormatObj )
-//------------------------------------------------------------------------
ScAutoFormatFieldObj::ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField) :
aPropSet( lcl_GetAutoFieldMap() ),
@@ -695,7 +694,7 @@ ScAutoFormatFieldObj::~ScAutoFormatFieldObj()
{
}
-void ScAutoFormatFieldObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScAutoFormatFieldObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/ )
{
// spaeter...
}
@@ -816,8 +815,6 @@ uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const ::rtl::OUString&
SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAutoFormatFieldObj )
-//------------------------------------------------------------------------
-
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx
index 1bac6f4..dfd5959 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_chartuno.cxx
@@ -51,12 +51,10 @@ namespace binfilter {
using namespace ::com::sun::star;
-//------------------------------------------------------------------------
SC_SIMPLE_SERVICE_INFO( ScChartObj, "ScChartObj", "com.sun.star.table.TableChart" )
SC_SIMPLE_SERVICE_INFO( ScChartsObj, "ScChartsObj", "com.sun.star.table.TableCharts" )
-//------------------------------------------------------------------------
SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, USHORT nTab, const String& rName )
{
@@ -95,7 +93,6 @@ SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, USHORT nTab, const String&
return NULL;
}
-//------------------------------------------------------------------------
ScChartsObj::ScChartsObj(ScDocShell* pDocSh, USHORT nT) :
pDocShell( pDocSh ),
@@ -263,8 +260,7 @@ void SAL_CALL ScChartsObj::addNewByName( const ::rtl::OUString& aName,
pModel->AddUndo( new SdrUndoInsertObj( *pObj ) ); //! Undo-Kommentar?
// Dies veranlaesst Chart zum sofortigen Update
- //SvData aEmpty;
- //aIPObj->SendDataChanged( aEmpty );
+
aIPObj->SendViewChanged();
}
}
@@ -423,7 +419,6 @@ sal_Bool SAL_CALL ScChartsObj::hasByName( const ::rtl::OUString& aName )
return ( lcl_FindChartObj( pDocShell, nTab, aNameString ) != NULL );
}
-//------------------------------------------------------------------------
ScChartObj::ScChartObj(ScDocShell* pDocSh, USHORT nT, const String& rN) :
pDocShell( pDocSh ),
@@ -439,7 +434,7 @@ ScChartObj::~ScChartObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScChartObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScChartObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
//! Referenz-Update
@@ -615,15 +610,12 @@ uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw(
return aChartName;
}
-void SAL_CALL ScChartObj::setName( const ::rtl::OUString& aName ) throw(uno::RuntimeException)
+void SAL_CALL ScChartObj::setName( const ::rtl::OUString& /*aName*/ ) throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
throw uno::RuntimeException(); // name cannot be changed
}
-//------------------------------------------------------------------------
-
-
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
index a8aa708..9e6596a 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_confuno.cxx
@@ -102,7 +102,7 @@ ScDocumentConfiguration::~ScDocumentConfiguration()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScDocumentConfiguration::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScDocumentConfiguration::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
// Referenz-Update interessiert hier nicht
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx
index f851439..754c713 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_dapiuno.cxx
@@ -47,7 +47,6 @@ namespace binfilter {
using namespace ::com::sun::star;
-//------------------------------------------------------------------------
const SfxItemPropertyMap* lcl_GetDataPilotFieldMap()
{
@@ -60,7 +59,6 @@ const SfxItemPropertyMap* lcl_GetDataPilotFieldMap()
return aDataPilotFieldMap_Impl;
}
-//------------------------------------------------------------------------
SC_SIMPLE_SERVICE_INFO( ScDataPilotDescriptor, "ScDataPilotDescriptor", "stardiv::one::sheet::DataPilotDescriptor" )
SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldObj, "ScDataPilotFieldObj", "com.sun.star.sheet.DataPilotField" )
@@ -68,7 +66,6 @@ SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldsObj, "ScDataPilotFieldsObj", "com.sun.s
SC_SIMPLE_SERVICE_INFO( ScDataPilotTableObj, "ScDataPilotTableObj", "com.sun.star.sheet.DataPilotTable" )
SC_SIMPLE_SERVICE_INFO( ScDataPilotTablesObj, "ScDataPilotTablesObj", "com.sun.star.sheet.DataPilotTables" )
-//------------------------------------------------------------------------
//! irgendwann ueberall die neuen enum-Werte benutzen
#define DATA_PILOT_HIDDEN sheet::DataPilotFieldOrientation_HIDDEN
@@ -77,7 +74,6 @@ SC_SIMPLE_SERVICE_INFO( ScDataPilotTablesObj, "ScDataPilotTablesObj", "com.sun.s
#define DATA_PILOT_PAGE sheet::DataPilotFieldOrientation_PAGE
#define DATA_PILOT_DATA sheet::DataPilotFieldOrientation_DATA
-//------------------------------------------------------------------------
USHORT lcl_BitCount( USHORT nBits )
{
@@ -299,7 +295,6 @@ void lcl_SetLayoutNamesToParam( ScPivotParam& rParam, ScDocument* pDoc,
}
}
-//------------------------------------------------------------------------
ScDataPilotTablesObj::ScDataPilotTablesObj(ScDocShell* pDocSh, USHORT nT) :
pDocShell( pDocSh ),
@@ -314,7 +309,7 @@ ScDataPilotTablesObj::~ScDataPilotTablesObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScDataPilotTablesObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScDataPilotTablesObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
//! Referenz-Update
@@ -625,7 +620,6 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const ::rtl::OUString& aName
return FALSE;
}
-//------------------------------------------------------------------------
ScDataPilotDescriptorBase::ScDataPilotDescriptorBase(ScDocShell* pDocSh) :
pDocShell( pDocSh )
@@ -689,7 +683,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScDataPilotDescriptorBase::getImplementationId(
return aId;
}
-void ScDataPilotDescriptorBase::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScDataPilotDescriptorBase::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
//! Referenz-Update?
@@ -830,7 +824,6 @@ ScDataPilotDescriptorBase* ScDataPilotDescriptorBase::getImplementation(
return pRet;
}
-//------------------------------------------------------------------------
ScDataPilotTableObj::ScDataPilotTableObj(ScDocShell* pDocSh, USHORT nT, const String& rN) :
ScDataPilotDescriptorBase( pDocSh ),
@@ -893,8 +886,6 @@ uno::Sequence<sal_Int8> SAL_CALL ScDataPilotTableObj::getImplementationId()
return aId;
}
-// ---
-
void ScDataPilotTableObj::GetParam( ScPivotParam& rParam, ScQueryParam& rQuery, ScArea& rSrcArea ) const
{
ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName);
@@ -962,8 +953,6 @@ void ScDataPilotTableObj::SetParam( const ScPivotParam& rParam,
rEntry.nField += nFieldStart;
}
-// ScPivot* pNew = new ScPivot(*pPivot); //? behaelt falsche Groessenangaben bei...
-
ScDocument* pDoc = pDocShell->GetDocument();
ScPivot* pNew = new ScPivot( pDoc );
pNew->SetName( pDPObj->GetName() );
@@ -1068,8 +1057,6 @@ void SAL_CALL ScDataPilotTableObj::refresh() throw(uno::RuntimeException)
}
}
-//------------------------------------------------------------------------
-
ScDataPilotDescriptor::ScDataPilotDescriptor(ScDocShell* pDocSh) :
ScDataPilotDescriptorBase( pDocSh )
{
@@ -1127,8 +1114,6 @@ void SAL_CALL ScDataPilotDescriptor::setTag( const ::rtl::OUString& aNewTag )
aTagStr = String( aNewTag );
}
-//------------------------------------------------------------------------
-
ScDataPilotFieldsObj::ScDataPilotFieldsObj(ScDataPilotDescriptorBase* pPar, USHORT nTy) :
pParent( pPar ),
nType( nTy )
@@ -1489,8 +1474,6 @@ sal_Bool SAL_CALL ScDataPilotFieldsObj::hasByName( const ::rtl::OUString& aName
return FALSE;
}
-//------------------------------------------------------------------------
-
ScDataPilotFieldObj::ScDataPilotFieldObj( ScDataPilotDescriptorBase* pPar,
USHORT nF, USHORT nST, USHORT nSP ) :
aPropSet( lcl_GetDataPilotFieldMap() ),
@@ -1845,11 +1828,6 @@ void ScDataPilotFieldObj::setFunction(sheet::GeneralFunction eNewFunc)
}
-//------------------------------------------------------------------------
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
index b8ebcab..63e1239 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_datauno.cxx
@@ -57,7 +57,6 @@ namespace binfilter {
using namespace ::com::sun::star;
-//------------------------------------------------------------------------
// alles ohne Which-ID, Map nur fuer PropertySetInfo
@@ -121,7 +120,6 @@ const SfxItemPropertyMap* lcl_GetDBRangePropertyMap()
}
-//------------------------------------------------------------------------
#define SCDATABASERANGEOBJ_SERVICE "com.sun.star.sheet.DatabaseRange"
@@ -132,7 +130,6 @@ SC_SIMPLE_SERVICE_INFO( ScSubTotalDescriptorBase, "ScSubTotalDescriptorBase", "c
SC_SIMPLE_SERVICE_INFO( ScSubTotalFieldObj, "ScSubTotalFieldObj", "com.sun.star.sheet.SubTotalField" )
-//------------------------------------------------------------------------
// static
ScSubTotalFunc ScDataUnoConversion::GeneralToSubTotal( sheet::GeneralFunction eSummary )
@@ -186,7 +183,6 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc eS
return eGeneral;
}
-//------------------------------------------------------------------------
// ScImportDescriptor: alles static
@@ -298,8 +294,7 @@ void ScSortDescriptor::FillProperties( uno::Sequence<beans::PropertyValue>& rSeq
// Uno-Werte zusammensuchen
- table::TableOrientation eOrient =
- rParam.bByRow ? table::TableOrientation_ROWS : table::TableOrientation_COLUMNS;
+ rParam.bByRow ? table::TableOrientation_ROWS : table::TableOrientation_COLUMNS;
table::CellAddress aOutPos;
aOutPos.Sheet = rParam.nDestTab;
@@ -486,7 +481,6 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
}
}
-//------------------------------------------------------------------------
ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, USHORT nP ) :
rParent( *pDesc ),
@@ -578,7 +572,6 @@ void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns(
rParent.PutData(aParam);
}
-//------------------------------------------------------------------------
ScSubTotalDescriptorBase::ScSubTotalDescriptorBase() :
aPropSet( lcl_GetSubTotalPropertyMap() )
@@ -844,7 +837,6 @@ ScSubTotalDescriptorBase* ScSubTotalDescriptorBase::getImplementation(
return pRet;
}
-//------------------------------------------------------------------------
ScSubTotalDescriptor::ScSubTotalDescriptor()
{
@@ -869,7 +861,6 @@ void ScSubTotalDescriptor::SetParam( const ScSubTotalParam& rNew )
aStoredParam = rNew; // von aussen gesetzt
}
-//------------------------------------------------------------------------
ScRangeSubTotalDescriptor::ScRangeSubTotalDescriptor(ScDatabaseRangeObj* pPar) :
pParent(pPar)
@@ -896,7 +887,6 @@ void ScRangeSubTotalDescriptor::PutData( const ScSubTotalParam& rParam )
pParent->SetSubTotalParam( rParam );
}
-//------------------------------------------------------------------------
ScConsolidationDescriptor::ScConsolidationDescriptor()
{
@@ -1038,7 +1028,6 @@ void SAL_CALL ScConsolidationDescriptor::setInsertLinks( sal_Bool bInsertLinks )
aParam.bReferenceData = bInsertLinks;
}
-//------------------------------------------------------------------------
ScFilterDescriptorBase::ScFilterDescriptorBase(ScDocShell* pDocShell) :
pDocSh(pDocShell),
@@ -1054,7 +1043,7 @@ ScFilterDescriptorBase::~ScFilterDescriptorBase()
pDocSh->GetDocument()->RemoveUnoObject(*this);
}
-void ScFilterDescriptorBase::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScFilterDescriptorBase::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if ( rHint.ISA( SfxSimpleHint ) )
{
@@ -1321,7 +1310,6 @@ uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const ::rtl::OUStrin
SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFilterDescriptorBase )
-//------------------------------------------------------------------------
ScFilterDescriptor::ScFilterDescriptor(ScDocShell* pDocSh)
:
@@ -1348,7 +1336,6 @@ void ScFilterDescriptor::SetParam( const ScQueryParam& rNew )
aStoredParam = rNew; // von aussen gesetzt
}
-//------------------------------------------------------------------------
ScRangeFilterDescriptor::ScRangeFilterDescriptor(ScDocShell* pDocSh, ScDatabaseRangeObj* pPar) :
ScFilterDescriptorBase(pDocSh),
@@ -1376,7 +1363,6 @@ void ScRangeFilterDescriptor::PutData( const ScQueryParam& rParam )
pParent->SetQueryParam( rParam );
}
-//------------------------------------------------------------------------
ScDataPilotFilterDescriptor::ScDataPilotFilterDescriptor(ScDocShell* pDocSh, ScDataPilotDescriptorBase* pPar) :
ScFilterDescriptorBase(pDocSh),
@@ -1414,7 +1400,6 @@ void ScDataPilotFilterDescriptor::PutData( const ScQueryParam& rParam )
}
}
-//------------------------------------------------------------------------
ScDatabaseRangeObj::ScDatabaseRangeObj(ScDocShell* pDocSh, const String& rNm) :
pDocShell( pDocSh ),
@@ -1430,7 +1415,7 @@ ScDatabaseRangeObj::~ScDatabaseRangeObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScDatabaseRangeObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScDatabaseRangeObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
// Ref-Update interessiert nicht
@@ -1876,7 +1861,6 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScDatabaseRangeObj::getSupportedService
return aRet;
}
-//------------------------------------------------------------------------
ScDatabaseRangesObj::ScDatabaseRangesObj(ScDocShell* pDocSh) :
pDocShell( pDocSh )
@@ -1890,7 +1874,7 @@ ScDatabaseRangesObj::~ScDatabaseRangesObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScDatabaseRangesObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScDatabaseRangesObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
// Referenz-Update interessiert hier nicht
@@ -2074,11 +2058,6 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const ::rtl::OUString& aName )
return FALSE;
}
-//------------------------------------------------------------------------
-
-
-
-
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
index 3894e49..18a8188 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_editsrc.cxx
@@ -254,11 +254,11 @@ void ScAnnotationEditSource::UpdateData()
}
}
-void ScAnnotationEditSource::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScAnnotationEditSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if ( rHint.ISA( ScUpdateRefHint ) )
{
- const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
+ (const ScUpdateRefHint&)rHint;
//! Ref-Update
}
@@ -277,7 +277,6 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
}
}
-//------------------------------------------------------------------------
ScSimpleEditSource::ScSimpleEditSource( SvxTextForwarder* pForw ) :
pForwarder( pForw )
@@ -306,7 +305,6 @@ void ScSimpleEditSource::UpdateData()
// nothing
}
-//------------------------------------------------------------------------
ScAccessibilityEditSource::ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData )
: mpAccessibleTextData(pAccessibleCellTextData)
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx
index f9b58fc..b09b793 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_filtuno.cxx
@@ -128,7 +128,7 @@ void SAL_CALL ScFilterOptionsObj::setPropertyValues( const uno::Sequence<beans::
// XExecutableDialog
-void SAL_CALL ScFilterOptionsObj::setTitle( const ::rtl::OUString& aTitle ) throw(uno::RuntimeException)
+void SAL_CALL ScFilterOptionsObj::setTitle( const ::rtl::OUString& /*aTitle*/ ) throw(uno::RuntimeException)
{
// not used
}
@@ -236,7 +236,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
// XImporter
-void SAL_CALL ScFilterOptionsObj::setTargetDocument( const uno::Reference<lang::XComponent>& xDoc )
+void SAL_CALL ScFilterOptionsObj::setTargetDocument( const uno::Reference<lang::XComponent>& /*xDoc*/ )
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
bExport = sal_False;
@@ -244,7 +244,7 @@ void SAL_CALL ScFilterOptionsObj::setTargetDocument( const uno::Reference<lang::
// XExporter
-void SAL_CALL ScFilterOptionsObj::setSourceDocument( const uno::Reference<lang::XComponent>& xDoc )
+void SAL_CALL ScFilterOptionsObj::setSourceDocument( const uno::Reference<lang::XComponent>& /*xDoc*/ )
throw(lang::IllegalArgumentException, uno::RuntimeException)
{
bExport = sal_True;
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_forbiuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_forbiuno.cxx
index 709a20a..c38ef8d 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_forbiuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_forbiuno.cxx
@@ -73,7 +73,7 @@ ScForbiddenCharsObj::~ScForbiddenCharsObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScForbiddenCharsObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScForbiddenCharsObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if ( rHint.ISA( SfxSimpleHint ) &&
((const SfxSimpleHint&)rHint).GetId() == SFX_HINT_DYING )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
index 3e77cef..33b46c4 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx
@@ -120,7 +120,6 @@ ScDocument* ScTempDocSource::GetDocument()
return rCache.GetDocument();
}
-//------------------------------------------------------------------------
ScTempDocCache::ScTempDocCache() :
pDoc( NULL ),
@@ -147,8 +146,6 @@ void ScTempDocCache::Clear()
pDoc = NULL;
}
-//------------------------------------------------------------------------
-
// copy results from one document into another
//! merge this with ScAreaLink::Refresh
//! copy directly without a clipboard document?
@@ -190,8 +187,6 @@ BOOL lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
return TRUE;
}
-//------------------------------------------------------------------------
-
ScFunctionAccess::ScFunctionAccess() :
bInvalid( FALSE ),
pOptions( NULL )
@@ -204,7 +199,7 @@ ScFunctionAccess::~ScFunctionAccess()
delete pOptions;
}
-void ScFunctionAccess::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScFunctionAccess::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
if ( rHint.ISA(SfxSimpleHint) &&
((SfxSimpleHint&)rHint).GetId() == SFX_HINT_DEINITIALIZING )
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
index caca2f9..8ee79b1 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_linkuno.cxx
@@ -63,7 +63,6 @@ const SfxItemPropertyMap* lcl_GetSheetLinkMap()
return aSheetLinkMap_Impl;
}
-//------------------------------------------------------------------------
SV_IMPL_PTRARR( XRefreshListenerArr_Impl, XRefreshListenerPtr );
@@ -74,7 +73,6 @@ SC_SIMPLE_SERVICE_INFO( ScDDELinksObj, "ScDDELinksObj", "com.sun.star.sheet.DDEL
SC_SIMPLE_SERVICE_INFO( ScSheetLinkObj, "ScSheetLinkObj", "com.sun.star.sheet.SheetLink" )
SC_SIMPLE_SERVICE_INFO( ScSheetLinksObj, "ScSheetLinksObj", "com.sun.star.sheet.SheetLinks" )
-//------------------------------------------------------------------------
ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const String& rName) :
aPropSet( lcl_GetSheetLinkMap() ),
@@ -90,7 +88,7 @@ ScSheetLinkObj::~ScSheetLinkObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScSheetLinkObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScSheetLinkObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
//! notify if links in document are changed
// UpdateRef is not needed here
@@ -367,7 +365,6 @@ void ScSheetLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay)
ModifyRefreshDelay_Impl( nRefreshDelay );
}
-//------------------------------------------------------------------------
ScSheetLinksObj::ScSheetLinksObj(ScDocShell* pDocSh) :
pDocShell( pDocSh )
@@ -381,7 +378,7 @@ ScSheetLinksObj::~ScSheetLinksObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScSheetLinksObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScSheetLinksObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
// Referenz-Update interessiert hier nicht
@@ -575,7 +572,6 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScSheetLinksObj::getElementNames() thro
return uno::Sequence< ::rtl::OUString>();
}
-//------------------------------------------------------------------------
ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, USHORT nPos )
{
@@ -612,7 +608,7 @@ ScAreaLinkObj::~ScAreaLinkObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScAreaLinkObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScAreaLinkObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
//! notify if links in document are changed
// UpdateRef is not needed here
@@ -918,7 +914,7 @@ ScAreaLinksObj::~ScAreaLinksObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScAreaLinksObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScAreaLinksObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
// Referenz-Update interessiert hier nicht
@@ -1050,7 +1046,7 @@ ScDDELinkObj::~ScDDELinkObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScDDELinkObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScDDELinkObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
//! notify if links in document are changed
// UpdateRef is not needed here
@@ -1090,7 +1086,7 @@ String lcl_BuildDDEName( const String& rAppl, const String& rTopic, const String
return lcl_BuildDDEName( aAppl, aTopic, aItem );
}
-void SAL_CALL ScDDELinkObj::setName( const ::rtl::OUString& aName ) throw(uno::RuntimeException)
+void SAL_CALL ScDDELinkObj::setName( const ::rtl::OUString& /*aName*/ ) throw(uno::RuntimeException)
{
// name can't be changed (formulas wouldn't find the link)
throw uno::RuntimeException();
@@ -1130,7 +1126,7 @@ void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException)
if (pDocShell)
{
ScDocument* pDoc = pDocShell->GetDocument();
- BOOL bOk = pDoc->UpdateDdeLink( aAppl, aTopic, aItem );
+ pDoc->UpdateDdeLink( aAppl, aTopic, aItem );
//! Fehler abfragen
}
}
@@ -1176,7 +1172,6 @@ void ScDDELinkObj::Refreshed_Impl()
(*aRefreshListeners[n])->refreshed( aEvent );
}
-//------------------------------------------------------------------------
ScDDELinksObj::ScDDELinksObj(ScDocShell* pDocSh) :
pDocShell( pDocSh )
@@ -1190,7 +1185,7 @@ ScDDELinksObj::~ScDDELinksObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScDDELinksObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScDDELinksObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
// Referenz-Update interessiert hier nicht
@@ -1337,9 +1332,6 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const ::rtl::OUString& aName )
return FALSE;
}
-//------------------------------------------------------------------------
-
-
}
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx b/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
index f22180d..fac3ce3 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_nameuno.cxx
@@ -63,7 +63,6 @@ const SfxItemPropertyMap* lcl_GetNamedRangeMap()
return aNamedRangeMap_Impl;
}
-//------------------------------------------------------------------------
#define SCNAMEDRANGEOBJ_SERVICE "com.sun.star.sheet.NamedRange"
@@ -71,7 +70,6 @@ SC_SIMPLE_SERVICE_INFO( ScLabelRangeObj, "ScLabelRangeObj", "com.sun.star.sheet.
SC_SIMPLE_SERVICE_INFO( ScLabelRangesObj, "ScLabelRangesObj", "com.sun.star.sheet.LabelRanges" )
SC_SIMPLE_SERVICE_INFO( ScNamedRangesObj, "ScNamedRangesObj", "com.sun.star.sheet.NamedRanges" )
-//------------------------------------------------------------------------
sal_Bool lcl_UserVisibleName( const ScRangeData* pData )
{
@@ -80,7 +78,6 @@ sal_Bool lcl_UserVisibleName( const ScRangeData* pData )
return ( pData && !pData->HasType( RT_DATABASE ) && !pData->HasType( RT_SHARED ) );
}
-//------------------------------------------------------------------------
ScNamedRangeObj::ScNamedRangeObj(ScDocShell* pDocSh, const String& rNm) :
pDocShell( pDocSh ),
@@ -306,7 +303,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangeObj::getPropertySet
}
void SAL_CALL ScNamedRangeObj::setPropertyValue(
- const ::rtl::OUString& aPropertyName, const uno::Any& aValue )
+ const ::rtl::OUString& /*aPropertyName*/, const uno::Any& /*aValue*/ )
throw(beans::UnknownPropertyException, beans::PropertyVetoException,
lang::IllegalArgumentException, lang::WrappedTargetException,
uno::RuntimeException)
@@ -356,7 +353,6 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNam
return aRet;
}
-//------------------------------------------------------------------------
ScNamedRangesObj::ScNamedRangesObj(ScDocShell* pDocSh) :
pDocShell( pDocSh )
@@ -370,7 +366,7 @@ ScNamedRangesObj::~ScNamedRangesObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScNamedRangesObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScNamedRangesObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
// Referenz-Update interessiert hier nicht
@@ -615,7 +611,6 @@ uno::Sequence< ::rtl::OUString> SAL_CALL ScNamedRangesObj::getElementNames()
if ( lcl_UserVisibleName(pData) )
pAry[nVisPos++] = pData->GetName();
}
-// DBG_ASSERT(nVisPos == nVisCount, "huch, verzaehlt?");
return aSeq;
}
}
@@ -641,7 +636,6 @@ sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const ::rtl::OUString& aName )
return sal_False;
}
-//------------------------------------------------------------------------
ScLabelRangeObj::ScLabelRangeObj(ScDocShell* pDocSh, sal_Bool bCol, const ScRange& rR) :
pDocShell( pDocSh ),
@@ -657,7 +651,7 @@ ScLabelRangeObj::~ScLabelRangeObj()
pDocShell->GetDocument()->RemoveUnoObject(*this);
}
-void ScLabelRangeObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
+void ScLabelRangeObj::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
//! Ref-Update !!!
@@ -762,7 +756,6 @@ void SAL_CALL ScLabelRangeObj::setDataArea( const table::CellRangeAddress& aData
Modify_Impl( NULL, &aDataRange );
}
-//------------------------------------------------------------------------
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list