diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-01-17 17:25:58 +0100 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-01-18 11:44:43 -0500 |
commit | db95c38b3cd3efb924a3be2f7fe1027dbf75401f (patch) | |
tree | 7f414156b0fe3e305911dc890d0c771794a4f0be /sc/source | |
parent | 1190d330bef57b04545427ac7b119cf416ed4fba (diff) |
Remove dead code: "//static" and "//virtual"
Diffstat (limited to 'sc/source')
63 files changed, 38 insertions, 170 deletions
diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx index 2bd9b6755776..7e0f8b7ebb82 100644 --- a/sc/source/core/data/dbdocutl.cxx +++ b/sc/source/core/data/dbdocutl.cxx @@ -56,7 +56,6 @@ ScDatabaseDocUtil::StrData::StrData() : // ---------------------------------------------------------------------------- -// static void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const uno::Reference<sdbc::XRow>& xRow, long nRowPos, long nType, BOOL bCurrency, StrData* pStrData ) diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 3ef2101755db..9e862ffe6d17 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -630,7 +630,7 @@ void ScDocumentPool::Remove( const SfxPoolItem& rItem ) SfxItemPool::Remove( rItem ); } -void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) // static +void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) { ULONG nRef = rItem.GetRefCount(); if ( nRef >= (ULONG) SC_MAX_POOLREF && nRef <= (ULONG) SFX_ITEMS_OLD_MAXREF ) diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 83a1f9a2bf3e..96c9544ff8ba 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -1219,7 +1219,6 @@ void ScDocument::DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine) // ---------------------------------------------------------------------------- -// static ScRecursionHelper* ScDocument::CreateRecursionHelperInstance() { return new ScRecursionHelper; diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index ca3d5c56c4dd..d6a5350be18e 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -1002,7 +1002,6 @@ void ScDocument::GetAutoFormatData(SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, } } -// static void ScDocument::GetSearchAndReplaceStart( const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow ) { diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 2c07c3aec250..942836760f65 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2134,7 +2134,6 @@ bool hasFieldColumn(const vector<PivotField>* pRefFields, SCCOL nCol) } -// static void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, const vector<PivotField>& rFields, USHORT nOrient, const Reference<XDimensionsSupplier>& xSource, @@ -2240,7 +2239,6 @@ void ScDPObject::ConvertOrientation( } } -// static bool ScDPObject::IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags ) { bool bAllowed = true; @@ -2268,7 +2266,6 @@ bool ScDPObject::IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags ) // ----------------------------------------------------------------------- -// static BOOL ScDPObject::HasRegisteredSources() { BOOL bFound = FALSE; @@ -2286,7 +2283,6 @@ BOOL ScDPObject::HasRegisteredSources() return bFound; } -// static uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources() { uno::Sequence<rtl::OUString> aSeq(0); @@ -2332,7 +2328,6 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources() // use getContext from addincol.cxx uno::Reference<uno::XComponentContext> getContext(uno::Reference<lang::XMultiServiceFactory> xMSF); -// static uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPServiceDesc& rDesc ) { rtl::OUString aImplName = rDesc.aServiceName; diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 99f31fd3610e..cb9a918098f7 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -1637,7 +1637,6 @@ String lcl_GetDataFieldName( const String& rSourceName, sheet::GeneralFunction e return aRet; } -// static void ScDPOutput::GetDataDimensionNames( String& rSourceName, String& rGivenName, const uno::Reference<uno::XInterface>& xDim ) { diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index d8b48e9591ff..c3cafc868430 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -3315,7 +3315,6 @@ ScDPDataMember* ScDPResultDimension::GetRowReferenceMember( const ScDPRelativePo return pColMember; } -// static ScDPDataMember* ScDPResultDimension::GetColReferenceMember( const ScDPRelativePos* pRelativePos, const String* pName, long nRefDimPos, const ScDPRunningTotalState& rRunning ) { diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 8ac38656f246..f8e0f69c56c4 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -1649,7 +1649,6 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj ) } } -// static void ScDrawLayer::MirrorRectRTL( Rectangle& rRect ) { // mirror and swap left/right @@ -1699,7 +1698,6 @@ Rectangle ScDrawLayer::GetCellRect( ScDocument& rDoc, const ScAddress& rPos, boo return aCellRect; } -// static String ScDrawLayer::GetVisibleName( SdrObject* pObj ) { String aName = pObj->GetName(); @@ -1826,7 +1824,7 @@ ScAnchorType ScDrawLayer::GetAnchor( const SdrObject* pObj ) return ( aAnchor.Y() != 0 ) ? SCA_PAGE : SCA_CELL; } -ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate ) // static +ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate ) { USHORT nCount = pObj ? pObj->GetUserDataCount() : 0; for( USHORT i = 0; i < nCount; i++ ) @@ -1845,7 +1843,7 @@ ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate ) // s return 0; } -ScDrawObjData* ScDrawLayer::GetObjDataTab( SdrObject* pObj, SCTAB nTab ) // static +ScDrawObjData* ScDrawLayer::GetObjDataTab( SdrObject* pObj, SCTAB nTab ) { ScDrawObjData* pData = GetObjData( pObj ); if ( pData ) @@ -1870,7 +1868,7 @@ ScDrawObjData* ScDrawLayer::GetNoteCaptionData( SdrObject* pObj, SCTAB nTab ) return (pData && pData->mbNote) ? pData : 0; } -ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static +ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) { USHORT nCount = pObj->GetUserDataCount(); for( USHORT i = 0; i < nCount; i++ ) @@ -1883,7 +1881,6 @@ ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static return NULL; } -// static: IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, const Point& rWinPoint, const Window& rCmpWnd ) { @@ -1949,7 +1946,7 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, return pIMapObj; } -ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate ) // static +ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate ) { USHORT nCount = pObj->GetUserDataCount(); for( USHORT i = 0; i < nCount; i++ ) @@ -1968,7 +1965,7 @@ ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate ) return 0; } -void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) // static +void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) { DBG_ASSERT(!pGlobalDrawPersist,"SetGlobalDrawPersist mehrfach"); pGlobalDrawPersist = pPersist; diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 352e78dd3ae3..11e6b38aa05a 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -220,7 +220,6 @@ ULONG ScGlobal::GetStandardFormat( double fNumber, SvNumberFormatter& rFormatter } -// static SvNumberFormatter* ScGlobal::GetEnglishFormatter() { if ( !pEnglishFormatter ) @@ -685,7 +684,6 @@ void ScGlobal::Clear() //------------------------------------------------------------------------ -// static CharSet ScGlobal::GetCharsetValue( const String& rCharSet ) { // new TextEncoding values @@ -711,7 +709,6 @@ CharSet ScGlobal::GetCharsetValue( const String& rCharSet ) //------------------------------------------------------------------------ -// static String ScGlobal::GetCharsetString( CharSet eVal ) { const sal_Char* pChar; @@ -770,7 +767,6 @@ void ScGlobal::ResetFunctionList() //------------------------------------------------------------------------ -// static ScUnitConverter* ScGlobal::GetUnitConverter() { if ( !pUnitConverter ) @@ -782,7 +778,6 @@ ScUnitConverter* ScGlobal::GetUnitConverter() //------------------------------------------------------------------------ -// static const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c ) { diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx index 43b14fab4687..8d043ac7a1e8 100644 --- a/sc/source/core/data/globalx.cxx +++ b/sc/source/core/data/globalx.cxx @@ -56,7 +56,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -// static void ScGlobal::InitAddIns() { // multi paths separated by semicolons @@ -135,7 +134,6 @@ void ScGlobal::InitAddIns() } -// static String ScGlobal::GetOrdinalSuffix( sal_Int32 nNumber) { if (!xOrdinalSuffix.is()) diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index d1df2bb04df6..da935464cffb 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -40,7 +40,6 @@ // ----------------------------------------------------------------------- -// static rtl::OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) @@ -62,7 +61,6 @@ rtl::OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) return rtl::OUString::createFromAscii(aEventNames[nEvent]); } -// static sal_Int32 ScSheetEvents::GetVbaSheetEventId(sal_Int32 nEvent) { using namespace ::com::sun::star::script::vba::VBAEventId; @@ -85,7 +83,6 @@ sal_Int32 ScSheetEvents::GetVbaSheetEventId(sal_Int32 nEvent) return nVbaEventIds[nEvent]; } -// static sal_Int32 ScSheetEvents::GetVbaDocumentEventId(sal_Int32 nEvent) { using namespace ::com::sun::star::script::vba::VBAEventId; diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 91fcb31be0e7..d323027490df 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -911,7 +911,6 @@ inline void ScInterpreter::TreatDoubleError( double& rVal ) } -// static inline double ScInterpreter::div( const double& fNumerator, const double& fDenominator ) { return (fDenominator != 0.0) ? (fNumerator / fDenominator) : diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 5299ac450e42..9a6d416552dc 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1309,7 +1309,6 @@ BOOL ScUnoAddInCollection::FillFunctionDesc( long nFunc, ScFuncDesc& rDesc ) return FillFunctionDescFromData( rFuncData, rDesc ); } -// static BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& rFuncData, ScFuncDesc& rDesc ) { rDesc.Clear(); diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx index 914841169c78..cb35b625baf2 100644 --- a/sc/source/core/tool/addinlis.cxx +++ b/sc/source/core/tool/addinlis.cxx @@ -54,7 +54,6 @@ List ScAddInListener::aAllListeners; //------------------------------------------------------------------------ -// static ScAddInListener* ScAddInListener::CreateListener( uno::Reference<sheet::XVolatileResult> xVR, ScDocument* pDoc ) { @@ -81,7 +80,6 @@ ScAddInListener::~ScAddInListener() delete pDocs; } -// static ScAddInListener* ScAddInListener::Get( uno::Reference<sheet::XVolatileResult> xVR ) { sheet::XVolatileResult* pComp = xVR.get(); @@ -97,7 +95,6 @@ ScAddInListener* ScAddInListener::Get( uno::Reference<sheet::XVolatileResult> xV } //! move to some container object? -// static void ScAddInListener::RemoveDocument( ScDocument* pDocumentP ) { ULONG nPos = aAllListeners.Count(); diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index aa81884553c5..97f6a157ed80 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -56,9 +56,6 @@ const sal_Char *linker_dummy = ""; -// Standard-Name ist jetzt STR_STYLENAME_STANDARD (wie Vorlagen) -//static const sal_Char cStandardName[] = "Standard"; - static const sal_Char sAutoTblFmtName[] = "autotbl.fmt"; // bis SO5PF diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 7bf78a632ecc..a75dd176bd86 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -126,13 +126,11 @@ BOOL lcl_AdjustRanges( ScRangeList& rRanges, SCTAB nSourceTab, SCTAB nDestTab, S }//end anonymous namespace // === ScChartHelper ====================================== -//static USHORT ScChartHelper::DoUpdateAllCharts( ScDocument* pDoc ) { return lcl_DoUpdateCharts( ScAddress(), pDoc, TRUE ); } -//static void ScChartHelper::AdjustRangesOfChartsOnDestinationPage( ScDocument* pSrcDoc, ScDocument* pDestDoc, const SCTAB nSrcTab, const SCTAB nDestTab ) { if( !pSrcDoc || !pDestDoc ) @@ -173,7 +171,6 @@ void ScChartHelper::AdjustRangesOfChartsOnDestinationPage( ScDocument* pSrcDoc, } } -//static uno::Reference< chart2::XChartDocument > ScChartHelper::GetChartFromSdrObject( SdrObject* pObject ) { uno::Reference< chart2::XChartDocument > xReturn; diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 633bf8ea0b88..a0cc38007615 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -1744,7 +1744,6 @@ BOOL ScChangeActionContent::Select( ScDocument* pDoc, ScChangeTrack* pTrack, } -// static void ScChangeActionContent::GetStringOfCell( String& rStr, const ScBaseCell* pCell, const ScDocument* pDoc, const ScAddress& rPos ) { @@ -1760,7 +1759,6 @@ void ScChangeActionContent::GetStringOfCell( String& rStr, } -// static void ScChangeActionContent::GetStringOfCell( String& rStr, const ScBaseCell* pCell, const ScDocument* pDoc, ULONG nFormat ) { @@ -1793,7 +1791,6 @@ void ScChangeActionContent::GetStringOfCell( String& rStr, } -// static ScChangeActionContentCellType ScChangeActionContent::GetContentCellType( const ScBaseCell* pCell ) { if ( pCell ) @@ -1829,14 +1826,12 @@ ScChangeActionContentCellType ScChangeActionContent::GetContentCellType( const S } -// static BOOL ScChangeActionContent::NeedsNumberFormat( const ScBaseCell* pCell ) { return pCell && pCell->GetCellType() == CELLTYPE_VALUE; } -// static void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell, const ScAddress& rPos, const ScBaseCell* pOrgCell, const ScDocument* pFromDoc, ScDocument* pToDoc ) @@ -1845,8 +1840,6 @@ void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell, SetValue( rStr, pCell, nFormat, pOrgCell, pFromDoc, pToDoc ); } - -// static void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell, ULONG nFormat, const ScBaseCell* pOrgCell, const ScDocument* pFromDoc, ScDocument* pToDoc ) @@ -1880,7 +1873,6 @@ void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell, } -// static void ScChangeActionContent::SetCell( String& rStr, ScBaseCell* pCell, ULONG nFormat, const ScDocument* pDoc ) { @@ -2212,7 +2204,6 @@ const SCROW ScChangeTrack::nContentRowsPerSlot = InitContentRowsPerSlot(); const SCSIZE ScChangeTrack::nContentSlots = (MAXROWCOUNT) / InitContentRowsPerSlot() + 2; -// static SCROW ScChangeTrack::InitContentRowsPerSlot() { const SCSIZE nMaxSlots = 0xffe0 / sizeof( ScChangeActionContent* ) - 2; @@ -2726,7 +2717,6 @@ void ScChangeTrack::AppendMove( const ScRange& rFromRange, } -// static BOOL ScChangeTrack::IsMatrixFormulaRangeDifferent( const ScBaseCell* pOldCell, const ScBaseCell* pNewCell ) { @@ -3338,7 +3328,6 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge ) } -// static BOOL ScChangeTrack::MergeIgnore( const ScChangeAction& rAction, ULONG nFirstMerge ) { if ( rAction.IsRejected() ) diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 9f899f437b50..3553cef124c4 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -288,7 +288,6 @@ void dbg_call_generateMappingDiff() } #endif // erGENERATEMAPPINGDIFF -// static void ScCompiler::DeInit() { if (pCharClassEnglish) @@ -325,7 +324,6 @@ bool ScCompiler::IsEnglishSymbol( const String& rName ) return false; // no valid function name } -// static void ScCompiler::InitCharClassEnglish() { ::com::sun::star::lang::Locale aLocale( @@ -4184,7 +4182,6 @@ void ScCompiler::MoveRelWrap( SCCOL nMaxCol, SCROW nMaxRow ) } } -// static // Wrap-adjust relative references of a RangeName to current position, // don't call for other token arrays! void ScCompiler::MoveRelWrap( ScTokenArray& rArr, ScDocument* pDoc, const ScAddress& rPos, diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index a6340fbcd955..d964118c4a60 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -461,7 +461,7 @@ BOOL ScDetectiveFunc::HasArrow( const ScAddress& rStart, return bFound; } -BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) // static +BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) { if ( pObject->GetLayer()==SC_LAYER_INTERN && pObject->IsPolyObj() && pObject->GetPointCount()==2 ) @@ -1706,7 +1706,6 @@ void ScDetectiveFunc::InsertObject( ScDetectiveObjType eType, } } -// static ColorData ScDetectiveFunc::GetArrowColor() { if (!bColorsInitialized) @@ -1714,7 +1713,6 @@ ColorData ScDetectiveFunc::GetArrowColor() return nArrowColor; } -// static ColorData ScDetectiveFunc::GetErrorColor() { if (!bColorsInitialized) @@ -1722,7 +1720,6 @@ ColorData ScDetectiveFunc::GetErrorColor() return nErrorColor; } -// static ColorData ScDetectiveFunc::GetCommentColor() { if (!bColorsInitialized) @@ -1730,7 +1727,6 @@ ColorData ScDetectiveFunc::GetCommentColor() return nCommentColor; } -// static void ScDetectiveFunc::InitializeColors() { // may be called several times to update colors from configuration @@ -1743,7 +1739,6 @@ void ScDetectiveFunc::InitializeColors() bColorsInitialized = TRUE; } -// static BOOL ScDetectiveFunc::IsColorsInitialized() { return bColorsInitialized; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index c97e11e606db..52a1a7618b23 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -3614,7 +3614,7 @@ ScInterpreter::~ScInterpreter() } -void ScInterpreter::GlobalExit() // static +void ScInterpreter::GlobalExit() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GlobalExit" ); DBG_ASSERT(!bGlobalStackInUse, "wer benutzt noch den TokenStack?"); diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx index 28b13e249a07..fc89705d1c39 100644 --- a/sc/source/core/tool/odffmap.cxx +++ b/sc/source/core/tool/odffmap.cxx @@ -138,13 +138,11 @@ ScCompiler::AddInMap ScCompiler::maAddInMap[] = { "FVSCHEDULE", "FVSCHEDULE", false, "com.sun.star.sheet.addin.Analysis.getFvschedule", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETFVSCHEDULE" }, }; -// static const ScCompiler::AddInMap* ScCompiler::GetAddInMap() { return maAddInMap; } -// static size_t ScCompiler::GetAddInMapCount() { return SAL_N_ELEMENTS(maAddInMap); diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index 45a3e20f0e58..377676e5647f 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.cxx @@ -39,7 +39,6 @@ //------------------------------------------------------------------ -// static BOOL ScOptionsUtil::IsMetricSystem() { //! which language should be used here - system language or installed office language? diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index ed6de3ed6dfc..20b6440ce302 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -141,7 +141,6 @@ ScProgress::~ScProgress() } } -// static void ScProgress::CreateInterpretProgress( ScDocument* pDoc, BOOL bWait ) { @@ -167,7 +166,6 @@ void ScProgress::CreateInterpretProgress( ScDocument* pDoc, BOOL bWait ) } -// static void ScProgress::DeleteInterpretProgress() { diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 3cfb72ba6fc5..2976141dcbce 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -426,7 +426,7 @@ void ScRangeData::UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable) } -void ScRangeData::MakeValidName( String& rName ) // static +void ScRangeData::MakeValidName( String& rName ) { // strip leading invalid characters diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index 0cd5bee35056..10b7f7936528 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -378,7 +378,6 @@ bool ScApiTypeConversion::ConvertAnyToDouble( double & o_fVal, //------------------------------------------------------------------------ -// static ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const com::sun::star::uno::Any & rAny ) { ScMatrixRef xMatrix; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index e60d5ddc4de2..a57c2dad928d 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -527,7 +527,6 @@ BOOL ScToken::Is3DRef() const return FALSE; } -// static FormulaTokenRef ScToken::ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2, const ScAddress & rPos, bool bReuseDoubleRef ) { diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index cd2cb0eb0496..58cb4146be01 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -75,7 +75,6 @@ ScDataObject* ScUnitConverterData::Clone() const } -// static void ScUnitConverterData::BuildIndexString( String& rStr, const String& rFromUnit, const String& rToUnit ) { diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 14dcf7da619e..902616ce0749 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -842,7 +842,7 @@ sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet, } // namespace -/*static*/ sal_Int16 XclExpFontHelper::GetFirstUsedScript( const XclExpRoot& rRoot, const SfxItemSet& rItemSet ) +sal_Int16 XclExpFontHelper::GetFirstUsedScript( const XclExpRoot& rRoot, const SfxItemSet& rItemSet ) { namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; @@ -884,7 +884,7 @@ sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet, return nScript; } -/*static*/ Font XclExpFontHelper::GetFontFromItemSet( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16 nScript ) +Font XclExpFontHelper::GetFontFromItemSet( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16 nScript ) { namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; @@ -908,7 +908,7 @@ sal_Int16 lclCheckFontItems( const SfxItemSet& rItemSet, return aFont; } -/*static*/ bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16 nScript, bool bDeep ) +bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rItemSet, sal_Int16 nScript, bool bDeep ) { static const USHORT pnCommonIds[] = { ATTR_FONT_UNDERLINE, ATTR_FONT_CROSSEDOUT, ATTR_FONT_CONTOUR, diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index e28266a78138..fc84aeb6aba5 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -214,7 +214,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase() { } -/*static*/ XclImpDrawObjRef XclImpDrawObjBase::ReadObj3( const XclImpRoot& rRoot, XclImpStream& rStrm ) +XclImpDrawObjRef XclImpDrawObjBase::ReadObj3( const XclImpRoot& rRoot, XclImpStream& rStrm ) { XclImpDrawObjRef xDrawObj; @@ -246,7 +246,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase() return xDrawObj; } -/*static*/ XclImpDrawObjRef XclImpDrawObjBase::ReadObj4( const XclImpRoot& rRoot, XclImpStream& rStrm ) +XclImpDrawObjRef XclImpDrawObjBase::ReadObj4( const XclImpRoot& rRoot, XclImpStream& rStrm ) { XclImpDrawObjRef xDrawObj; @@ -279,7 +279,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase() return xDrawObj; } -/*static*/ XclImpDrawObjRef XclImpDrawObjBase::ReadObj5( const XclImpRoot& rRoot, XclImpStream& rStrm ) +XclImpDrawObjRef XclImpDrawObjBase::ReadObj5( const XclImpRoot& rRoot, XclImpStream& rStrm ) { XclImpDrawObjRef xDrawObj; @@ -322,7 +322,7 @@ XclImpDrawObjBase::~XclImpDrawObjBase() return xDrawObj; } -/*static*/ XclImpDrawObjRef XclImpDrawObjBase::ReadObj8( const XclImpRoot& rRoot, XclImpStream& rStrm ) +XclImpDrawObjRef XclImpDrawObjBase::ReadObj8( const XclImpRoot& rRoot, XclImpStream& rStrm ) { XclImpDrawObjRef xDrawObj; @@ -3704,7 +3704,7 @@ XclImpDrawing::~XclImpDrawing() { } -/*static*/ Graphic XclImpDrawing::ReadImgData( const XclImpRoot& rRoot, XclImpStream& rStrm ) +Graphic XclImpDrawing::ReadImgData( const XclImpRoot& rRoot, XclImpStream& rStrm ) { Graphic aGraphic; sal_uInt16 nFormat, nEnv; diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index ee6a345fdc11..f18c26d3b188 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -585,7 +585,7 @@ bool lclSkipEmptyParentheses( const sal_Unicode*& rpcString, const sal_Unicode* // ---------------------------------------------------------------------------- -/*static*/ void ScXMLConditionHelper::parseCondition( +void ScXMLConditionHelper::parseCondition( ScXMLConditionParseResult& rParseResult, const OUString& rAttribute, sal_Int32 nStartIndex ) { rParseResult.meToken = XML_COND_INVALID; diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 0c83daa50669..0726f2c2faec 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -268,7 +268,6 @@ ScDrawTransferObj::~ScDrawTransferObj() delete pDragSourceView; } -// static ScDrawTransferObj* ScDrawTransferObj::GetOwnClipboard( Window* ) { ScDrawTransferObj* pObj = SC_MOD()->GetClipData().pDrawClipboard; diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx index 8155d5e9dccb..c82bc7d79512 100644 --- a/sc/source/ui/app/rfindlst.cxx +++ b/sc/source/ui/app/rfindlst.cxx @@ -59,7 +59,7 @@ ScRangeFindList::~ScRangeFindList() } } -ColorData ScRangeFindList::GetColorName( size_t nIndex ) // static +ColorData ScRangeFindList::GetColorName( size_t nIndex ) { return aColNames[nIndex % SC_RANGECOLORS]; } diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index d21255806fc4..6cf559d950fd 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.cxx @@ -50,7 +50,6 @@ using namespace com::sun::star; //------------------------------------------------------------------ -// static void ScModule::GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCtlLang, BOOL& rAutoSpell ) { @@ -67,7 +66,6 @@ void ScModule::GetSpellSettings( USHORT& rDefLang, USHORT& rCjkLang, USHORT& rCt rAutoSpell = aOptions.bIsSpellAuto; } -// static void ScModule::SetAutoSpellProperty( BOOL bSet ) { // use SvtLinguConfig instead of service LinguProperties to avoid @@ -81,7 +79,6 @@ void ScModule::SetAutoSpellProperty( BOOL bSet ) -// static BOOL ScModule::HasThesaurusLanguage( USHORT nLang ) { if ( nLang == LANGUAGE_NONE ) diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index eb6b662c5c75..f229e885d0d5 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -84,7 +84,6 @@ BOOL lcl_IsURLButton( SdrObject* pObject ) return bRet; } -// static ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView ) { diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index ca9d55df8fe0..91a972cab1cd 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -85,7 +85,6 @@ using namespace com::sun::star; // ----------------------------------------------------------------------- -// static void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol ) { SCCOL nMaxCol = 0; @@ -107,7 +106,6 @@ void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCR nCol = nMaxCol; } -// static void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPrintFactor, const ScRange& rBlock, BOOL bMetaFile ) { @@ -216,7 +214,6 @@ ScTransferObj::~ScTransferObj() } -// static ScTransferObj* ScTransferObj::GetOwnClipboard( Window* pUIWin ) { ScTransferObj* pObj = SC_MOD()->GetClipData().pCellClipboard; @@ -732,7 +729,6 @@ void ScTransferObj::InitDocShell() } } -// static SfxObjectShell* ScTransferObj::SetDrawClipDoc( BOOL bAnyOle ) { // update ScGlobal::pDrawClipDocShellRef @@ -752,7 +748,6 @@ SfxObjectShell* ScTransferObj::SetDrawClipDoc( BOOL bAnyOle ) } } -// static void ScTransferObj::StripRefs( ScDocument* pDoc, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, ScDocument* pDestDoc, SCCOL nSubX, SCROW nSubY ) diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 4f2c795fa70a..5902b552634d 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -80,7 +80,6 @@ using namespace com::sun::star; #define SC_DBPROP_SELECTION "Selection" #define SC_DBPROP_CURSOR "Cursor" -// static void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFrame ) { // called after opening the database beamer diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 3ea2685f4b08..d6147bb6f108 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -2408,7 +2408,7 @@ void ScDocShell::PrepareReload() } -String ScDocShell::GetOwnFilterName() // static +String ScDocShell::GetOwnFilterName() { return String::CreateFromAscii(pFilterSc50); } @@ -2418,32 +2418,32 @@ String ScDocShell::GetHtmlFilterName() return String::CreateFromAscii(pFilterHtml); } -String ScDocShell::GetWebQueryFilterName() // static +String ScDocShell::GetWebQueryFilterName() { return String::CreateFromAscii(pFilterHtmlWebQ); } -String ScDocShell::GetAsciiFilterName() // static +String ScDocShell::GetAsciiFilterName() { return String::CreateFromAscii(pFilterAscii); } -String ScDocShell::GetLotusFilterName() // static +String ScDocShell::GetLotusFilterName() { return String::CreateFromAscii(pFilterLotus); } -String ScDocShell::GetDBaseFilterName() // static +String ScDocShell::GetDBaseFilterName() { return String::CreateFromAscii(pFilterDBase); } -String ScDocShell::GetDifFilterName() // static +String ScDocShell::GetDifFilterName() { return String::CreateFromAscii(pFilterDif); } -BOOL ScDocShell::HasAutomaticTableName( const String& rFilter ) // static +BOOL ScDocShell::HasAutomaticTableName( const String& rFilter ) { // TRUE for those filters that keep the default table name // (which is language specific) diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 9c23ae45f99e..5116e54cb022 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -454,7 +454,7 @@ IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink ) // === ScDocumentLoader ================================================== -String ScDocumentLoader::GetOptions( SfxMedium& rMedium ) // static +String ScDocumentLoader::GetOptions( SfxMedium& rMedium ) { SfxItemSet* pSet = rMedium.GetItemSet(); const SfxPoolItem* pItem; @@ -466,7 +466,7 @@ String ScDocumentLoader::GetOptions( SfxMedium& rMedium ) // static BOOL ScDocumentLoader::GetFilterName( const String& rFileName, String& rFilter, String& rOptions, - BOOL bWithContent, BOOL bWithInteraction ) // static + BOOL bWithContent, BOOL bWithInteraction ) { TypeId aScType = TYPE(ScDocShell); SfxObjectShell* pDocSh = SfxObjectShell::GetFirst( &aScType ); @@ -520,7 +520,7 @@ BOOL ScDocumentLoader::GetFilterName( const String& rFileName, return bOK; } -void ScDocumentLoader::RemoveAppPrefix( String& rFilterName ) // static +void ScDocumentLoader::RemoveAppPrefix( String& rFilterName ) { String aAppPrefix = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); aAppPrefix.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 2bfdabe7df15..343e952abb3e 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -157,7 +157,6 @@ public: }; -// static inline BOOL ScImportExport::IsEndianSwap( const SvStream& rStrm ) { #ifdef OSL_BIGENDIAN @@ -167,7 +166,6 @@ inline BOOL ScImportExport::IsEndianSwap( const SvStream& rStrm ) #endif } -// static inline void ScImportExport::SetNoEndianSwap( SvStream& rStrm ) { #ifdef OSL_BIGENDIAN diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index 5c7f873f0883..9414fc04a94f 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -83,7 +83,6 @@ uno::Reference<sheet::XSolver> lcl_CreateSolver( const uno::Reference<uno::XInte return xSolver; } -// static void ScSolverUtil::GetImplementations( uno::Sequence<rtl::OUString>& rImplNames, uno::Sequence<rtl::OUString>& rDescriptions ) { @@ -142,7 +141,6 @@ void ScSolverUtil::GetImplementations( uno::Sequence<rtl::OUString>& rImplNames, } } -// static uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const rtl::OUString& rImplName ) { uno::Reference<sheet::XSolver> xSolver; @@ -188,7 +186,6 @@ uno::Reference<sheet::XSolver> ScSolverUtil::GetSolver( const rtl::OUString& rIm return xSolver; } -// static uno::Sequence<beans::PropertyValue> ScSolverUtil::GetDefaults( const rtl::OUString& rImplName ) { uno::Sequence<beans::PropertyValue> aDefaults; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 2f272cc10d2e..78918415c40f 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -738,7 +738,7 @@ void ScContentTree::GetDbNames() } } -bool ScContentTree::IsPartOfType( USHORT nContentType, USHORT nObjIdentifier ) // static +bool ScContentTree::IsPartOfType( USHORT nContentType, USHORT nObjIdentifier ) { bool bRet = false; switch ( nContentType ) diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 8d7dd7daff95..9be3f8a0f139 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -213,7 +213,6 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Edit*, pEdit ) return 0; } -// static SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreSet) { return new ScTpFormulaOptions(pParent, rCoreSet); diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx index 9f2b4eb7f03c..56eb56508336 100644 --- a/sc/source/ui/undo/areasave.cxx +++ b/sc/source/ui/undo/areasave.cxx @@ -201,7 +201,6 @@ void ScAreaLinkSaveCollection::Restore( ScDocument* pDoc ) const } } -// static ScAreaLinkSaveCollection* ScAreaLinkSaveCollection::CreateFromDoc( const ScDocument* pDoc ) { ScAreaLinkSaveCollection* pColl = NULL; diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 2c44a8ecf4b9..6fbc9effb1cf 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -145,14 +145,14 @@ void ScSimpleUndo::EndRedo() pDocShell->SetInUndo( FALSE ); } -void ScSimpleUndo::ShowTable( SCTAB nTab ) // static +void ScSimpleUndo::ShowTable( SCTAB nTab ) { ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) pViewShell->SetTabNo( nTab ); } -void ScSimpleUndo::ShowTable( const ScRange& rRange ) // static +void ScSimpleUndo::ShowTable( const ScRange& rRange ) { ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); if (pViewShell) diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 5d4af591a2bc..619736f8f188 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -141,7 +141,6 @@ void lcl_DocStyleChanged( ScDocument* pDoc, SfxStyleSheetBase* pStyle, BOOL bRem pHdl->ForgetLastPattern(); } -// static void ScUndoModifyStyle::DoChange( ScDocShell* pDocSh, const String& rName, SfxStyleFamily eStyleFamily, const ScStyleSaveData& rData ) { diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 7cd6a99f922f..8f98266d87d0 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -470,7 +470,6 @@ sal_Int64 SAL_CALL ScAutoFormatObj::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScAutoFormatObj::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -487,7 +486,6 @@ const uno::Sequence<sal_Int8>& ScAutoFormatObj::getUnoTunnelId() return *pSeq; } -// static ScAutoFormatObj* ScAutoFormatObj::getImplementation( const uno::Reference<uno::XInterface> xObj ) { diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index b5763bb0c50b..fc908d3b6e13 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -4090,7 +4090,6 @@ sal_Int64 SAL_CALL ScCellRangesBase::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScCellRangesBase::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -4107,7 +4106,6 @@ const uno::Sequence<sal_Int8>& ScCellRangesBase::getUnoTunnelId() return *pSeq; } -// static ScCellRangesBase* ScCellRangesBase::getImplementation( const uno::Reference<uno::XInterface> xObj ) { ScCellRangesBase* pRet = NULL; @@ -4741,7 +4739,6 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames( //------------------------------------------------------------------------ -// static uno::Reference<table::XCellRange> ScCellRangeObj::CreateRangeFromDoc( ScDocument* pDoc, const ScRange& rR ) { SfxObjectShell* pObjSh = pDoc->GetDocumentShell(); @@ -6054,7 +6051,7 @@ uno::Sequence<rtl::OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() //------------------------------------------------------------------------ -const SvxItemPropertySet* ScCellObj::GetEditPropertySet() // static +const SvxItemPropertySet* ScCellObj::GetEditPropertySet() { return lcl_GetEditPropertySet(); } @@ -8707,7 +8704,6 @@ sal_Int64 SAL_CALL ScTableSheetObj::getSomething( return ScCellRangeObj::getSomething( rId ); } -// static const uno::Sequence<sal_Int8>& ScTableSheetObj::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -8724,7 +8720,6 @@ const uno::Sequence<sal_Int8>& ScTableSheetObj::getUnoTunnelId() return *pSeq; } -// static ScTableSheetObj* ScTableSheetObj::getImplementation( const uno::Reference<uno::XInterface> xObj ) { ScTableSheetObj* pRet = NULL; diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 9866c038b485..a27e9b8ee7b3 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -151,7 +151,6 @@ SC_SIMPLE_SERVICE_INFO( ScSubTotalFieldObj, "ScSubTotalFieldObj", "com.sun.star. //------------------------------------------------------------------------ -// static ScSubTotalFunc ScDataUnoConversion::GeneralToSubTotal( sheet::GeneralFunction eSummary ) { ScSubTotalFunc eSubTotal; @@ -177,7 +176,6 @@ ScSubTotalFunc ScDataUnoConversion::GeneralToSubTotal( sheet::GeneralFunction eS return eSubTotal; } -// static sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc eSubTotal ) { sheet::GeneralFunction eGeneral; @@ -856,7 +854,6 @@ sal_Int64 SAL_CALL ScSubTotalDescriptorBase::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScSubTotalDescriptorBase::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -873,7 +870,6 @@ const uno::Sequence<sal_Int8>& ScSubTotalDescriptorBase::getUnoTunnelId() return *pSeq; } -// static ScSubTotalDescriptorBase* ScSubTotalDescriptorBase::getImplementation( const uno::Reference<sheet::XSubTotalDescriptor> xObj ) { diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index e621f8bf0f2e..5d9207818694 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -341,7 +341,6 @@ void ScPrintUIOptions::SetDefaults() } } -// static void ScModelObj::CreateAndSet(ScDocShell* pDocSh) { if (pDocSh) @@ -2060,7 +2059,6 @@ sal_Int64 SAL_CALL ScModelObj::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScModelObj::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -2077,7 +2075,6 @@ const uno::Sequence<sal_Int8>& ScModelObj::getUnoTunnelId() return *pSeq; } -// static ScModelObj* ScModelObj::getImplementation( const uno::Reference<uno::XInterface> xObj ) { ScModelObj* pRet = NULL; diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 09155bb04f76..5cbabe2d2679 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -808,7 +808,6 @@ sal_Int64 SAL_CALL ScCellFieldObj::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScCellFieldObj::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -825,7 +824,6 @@ const uno::Sequence<sal_Int8>& ScCellFieldObj::getUnoTunnelId() return *pSeq; } -// static ScCellFieldObj* ScCellFieldObj::getImplementation( const uno::Reference<text::XTextContent> xObj ) { @@ -1469,7 +1467,6 @@ sal_Int64 SAL_CALL ScHeaderFieldObj::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScHeaderFieldObj::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -1486,7 +1483,6 @@ const uno::Sequence<sal_Int8>& ScHeaderFieldObj::getUnoTunnelId() return *pSeq; } -// static ScHeaderFieldObj* ScHeaderFieldObj::getImplementation( const uno::Reference<text::XTextContent> xObj ) { diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 72c10ee29c62..2dea92c13e5e 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -491,7 +491,6 @@ sal_Int64 SAL_CALL ScTableConditionalFormat::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScTableConditionalFormat::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -508,7 +507,6 @@ const uno::Sequence<sal_Int8>& ScTableConditionalFormat::getUnoTunnelId() return *pSeq; } -// static ScTableConditionalFormat* ScTableConditionalFormat::getImplementation( const uno::Reference<sheet::XSheetConditionalEntries> xObj ) { @@ -1027,7 +1025,6 @@ sal_Int64 SAL_CALL ScTableValidationObj::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScTableValidationObj::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -1044,7 +1041,6 @@ const uno::Sequence<sal_Int8>& ScTableValidationObj::getUnoTunnelId() return *pSeq; } -// static ScTableValidationObj* ScTableValidationObj::getImplementation( const uno::Reference<beans::XPropertySet> xObj ) { diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 24299b69f335..784eb4f9bad2 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -89,7 +89,6 @@ public: //------------------------------------------------------------------------ -// static ScDocument* ScTempDocSource::CreateDocument() { ScDocument* pDoc = new ScDocument; // SCDOCMODE_DOCUMENT diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index fc963f493bfe..cef54bb1a3ed 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -47,7 +47,6 @@ SC_SIMPLE_SERVICE_INFO( ScNameToIndexAccess, "ScNameToIndexAccess", "stardiv.unk //------------------------------------------------------------------------ -// static uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::Any& rAny ) { if ( rAny.getValueTypeClass() == uno::TypeClass_INTERFACE ) @@ -57,7 +56,6 @@ uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::A return uno::Reference<uno::XInterface>(); //! Exception? } -// static sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp, const rtl::OUString& rName, sal_Bool bDefault ) { @@ -83,7 +81,6 @@ sal_Bool ScUnoHelpFunctions::GetBoolProperty( const uno::Reference<beans::XPrope return bRet; } -// static sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XPropertySet>& xProp, const rtl::OUString& rName, long nDefault ) { @@ -103,7 +100,6 @@ sal_Int32 ScUnoHelpFunctions::GetLongProperty( const uno::Reference<beans::XProp return nRet; } -// static sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XPropertySet>& xProp, const rtl::OUString& rName, long nDefault ) { @@ -133,7 +129,6 @@ sal_Int32 ScUnoHelpFunctions::GetEnumProperty( const uno::Reference<beans::XProp return nRet; } -// static OUString ScUnoHelpFunctions::GetStringProperty( const Reference<beans::XPropertySet>& xProp, const OUString& rName, const OUString& rDefault ) { @@ -153,7 +148,6 @@ OUString ScUnoHelpFunctions::GetStringProperty( return aRet; } -// static sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny ) { if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN ) @@ -161,7 +155,6 @@ sal_Bool ScUnoHelpFunctions::GetBoolFromAny( const uno::Any& aAny ) return FALSE; } -// static sal_Int16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny ) { sal_Int16 nRet = 0; @@ -170,7 +163,6 @@ sal_Int16 ScUnoHelpFunctions::GetInt16FromAny( const uno::Any& aAny ) return 0; } -// static sal_Int32 ScUnoHelpFunctions::GetInt32FromAny( const uno::Any& aAny ) { sal_Int32 nRet = 0; @@ -179,7 +171,6 @@ sal_Int32 ScUnoHelpFunctions::GetInt32FromAny( const uno::Any& aAny ) return 0; } -// static sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny ) { sal_Int32 nRet = 0; @@ -190,13 +181,11 @@ sal_Int32 ScUnoHelpFunctions::GetEnumFromAny( const uno::Any& aAny ) return nRet; } -// static void ScUnoHelpFunctions::SetBoolInAny( uno::Any& rAny, sal_Bool bValue ) { rAny.setValue( &bValue, getBooleanCppuType() ); } -// static void ScUnoHelpFunctions::SetOptionalPropertyValue( Reference<beans::XPropertySet>& rPropSet, const sal_Char* pPropName, const Any& rVal ) { diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index a480b3a41fd6..c71487d8f6db 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -461,7 +461,6 @@ sal_Int64 SAL_CALL ScNamedRangeObj::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -478,7 +477,6 @@ const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId() return *pSeq; } -// static ScNamedRangeObj* ScNamedRangeObj::getImplementation( const uno::Reference<uno::XInterface> xObj ) { ScNamedRangeObj* pRet = NULL; diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index bfd6e631bd31..e8a5f535a35c 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -43,7 +43,6 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -// static const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() { static SfxItemPropertyMapEntry aMap[] = @@ -65,7 +64,6 @@ const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() return aMap; } -// static sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, const rtl::OUString& aPropertyName, const uno::Any& aValue ) @@ -138,7 +136,6 @@ sal_Bool ScDocOptionsHelper::setPropertyValue( ScDocOptions& rOptions, return sal_True; } -// static uno::Any ScDocOptionsHelper::getPropertyValue( const ScDocOptions& rOptions, const SfxItemPropertyMap& rPropMap, diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index bd86f2964340..73d12bffa619 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -81,7 +81,6 @@ const SfxItemPropertyMapEntry* lcl_GetShapeMap() return aShapeMap_Impl; } -// static const SvEventDescription* ScShapeObj::GetSupportedMacroItems() { static const SvEventDescription aMacroDescriptionsImpl[] = diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index b6b6d907fe0b..6bc561ec4201 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -242,7 +242,6 @@ sal_Int64 SAL_CALL ScCellSearchObj::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScCellSearchObj::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -259,7 +258,6 @@ const uno::Sequence<sal_Int8>& ScCellSearchObj::getUnoTunnelId() return *pSeq; } -// static ScCellSearchObj* ScCellSearchObj::getImplementation( const uno::Reference<util::XSearchDescriptor> xObj ) { diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 85ea48a88b8f..61ab291076f2 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -492,7 +492,6 @@ BOOL lcl_EndsWithUser( const String& rString ) pChar[nLen-1] == ')'; } -// static String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName, UINT16 nType ) { BOOL bDisplayIsProgrammatic = FALSE; @@ -523,7 +522,6 @@ String ScStyleNameConversion::DisplayToProgrammaticName( const String& rDispName return rDispName; } -// static String ScStyleNameConversion::ProgrammaticToDisplayName( const String& rProgName, UINT16 nType ) { if ( lcl_EndsWithUser( rProgName ) ) @@ -1132,7 +1130,6 @@ sal_Int64 SAL_CALL ScStyleObj::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScStyleObj::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -1149,7 +1146,6 @@ const uno::Sequence<sal_Int8>& ScStyleObj::getUnoTunnelId() return *pSeq; } -// static ScStyleObj* ScStyleObj::getImplementation( const uno::Reference<uno::XInterface> xObj ) { @@ -1304,7 +1300,6 @@ void SAL_CALL ScStyleObj::setName( const rtl::OUString& aNewName ) } } -// static uno::Reference<container::XIndexReplace> ScStyleObj::CreateEmptyNumberingRules() { SvxNumRule aRule( 0, 0, TRUE ); // nothing supported diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index dccf1d166257..254cff9403d7 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -383,7 +383,7 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs //! wie ScCellObj::createTextCursorByRange, wenn SvxUnoTextRange_getReflection verfuegbar } -void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) // static +void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) { String aDummy(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( "???" ))); rData.aTitle = aDummy; diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index fff4fe64d8ba..aa736ac5ad5b 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -336,14 +336,12 @@ void lcl_SingleRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rR rAPI.Flags = nFlags; } -// static bool ScTokenConversion::ConvertToTokenArray( ScDocument& rDoc, ScTokenArray& rTokenArray, const uno::Sequence<sheet::FormulaToken>& rSequence ) { return !rTokenArray.Fill(rSequence,rDoc.GetExternalRefManager()); } -// static bool ScTokenConversion::ConvertToTokenSequence( ScDocument& rDoc, uno::Sequence<sheet::FormulaToken>& rSequence, const ScTokenArray& rTokenArray ) { diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 43ff644b3781..1752d380d8d4 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -2289,7 +2289,6 @@ sal_Int64 SAL_CALL ScTabViewObj::getSomething( return 0; } -// static const uno::Sequence<sal_Int8>& ScTabViewObj::getUnoTunnelId() { static uno::Sequence<sal_Int8> * pSeq = 0; @@ -2306,7 +2305,6 @@ const uno::Sequence<sal_Int8>& ScTabViewObj::getUnoTunnelId() return *pSeq; } -// static ScTabViewObj* ScTabViewObj::getImplementation( const uno::Reference<uno::XInterface> xObj ) { ScTabViewObj* pRet = NULL; diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index dd746eb57aec..8eaa0a0950bd 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -407,7 +407,7 @@ ScVbaRange::getScDocShell() throw (uno::RuntimeException) return excel::GetDocShellFromRange( mxRange ); } -/*static*/ ScVbaRange* ScVbaRange::getImplementation( const uno::Reference< excel::XRange >& rxRange ) +ScVbaRange* ScVbaRange::getImplementation( const uno::Reference< excel::XRange >& rxRange ) { // FIXME: always save to use dynamic_cast? Or better to (implement and) use XTunnel? return dynamic_cast< ScVbaRange* >( rxRange.get() ); @@ -420,7 +420,7 @@ uno::Reference< frame::XModel > ScVbaRange::getUnoModel() throw (uno::RuntimeExc throw uno::RuntimeException(); } -/*static*/ uno::Reference< frame::XModel > ScVbaRange::getUnoModel( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) +uno::Reference< frame::XModel > ScVbaRange::getUnoModel( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) { if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) ) return pScVbaRange->getUnoModel(); @@ -434,7 +434,7 @@ const ScRangeList& ScVbaRange::getScRangeList() throw (uno::RuntimeException) throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cannot obtain UNO range implementation object" ) ), uno::Reference< uno::XInterface >() ); } -/*static*/ const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) +const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) { if( ScVbaRange* pScVbaRange = getImplementation( rxRange ) ) return pScVbaRange->getScRangeList(); @@ -2822,7 +2822,7 @@ uno::Any SAL_CALL ScVbaRange::getCellRange( ) throw (uno::RuntimeException) return aAny; } -/*static*/ uno::Any ScVbaRange::getCellRange( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) +uno::Any ScVbaRange::getCellRange( const uno::Reference< excel::XRange >& rxRange ) throw (uno::RuntimeException) { if( ScVbaRange* pVbaRange = getImplementation( rxRange ) ) return pVbaRange->getCellRange(); diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index a96dc2970875..940ffa5a37d6 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -53,7 +53,6 @@ using namespace com::sun::star; //================================================================== -// static USHORT ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCharts ) { ScDrawLayer* pModel = pDoc->GetDrawLayer(); |