diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-09-05 17:39:16 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-09-10 17:31:15 +0000 |
| commit | d2ddff7b355fac5ba7ec93f866ea52f462dbc6fe (patch) | |
| tree | 69e7f3983c9ed1ed7af7a1af762dd2d2809d3e6a /sc/source | |
| parent | 7dc7d77cd0b142ea3fde93368334d1e4909d94da (diff) | |
fdo#62475 removed pointless comments
Conflicts:
sc/source/core/tool/interpr1.cxx
sc/source/core/tool/interpr4.cxx
sc/source/core/tool/token.cxx
Change-Id: I507d747b6c087d089203f7bce6be836da28fc537
Reviewed-on: https://gerrit.libreoffice.org/5824
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat (limited to 'sc/source')
53 files changed, 38 insertions, 819 deletions
diff --git a/sc/source/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx index e322f12928e5..db6cc3474687 100644 --- a/sc/source/core/tool/addincfg.cxx +++ b/sc/source/core/tool/addincfg.cxx @@ -28,8 +28,6 @@ using namespace com::sun::star; -//================================================================== - #define CFGPATH_ADDINS "Office.CalcAddIns/AddInInfo" ScAddInCfg::ScAddInCfg() : @@ -55,5 +53,4 @@ void ScAddInCfg::Notify( const uno::Sequence<OUString>& ) ScGlobal::ResetFunctionList(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 719b9c1fbad9..894d42fbaef1 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -218,8 +218,6 @@ void ScUnoAddInFuncData::SetCallerPos( long nNewPos ) nCallerPos = nNewPos; } -//------------------------------------------------------------------------ - ScUnoAddInCollection::ScUnoAddInCollection() : nFuncCount( 0 ), ppFuncData( NULL ), @@ -314,7 +312,6 @@ void ScUnoAddInCollection::Initialize() bInitialized = true; // with or without functions } -// ----------------------------------------------------------------------------- static sal_uInt16 lcl_GetCategory( const OUString& rName ) { @@ -341,7 +338,6 @@ static sal_uInt16 lcl_GetCategory( const OUString& rName ) return ID_FUNCTION_GRP_ADDINS; // if not found, use Add-In group } - #define CFGPATH_ADDINS "Office.CalcAddIns/AddInInfo" #define CFGSTR_ADDINFUNCTIONS "AddInFunctions" @@ -357,7 +353,6 @@ static sal_uInt16 lcl_GetCategory( const OUString& rName ) #define CFGSTR_COMPATIBILITYNAME "CompatibilityName" #define CFGSTR_PARAMETERS "Parameters" - void ScUnoAddInCollection::ReadConfiguration() { // called only from Initialize @@ -1208,7 +1203,6 @@ void ScUnoAddInCollection::LocalizeString( OUString& rName ) rName = iLook->second->GetUpperLocal(); //! upper? } - long ScUnoAddInCollection::GetFuncCount() { if (!bInitialized) @@ -1294,9 +1288,6 @@ bool ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r return true; } - -//------------------------------------------------------------------------ - ScUnoAddInCall::ScUnoAddInCall( ScUnoAddInCollection& rColl, const OUString& rName, long nParamCount ) : bValidCount( false ), diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index 5b41833ba445..f06962dca504 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.cxx @@ -17,12 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "addinhelpid.hxx" #include "sc.hrc" -// ============================================================================ - // A struct containing the built-in function name and the built-in help ID. struct ScUnoAddInHelpId { @@ -30,9 +27,6 @@ struct ScUnoAddInHelpId const sal_Char* sHelpId; }; - -// ---------------------------------------------------------------------------- - // Help IDs for Analysis AddIn. MUST BE SORTED for binary search. const ScUnoAddInHelpId pAnalysisHelpIds[] = { @@ -139,9 +133,6 @@ const ScUnoAddInHelpId pAnalysisHelpIds[] = { "getYieldmat" , HID_AAI_FUNC_YIELDMAT } }; - -// ---------------------------------------------------------------------------- - // Help IDs for DateFunc AddIn. MUST BE SORTED for binary search. const ScUnoAddInHelpId pDateFuncHelpIds[] = { @@ -154,10 +145,6 @@ const ScUnoAddInHelpId pDateFuncHelpIds[] = { "getWeeksInYear" , HID_DAI_FUNC_WEEKSINYEAR } }; - -// ============================================================================ - - ScUnoAddInHelpIdGenerator::ScUnoAddInHelpIdGenerator( const OUString& rServiceName ) { SetServiceName( rServiceName ); @@ -205,7 +192,4 @@ OString ScUnoAddInHelpIdGenerator::GetHelpId( const OUString& rFuncName ) const return OString(); } - -// ============================================================================ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index f528b77b62f6..3a8aed3640bf 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -46,9 +46,6 @@ ScAddress::Details::Details ( const ScDocument* pDoc, { } - -//////////////////////////////////////////////////////////////////////////// - /** * Parse from the opening single quote to the closing single quote. Inside * the quotes, a single quote character is encoded by double single-quote @@ -332,7 +329,6 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start, return p; } - /** Tries to obtain the external document index and replace by actual document name. @@ -389,7 +385,6 @@ static bool lcl_XL_getExternalDoc( const sal_Unicode** ppErrRet, String& rExtern return true; } - const sal_Unicode* ScRange::Parse_XL_Header( const sal_Unicode* p, const ScDocument* pDoc, @@ -573,7 +568,6 @@ const sal_Unicode* ScRange::Parse_XL_Header( return p; } - static const sal_Unicode* lcl_r1c1_get_col( const sal_Unicode* p, const ScAddress::Details& rDetails, @@ -1268,7 +1262,6 @@ lcl_ScAddress_Parse ( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAddr, } } - bool ConvertSingleRef( ScDocument* pDoc, const String& rRefString, SCTAB nDefTab, ScRefAddress& rRefAddress, const ScAddress::Details& rDetails, @@ -1291,7 +1284,6 @@ bool ConvertSingleRef( ScDocument* pDoc, const String& rRefString, return bRet; } - bool ConvertDoubleRef( ScDocument* pDoc, const String& rRefString, SCTAB nDefTab, ScRefAddress& rStartRefAddress, ScRefAddress& rEndRefAddress, const ScAddress::Details& rDetails, @@ -1318,7 +1310,6 @@ bool ConvertDoubleRef( ScDocument* pDoc, const String& rRefString, SCTAB nDefTab return bRet; } - sal_uInt16 ScAddress::Parse( const String& r, ScDocument* pDoc, const Details& rDetails, ExternalInfo* pExtInfo, @@ -1327,7 +1318,6 @@ sal_uInt16 ScAddress::Parse( const String& r, ScDocument* pDoc, return lcl_ScAddress_Parse( r.GetBuffer(), pDoc, *this, rDetails, pExtInfo, pExternalLinks ); } - bool ScRange::Intersects( const ScRange& r ) const { return !( @@ -1477,7 +1467,6 @@ sal_uInt16 ScRange::Parse( const String& r, ScDocument* pDoc, } } - // Accept a full range, or an address sal_uInt16 ScRange::ParseAny( const String& r, ScDocument* pDoc, const ScAddress::Details& rDetails ) @@ -1965,14 +1954,12 @@ bool ScAddress::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScDocument* pDoc ) return bValid; } - bool ScRange::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScDocument* pDoc ) { // single & to process both return aStart.Move( dx, dy, dz, pDoc ) & aEnd.Move( dx, dy, dz, pDoc ); } - String ScAddress::GetColRowString( bool bAbsolute, const Details& rDetails ) const { @@ -2004,7 +1991,6 @@ String ScAddress::GetColRowString( bool bAbsolute, return aString; } - String ScRefAddress::GetRefString( ScDocument* pDoc, SCTAB nActTab, const ScAddress::Details& rDetails ) const { @@ -2028,8 +2014,6 @@ String ScRefAddress::GetRefString( ScDocument* pDoc, SCTAB nActTab, return aAdr.Format(nFlags, pDoc, rDetails); } -//------------------------------------------------------------------------ - void ScColToAlpha( OUStringBuffer& rBuf, SCCOL nCol ) { if (nCol < 26*26) @@ -2062,7 +2046,6 @@ void ScColToAlpha( OUStringBuffer& rBuf, SCCOL nCol ) } } - bool AlphaToCol( SCCOL& rCol, const String& rStr) { SCCOL nResult = 0; diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx index f5e5edb1b8da..e5f65fdf489f 100644 --- a/sc/source/core/tool/adiasync.cxx +++ b/sc/source/core/tool/adiasync.cxx @@ -26,13 +26,9 @@ #include "sc.hrc" // FID_DATACHANGED #include <osl/thread.h> - -//------------------------------------------------------------------------ - ScAddInAsyncs theAddInAsyncTbl; static ScAddInAsync aSeekObj; - extern "C" { void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData ) { @@ -40,16 +36,12 @@ void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData ) } } - - ScAddInAsync::ScAddInAsync() : SvtBroadcaster(), nHandle( 0 ) { // nur fuer aSeekObj ! } - - ScAddInAsync::ScAddInAsync(sal_uLong nHandleP, FuncData* pFuncData, ScDocument* pDoc) : SvtBroadcaster(), pStr( NULL ), @@ -63,8 +55,6 @@ ScAddInAsync::ScAddInAsync(sal_uLong nHandleP, FuncData* pFuncData, ScDocument* theAddInAsyncTbl.insert( this ); } - - ScAddInAsync::~ScAddInAsync() { // aSeekObj does not have that, handle 0 does not exist otherwise @@ -78,8 +68,6 @@ ScAddInAsync::~ScAddInAsync() } } - - ScAddInAsync* ScAddInAsync::Get( sal_uLong nHandleP ) { ScAddInAsync* pRet = 0; @@ -91,8 +79,6 @@ ScAddInAsync* ScAddInAsync::Get( sal_uLong nHandleP ) return pRet; } - - void ScAddInAsync::CallBack( sal_uLong nHandleP, void* pData ) { ScAddInAsync* p; @@ -132,8 +118,6 @@ void ScAddInAsync::CallBack( sal_uLong nHandleP, void* pData ) } } - - void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP ) { if ( !theAddInAsyncTbl.empty() ) @@ -156,6 +140,4 @@ void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index 45a256e6daa2..74abab2b14db 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -34,31 +34,23 @@ using namespace utl; using namespace com::sun::star::uno; -//======================================================================== // ScAppOptions - Applikations-Optionen -//======================================================================== ScAppOptions::ScAppOptions() : pLRUList( NULL ) { SetDefaults(); } -//------------------------------------------------------------------------ - ScAppOptions::ScAppOptions( const ScAppOptions& rCpy ) : pLRUList( NULL ) { *this = rCpy; } -//------------------------------------------------------------------------ - ScAppOptions::~ScAppOptions() { delete [] pLRUList; } -//------------------------------------------------------------------------ - void ScAppOptions::SetDefaults() { if ( ScOptionsUtil::IsMetricSystem() ) @@ -117,7 +109,6 @@ const ScAppOptions& ScAppOptions::operator=( const ScAppOptions& rCpy ) meKeyBindingType = rCpy.meKeyBindingType; return *this; } -//------------------------------------------------------------------------ void ScAppOptions::SetLRUFuncList( const sal_uInt16* pList, const sal_uInt16 nCount ) { @@ -136,9 +127,7 @@ void ScAppOptions::SetLRUFuncList( const sal_uInt16* pList, const sal_uInt16 nCo pLRUList = NULL; } -//================================================================== // Config Item containing app options -//================================================================== static void lcl_SetLastFunctions( ScAppOptions& rOpt, const Any& rValue ) { @@ -221,8 +210,6 @@ static void lcl_GetSortList( Any& rDest ) rDest <<= Sequence<OUString>(0); // empty } -//------------------------------------------------------------------ - #define CFGPATH_LAYOUT "Office.Calc/Layout" #define SCLAYOUTOPT_MEASURE 0 @@ -779,5 +766,4 @@ void ScAppCfg::OptionsChanged() aCompatItem.SetModified(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 234ec8e10b8b..4a5e82a85817 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -82,7 +82,6 @@ const sal_uInt16 AUTOFORMAT_DATA_ID_31005 = 10042; const sal_uInt16 AUTOFORMAT_ID = AUTOFORMAT_ID_31005; const sal_uInt16 AUTOFORMAT_DATA_ID = AUTOFORMAT_DATA_ID_31005; - namespace { /// Read an AutoFormatSwBlob from stream. @@ -209,8 +208,6 @@ void ScAfVersions::Write(SvStream& rStream, sal_uInt16 fileVersion) rStream << (sal_uInt16)0; // Num-Format } -// --------------------------------------------------------------------------- - ScAutoFormatDataField::ScAutoFormatDataField() : aFont( ATTR_FONT ), aHeight( 240, 100, ATTR_FONT_HEIGHT ), @@ -436,9 +433,6 @@ sal_Bool ScAutoFormatDataField::Save( SvStream& rStream, sal_uInt16 fileVersion return (rStream.GetError() == 0); } - -// --------------------------------------------------------------------------- - ScAutoFormatData::ScAutoFormatData() { nStrResId = USHRT_MAX; @@ -823,9 +817,6 @@ bool ScAutoFormatData::Save(SvStream& rStream, sal_uInt16 fileVersion) return bRet; } -//--------------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------------- - ScAutoFormat::ScAutoFormat() : mbSaveLater(false) { @@ -1104,7 +1095,6 @@ bool ScAutoFormat::Save() bRet &= (rStream.GetError() == 0); - //----------------------------------------------------------- rStream << (sal_uInt16)(maData.size() - 1); bRet &= (rStream.GetError() == 0); MapType::iterator it = maData.begin(), itEnd = maData.end(); diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx index 8fd8ea28ce6b..13f011c5b947 100644 --- a/sc/source/core/tool/callform.cxx +++ b/sc/source/core/tool/callform.cxx @@ -26,8 +26,6 @@ #include "global.hxx" #include "adiasync.hxx" -//------------------------------------------------------------------------ - extern "C" { typedef void (CALLTYPE* ExFuncPtr1)(void*); @@ -97,8 +95,6 @@ public: void FreeInstance() { delete pInstance; pInstance = 0; } }; -//------------------------------------------------------------------------ - FuncData::FuncData(const ModuleData*pModule, const OUString& rIName, const OUString& rFName, @@ -117,8 +113,6 @@ FuncData::FuncData(const ModuleData*pModule, eParamType[i] = peType[i]; } -//------------------------------------------------------------------------ - FuncData::FuncData(const FuncData& rData) : pModuleData (rData.pModuleData), aInternalName (rData.aInternalName), @@ -257,15 +251,11 @@ bool InitExternalFunc(const OUString& rModuleName) #endif } -//------------------------------------------------------------------------ - void ExitExternalFunc() { aModuleCollection.clear(); } -//------------------------------------------------------------------------ - bool FuncData::Call(void** ppParam) const { #ifdef DISABLE_DYNLOADING @@ -364,8 +354,6 @@ bool FuncData::Call(void** ppParam) const #endif } -//------------------------------------------------------------------------ - bool FuncData::Unadvice( double nHandle ) { #ifdef DISABLE_DYNLOADING @@ -384,8 +372,6 @@ bool FuncData::Unadvice( double nHandle ) #endif } -//------------------------------------------------------------------------ - const OUString& FuncData::GetModuleName() const { return pModuleData->GetName(); @@ -456,5 +442,4 @@ FuncCollection::const_iterator FuncCollection::end() const return maData.end(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx index bc65f9199a39..57ada4a4d3d2 100644 --- a/sc/source/core/tool/cellform.cxx +++ b/sc/source/core/tool/cellform.cxx @@ -28,8 +28,7 @@ #include "formula/errorcodes.hxx" #include "sc.hrc" -// STATIC DATA ----------------------------------------------------------- - +// STATIC DATA // Err527 Workaround const ScFormulaCell* pLastFormulaTreeTop = 0; @@ -263,6 +262,4 @@ void ScCellFormat::GetInputString( rString = aString; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 6929e42963c6..67fa14aa3d68 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -33,8 +33,6 @@ using ::std::vector; -// ----------------------------------------------------------------------- - ScMemChart::ScMemChart(short nCols, short nRows) { nRowCnt = nRows; @@ -61,8 +59,6 @@ ScMemChart::~ScMemChart() delete[] pData; } -// ----------------------------------------------------------------------- - ScChartArray::ScChartArray( ScDocument* pDoc, SCTAB nTab, SCCOL nStartColP, SCROW nStartRowP, SCCOL nEndColP, SCROW nEndRowP, const OUString& rChartName ) : diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 5498ee62b095..cb2d152041bd 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "charthelper.hxx" #include "document.hxx" #include "drwlayer.hxx" @@ -35,13 +34,9 @@ using namespace com::sun::star; using ::com::sun::star::uno::Reference; - -// ==================================================================== - namespace { - sal_uInt16 lcl_DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts ) { ScDrawLayer* pModel = pDoc->GetDrawLayer(); @@ -116,8 +111,7 @@ bool lcl_AdjustRanges( ScRangeList& rRanges, SCTAB nSourceTab, SCTAB nDestTab, S }//end anonymous namespace -// === ScChartHelper ====================================== - +// ScChartHelper //static sal_uInt16 ScChartHelper::DoUpdateAllCharts( ScDocument* pDoc ) { diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index db5096aeafff..644b4c14a702 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -36,9 +36,6 @@ using ::std::for_each; // which register UNO listeners. #define SC_CHARTTIMEOUT 10 - -// ==================================================================== - class ScChartUnoData { uno::Reference< chart::XChartDataChangeEventListener > xListener; @@ -54,9 +51,7 @@ public: const uno::Reference< chart::XChartData >& GetSource() const { return xSource; } }; - -// === ScChartListener ================================================ - +// ScChartListener ScChartListener::ExternalRefListener::ExternalRefListener(ScChartListener& rParent, ScDocument* pDoc) : mrParent(rParent), mpDoc(pDoc) { @@ -105,8 +100,6 @@ boost::unordered_set<sal_uInt16>& ScChartListener::ExternalRefListener::getAllFi return maFileIds; } -// ---------------------------------------------------------------------------- - ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, const ScRangeListRef& rRangeList ) : SvtListener(), @@ -338,7 +331,6 @@ void ScChartListener::EndListeningTo() for_each(mpTokens->begin(), mpTokens->end(), StartEndListening(mpDoc, *this, false)); } - void ScChartListener::ChangeListening( const ScRangeListRef& rRangeListRef, bool bDirtyP ) { @@ -349,7 +341,6 @@ void ScChartListener::ChangeListening( const ScRangeListRef& rRangeListRef, SetDirty( true ); } - void ScChartListener::UpdateScheduledSeriesRanges() { if ( bSeriesRangesScheduled ) @@ -359,7 +350,6 @@ void ScChartListener::UpdateScheduledSeriesRanges() } } - void ScChartListener::UpdateChartIntersecting( const ScRange& rRange ) { ScTokenRef pToken; @@ -372,7 +362,6 @@ void ScChartListener::UpdateChartIntersecting( const ScRange& rRange ) } } - void ScChartListener::UpdateSeriesRanges() { ScRangeListRef pRangeList(new ScRangeList); @@ -416,8 +405,6 @@ bool ScChartListener::operator!=( const ScChartListener& r ) const return !operator==(r); } -// ============================================================================ - ScChartHiddenRangeListener::ScChartHiddenRangeListener() { } @@ -427,8 +414,7 @@ ScChartHiddenRangeListener::~ScChartHiddenRangeListener() // empty d'tor } -// === ScChartListenerCollection ====================================== - +// ScChartListenerCollection ScChartListenerCollection::RangeListenerItem::RangeListenerItem(const ScRange& rRange, ScChartHiddenRangeListener* p) : maRange(rRange), mpListener(p) { @@ -652,7 +638,6 @@ void ScChartListenerCollection::UpdateDirtyCharts() } } - void ScChartListenerCollection::SetDirty() { ListenersType::iterator it = maListeners.begin(), itEnd = maListeners.end(); @@ -662,7 +647,6 @@ void ScChartListenerCollection::SetDirty() StartTimer(); } - void ScChartListenerCollection::SetDiffDirty( const ScChartListenerCollection& rCmp, bool bSetChartRangeLists ) { @@ -697,7 +681,6 @@ void ScChartListenerCollection::SetDiffDirty( StartTimer(); } - void ScChartListenerCollection::SetRangeDirty( const ScRange& rRange ) { bool bDirty = false; @@ -724,7 +707,6 @@ void ScChartListenerCollection::SetRangeDirty( const ScRange& rRange ) } } - void ScChartListenerCollection::UpdateScheduledSeriesRanges() { ListenersType::iterator it = maListeners.begin(), itEnd = maListeners.end(); @@ -732,7 +714,6 @@ void ScChartListenerCollection::UpdateScheduledSeriesRanges() it->second->UpdateScheduledSeriesRanges(); } - void ScChartListenerCollection::UpdateChartsContainingTab( SCTAB nTab ) { ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab ); @@ -741,7 +722,6 @@ void ScChartListenerCollection::UpdateChartsContainingTab( SCTAB nTab ) it->second->UpdateChartIntersecting(aRange); } - bool ScChartListenerCollection::operator==( const ScChartListenerCollection& r ) const { // Do not use ScStrCollection::operator==() here that uses IsEqual und Compare. diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx index 5e73c8273866..dfc2b5c20f97 100644 --- a/sc/source/core/tool/chartlock.cxx +++ b/sc/source/core/tool/chartlock.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/svapp.hxx> #include <svx/svditer.hxx> #include <svx/svdoole2.hxx> @@ -35,8 +34,6 @@ using ::com::sun::star::uno::WeakReference; #define SC_CHARTLOCKTIMEOUT 660 -// ==================================================================== - namespace { @@ -80,8 +77,7 @@ std::vector< WeakReference< frame::XModel > > lcl_getAllLivingCharts( ScDocument }//end anonymous namespace -// === ScChartLockGuard ====================================== - +// ScChartLockGuard ScChartLockGuard::ScChartLockGuard( ScDocument* pDoc ) : maChartModels( lcl_getAllLivingCharts( pDoc ) ) { @@ -145,8 +141,7 @@ void ScChartLockGuard::AlsoLockThisChart( const Reference< frame::XModel >& xMod } } -// === ScTemporaryChartLock ====================================== - +// ScTemporaryChartLock ScTemporaryChartLock::ScTemporaryChartLock( ScDocument* pDocP ) : mpDoc( pDocP ) { @@ -154,7 +149,6 @@ ScTemporaryChartLock::ScTemporaryChartLock( ScDocument* pDocP ) : maTimer.SetTimeoutHdl( LINK( this, ScTemporaryChartLock, TimeoutHdl ) ); } - ScTemporaryChartLock::~ScTemporaryChartLock() { mpDoc = 0; diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 64951951ff62..5ba0e350b320 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -106,7 +106,6 @@ ScChangeAction::ScChangeAction( ScChangeActionType eTypeP, const ScBigRange& rRa aDateTime.ConvertToUTC(); } - ScChangeAction::~ScChangeAction() { RemoveAllLinks(); @@ -152,7 +151,6 @@ bool ScChangeAction::IsVisible() const return true; } - bool ScChangeAction::IsTouchable() const { //! sequence order of execution is significant @@ -166,7 +164,6 @@ bool ScChangeAction::IsTouchable() const return true; } - bool ScChangeAction::IsClickable() const { //! sequence order of execution is significant @@ -198,7 +195,6 @@ bool ScChangeAction::IsClickable() const return IsTouchable(); // Accept()/Reject() only on touchables } - bool ScChangeAction::IsRejectable() const { //! sequence order of execution is significant @@ -217,7 +213,6 @@ bool ScChangeAction::IsRejectable() const return IsTouchable(); } - bool ScChangeAction::IsInternalRejectable() const { //! sequence order of execution is significant @@ -236,13 +231,11 @@ bool ScChangeAction::IsInternalRejectable() const return IsTouchable(); } - bool ScChangeAction::IsDialogRoot() const { return IsInternalRejectable(); // only rejectables in root } - bool ScChangeAction::IsDialogParent() const { //! sequence order of execution is significant @@ -279,7 +272,6 @@ bool ScChangeAction::IsDialogParent() const return false; } - bool ScChangeAction::IsMasterDelete() const { if ( !IsDeleteType() ) @@ -288,7 +280,6 @@ bool ScChangeAction::IsMasterDelete() const return pDel->IsMultiDelete() && (pDel->IsTopDelete() || pDel->IsRejectable()); } - void ScChangeAction::RemoveAllLinks() { RemoveAllAnyLinks(); @@ -297,14 +288,12 @@ void ScChangeAction::RemoveAllLinks() RemoveAllDependent(); } - void ScChangeAction::RemoveAllAnyLinks() { while ( pLinkAny ) delete pLinkAny; // rueckt sich selbst hoch } - bool ScChangeAction::RemoveDeletedIn( const ScChangeAction* p ) { bool bRemoved = false; @@ -400,21 +389,18 @@ void ScChangeAction::SetDeletedIn( ScChangeAction* p ) pLink1->SetLink( pLink2 ); } - void ScChangeAction::RemoveAllDeleted() { while ( pLinkDeleted ) delete pLinkDeleted; // rueckt sich selbst hoch } - void ScChangeAction::RemoveAllDependent() { while ( pLinkDependent ) delete pLinkDependent; // rueckt sich selbst hoch } - DateTime ScChangeAction::GetDateTime() const { DateTime aDT( aDateTime ); @@ -422,7 +408,6 @@ DateTime ScChangeAction::GetDateTime() const return aDT; } - void ScChangeAction::UpdateReference( const ScChangeTrack* /* pTrack */, UpdateRefMode eMode, const ScBigRange& rRange, sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) @@ -430,7 +415,6 @@ void ScChangeAction::UpdateReference( const ScChangeTrack* /* pTrack */, ScRefUpdate::Update( eMode, rRange, nDx, nDy, nDz, GetBigRange() ); } - void ScChangeAction::GetDescription( OUString& rStr, ScDocument* /* pDoc */, bool /* bSplitRange */, bool bWarning ) const { @@ -513,7 +497,6 @@ void ScChangeAction::GetDescription( } } - OUString ScChangeAction::GetRefString( const ScBigRange& rRange, ScDocument* pDoc, bool bFlag3D ) const { @@ -595,7 +578,6 @@ void ScChangeAction::GetRefString( rStr = GetRefString( GetBigRange(), pDoc, bFlag3D ); } - void ScChangeAction::Accept() { if ( IsVirgin() ) @@ -605,7 +587,6 @@ void ScChangeAction::Accept() } } - void ScChangeAction::SetRejected() { if ( IsVirgin() ) @@ -616,7 +597,6 @@ void ScChangeAction::SetRejected() } } - void ScChangeAction::RejectRestoreContents( ScChangeTrack* pTrack, SCsCOL nDx, SCsROW nDy ) { @@ -651,7 +631,6 @@ void ScChangeAction::RejectRestoreContents( ScChangeTrack* pTrack, DeleteCellEntries(); // weg mit den generierten } - void ScChangeAction::SetDeletedInThis( sal_uLong nActionNumber, const ScChangeTrack* pTrack ) { @@ -664,7 +643,6 @@ void ScChangeAction::SetDeletedInThis( sal_uLong nActionNumber, } } - void ScChangeAction::AddDependent( sal_uLong nActionNumber, const ScChangeTrack* pTrack ) { @@ -680,8 +658,7 @@ void ScChangeAction::AddDependent( sal_uLong nActionNumber, } } -// --- ScChangeActionIns --------------------------------------------------- - +// ScChangeActionIns ScChangeActionIns::ScChangeActionIns( const ScRange& rRange ) : ScChangeAction( SC_CAT_NONE, rRange ) { @@ -710,7 +687,6 @@ ScChangeActionIns::ScChangeActionIns( const ScRange& rRange ) } } - ScChangeActionIns::ScChangeActionIns( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aBigRangeP, @@ -790,9 +766,7 @@ bool ScChangeActionIns::Reject( ScDocument* pDoc ) return true; } - -// --- ScChangeActionDel --------------------------------------------------- - +// ScChangeActionDel ScChangeActionDel::ScChangeActionDel( const ScRange& rRange, SCsCOL nDxP, SCsROW nDyP, ScChangeTrack* pTrackP ) : @@ -830,7 +804,6 @@ ScChangeActionDel::ScChangeActionDel( const ScRange& rRange, } } - ScChangeActionDel::ScChangeActionDel( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aBigRangeP, @@ -865,19 +838,16 @@ void ScChangeActionDel::AddContent( ScChangeActionContent* pContent ) pFirstCell = pE; } - void ScChangeActionDel::DeleteCellEntries() { pTrack->DeleteCellEntries( pFirstCell, this ); } - bool ScChangeActionDel::IsBaseDelete() const { return !GetDx() && !GetDy(); } - bool ScChangeActionDel::IsTopDelete() const { const ScChangeAction* p = GetNext(); @@ -886,7 +856,6 @@ bool ScChangeActionDel::IsTopDelete() const return ((ScChangeActionDel*)p)->IsBaseDelete(); } - bool ScChangeActionDel::IsMultiDelete() const { if ( GetDx() || GetDy() ) @@ -901,7 +870,6 @@ bool ScChangeActionDel::IsMultiDelete() const return false; } - bool ScChangeActionDel::IsTabDeleteCol() const { if ( GetType() != SC_CAT_DELETE_COLS ) @@ -959,7 +927,6 @@ void ScChangeActionDel::UpdateReference( const ScChangeTrack* /* pTrack */, } } - ScBigRange ScChangeActionDel::GetOverAllRange() const { ScBigRange aTmpRange( GetBigRange() ); @@ -968,7 +935,6 @@ ScBigRange ScChangeActionDel::GetOverAllRange() const return aTmpRange; } - void ScChangeActionDel::GetDescription( OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { @@ -1016,13 +982,11 @@ void ScChangeActionDel::GetDescription( } } - bool ScChangeActionDel::Reject( ScDocument* pDoc ) { if ( !aBigRange.IsValid( pDoc ) && GetType() != SC_CAT_DELETE_TABS ) return false; - if ( IsTopDelete() ) { // den kompletten Bereich in einem Rutsch restaurieren bool bOk = true; @@ -1091,7 +1055,6 @@ bool ScChangeActionDel::Reject( ScDocument* pDoc ) return true; } - void ScChangeActionDel::UndoCutOffMoves() { // abgeschnittene Moves wiederherstellen, Entries/Links deleten while ( pLinkMove ) @@ -1173,9 +1136,7 @@ void ScChangeActionDel::UndoCutOffInsert() } } - -// --- ScChangeActionMove -------------------------------------------------- - +// ScChangeActionMove ScChangeActionMove::ScChangeActionMove( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, const ScBigRange& aToBigRange, @@ -1196,7 +1157,6 @@ ScChangeActionMove::~ScChangeActionMove() DeleteCellEntries(); } - void ScChangeActionMove::AddContent( ScChangeActionContent* pContent ) { ScChangeActionCellListEntry* pE = new ScChangeActionCellListEntry( @@ -1204,13 +1164,11 @@ void ScChangeActionMove::AddContent( ScChangeActionContent* pContent ) pFirstCell = pE; } - void ScChangeActionMove::DeleteCellEntries() { pTrack->DeleteCellEntries( pFirstCell, this ); } - void ScChangeActionMove::UpdateReference( const ScChangeTrack* /* pTrack */, UpdateRefMode eMode, const ScBigRange& rRange, sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) @@ -1219,7 +1177,6 @@ void ScChangeActionMove::UpdateReference( const ScChangeTrack* /* pTrack */, ScRefUpdate::Update( eMode, rRange, nDx, nDy, nDz, GetBigRange() ); } - void ScChangeActionMove::GetDelta( sal_Int32& nDx, sal_Int32& nDy, sal_Int32& nDz ) const { const ScBigAddress& rToPos = GetBigRange().aStart; @@ -1229,7 +1186,6 @@ void ScChangeActionMove::GetDelta( sal_Int32& nDx, sal_Int32& nDy, sal_Int32& nD nDz = rToPos.Tab() - rFromPos.Tab(); } - void ScChangeActionMove::GetDescription( OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { @@ -1260,7 +1216,6 @@ void ScChangeActionMove::GetDescription( rStr = aBuf.makeStringAndClear(); } - void ScChangeActionMove::GetRefString( OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { @@ -1273,7 +1228,6 @@ void ScChangeActionMove::GetRefString( + ScChangeAction::GetRefString(GetBigRange(), pDoc, bFlag3D); } - bool ScChangeActionMove::Reject( ScDocument* pDoc ) { if ( !(aBigRange.IsValid( pDoc ) && aFromRange.IsValid( pDoc )) ) @@ -1336,9 +1290,7 @@ bool ScChangeActionMove::Reject( ScDocument* pDoc ) return true; } - -// --- ScChangeActionContent ----------------------------------------------- - +// ScChangeActionContent IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionContent ) ScChangeActionContent::ScChangeActionContent( const ScRange& rRange ) : @@ -1392,7 +1344,6 @@ ScChangeActionContent::~ScChangeActionContent() ClearTrack(); } - void ScChangeActionContent::ClearTrack() { RemoveFromSlot(); @@ -1402,7 +1353,6 @@ void ScChangeActionContent::ClearTrack() pNextContent->pPrevContent = pPrevContent; } - ScChangeActionContent* ScChangeActionContent::GetTopContent() const { if ( pNextContent ) @@ -1415,7 +1365,6 @@ ScChangeActionContent* ScChangeActionContent::GetTopContent() const return (ScChangeActionContent*) this; } - ScChangeActionLinkEntry* ScChangeActionContent::GetDeletedIn() const { if ( pNextContent ) @@ -1423,7 +1372,6 @@ ScChangeActionLinkEntry* ScChangeActionContent::GetDeletedIn() const return pLinkDeletedIn; } - ScChangeActionLinkEntry** ScChangeActionContent::GetDeletedInAddress() { if ( pNextContent ) @@ -1431,27 +1379,23 @@ ScChangeActionLinkEntry** ScChangeActionContent::GetDeletedInAddress() return &pLinkDeletedIn; } - void ScChangeActionContent::SetOldValue( const ScCellValue& rCell, const ScDocument* pFromDoc, ScDocument* pToDoc, sal_uLong nFormat ) { SetValue(maOldValue, maOldCell, nFormat, rCell, pFromDoc, pToDoc); } - void ScChangeActionContent::SetOldValue( const ScCellValue& rCell, const ScDocument* pFromDoc, ScDocument* pToDoc ) { SetValue(maOldValue, maOldCell, aBigRange.aStart.MakeAddress(), rCell, pFromDoc, pToDoc); } - void ScChangeActionContent::SetNewValue( const ScCellValue& rCell, ScDocument* pDoc ) { SetValue(maNewValue, maNewCell, aBigRange.aStart.MakeAddress(), rCell, pDoc, pDoc); } - void ScChangeActionContent::SetOldNewCells( const ScCellValue& rOldCell, sal_uLong nOldFormat, const ScCellValue& rNewCell, sal_uLong nNewFormat, ScDocument* pDoc ) @@ -1490,19 +1434,16 @@ void ScChangeActionContent::SetValueString( rValue = rStr; } - void ScChangeActionContent::SetOldValue( const OUString& rOld, ScDocument* pDoc ) { SetValueString(maOldValue, maOldCell, rOld, pDoc); } - void ScChangeActionContent::GetOldString( OUString& rStr, const ScDocument* pDoc ) const { GetValueString(rStr, maOldValue, maOldCell, pDoc); } - void ScChangeActionContent::GetNewString( OUString& rStr, const ScDocument* pDoc ) const { GetValueString(rStr, maNewValue, maNewCell, pDoc); @@ -1563,7 +1504,6 @@ void ScChangeActionContent::GetDescription( rStr = aBuf.makeStringAndClear(); } - void ScChangeActionContent::GetRefString( OUString& rStr, ScDocument* pDoc, bool bFlag3D ) const { @@ -1602,7 +1542,6 @@ void ScChangeActionContent::GetRefString( rStr = ScGlobal::GetRscString( STR_NOREF_STR ); } - bool ScChangeActionContent::Reject( ScDocument* pDoc ) { if ( !aBigRange.IsValid( pDoc ) ) @@ -1616,7 +1555,6 @@ bool ScChangeActionContent::Reject( ScDocument* pDoc ) return true; } - bool ScChangeActionContent::Select( ScDocument* pDoc, ScChangeTrack* pTrack, bool bOldest, ::std::stack<ScChangeActionContent*>* pRejectActions ) { @@ -1682,7 +1620,6 @@ bool ScChangeActionContent::Select( ScDocument* pDoc, ScChangeTrack* pTrack, return true; } - void ScChangeActionContent::GetStringOfCell( OUString& rStr, const ScCellValue& rCell, const ScDocument* pDoc, const ScAddress& rPos ) { @@ -1692,7 +1629,6 @@ void ScChangeActionContent::GetStringOfCell( GetStringOfCell(rStr, rCell, pDoc, 0); } - void ScChangeActionContent::GetStringOfCell( OUString& rStr, const ScCellValue& rCell, const ScDocument* pDoc, sal_uLong nFormat ) { @@ -1721,7 +1657,6 @@ void ScChangeActionContent::GetStringOfCell( } } - ScChangeActionContentCellType ScChangeActionContent::GetContentCellType( const ScCellValue& rCell ) { switch (rCell.meType) @@ -1844,7 +1779,6 @@ void ScChangeActionContent::SetCell( OUString& rStr, ScCellValue& rCell, sal_uLo } } - void ScChangeActionContent::GetValueString( OUString& rStr, const OUString& rValue, const ScCellValue& rCell, const ScDocument* pDoc ) const { @@ -1876,7 +1810,6 @@ void ScChangeActionContent::GetValueString( } } - void ScChangeActionContent::GetFormulaString( OUString& rStr, const ScFormulaCell* pCell ) const { @@ -1892,21 +1825,18 @@ void ScChangeActionContent::GetFormulaString( } } - void ScChangeActionContent::PutOldValueToDoc( ScDocument* pDoc, SCsCOL nDx, SCsROW nDy ) const { PutValueToDoc(maOldCell, maOldValue, pDoc, nDx, nDy); } - void ScChangeActionContent::PutNewValueToDoc( ScDocument* pDoc, SCsCOL nDx, SCsROW nDy ) const { PutValueToDoc(maNewCell, maNewValue, pDoc, nDx, nDy); } - void ScChangeActionContent::PutValueToDoc( const ScCellValue& rCell, const OUString& rValue, ScDocument* pDoc, SCsCOL nDx, SCsROW nDy ) const @@ -1964,7 +1894,6 @@ void ScChangeActionContent::PutValueToDoc( } } - static void lcl_InvalidateReference( ScToken& rTok, const ScBigAddress& rPos ) { ScSingleRefData& rRef1 = rTok.GetSingleRef(); @@ -1998,7 +1927,6 @@ static void lcl_InvalidateReference( ScToken& rTok, const ScBigAddress& rPos ) } } - void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack, UpdateRefMode eMode, const ScBigRange& rRange, sal_Int32 nDx, sal_Int32 nDy, sal_Int32 nDz ) @@ -2134,8 +2062,7 @@ bool ScChangeActionContent::IsOldMatrixReference() const return GetContentCellType(GetOldCell()) == SC_CACCT_MATREF; } -// --- ScChangeActionReject ------------------------------------------------ - +// ScChangeActionReject ScChangeActionReject::ScChangeActionReject( const sal_uLong nActionNumber, const ScChangeActionState eStateP, const sal_uLong nRejectingNumber, @@ -2150,9 +2077,7 @@ bool ScChangeActionReject::Reject(ScDocument* /*pDoc*/) return false; } - -// --- ScChangeTrack ------------------------------------------------------- - +// ScChangeTrack IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeTrackMsgInfo ) const SCROW ScChangeTrack::nContentRowsPerSlot = InitContentRowsPerSlot(); @@ -2168,7 +2093,6 @@ SCROW ScChangeTrack::InitContentRowsPerSlot() return nRowsPerSlot; } - ScChangeTrack::ScChangeTrack( ScDocument* pDocP ) : aFixDateTime( DateTime::SYSTEM ), pDoc( pDocP ) @@ -2198,7 +2122,6 @@ ScChangeTrack::~ScChangeTrack() delete [] ppContentSlots; } - void ScChangeTrack::Init() { pFirst = NULL; @@ -2234,7 +2157,6 @@ void ScChangeTrack::Init() maUserCollection.insert(maUser); } - void ScChangeTrack::DtorClear() { ScChangeAction* p; @@ -2258,7 +2180,6 @@ void ScChangeTrack::DtorClear() ClearMsgQueue(); } - void ScChangeTrack::ClearMsgQueue() { if ( pBlockModifyMsg ) @@ -2284,7 +2205,6 @@ void ScChangeTrack::ClearMsgQueue() aMsgQueue.clear(); } - void ScChangeTrack::Clear() { DtorClear(); @@ -2328,7 +2248,6 @@ void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uI } } - void ScChangeTrack::SetUser( const OUString& rUser ) { if ( IsLoadSave() ) @@ -2356,7 +2275,6 @@ void ScChangeTrack::StartBlockModify( ScChangeTrackMsgType eMsgType, } } - void ScChangeTrack::EndBlockModify( sal_uLong nEndAction ) { if ( aModifiedLink.IsSet() ) @@ -2394,7 +2312,6 @@ void ScChangeTrack::EndBlockModify( sal_uLong nEndAction ) } } - void ScChangeTrack::NotifyModified( ScChangeTrackMsgType eMsgType, sal_uLong nStartAction, sal_uLong nEndAction ) { @@ -2410,7 +2327,6 @@ void ScChangeTrack::NotifyModified( ScChangeTrackMsgType eMsgType, } } - void ScChangeTrack::MasterLinks( ScChangeAction* pAppend ) { ScChangeActionType eType = pAppend->GetType(); @@ -2467,7 +2383,6 @@ void ScChangeTrack::MasterLinks( ScChangeAction* pAppend ) } } - void ScChangeTrack::AppendLoaded( ScChangeAction* pAppend ) { aMap.insert( ::std::make_pair( pAppend->GetActionNumber(), pAppend ) ); @@ -2482,7 +2397,6 @@ void ScChangeTrack::AppendLoaded( ScChangeAction* pAppend ) MasterLinks( pAppend ); } - void ScChangeTrack::Append( ScChangeAction* pAppend, sal_uLong nAction ) { if ( nActionMax < nAction ) @@ -2533,13 +2447,11 @@ void ScChangeTrack::Append( ScChangeAction* pAppend, sal_uLong nAction ) } } - void ScChangeTrack::Append( ScChangeAction* pAppend ) { Append( pAppend, ++nActionMax ); } - void ScChangeTrack::AppendDeleteRange( const ScRange& rRange, ScDocument* pRefDoc, sal_uLong& nStartAction, sal_uLong& nEndAction, SCsTAB nDz ) { @@ -2548,7 +2460,6 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange, nEndAction = GetActionMax(); } - void ScChangeTrack::AppendDeleteRange( const ScRange& rRange, ScDocument* pRefDoc, SCsTAB nDz, sal_uLong nRejectingInsert ) { @@ -2621,7 +2532,6 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange, EndBlockModify( GetActionMax() ); } - void ScChangeTrack::AppendOneDeleteRange( const ScRange& rOrgRange, ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, sal_uLong nRejectingInsert ) @@ -2656,7 +2566,6 @@ void ScChangeTrack::AppendOneDeleteRange( const ScRange& rOrgRange, Append( pAct ); } - void ScChangeTrack::LookUpContents( const ScRange& rOrgRange, ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ) { @@ -2688,7 +2597,6 @@ void ScChangeTrack::LookUpContents( const ScRange& rOrgRange, } } - void ScChangeTrack::AppendMove( const ScRange& rFromRange, const ScRange& rToRange, ScDocument* pRefDoc ) { @@ -2697,7 +2605,6 @@ void ScChangeTrack::AppendMove( const ScRange& rFromRange, Append( pAct ); } - bool ScChangeTrack::IsMatrixFormulaRangeDifferent( const ScCellValue& rOldCell, const ScCellValue& rNewCell ) { @@ -2739,7 +2646,6 @@ void ScChangeTrack::AppendContent( } } - void ScChangeTrack::AppendContent( const ScAddress& rPos, ScDocument* pRefDoc ) { @@ -2763,7 +2669,6 @@ void ScChangeTrack::AppendContent( const ScAddress& rPos, } } - void ScChangeTrack::AppendContent( const ScAddress& rPos, const ScCellValue& rOldCell ) { if (ScChangeActionContent::NeedsNumberFormat(rOldCell)) @@ -2772,7 +2677,6 @@ void ScChangeTrack::AppendContent( const ScAddress& rPos, const ScCellValue& rOl AppendContent(rPos, rOldCell, 0, pDoc); } - void ScChangeTrack::SetLastCutMoveRange( const ScRange& rRange, ScDocument* pRefDoc ) { @@ -2793,7 +2697,6 @@ void ScChangeTrack::SetLastCutMoveRange( const ScRange& rRange, } } - void ScChangeTrack::AppendContentRange( const ScRange& rRange, ScDocument* pRefDoc, sal_uLong& nStartAction, sal_uLong& nEndAction, ScChangeActionClipMode eClipMode ) @@ -2886,7 +2789,6 @@ void ScChangeTrack::AppendContentRange( const ScRange& rRange, } } - void ScChangeTrack::AppendContentsIfInRefDoc( ScDocument* pRefDoc, sal_uLong& nStartAction, sal_uLong& nEndAction ) { @@ -2912,7 +2814,6 @@ void ScChangeTrack::AppendContentsIfInRefDoc( ScDocument* pRefDoc, nStartAction = nEndAction = 0; } - ScChangeActionContent* ScChangeTrack::AppendContentOnTheFly( const ScAddress& rPos, const ScCellValue& rOldCell, const ScCellValue& rNewCell, sal_uLong nOldFormat, sal_uLong nNewFormat ) @@ -2924,14 +2825,12 @@ ScChangeActionContent* ScChangeTrack::AppendContentOnTheFly( return pAct; } - void ScChangeTrack::AppendInsert( const ScRange& rRange ) { ScChangeActionIns* pAct = new ScChangeActionIns( rRange ); Append( pAct ); } - void ScChangeTrack::DeleteCellEntries( ScChangeActionCellListEntry*& pCellList, ScChangeAction* pDeletor ) { @@ -2949,7 +2848,6 @@ void ScChangeTrack::DeleteCellEntries( ScChangeActionCellListEntry*& pCellList, pCellList = NULL; } - ScChangeActionContent* ScChangeTrack::GenerateDelContent( const ScAddress& rPos, const ScCellValue& rCell, const ScDocument* pFromDoc ) { @@ -2971,7 +2869,6 @@ ScChangeActionContent* ScChangeTrack::GenerateDelContent( return pContent; } - void ScChangeTrack::DeleteGeneratedDelContent( ScChangeActionContent* pContent ) { sal_uLong nAct = pContent->GetActionNumber(); @@ -2988,7 +2885,6 @@ void ScChangeTrack::DeleteGeneratedDelContent( ScChangeActionContent* pContent ) ++nGeneratedMin; //! erst nach NotifyModified wg. IsGenerated } - ScChangeActionContent* ScChangeTrack::SearchContentAt( const ScBigAddress& rPos, ScChangeAction* pButNotThis ) const { @@ -3007,7 +2903,6 @@ ScChangeActionContent* ScChangeTrack::SearchContentAt( return NULL; } - void ScChangeTrack::AddDependentWithNotify( ScChangeAction* pParent, ScChangeAction* pDependent ) { @@ -3020,7 +2915,6 @@ void ScChangeTrack::AddDependentWithNotify( ScChangeAction* pParent, } } - void ScChangeTrack::Dependencies( ScChangeAction* pAct ) { // Finde die letzte Abhaengigkeit fuer jeweils Col/Row/Tab. @@ -3168,7 +3062,6 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) } } - void ScChangeTrack::Remove( ScChangeAction* pRemove ) { // aus Track ausklinken @@ -3220,7 +3113,6 @@ void ScChangeTrack::Remove( ScChangeAction* pRemove ) } } - void ScChangeTrack::Undo( sal_uLong nStartAction, sal_uLong nEndAction, bool bMerge ) { // #i94841# [Collaboration] When deleting rows is rejected, the content is sometimes wrong @@ -3314,7 +3206,6 @@ void ScChangeTrack::Undo( sal_uLong nStartAction, sal_uLong nEndAction, bool bMe } } - bool ScChangeTrack::MergeIgnore( const ScChangeAction& rAction, sal_uLong nFirstMerge ) { if ( rAction.IsRejected() ) @@ -3326,7 +3217,6 @@ bool ScChangeTrack::MergeIgnore( const ScChangeAction& rAction, sal_uLong nFirst return false; // alles andere } - void ScChangeTrack::MergePrepare( ScChangeAction* pFirstMerge, bool bShared ) { SetMergeState( SC_CTMS_PREPARE ); @@ -3359,7 +3249,6 @@ void ScChangeTrack::MergePrepare( ScChangeAction* pFirstMerge, bool bShared ) SetMergeState( SC_CTMS_OTHER ); //! nachfolgende per default MergeOther } - void ScChangeTrack::MergeOwn( ScChangeAction* pAct, sal_uLong nFirstMerge, bool bShared ) { // #i94841# [Collaboration] When deleting rows is rejected, the content is sometimes wrong @@ -3381,7 +3270,6 @@ void ScChangeTrack::MergeOwn( ScChangeAction* pAct, sal_uLong nFirstMerge, bool } } - void ScChangeTrack::UpdateReference( ScChangeAction* pAct, bool bUndo ) { ScChangeActionType eActType = pAct->GetType(); @@ -3425,7 +3313,6 @@ void ScChangeTrack::UpdateReference( ScChangeAction* pAct, bool bUndo ) pDoc->SetAutoCalc( bOldAutoCalc ); } - void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, ScChangeAction* pAct, bool bUndo ) { @@ -3983,7 +3870,6 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, } } - void ScChangeTrack::GetDependents( ScChangeAction* pAct, ScChangeActionMap& rMap, bool bListMasterDelete, bool bAllFlat ) const { @@ -4176,7 +4062,6 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, } } - bool ScChangeTrack::SelectContent( ScChangeAction* pAct, bool bOldest ) { if ( pAct->GetType() != SC_CAT_CONTENT ) @@ -4258,7 +4143,6 @@ bool ScChangeTrack::SelectContent( ScChangeAction* pAct, bool bOldest ) return pContent->Select( pDoc, this, bOldest, NULL ); } - void ScChangeTrack::AcceptAll() { for ( ScChangeAction* p = GetFirst(); p; p = p->GetNext() ) @@ -4267,7 +4151,6 @@ void ScChangeTrack::AcceptAll() } } - bool ScChangeTrack::Accept( ScChangeAction* pAct ) { if ( !pAct->IsClickable() ) @@ -4289,7 +4172,6 @@ bool ScChangeTrack::Accept( ScChangeAction* pAct ) return true; } - bool ScChangeTrack::RejectAll() { bool bOk = true; @@ -4301,7 +4183,6 @@ bool ScChangeTrack::RejectAll() return bOk; } - bool ScChangeTrack::Reject( ScChangeAction* pAct, bool bShared ) { // #i100895# When collaboration changes are reversed, it must be possible @@ -4324,7 +4205,6 @@ bool ScChangeTrack::Reject( ScChangeAction* pAct, bool bShared ) return bRejected; } - bool ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionMap* pMap, bool bRecursion ) { @@ -4508,7 +4388,6 @@ bool ScChangeTrack::Reject( return bRejected; } - sal_uLong ScChangeTrack::AddLoadedGenerated( const ScCellValue& rNewCell, const ScBigRange& aBigRange, const OUString& sNewValue ) { diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx index 163e75d4b9a8..52620f5d86b4 100644 --- a/sc/source/core/tool/chgviset.cxx +++ b/sc/source/core/tool/chgviset.cxx @@ -24,7 +24,6 @@ #include "chgtrack.hxx" #include "document.hxx" -// ----------------------------------------------------------------------- ScChangeViewSettings::~ScChangeViewSettings() { delete pCommentSearcher; diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index a510f4b6a047..a6b3e196cd77 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -69,7 +69,6 @@ using namespace formula; using namespace ::com::sun::star; using ::std::vector; - CharClass* ScCompiler::pCharClassEnglish = NULL; const ScCompiler::Convention* ScCompiler::pConventions[ ] = { NULL, NULL, NULL, NULL, NULL, NULL }; @@ -91,10 +90,6 @@ static const sal_Char* pInternal[ 1 ] = { "TTT" }; using namespace ::com::sun::star::i18n; -///////////////////////////////////////////////////////////////////////// - - - class ScCompilerRecursionGuard { private: @@ -105,7 +100,6 @@ public: ~ScCompilerRecursionGuard() { --rRecursion; } }; - void ScCompiler::fillFromAddInMap( NonConstOpCodeMapPtr xMap,FormulaGrammar::Grammar _eGrammar ) const { size_t nSymbolOffset; @@ -208,7 +202,6 @@ void ScCompiler::InitCharClassEnglish() ::comphelper::getProcessComponentContext(), LanguageTag( aLocale)); } - void ScCompiler::SetGrammar( const FormulaGrammar::Grammar eGrammar ) { OSL_ENSURE( eGrammar != FormulaGrammar::GRAM_UNSPECIFIED, "ScCompiler::SetGrammar: don't pass FormulaGrammar::GRAM_UNSPECIFIED"); @@ -265,7 +258,6 @@ void ScCompiler::SetFormulaLanguage( const ScCompiler::OpCodeMapPtr & xMap ) } } - void ScCompiler::SetGrammarAndRefConvention( const FormulaGrammar::Grammar eNewGrammar, const FormulaGrammar::Grammar eOldGrammar ) { @@ -287,9 +279,6 @@ String ScCompiler::FindAddInFunction( const String& rUpperName, bool bLocalFirst return ScGlobal::GetAddInCollection()->FindFunction(rUpperName, bLocalFirst); // bLocalFirst=false for english } - -//----------------------------------------------------------------------------- - ScCompiler::Convention::~Convention() { delete [] mpCharTable; @@ -419,8 +408,6 @@ ScCompiler::Convention::Convention( FormulaGrammar::AddressConvention eConv ) } } -//----------------------------------------------------------------------------- - static bool lcl_isValidQuotedText( const String& rFormula, xub_StrLen nSrcPos, ParseResult& rRes ) { // Tokens that start at ' can have anything in them until a final ' @@ -728,8 +715,6 @@ void Convention_A1::MakeRowStr( OUStringBuffer& rBuffer, SCROW nRow ) rBuffer.append(sal_Int32(nRow + 1)); } -//----------------------------------------------------------------------------- - struct ConventionOOO_A1 : public Convention_A1 { ConventionOOO_A1() : Convention_A1 (FormulaGrammar::CONV_OOO) { } @@ -760,7 +745,6 @@ struct ConventionOOO_A1 : public Convention_A1 return aString; } - void MakeOneRefStrImpl( OUStringBuffer& rBuffer, const ScCompiler& rComp, const ScSingleRefData& rRef, const ScAddress& rAbsRef, @@ -801,7 +785,6 @@ struct ConventionOOO_A1 : public Convention_A1 MakeRowStr(rBuffer, rAbsRef.Row()); } - void MakeRefStrImpl( OUStringBuffer& rBuffer, const ScCompiler& rComp, const ScComplexRefData& rRef, @@ -1009,12 +992,9 @@ struct ConventionOOO_A1 : public Convention_A1 } }; - static const ConventionOOO_A1 ConvOOO_A1; const ScCompiler::Convention * const ScCompiler::pConvOOO_A1 = &ConvOOO_A1; -//----------------------------------------------------------------------------- - struct ConventionOOO_A1_ODF : public ConventionOOO_A1 { ConventionOOO_A1_ODF() : ConventionOOO_A1 (FormulaGrammar::CONV_ODF) { } @@ -1049,8 +1029,6 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 static const ConventionOOO_A1_ODF ConvOOO_A1_ODF; const ScCompiler::Convention * const ScCompiler::pConvOOO_A1_ODF = &ConvOOO_A1_ODF; -//----------------------------------------------------------------------------- - struct ConventionXL { static bool GetDocAndTab( const ScCompiler& rComp, @@ -1424,7 +1402,6 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL static const ConventionXL_A1 ConvXL_A1; const ScCompiler::Convention * const ScCompiler::pConvXL_A1 = &ConvXL_A1; - struct ConventionXL_OOX : public ConventionXL_A1 { ConventionXL_OOX() : ConventionXL_A1( FormulaGrammar::CONV_XL_OOX ) { } @@ -1433,9 +1410,6 @@ struct ConventionXL_OOX : public ConventionXL_A1 static const ConventionXL_OOX ConvXL_OOX; const ScCompiler::Convention * const ScCompiler::pConvXL_OOX = &ConvXL_OOX; - -//----------------------------------------------------------------------------- - static void r1c1_add_col( OUStringBuffer &rBuf, const ScSingleRefData& rRef, const ScAddress& rAbsRef ) { @@ -1660,7 +1634,6 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL static const ConventionXL_R1C1 ConvXL_R1C1; const ScCompiler::Convention * const ScCompiler::pConvXL_R1C1 = &ConvXL_R1C1; -//----------------------------------------------------------------------------- ScCompiler::ScCompiler( ScDocument* pDocument, const ScAddress& rPos,ScTokenArray& rArr) : FormulaCompiler(rArr), pDoc( pDocument ), @@ -1735,7 +1708,6 @@ void ScCompiler::CheckTabQuotes( String& rString, } } - xub_StrLen ScCompiler::GetDocTabPos( const String& rString ) { if (rString.GetChar(0) != '\'') @@ -1747,8 +1719,6 @@ xub_StrLen ScCompiler::GetDocTabPos( const String& rString ) return nPos; } -//--------------------------------------------------------------------------- - void ScCompiler::SetRefConvention( FormulaGrammar::AddressConvention eConv ) { switch ( eConv ) { @@ -1777,7 +1747,6 @@ void ScCompiler::SetError(sal_uInt16 nError) pArr->SetCodeError( nError); } - static sal_Unicode* lcl_UnicodeStrNCpy( sal_Unicode* pDst, const sal_Unicode* pSrc, xub_StrLen nMax ) { const sal_Unicode* const pStop = pDst + nMax; @@ -1789,15 +1758,13 @@ static sal_Unicode* lcl_UnicodeStrNCpy( sal_Unicode* pDst, const sal_Unicode* pS return pDst; } - -//--------------------------------------------------------------------------- // NextSymbol -//--------------------------------------------------------------------------- + // Zerlegt die Formel in einzelne Symbole fuer die weitere // Verarbeitung (Turing-Maschine). -//--------------------------------------------------------------------------- + // Ausgangs Zustand = GetChar -//---------------+-------------------+-----------------------+--------------- + // Alter Zustand | gelesenes Zeichen | Aktion | Neuer Zustand //---------------+-------------------+-----------------------+--------------- // GetChar | ;()+-*/^=& | Symbol=Zeichen | Stop @@ -1816,7 +1783,7 @@ static sal_Unicode* lcl_UnicodeStrNCpy( sal_Unicode* pDst, const sal_Unicode* pS // | $_:. | | // | Buchstabe,Ziffer | Symbol=Symbol+Zeichen | GetWord // | Sonst | Fehler | Stop -//---------------|-------------------+-----------------------+--------------- +//---------------+-------------------+-----------------------+--------------- // GetValue | ;()*/^=<>& | | // | Leerzeichen | Dec(CharPos) | Stop // | Ziffer E+-%,. | Symbol=Symbol+Zeichen | GetValue @@ -2413,9 +2380,7 @@ Label_MaskStateMachine: return nSpaces; } -//--------------------------------------------------------------------------- // Convert symbol to token -//--------------------------------------------------------------------------- bool ScCompiler::IsOpCode( const String& rName, bool bInArray ) { @@ -2610,7 +2575,6 @@ bool ScCompiler::IsString() return false; } - bool ScCompiler::IsPredetectedReference( const String& rName ) { // Speedup documents with lots of broken references, e.g. sheet deleted. @@ -2668,7 +2632,6 @@ bool ScCompiler::IsPredetectedReference( const String& rName ) return false; } - bool ScCompiler::IsDoubleReference( const String& rName ) { ScRange aRange( aPos, aPos ); @@ -2711,7 +2674,6 @@ bool ScCompiler::IsDoubleReference( const String& rName ) return ( nFlags & SCA_VALID ) != 0; } - bool ScCompiler::IsSingleReference( const String& rName ) { ScAddress aAddr( aPos ); @@ -2758,7 +2720,6 @@ bool ScCompiler::IsSingleReference( const String& rName ) return ( nFlags & SCA_VALID ) != 0; } - bool ScCompiler::IsReference( const String& rName ) { // Has to be called before IsValue @@ -3255,7 +3216,6 @@ bool ScCompiler::IsBoolean( const String& rName ) return false; } - bool ScCompiler::IsErrorConstant( const String& rName ) const { sal_uInt16 nError = GetErrorConstant( rName); @@ -3270,8 +3230,6 @@ bool ScCompiler::IsErrorConstant( const String& rName ) const return false; } -//--------------------------------------------------------------------------- - void ScCompiler::AutoCorrectParsedSymbol() { xub_StrLen nPos = aCorrectedSymbol.Len(); @@ -3918,7 +3876,6 @@ ScTokenArray* ScCompiler::CompileString( const OUString& rFormula ) return pNew; } - ScTokenArray* ScCompiler::CompileString( const OUString& rFormula, const OUString& rFormulaNmsp ) { OSL_ENSURE( (GetGrammar() == FormulaGrammar::GRAM_EXTERNAL) || rFormulaNmsp.isEmpty(), @@ -3946,7 +3903,6 @@ ScTokenArray* ScCompiler::CompileString( const OUString& rFormula, const OUStrin return CompileString( rFormula ); } - ScRangeData* ScCompiler::GetRangeData( const FormulaToken& rToken ) const { ScRangeData* pRangeData = NULL; @@ -3964,7 +3920,6 @@ ScRangeData* ScCompiler::GetRangeData( const FormulaToken& rToken ) const return pRangeData; } - bool ScCompiler::HandleRange() { const ScRangeData* pRangeData = GetRangeData( *mpToken); @@ -4018,7 +3973,7 @@ bool ScCompiler::HandleRange() SetError(errNoName); return true; } -// ----------------------------------------------------------------------------- + bool ScCompiler::HandleExternalReference(const FormulaToken& _aToken) { // Handle external range names. @@ -4251,12 +4206,12 @@ void ScCompiler::CreateStringFromSingleRef(OUStringBuffer& rBuffer,FormulaToken* else pConv->MakeRefStr( rBuffer, *this, aRef, true ); } -// ----------------------------------------------------------------------------- + void ScCompiler::CreateStringFromDoubleRef(OUStringBuffer& rBuffer,FormulaToken* _pTokenP) { pConv->MakeRefStr( rBuffer, *this, static_cast<ScToken*>(_pTokenP)->GetDoubleRef(), false ); } -// ----------------------------------------------------------------------------- + void ScCompiler::CreateStringFromIndex(OUStringBuffer& rBuffer,FormulaToken* _pTokenP) { const OpCode eOp = _pTokenP->GetOpCode(); @@ -4285,14 +4240,13 @@ void ScCompiler::CreateStringFromIndex(OUStringBuffer& rBuffer,FormulaToken* _pT else rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF)); } -// ----------------------------------------------------------------------------- + void ScCompiler::LocalizeString( String& rName ) { OUString aName(rName); ScGlobal::GetAddInCollection()->LocalizeString( aName ); rName = aName; } -// ----------------------------------------------------------------------------- // Put quotes around string if non-alphanumeric characters are contained, // quote characters contained within are escaped by '\\'. @@ -4348,7 +4302,7 @@ void ScCompiler::fillAddInToken(::std::vector< ::com::sun::star::sheet::FormulaO } // FIXME: what about those old non-UNO AddIns? } -// ----------------------------------------------------------------------------- + bool ScCompiler::HandleSingleRef() { ScSingleRefData& rRef = static_cast<ScToken*>(mpToken.get())->GetSingleRef(); @@ -4562,7 +4516,7 @@ bool ScCompiler::HandleSingleRef() SetError(errNoName); return true; } -// ----------------------------------------------------------------------------- + bool ScCompiler::HandleDbData() { ScDBData* pDBData = pDoc->GetDBCollection()->getNamedDBs().findByIndex(mpToken->GetIndex()); @@ -4585,7 +4539,6 @@ bool ScCompiler::HandleDbData() return true; } -// ----------------------------------------------------------------------------- FormulaTokenRef ScCompiler::ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2, bool bReuseDoubleRef ) { return ScToken::ExtendRangeReference( rTok1, rTok2, aPos,bReuseDoubleRef ); diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx index 8630a01ef2df..12819663b2da 100644 --- a/sc/source/core/tool/consoli.cxx +++ b/sc/source/core/tool/consoli.cxx @@ -31,8 +31,7 @@ #define SC_CONS_NOTFOUND -1 -// STATIC DATA ----------------------------------------------------------- - +// STATIC DATA static const OpCode eOpCodeTable[] = { // Reihenfolge wie bei enum ScSubTotalFunc ocBad, // none ocAverage, @@ -47,8 +46,6 @@ static const OpCode eOpCodeTable[] = { // Reihenfolge wie bei enum ScSubTo ocVar, ocVarP }; -// ----------------------------------------------------------------------- - void ScReferenceList::AddEntry( SCCOL nCol, SCROW nRow, SCTAB nTab ) { ScReferenceEntry* pOldData = pData; @@ -86,8 +83,6 @@ static void lcl_AddString( String**& pData, T& nCount, const String& rInsert ) ++nCount; } -// ----------------------------------------------------------------------- - ScConsData::ScConsData() : eFunction(SUBTOTAL_FUNC_SUM), bReference(false), @@ -115,7 +110,6 @@ ScConsData::~ScConsData() DeleteData(); } - #define DELETEARR(ppArray,nCount) \ { \ sal_uLong i; \ @@ -814,8 +808,4 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, } } - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 0b60852fc3e4..86015fa2a62b 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unotools/transliterationwrapper.hxx> #include "dbdata.hxx" @@ -40,8 +39,6 @@ using ::std::find_if; using ::std::remove_if; using ::std::pair; -//--------------------------------------------------------------------------------------- - bool ScDBData::less::operator() (const ScDBData& left, const ScDBData& right) const { return ScGlobal::GetpTransliteration()->compareString(left.GetUpperName(), right.GetUpperName()) < 0; @@ -209,7 +206,6 @@ ScDBData::~ScDBData() StopRefreshTimer(); } - OUString ScDBData::GetSourceString() const { OUStringBuffer aBuf; @@ -959,7 +955,6 @@ void ScDBCollection::UpdateReference(UpdateRefMode eUpdateRefMode, for_each(maAnonDBs.begin(), maAnonDBs.end(), func); } - void ScDBCollection::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ) { UpdateMoveTabFunc func(nOldPos, nNewPos); diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index e007c8572d8a..51ffac15df4f 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/string.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/bindings.hxx> @@ -39,8 +38,6 @@ TYPEINIT2(ScDdeLink,::sfx2::SvBaseLink,SfxBroadcaster); bool ScDdeLink::bIsInUpdate = false; -//------------------------------------------------------------------------ - ScDdeLink::ScDdeLink( ScDocument* pD, const String& rA, const String& rT, const String& rI, sal_uInt8 nM ) : ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ALWAYS,FORMAT_STRING), diff --git a/sc/source/core/tool/defaultsoptions.cxx b/sc/source/core/tool/defaultsoptions.cxx index a10969804e53..896a94a672ff 100644 --- a/sc/source/core/tool/defaultsoptions.cxx +++ b/sc/source/core/tool/defaultsoptions.cxx @@ -18,12 +18,8 @@ using namespace utl; using namespace com::sun::star::uno; -// ----------------------------------------------------------------------- - TYPEINIT1(ScTpDefaultsItem, SfxPoolItem); -// ----------------------------------------------------------------------- - ScDefaultsOptions::ScDefaultsOptions() { SetDefaults(); @@ -64,9 +60,6 @@ bool ScDefaultsOptions::operator!=( const ScDefaultsOptions& rOpt ) const return !(operator==(rOpt)); } -// ----------------------------------------------------------------------- - - ScTpDefaultsItem::ScTpDefaultsItem( sal_uInt16 nWhichP, const ScDefaultsOptions& rOpt ) : SfxPoolItem ( nWhichP ), theOptions ( rOpt ) @@ -101,8 +94,6 @@ SfxPoolItem* ScTpDefaultsItem::Clone( SfxItemPool * ) const return new ScTpDefaultsItem( *this ); } -// ----------------------------------------------------------------------- - #define CFGPATH_FORMULA "Office.Calc/Defaults" #define SCDEFAULTSOPT_TAB_COUNT 0 diff --git a/sc/source/core/tool/detdata.cxx b/sc/source/core/tool/detdata.cxx index 6c1182721733..8e67e718ee94 100644 --- a/sc/source/core/tool/detdata.cxx +++ b/sc/source/core/tool/detdata.cxx @@ -21,8 +21,6 @@ #include "refupdat.hxx" #include "rechead.hxx" -//------------------------------------------------------------------------ - ScDetOpList::ScDetOpList(const ScDetOpList& rList) : bHasAddError( false ) { @@ -75,7 +73,6 @@ void ScDetOpList::Append( ScDetOpData* pDetOpData ) aDetOpDataVector.push_back( pDetOpData ); } - sal_Bool ScDetOpList::operator==( const ScDetOpList& r ) const { // for Ref-Undo diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 2558031c1ddf..198dba51d45a 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -73,23 +73,16 @@ using ::std::vector; -//------------------------------------------------------------------------ - // line ends are now created with an empty name. // The checkForUniqueItem method then finds a unique name for the item's value. #define SC_LINEEND_NAME EMPTY_STRING -//------------------------------------------------------------------------ - enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level DET_INS_CONTINUE, DET_INS_INSERTED, DET_INS_EMPTY, DET_INS_CIRCULAR }; - -//------------------------------------------------------------------------ - class ScDetectiveData { private: @@ -125,15 +118,11 @@ private: SfxItemSet aCaptionSet; }; -//------------------------------------------------------------------------ - ColorData ScDetectiveFunc::nArrowColor = 0; ColorData ScDetectiveFunc::nErrorColor = 0; ColorData ScDetectiveFunc::nCommentColor = 0; sal_Bool ScDetectiveFunc::bColorsInitialized = false; -//------------------------------------------------------------------------ - static sal_Bool lcl_HasThickLine( SdrObject& rObj ) { // thin lines get width 0 -> everything greater 0 is a thick line @@ -141,8 +130,6 @@ static sal_Bool lcl_HasThickLine( SdrObject& rObj ) return ( ((const XLineWidthItem&)rObj.GetMergedItem(XATTR_LINEWIDTH)).GetValue() > 0 ); } -//------------------------------------------------------------------------ - ScDetectiveData::ScDetectiveData( SdrModel* pModel ) : aBoxSet( pModel->GetItemPool(), SDRATTR_START, SDRATTR_END ), aArrowSet( pModel->GetItemPool(), SDRATTR_START, SDRATTR_END ), @@ -280,8 +267,6 @@ void ScCommentData::UpdateCaptionSet( const SfxItemSet& rItemSet ) } } -//------------------------------------------------------------------------ - void ScDetectiveFunc::Modified() { if (pDoc->IsStreamValid(nTab)) @@ -465,8 +450,6 @@ sal_Bool ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) return false; } -//------------------------------------------------------------------------ - // InsertXXX: called from DrawEntry/DrawAlienEntry and InsertObject sal_Bool ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow, @@ -607,8 +590,6 @@ sal_Bool ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, return sal_True; } -//------------------------------------------------------------------------ - // DrawEntry: Formel auf dieser Tabelle, // Referenz auf dieser oder anderer // DrawAlienEntry: Formel auf anderer Tabelle, @@ -784,8 +765,6 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR } } -//------------------------------------------------------------------------ - sal_uInt16 ScDetectiveFunc::InsertPredLevelArea( const ScRange& rRef, ScDetectiveData& rData, sal_uInt16 nLevel ) { @@ -966,8 +945,6 @@ sal_uInt16 ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, sal_uInt16 nL return nResult; } -//------------------------------------------------------------------------ - sal_uInt16 ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveData& rData, sal_uInt16 nLevel ) { @@ -1019,8 +996,6 @@ sal_uInt16 ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiv return nResult; } -//------------------------------------------------------------------------ - sal_uInt16 ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScDetectiveData& rData, sal_uInt16 nLevel ) { @@ -1168,9 +1143,8 @@ sal_uInt16 ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2 return nResult; } - // -// -------------------------------------------------------------------------------- + // sal_Bool ScDetectiveFunc::ShowPred( SCCOL nCol, SCROW nRow ) diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index d06225cbc4fa..190e4688c62a 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -35,18 +35,12 @@ using namespace utl; using namespace com::sun::star::uno; -//------------------------------------------------------------------------ - TYPEINIT1(ScTpCalcItem, SfxPoolItem); -//------------------------------------------------------------------------ - using sc::HMMToTwips; using sc::TwipsToHMM; using sc::TwipsToEvenHMM; -//------------------------------------------------------------------------ - static sal_uInt16 lcl_GetDefaultTabDist() { if ( ScOptionsUtil::IsMetricSystem() ) @@ -55,17 +49,13 @@ static sal_uInt16 lcl_GetDefaultTabDist() return 720; // 1/2" } -//======================================================================== // ScDocOptions - Dokument-Optionen -//======================================================================== ScDocOptions::ScDocOptions() { ResetDocOptions(); } -//------------------------------------------------------------------------ - ScDocOptions::ScDocOptions( const ScDocOptions& rCpy ) : fIterEps( rCpy.fIterEps ), nIterCount( rCpy.nIterCount ), @@ -85,14 +75,10 @@ ScDocOptions::ScDocOptions( const ScDocOptions& rCpy ) { } -//------------------------------------------------------------------------ - ScDocOptions::~ScDocOptions() { } -//------------------------------------------------------------------------ - void ScDocOptions::ResetDocOptions() { bIsIgnoreCase = false; @@ -112,11 +98,7 @@ void ScDocOptions::ResetDocOptions() bFormulaRegexEnabled= true; } -//======================================================================== // ScTpCalcItem - Daten fuer die CalcOptions-TabPage -//======================================================================== - -//------------------------------------------------------------------------ ScTpCalcItem::ScTpCalcItem( sal_uInt16 nWhichP, const ScDocOptions& rOpt ) : SfxPoolItem ( nWhichP ), @@ -124,29 +106,21 @@ ScTpCalcItem::ScTpCalcItem( sal_uInt16 nWhichP, const ScDocOptions& rOpt ) { } -//------------------------------------------------------------------------ - ScTpCalcItem::ScTpCalcItem( const ScTpCalcItem& rItem ) : SfxPoolItem ( rItem ), theOptions ( rItem.theOptions ) { } -//------------------------------------------------------------------------ - ScTpCalcItem::~ScTpCalcItem() { } -//------------------------------------------------------------------------ - OUString ScTpCalcItem::GetValueText() const { return OUString("ScTpCalcItem"); } -//------------------------------------------------------------------------ - int ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -156,16 +130,12 @@ int ScTpCalcItem::operator==( const SfxPoolItem& rItem ) const return ( theOptions == rPItem.theOptions ); } -//------------------------------------------------------------------------ - SfxPoolItem* ScTpCalcItem::Clone( SfxItemPool * ) const { return new ScTpCalcItem( *this ); } -//================================================================== // Config Item containing document options -//================================================================== #define CFGPATH_CALC "Office.Calc/Calculate" @@ -417,5 +387,4 @@ void ScDocCfg::SetOptions( const ScDocOptions& rNew ) aLayoutItem.SetModified(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 5b0920ae8767..86fb5d51ec5a 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -235,8 +235,6 @@ bool lcl_fillQueryEntries( } -// ============================================================================ - ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc, RefType eType) : mpDoc(pDoc), meType(eType) { @@ -269,8 +267,6 @@ ScDocument* ScDBRangeBase::getDoc() const return mpDoc; } -// ============================================================================ - ScDBInternalRange::ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange) : ScDBRangeBase(pDoc, INTERNAL), maRange(rRange) { @@ -391,8 +387,6 @@ bool ScDBInternalRange::isRangeEqual(const ScRange& rRange) const return maRange == rRange; } -// ============================================================================ - ScDBExternalRange::ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat) : ScDBRangeBase(pDoc, EXTERNAL), mpMatrix(pMat) { diff --git a/sc/source/core/tool/editdataarray.cxx b/sc/source/core/tool/editdataarray.cxx index 85be62c4cbbb..b3946d4c011c 100644 --- a/sc/source/core/tool/editdataarray.cxx +++ b/sc/source/core/tool/editdataarray.cxx @@ -48,8 +48,6 @@ const ScEditDataArray::Item* ScEditDataArray::Next() return &(*maIter++); } -// ============================================================================ - ScEditDataArray::Item::Item(SCTAB nTab, SCCOL nCol, SCROW nRow, EditTextObject* pOldData, EditTextObject* pNewData) : mnTab(nTab), @@ -89,5 +87,4 @@ SCROW ScEditDataArray::Item::GetRow() const return mnRow; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index d851def62541..563e91a147f2 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -50,15 +50,11 @@ using namespace com::sun::star; -// STATIC DATA ----------------------------------------------------------- - +// STATIC DATA // Delimiters zusaetzlich zu EditEngine-Default: const sal_Char ScEditUtil::pCalcDelimiters[] = "=()+-*/^&<>"; - -//------------------------------------------------------------------------ - OUString ScEditUtil::ModifyDelimiters( const OUString& rOld ) { // underscore is used in function argument names @@ -282,8 +278,6 @@ OUString ScEditUtil::GetCellFieldValue( return aRet; } -//------------------------------------------------------------------------ - Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, sal_Bool bForceToTop ) { // bForceToTop = always align to top, for editing @@ -375,8 +369,6 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, sal_Bool bForc return Rectangle( aStartPos, Size(nCellX-1,nCellY-1) ); } -//------------------------------------------------------------------------ - ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) : pEngine( pEng ), pEditAttrs( NULL ), @@ -439,9 +431,6 @@ ScEditAttrTester::~ScEditAttrTester() delete pEditAttrs; } - -//------------------------------------------------------------------------ - ScEnginePoolHelper::ScEnginePoolHelper( SfxItemPool* pEnginePoolP, sal_Bool bDeleteEnginePoolP ) : @@ -452,7 +441,6 @@ ScEnginePoolHelper::ScEnginePoolHelper( SfxItemPool* pEnginePoolP, { } - ScEnginePoolHelper::ScEnginePoolHelper( const ScEnginePoolHelper& rOrg ) : pEnginePool( rOrg.bDeleteEnginePool ? rOrg.pEnginePool->Clone() : rOrg.pEnginePool ), @@ -462,7 +450,6 @@ ScEnginePoolHelper::ScEnginePoolHelper( const ScEnginePoolHelper& rOrg ) { } - ScEnginePoolHelper::~ScEnginePoolHelper() { if ( bDeleteDefaults ) @@ -471,9 +458,6 @@ ScEnginePoolHelper::~ScEnginePoolHelper() SfxItemPool::Free(pEnginePool); } - -//------------------------------------------------------------------------ - ScEditEngineDefaulter::ScEditEngineDefaulter( SfxItemPool* pEnginePoolP, sal_Bool bDeleteEnginePoolP ) : @@ -486,7 +470,6 @@ ScEditEngineDefaulter::ScEditEngineDefaulter( SfxItemPool* pEnginePoolP, SetDefaultLanguage( ScGlobal::GetEditDefaultLanguage() ); } - ScEditEngineDefaulter::ScEditEngineDefaulter( const ScEditEngineDefaulter& rOrg ) : ScEnginePoolHelper( rOrg ), @@ -495,12 +478,10 @@ ScEditEngineDefaulter::ScEditEngineDefaulter( const ScEditEngineDefaulter& rOrg SetDefaultLanguage( ScGlobal::GetEditDefaultLanguage() ); } - ScEditEngineDefaulter::~ScEditEngineDefaulter() { } - void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRememberCopy ) { if ( bRememberCopy ) @@ -527,7 +508,6 @@ void ScEditEngineDefaulter::SetDefaults( const SfxItemSet& rSet, sal_Bool bRemem EnableUndo( sal_True ); } - void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, sal_Bool bTakeOwnership ) { if ( bDeleteDefaults ) @@ -538,7 +518,6 @@ void ScEditEngineDefaulter::SetDefaults( SfxItemSet* pSet, sal_Bool bTakeOwnersh SetDefaults( *pDefaults, false ); } - void ScEditEngineDefaulter::SetDefaultItem( const SfxPoolItem& rItem ) { if ( !pDefaults ) @@ -596,7 +575,6 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec SetUpdateMode( sal_True ); } - void ScEditEngineDefaulter::SetText( const OUString& rText ) { sal_Bool bUpdateMode = GetUpdateMode(); @@ -716,8 +694,6 @@ void ScEditEngineDefaulter::RemoveParaAttribs() SetUpdateMode( sal_True ); } -//------------------------------------------------------------------------ - ScTabEditEngine::ScTabEditEngine( ScDocument* pDoc ) : ScEditEngineDefaulter( pDoc->GetEnginePool() ) { @@ -744,9 +720,7 @@ void ScTabEditEngine::Init( const ScPatternAttr& rPattern ) SetControlWord( GetControlWord() & ~EE_CNTRL_RTFSTYLESHEETS ); } -//------------------------------------------------------------------------ // Feldbefehle fuer Kopf- und Fusszeilen -//------------------------------------------------------------------------ // // Zahlen aus \sw\source\core\doc\numbers.cxx @@ -876,11 +850,9 @@ OUString ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, return aRet; } -//------------------------------------------------------------------------ // // Feld-Daten // -//------------------------------------------------------------------------ ScFieldEditEngine::ScFieldEditEngine( ScDocument* pDoc, SfxItemPool* pEnginePoolP, @@ -918,8 +890,6 @@ void ScFieldEditEngine::FieldClicked( const SvxFieldItem& rField, sal_Int32, sal } } -//------------------------------------------------------------------------ - ScNoteEditEngine::ScNoteEditEngine( SfxItemPool* pEnginePoolP, SfxItemPool* pTextObjectPool, sal_Bool bDeleteEnginePoolP ) : ScEditEngineDefaulter( pEnginePoolP, bDeleteEnginePoolP ) diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index ca4f27cfa0fb..f87a68b15c9c 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.cxx @@ -26,9 +26,6 @@ using namespace utl; using namespace com::sun::star::uno; - -//------------------------------------------------------------------ - #define CFGPATH_FILTER "Office.Calc/Filter/Import" #define SCFILTOPT_COLSCALE 0 @@ -86,7 +83,6 @@ ScFilterOptions::ScFilterOptions() : } } - void ScFilterOptions::Commit() { // options are never modified from office @@ -99,5 +95,4 @@ void ScFilterOptions::Notify( const Sequence<OUString>& /* aPropertyNames */ ) OSL_FAIL("properties have been changed"); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/formulaopt.cxx b/sc/source/core/tool/formulaopt.cxx index 20ef8317ba71..0868fd20db36 100644 --- a/sc/source/core/tool/formulaopt.cxx +++ b/sc/source/core/tool/formulaopt.cxx @@ -21,12 +21,8 @@ using namespace com::sun::star::uno; using ::com::sun::star::lang::Locale; using ::com::sun::star::i18n::LocaleDataItem; -// ----------------------------------------------------------------------- - TYPEINIT1(ScTpFormulaItem, SfxPoolItem); -// ----------------------------------------------------------------------- - ScFormulaOptions::ScFormulaOptions() { SetDefaults(); @@ -154,9 +150,6 @@ bool ScFormulaOptions::operator!=( const ScFormulaOptions& rOpt ) const return !(operator==(rOpt)); } -// ----------------------------------------------------------------------- - - ScTpFormulaItem::ScTpFormulaItem( sal_uInt16 nWhichP, const ScFormulaOptions& rOpt ) : SfxPoolItem ( nWhichP ), theOptions ( rOpt ) @@ -191,8 +184,6 @@ SfxPoolItem* ScTpFormulaItem::Clone( SfxItemPool * ) const return new ScTpFormulaItem( *this ); } -// ----------------------------------------------------------------------- - #define CFGPATH_FORMULA "Office.Calc/Formula" #define SCFORMULAOPT_GRAMMAR 0 diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx index 91c066c0bc96..653f4c3a2f70 100644 --- a/sc/source/core/tool/formulaparserpool.cxx +++ b/sc/source/core/tool/formulaparserpool.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "formulaparserpool.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> @@ -35,8 +34,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; -// ============================================================================ - namespace { class ScParserFactoryMap @@ -106,8 +103,6 @@ struct ScParserFactorySingleton : public ::rtl::Static< ScParserFactoryMap, ScPa } // namespace -// ============================================================================ - ScFormulaParserPool::ScFormulaParserPool( const ScDocument& rDoc ) : mrDoc( rDoc ) { @@ -145,6 +140,4 @@ Reference< XFormulaParser > ScFormulaParserPool::getFormulaParser( const OUStrin return rxParser; } -// ============================================================================ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx index 9a00b3f5b558..dd143e5c203b 100644 --- a/sc/source/core/tool/hints.cxx +++ b/sc/source/core/tool/hints.cxx @@ -19,8 +19,6 @@ #include "hints.hxx" -// ----------------------------------------------------------------------- - TYPEINIT1(ScPaintHint, SfxHint); TYPEINIT1(ScUpdateRefHint, SfxHint); TYPEINIT1(ScPointerChangedHint, SfxHint); @@ -29,9 +27,7 @@ TYPEINIT1(ScAutoStyleHint, SfxHint); TYPEINIT1(ScDBRangeRefreshedHint, SfxHint); TYPEINIT1(ScDataPilotModifiedHint, SfxHint); -// ----------------------------------------------------------------------- // ScPaintHint - info what has to be repainted -// ----------------------------------------------------------------------- ScPaintHint::ScPaintHint( const ScRange& rRng, sal_uInt16 nPaint ) : aRange( rRng ), @@ -44,9 +40,7 @@ ScPaintHint::~ScPaintHint() { } -// ----------------------------------------------------------------------- // ScUpdateRefHint - update references -// ----------------------------------------------------------------------- ScUpdateRefHint::ScUpdateRefHint( UpdateRefMode eMode, const ScRange& rR, SCsCOL nX, SCsROW nY, SCsTAB nZ ) : @@ -62,18 +56,13 @@ ScUpdateRefHint::~ScUpdateRefHint() { } -// ----------------------------------------------------------------------- // ScPointerChangedHint - pointer has become invalid -// ----------------------------------------------------------------------- - ScPointerChangedHint::~ScPointerChangedHint() { } -// ----------------------------------------------------------------------- // ScLinkRefreshedHint - a link has been refreshed -// ----------------------------------------------------------------------- ScLinkRefreshedHint::ScLinkRefreshedHint() : nLinkType( SC_LINKREFTYPE_NONE ), @@ -107,9 +96,7 @@ void ScLinkRefreshedHint::SetAreaLink( const ScAddress& rPos ) aDestPos = rPos; } -// ----------------------------------------------------------------------- // ScAutoStyleHint - STYLE() function has been called -// ----------------------------------------------------------------------- ScAutoStyleHint::ScAutoStyleHint( const ScRange& rR, const String& rSt1, sal_uLong nT, const String& rSt2 ) : @@ -124,7 +111,6 @@ ScAutoStyleHint::~ScAutoStyleHint() { } - ScDBRangeRefreshedHint::ScDBRangeRefreshedHint( const ScImportParam& rP ) : aParam(rP) { @@ -133,7 +119,6 @@ ScDBRangeRefreshedHint::~ScDBRangeRefreshedHint() { } - ScDataPilotModifiedHint::ScDataPilotModifiedHint( const String& rName ) : maName(rName) { @@ -142,5 +127,4 @@ ScDataPilotModifiedHint::~ScDataPilotModifiedHint() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index da7205728bdd..e36cd8550e06 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.cxx @@ -31,31 +31,22 @@ using namespace utl; using namespace com::sun::star::uno; - -//======================================================================== // ScInputOptions - input options -//======================================================================== ScInputOptions::ScInputOptions() { SetDefaults(); } -//------------------------------------------------------------------------ - ScInputOptions::ScInputOptions( const ScInputOptions& rCpy ) { *this = rCpy; } -//------------------------------------------------------------------------ - ScInputOptions::~ScInputOptions() { } -//------------------------------------------------------------------------ - void ScInputOptions::SetDefaults() { nMoveDir = DIR_BOTTOM; @@ -71,8 +62,6 @@ void ScInputOptions::SetDefaults() bLegacyCellSelection = false; } -//------------------------------------------------------------------------ - const ScInputOptions& ScInputOptions::operator=( const ScInputOptions& rCpy ) { nMoveDir = rCpy.nMoveDir; @@ -90,10 +79,7 @@ const ScInputOptions& ScInputOptions::operator=( const ScInputOptions& rCpy ) return *this; } - -//================================================================== // Config Item containing input options -//================================================================== #define CFGPATH_INPUT "Office.Calc/Input" @@ -192,7 +178,6 @@ ScInputCfg::ScInputCfg() : } } - void ScInputCfg::Commit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -257,5 +242,4 @@ void ScInputCfg::OptionsChanged() SetModified(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 02564b7bcc6d..961344a887b3 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -44,7 +44,6 @@ #include "tokenarray.hxx" #include "globalnames.hxx" - #include <com/sun/star/sheet/DataPilotFieldFilter.hpp> #include <string.h> @@ -55,9 +54,7 @@ using namespace formula; #define SCdEpsilon 1.0E-7 -//----------------------------------------------------------------------------- // Datum und Zeit -//----------------------------------------------------------------------------- double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay, bool bStrict, bool bCheckGregorian ) @@ -95,9 +92,7 @@ double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int1 } } -//----------------------------------------------------------------------------- // Funktionen -//----------------------------------------------------------------------------- void ScInterpreter::ScGetActDate() { @@ -576,7 +571,6 @@ void ScInterpreter::ScInt() PushDouble(::rtl::math::approxFloor(GetDouble())); } - void ScInterpreter::RoundNumber( rtl_math_RoundingMode eMode ) { sal_uInt8 nParamCount = GetByte(); @@ -912,7 +906,6 @@ void ScInterpreter::ScMIRR() } } - void ScInterpreter::ScISPMT() { // rate ; period ; total_periods ; invest if( MustHaveParamCount( GetByte(), 4 ) ) @@ -929,9 +922,7 @@ void ScInterpreter::ScISPMT() } } - -//----------------------- Finanzfunktionen ------------------------------------ - +// Finanzfunktionen double ScInterpreter::ScGetBw(double fZins, double fZzr, double fRmz, double fZw, double fF) { @@ -1073,7 +1064,6 @@ void ScInterpreter::ScGDA2() PushDouble(nGda2); } - double ScInterpreter::ScInterVDB(double fWert,double fRest,double fDauer, double fDauer1,double fPeriode,double fFaktor) { @@ -1119,7 +1109,6 @@ double ScInterpreter::ScInterVDB(double fWert,double fRest,double fDauer, return fVdb; } - inline double DblMin( double a, double b ) { return (a < b) ? a : b; @@ -1840,7 +1829,6 @@ void ScInterpreter::ScIntersect() } } - void ScInterpreter::ScRangeFunc() { formula::FormulaTokenRef x2 = PopToken(); @@ -1858,7 +1846,6 @@ void ScInterpreter::ScRangeFunc() PushTempToken( xRes.get()); } - void ScInterpreter::ScUnionFunc() { formula::FormulaTokenRef p2nd = PopToken(); @@ -1882,7 +1869,6 @@ void ScInterpreter::ScUnionFunc() ScToken* x1 = static_cast<ScToken*>(p1st.get()); ScToken* x2 = static_cast<ScToken*>(p2nd.get()); - ScTokenRef xRes; // Append to an existing RefList if there is one. if (sv1 == svRefList) @@ -1935,7 +1921,6 @@ void ScInterpreter::ScUnionFunc() PushTempToken( xRes.get()); } - void ScInterpreter::ScCurrent() { FormulaTokenRef xTok( PopToken()); @@ -2235,7 +2220,6 @@ void ScInterpreter::ScBase() } } - void ScInterpreter::ScDecimal() { // Text, Base if ( MustHaveParamCount( GetByte(), 2 ) ) @@ -2292,7 +2276,6 @@ void ScInterpreter::ScDecimal() } } - void ScInterpreter::ScConvert() { // Value, FromUnit, ToUnit if ( MustHaveParamCount( GetByte(), 3 ) ) @@ -2315,7 +2298,6 @@ void ScInterpreter::ScConvert() } } - void ScInterpreter::ScRoman() { // Value [Mode] sal_uInt8 nParamCount = GetByte(); @@ -2387,7 +2369,6 @@ void ScInterpreter::ScRoman() } } - static bool lcl_GetArabicValue( sal_Unicode cChar, sal_uInt16& rnValue, bool& rbIsDec ) { switch( cChar ) @@ -2404,7 +2385,6 @@ static bool lcl_GetArabicValue( sal_Unicode cChar, sal_uInt16& rnValue, bool& rb return true; } - void ScInterpreter::ScArabic() { OUString aRoman( GetString() ); @@ -2462,7 +2442,6 @@ void ScInterpreter::ScArabic() } } - void ScInterpreter::ScHyperLink() { sal_uInt8 nParamCount = GetByte(); @@ -2548,7 +2527,6 @@ void ScInterpreter::ScHyperLink() } } - bool lclConvertMoney( const String& aSearchUnit, double& rfRate, int& rnDec ) { struct ConvertInfo @@ -2647,9 +2625,7 @@ void ScInterpreter::ScEuroConvert() } } - -// BAHTTEXT =================================================================== - +// BAHTTEXT #define UTF8_TH_0 "\340\270\250\340\270\271\340\270\231\340\270\242\340\271\214" #define UTF8_TH_1 "\340\270\253\340\270\231\340\270\266\340\271\210\340\270\207" #define UTF8_TH_2 "\340\270\252\340\270\255\340\270\207" @@ -2673,8 +2649,7 @@ void ScInterpreter::ScEuroConvert() #define UTF8_TH_SATANG "\340\270\252\340\270\225\340\270\262\340\270\207\340\270\204\340\271\214" #define UTF8_TH_MINUS "\340\270\245\340\270\232" -// local functions ------------------------------------------------------------ - +// local functions namespace { inline void lclSplitBlock( double& rfInt, sal_Int32& rnBlock, double fValue, double fSize ) @@ -2764,8 +2739,6 @@ void lclAppendBlock( OStringBuffer& rText, sal_Int32 nValue ) } // namespace -// ---------------------------------------------------------------------------- - void ScInterpreter::ScBahtText() { sal_uInt8 nParamCount = GetByte(); @@ -2835,8 +2808,6 @@ void ScInterpreter::ScBahtText() } } -// ============================================================================ - void ScInterpreter::ScGetPivotData() { sal_uInt8 nParamCount = GetByte(); diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index abb7222c37c6..36f7fc1f38d9 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -37,15 +37,12 @@ using ::std::vector; using namespace formula; -// STATIC DATA ----------------------------------------------------------- - +// STATIC DATA #define MAX_ANZ_DOUBLE_FOR_SORT 100000 const double ScInterpreter::fMaxGammaArgument = 171.624376956302; // found experimental const double fMachEps = ::std::numeric_limits<double>::epsilon(); -//----------------------------------------------------------------------------- - class ScDistFunc { public: @@ -164,9 +161,7 @@ static double lcl_IterateInverse( const ScDistFunc& rFunction, double fAx, doubl return fRx; } -//----------------------------------------------------------------------------- // Allgemeine Funktionen -//----------------------------------------------------------------------------- void ScInterpreter::ScNoName() { @@ -886,8 +881,7 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, double fB) /* x^a * (1-x)^b - I_x(a,b) = ---------------- * result of ContFrac - a * Beta(a,b) + Ix(a,b) * result of ContFrac a * Beta(a,b) */ static double lcl_GetBetaHelperContFrac(double fX, double fA, double fB) { // like old version @@ -1138,7 +1132,6 @@ void ScInterpreter::ScVariationen2() } } - double ScInterpreter::GetBinomDistPMF(double x, double n, double p) // used in ScB and ScBinomDist // preconditions: 0.0 <= x <= n, 0.0 < p < 1.0; x,n integral although double @@ -2949,7 +2942,6 @@ bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double& vSum,std:: return true; } - void ScInterpreter::CalculateSkewOrSkewp( bool bSkewp ) { double fSum, fCount, vSum; diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index a033693d5c9c..4551e80d56ac 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -381,7 +381,6 @@ ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken return pMat; } - ScMatrixRef ScInterpreter::GetMatrix() { ScMatrixRef pMat = NULL; @@ -746,7 +745,6 @@ static int lcl_LUP_decompose( ScMatrix* mA, const SCSIZE n, return nSign; } - /* Solve a LUP decomposed equation Ax=b. LU is a combined matrix of L and U * triangulars and P the permutation vector as obtained from * lcl_LUP_decompose(). B is the right-hand side input vector, X is used to @@ -791,7 +789,6 @@ static void lcl_LUP_solve( const ScMatrix* mLU, const SCSIZE n, #endif } - void ScInterpreter::ScMatDet() { if ( MustHaveParamCount( GetByte(), 1 ) ) @@ -1015,7 +1012,6 @@ void ScInterpreter::ScMatTrans() } } - /** Minimum extent of one result matrix dimension. For a row or column vector to be replicated the larger matrix dimension is returned, else the smaller dimension. @@ -1098,7 +1094,6 @@ ScMatrixRef ScInterpreter::MatConcat(const ScMatrixRef& pMat1, const ScMatrixRef return xResMat; } - // for DATE, TIME, DATETIME static void lcl_GetDiffDateTimeFmtType( short& nFuncFmt, short nFmt1, short nFmt2 ) { @@ -1126,7 +1121,6 @@ static void lcl_GetDiffDateTimeFmtType( short& nFuncFmt, short nFmt1, short nFmt } } - void ScInterpreter::ScAdd() { CalculateAddSub(false); @@ -1808,13 +1802,11 @@ void ScInterpreter::ScFrequency() namespace { -// ----------------------------------------------------------------------------- // Helper methods for LINEST/LOGEST and TREND/GROWTH // All matrices must already exist and have the needed size, no control tests // done. Those methods, which names start with lcl_T, are adapted to case 3, // where Y (=observed values) is given as row. // Remember, ScMatrix matrices are zero based, index access (column,row). -// ----------------------------------------------------------------------------- // <A;B> over all elements; uses the matrices as vectors of length M double lcl_GetSumProduct(ScMatrixRef pMatA, ScMatrixRef pMatB, SCSIZE nM) @@ -1989,7 +1981,6 @@ bool lcl_TCalculateQRdecomposition(ScMatrixRef pMatA, return true; } - /* Applies a Householder transformation to a column vector Y with is given as * Nx1 Matrix. The Vektor u, from which the Householder transformation is build, * is the column part in matrix A, with column index C, starting with row @@ -2098,8 +2089,6 @@ void lcl_ApplyUpperRightTriangle(ScMatrixRef pMatA, } } - - double lcl_GetMeanOverAll(ScMatrixRef pMat, SCSIZE nN) { double fSum = 0.0; @@ -2282,8 +2271,6 @@ bool ScInterpreter::CheckMatrix(bool _bLOG, sal_uInt8& nCase, SCSIZE& nCX, return true; } -// ----------------------------------------------------------------------------- - // LINEST void ScInterpreter::ScRGP() { @@ -2553,7 +2540,6 @@ void ScInterpreter::CalulateRGPRKP(bool _bRKP) pResMat->PutDouble(_bRKP ? exp(pSlopes->GetDouble(i)) : pSlopes->GetDouble(i) , K-1-i, 0); - if (bStats) { double fSSreg = 0.0; @@ -2712,7 +2698,6 @@ void ScInterpreter::CalulateRGPRKP(bool _bRKP) pResMat->PutDouble(_bRKP ? exp(pSlopes->GetDouble(i)) : pSlopes->GetDouble(i) , K-1-i, 0); - if (bStats) { double fSSreg = 0.0; @@ -3124,7 +3109,6 @@ void ScInterpreter::CalculateTrendGrowth(bool _bGrowth) PushMatrix(pResMat); } - void ScInterpreter::ScMatRef() { // Falls Deltarefs drin sind... diff --git a/sc/source/core/tool/navicfg.cxx b/sc/source/core/tool/navicfg.cxx index 6ea645aa9cc6..524598138ea0 100644 --- a/sc/source/core/tool/navicfg.cxx +++ b/sc/source/core/tool/navicfg.cxx @@ -19,12 +19,8 @@ #include "navicfg.hxx" -//------------------------------------------------------------------ - //! #define CFGPATH_NAVIPI "Office.Calc/Navigator" -//------------------------------------------------------------------ - ScNavipiCfg::ScNavipiCfg() : //! ConfigItem( OUString( CFGPATH_NAVIPI ) ), nListMode(0), @@ -33,8 +29,6 @@ ScNavipiCfg::ScNavipiCfg() : { } -//------------------------------------------------------------------------ - void ScNavipiCfg::SetListMode(sal_uInt16 nNew) { if ( nListMode != nNew ) @@ -62,5 +56,4 @@ void ScNavipiCfg::SetRootType(sal_uInt16 nNew) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index 3a7417e92f55..e2156d3653fb 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.cxx @@ -23,8 +23,6 @@ #include "global.hxx" // for pSysLocale #include <unotools/syslocale.hxx> -//------------------------------------------------------------------ - sal_Bool ScOptionsUtil::IsMetricSystem() { //! which language should be used here - system language or installed office language? @@ -34,8 +32,6 @@ sal_Bool ScOptionsUtil::IsMetricSystem() return ( eSys == MEASURE_METRIC ); } -//------------------------------------------------------------------ - ScLinkConfigItem::ScLinkConfigItem( const OUString& rSubTree ) : ConfigItem( rSubTree ) { @@ -61,5 +57,4 @@ void ScLinkConfigItem::Commit() aCommitLink.Call( this ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index 02a697d133d3..6f3067a651d1 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.cxx @@ -37,7 +37,6 @@ #include "sc.hrc" // VAR_ARGS #endif - /* Following assumptions are made: * - OpCodes not specified at all will have at least one and only parameters of * type Value, no check is done on the count of parameters => no Bounds type @@ -208,7 +207,6 @@ const ScParameterClassification::RawData ScParameterClassification::pRawData[] = ScParameterClassification::RunData * ScParameterClassification::pData = NULL; - void ScParameterClassification::Init() { if ( pData ) @@ -281,14 +279,12 @@ void ScParameterClassification::Init() #endif } - void ScParameterClassification::Exit() { delete [] pData; pData = NULL; } - ScParameterClassification::Type ScParameterClassification::GetParameterType( const formula::FormulaToken* pToken, sal_uInt16 nParameter) { @@ -329,7 +325,6 @@ ScParameterClassification::Type ScParameterClassification::GetParameterType( return Unknown; } - ScParameterClassification::Type ScParameterClassification::GetExternalParameterType( const formula::FormulaToken* pToken, sal_uInt16 nParameter) @@ -405,8 +400,6 @@ ScParameterClassification::GetExternalParameterType( const formula::FormulaToken return eRet; } -//----------------------------------------------------------------------------- - #if OSL_DEBUG_LEVEL > 1 // add remaining functions, all Value parameters @@ -465,7 +458,6 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource() } } - void ScParameterClassification::GenerateDocumentation() { static const sal_Char aEnvVarName[] = "OOO_CALC_GENPARCLASSDOC"; diff --git a/sc/source/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index e6a2c49e9f89..b56bf987ade7 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.cxx @@ -26,13 +26,8 @@ using namespace utl; using namespace com::sun::star::uno; - -// ----------------------------------------------------------------------- - TYPEINIT1(ScTpPrintItem, SfxPoolItem); -// ----------------------------------------------------------------------- - ScPrintOptions::ScPrintOptions() { SetDefaults(); @@ -72,9 +67,6 @@ bool ScPrintOptions::operator!=( const ScPrintOptions& rOpt ) const return !(operator==(rOpt)); } -// ----------------------------------------------------------------------- - - ScTpPrintItem::ScTpPrintItem( sal_uInt16 nWhichP, const ScPrintOptions& rOpt ) : SfxPoolItem ( nWhichP ), theOptions ( rOpt ) @@ -109,8 +101,6 @@ SfxPoolItem* ScTpPrintItem::Clone( SfxItemPool * ) const return new ScTpPrintItem( *this ); } -// ----------------------------------------------------------------------- - #define CFGPATH_PRINT "Office.Calc/Print" #define SCPRINTOPT_EMPTYPAGES 0 @@ -161,7 +151,6 @@ ScPrintCfg::ScPrintCfg() : } } - void ScPrintCfg::Commit() { Sequence<OUString> aNames = GetPropertyNames(); diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx index 31588fe9797b..a7d3453ace3b 100644 --- a/sc/source/core/tool/prnsave.cxx +++ b/sc/source/core/tool/prnsave.cxx @@ -21,9 +21,7 @@ #include "global.hxx" #include "address.hxx" -// STATIC DATA ----------------------------------------------------------- - -//------------------------------------------------------------------ +// STATIC DATA // // Daten pro Tabelle @@ -113,7 +111,4 @@ sal_Bool ScPrintRangeSaver::operator==( const ScPrintRangeSaver& rCmp ) const return bEqual; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index b202432b6156..b35e1a411731 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -221,8 +221,6 @@ void ScQueryParamBase::FillInExcelSyntax(const OUString& rStr, SCSIZE nIndex) } } -// ============================================================================ - ScQueryParamTable::ScQueryParamTable() { } @@ -236,8 +234,6 @@ ScQueryParamTable::~ScQueryParamTable() { } -// ============================================================================ - ScQueryParam::ScQueryParam() : ScQueryParamBase(), ScQueryParamTable(), @@ -249,8 +245,6 @@ ScQueryParam::ScQueryParam() : Clear(); } -//------------------------------------------------------------------------ - ScQueryParam::ScQueryParam( const ScQueryParam& r ) : ScQueryParamBase(r), ScQueryParamTable(r), @@ -268,15 +262,10 @@ ScQueryParam::ScQueryParam( const ScDBQueryParamInternal& r ) : { } - -//------------------------------------------------------------------------ - ScQueryParam::~ScQueryParam() { } -//------------------------------------------------------------------------ - void ScQueryParam::Clear() { nCol1=nCol2 = 0; @@ -300,8 +289,6 @@ void ScQueryParam::ClearDestParams() nDestRow = 0; } -//------------------------------------------------------------------------ - ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r ) { nCol1 = r.nCol1; @@ -325,8 +312,6 @@ ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r ) return *this; } -//------------------------------------------------------------------------ - bool ScQueryParam::operator==( const ScQueryParam& rOther ) const { bool bEqual = false; @@ -365,8 +350,6 @@ bool ScQueryParam::operator==( const ScQueryParam& rOther ) const return bEqual; } -//------------------------------------------------------------------------ - void ScQueryParam::MoveToDest() { if (!bInplace) @@ -392,8 +375,6 @@ void ScQueryParam::MoveToDest() } } -// ============================================================================ - ScDBQueryParamBase::ScDBQueryParamBase(DataType eType) : ScQueryParamBase(), mnField(-1), @@ -411,8 +392,6 @@ ScDBQueryParamBase::DataType ScDBQueryParamBase::GetType() const return meType; } -// ============================================================================ - ScDBQueryParamInternal::ScDBQueryParamInternal() : ScDBQueryParamBase(ScDBQueryParamBase::INTERNAL), ScQueryParamTable() @@ -428,8 +407,6 @@ bool ScDBQueryParamInternal::IsValidFieldIndex() const return nCol1 <= mnField && mnField <= nCol2; } -// ============================================================================ - ScDBQueryParamMatrix::ScDBQueryParamMatrix() : ScDBQueryParamBase(ScDBQueryParamBase::MATRIX) { diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index 00a9ca025dca..64a6943c1f6f 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -173,8 +173,7 @@ private: } -// === ScRangeList ==================================================== - +// ScRangeList ScRangeList::~ScRangeList() { RemoveAll(); @@ -225,7 +224,6 @@ sal_uInt16 ScRangeList::Parse( const String& rStr, ScDocument* pDoc, sal_uInt16 return 0; } - void ScRangeList::Format( String& rStr, sal_uInt16 nFlags, ScDocument* pDoc, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cDelimiter ) const @@ -239,7 +237,6 @@ void ScRangeList::Format( String& rStr, sal_uInt16 nFlags, ScDocument* pDoc, for_each(maRanges.begin(), maRanges.end(), func); } - void ScRangeList::Format( OUString& rStr, sal_uInt16 nFlags, ScDocument* pDoc, formula::FormulaGrammar::AddressConvention eConv, sal_Unicode cDelimiter ) const @@ -254,7 +251,6 @@ void ScRangeList::Format( OUString& rStr, sal_uInt16 nFlags, ScDocument* pDoc, rStr = aStr; } - void ScRangeList::Join( const ScRange& r, bool bIsInList ) { if ( maRanges.empty() ) @@ -356,7 +352,6 @@ void ScRangeList::Join( const ScRange& r, bool bIsInList ) Append( r ); } - bool ScRangeList::operator==( const ScRangeList& r ) const { if ( this == &r ) @@ -943,6 +938,7 @@ bool handleFourRanges( const ScRange& rDelRange, ScRange* p, std::vector<ScRange if (nCol1 < nDeleteCol1 && nDeleteCol2 < nCol2 && nRow1 < nDeleteRow1 && nDeleteRow2 < nRow2) { + // +---------------+ // | 1 | // +---+-------+---+ @@ -1092,7 +1088,6 @@ bool ScRangeList::In( const ScRange& rRange ) const return itr != itrEnd; } - size_t ScRangeList::GetCellCount() const { CountCells func; @@ -1234,15 +1229,13 @@ ScRangeList ScRangeList::GetIntersectedRange(const ScRange& rRange) const return aReturn; } -// === ScRangePairList ======================================================== - +// ScRangePairList ScRangePairList::~ScRangePairList() { for_each( maPairs.begin(), maPairs.end(), ScDeleteObjectByPtr<ScRangePair>() ); maPairs.clear(); } -//----------------------------------------------------------------------------- ScRangePair* ScRangePairList::Remove(size_t nPos) { if (maPairs.size() <= nPos) @@ -1256,7 +1249,6 @@ ScRangePair* ScRangePairList::Remove(size_t nPos) return p; } -//----------------------------------------------------------------------------- ScRangePair* ScRangePairList::Remove( ScRangePair* Adr) { ScRangePair* p = NULL; @@ -1346,7 +1338,6 @@ bool ScRangePairList::UpdateReference( UpdateRefMode eUpdateRefMode, return bChanged; } -//----------------------------------------------------------------------------- // Delete entries that have the labels (first range) on nTab void ScRangePairList::DeleteOnTab( SCTAB nTab ) { @@ -1367,7 +1358,6 @@ void ScRangePairList::DeleteOnTab( SCTAB nTab ) } } -//----------------------------------------------------------------------------- ScRangePair* ScRangePairList::Find( const ScAddress& rAdr ) const { for ( size_t j = 0, nListCount = maPairs.size(); j < nListCount; j++ ) @@ -1379,7 +1369,6 @@ ScRangePair* ScRangePairList::Find( const ScAddress& rAdr ) const return NULL; } -//----------------------------------------------------------------------------- ScRangePair* ScRangePairList::Find( const ScRange& rRange ) const { for ( size_t j = 0, nListCount = maPairs.size(); j < nListCount; j++ ) @@ -1391,8 +1380,6 @@ ScRangePair* ScRangePairList::Find( const ScRange& rRange ) const return NULL; } - -//----------------------------------------------------------------------------- ScRangePairList* ScRangePairList::Clone() const { ScRangePairList* pNew = new ScRangePairList; @@ -1403,14 +1390,12 @@ ScRangePairList* ScRangePairList::Clone() const return pNew; } -//----------------------------------------------------------------------------- struct ScRangePairNameSort { ScRangePair* pPair; ScDocument* pDoc; }; -//----------------------------------------------------------------------------- extern "C" int SAL_CALL ScRangePairList_QsortNameCompare( const void* p1, const void* p2 ) { @@ -1489,7 +1474,6 @@ int SAL_CALL ScRangePairList_QsortNameCompare( const void* p1, const void* p2 ) #endif } -//----------------------------------------------------------------------------- void ScRangePairList::Join( const ScRangePair& r, bool bIsInList ) { if ( maPairs.empty() ) @@ -1609,7 +1593,6 @@ void ScRangePairList::Join( const ScRangePair& r, bool bIsInList ) Append( r ); } -//----------------------------------------------------------------------------- ScRangePair** ScRangePairList::CreateNameSortedArray( size_t& nListCount, ScDocument* pDoc ) const { diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 23245dcd2f58..f520c16b463c 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -41,9 +41,7 @@ using namespace formula; using ::std::pair; using ::std::unary_function; -//======================================================================== // ScRangeData -//======================================================================== ScRangeData::ScRangeData( ScDocument* pDok, const OUString& rName, @@ -363,7 +361,6 @@ bool ScRangeData::operator== (const ScRangeData& rData) const // for Undo return true; } - bool ScRangeData::IsRangeAtBlock( const ScRange& rBlock ) const { bool bRet = false; @@ -499,7 +496,6 @@ SCCOL ScRangeData::GetMaxCol() const return mnMaxCol >= 0 ? mnMaxCol : MAXCOL; } - sal_uInt16 ScRangeData::GetErrCode() const { return pCode ? pCode->GetCodeError() : 0; @@ -630,7 +626,6 @@ void ScRangeData::InitCode() } } - extern "C" int SAL_CALL ScRangeData_QsortNameCompare( const void* p1, const void* p2 ) { diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index 9331a63fd34f..39ef81288224 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.cxx @@ -31,8 +31,6 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ - static bool lcl_HasErrors( ScDocument* pDoc, const ScRange& rRange ) { // no need to look at empty cells - just use ScCellIterator @@ -84,7 +82,6 @@ sal_Bool ScRangeToSequence::FillLongArray( uno::Any& rAny, ScDocument* pDoc, con return !lcl_HasErrors( pDoc, rRange ); } - sal_Bool ScRangeToSequence::FillLongArray( uno::Any& rAny, const ScMatrix* pMatrix ) { if (!pMatrix) @@ -113,8 +110,6 @@ sal_Bool ScRangeToSequence::FillLongArray( uno::Any& rAny, const ScMatrix* pMatr return sal_True; } -//------------------------------------------------------------------------ - sal_Bool ScRangeToSequence::FillDoubleArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ) { SCTAB nTab = rRange.aStart.Tab(); @@ -140,7 +135,6 @@ sal_Bool ScRangeToSequence::FillDoubleArray( uno::Any& rAny, ScDocument* pDoc, c return !lcl_HasErrors( pDoc, rRange ); } - sal_Bool ScRangeToSequence::FillDoubleArray( uno::Any& rAny, const ScMatrix* pMatrix ) { if (!pMatrix) @@ -169,8 +163,6 @@ sal_Bool ScRangeToSequence::FillDoubleArray( uno::Any& rAny, const ScMatrix* pMa return sal_True; } -//------------------------------------------------------------------------ - sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ) { SCTAB nTab = rRange.aStart.Tab(); @@ -202,7 +194,6 @@ sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, ScDocument* pDoc, c return !bHasErrors; } - sal_Bool ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMatrix, SvNumberFormatter* pFormatter ) { @@ -291,7 +282,6 @@ sal_Bool ScRangeToSequence::FillMixedArray( uno::Any& rAny, ScDocument* pDoc, co return bAllowNV || !bHasErrors; } - sal_Bool ScRangeToSequence::FillMixedArray( uno::Any& rAny, const ScMatrix* pMatrix, bool bDataTypes ) { if (!pMatrix) @@ -333,8 +323,6 @@ sal_Bool ScRangeToSequence::FillMixedArray( uno::Any& rAny, const ScMatrix* pMat return sal_True; } -//------------------------------------------------------------------------ - bool ScApiTypeConversion::ConvertAnyToDouble( double & o_fVal, com::sun::star::uno::TypeClass & o_eClass, const com::sun::star::uno::Any & rAny ) @@ -365,8 +353,6 @@ bool ScApiTypeConversion::ConvertAnyToDouble( double & o_fVal, return bRet; } -//------------------------------------------------------------------------ - ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const com::sun::star::uno::Any & rAny ) { ScMatrixRef xMatrix; @@ -441,9 +427,6 @@ ScMatrixRef ScSequenceToMatrix::CreateMixedMatrix( const com::sun::star::uno::An return xMatrix; } - -//------------------------------------------------------------------------ - sal_Bool ScByteSequenceToString::GetString( OUString& rString, const uno::Any& rAny, sal_uInt16 nEncoding ) { @@ -458,6 +441,4 @@ sal_Bool ScByteSequenceToString::GetString( OUString& rString, const uno::Any& r return false; } -//------------------------------------------------------------------------ - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 93490af4e931..74e1dbfbd8ec 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.cxx @@ -31,8 +31,6 @@ using ::formula::FormulaGrammar; using namespace ::com::sun::star; -//------------------------------------------------------------------------ - sal_Bool ScRangeUtil::MakeArea( const String& rAreaStr, ScArea& rArea, ScDocument* pDoc, @@ -68,8 +66,6 @@ sal_Bool ScRangeUtil::MakeArea( const String& rAreaStr, return nSuccess; } -//------------------------------------------------------------------------ - void ScRangeUtil::CutPosString( const String& theAreaStr, String& thePosStr ) const { @@ -87,8 +83,6 @@ void ScRangeUtil::CutPosString( const String& theAreaStr, thePosStr = aPosStr; } -//------------------------------------------------------------------------ - sal_Bool ScRangeUtil::IsAbsTabArea( const String& rAreaStr, ScDocument* pDoc, ScArea*** pppAreas, @@ -176,8 +170,6 @@ sal_Bool ScRangeUtil::IsAbsTabArea( const String& rAreaStr, return bStrOk; } -//------------------------------------------------------------------------ - sal_Bool ScRangeUtil::IsAbsArea( const String& rAreaStr, ScDocument* pDoc, SCTAB nTab, @@ -217,8 +209,6 @@ sal_Bool ScRangeUtil::IsAbsArea( const String& rAreaStr, return bIsAbsArea; } -//------------------------------------------------------------------------ - sal_Bool ScRangeUtil::IsAbsPos( const String& rPosStr, ScDocument* pDoc, SCTAB nTab, @@ -244,8 +234,6 @@ sal_Bool ScRangeUtil::IsAbsPos( const String& rPosStr, return bIsAbsPos; } -//------------------------------------------------------------------------ - sal_Bool ScRangeUtil::MakeRangeFromName ( const String& rName, ScDocument* pDoc, @@ -342,8 +330,6 @@ sal_Bool ScRangeUtil::MakeRangeFromName ( return bResult; } -//======================================================================== - void ScRangeStringConverter::AssignString( OUString& rString, const OUString& rNewStr, @@ -450,8 +436,6 @@ sal_Int32 ScRangeStringConverter::GetTokenCount( const OUString& rString, sal_Un return nCount; } -//___________________________________________________________________ - sal_Bool ScRangeStringConverter::GetAddressFromString( ScAddress& rAddress, const OUString& rAddressStr, @@ -570,9 +554,6 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString( return bRet; } - -//___________________________________________________________________ - sal_Bool ScRangeStringConverter::GetAreaFromString( ScArea& rArea, const OUString& rRangeStr, @@ -596,9 +577,6 @@ sal_Bool ScRangeStringConverter::GetAreaFromString( return bResult; } - -//___________________________________________________________________ - sal_Bool ScRangeStringConverter::GetAddressFromString( table::CellAddress& rAddress, const OUString& rAddressStr, @@ -662,9 +640,6 @@ sal_Bool ScRangeStringConverter::GetRangeListFromString( return bRet; } - -//___________________________________________________________________ - void ScRangeStringConverter::GetStringFromAddress( OUString& rString, const ScAddress& rAddress, @@ -724,9 +699,6 @@ void ScRangeStringConverter::GetStringFromRangeList( rString = sRangeListStr; } - -//___________________________________________________________________ - void ScRangeStringConverter::GetStringFromArea( OUString& rString, const ScArea& rArea, @@ -740,9 +712,6 @@ void ScRangeStringConverter::GetStringFromArea( GetStringFromRange( rString, aRange, pDocument, eConv, cSeparator, bAppendStr, nFormatFlags ); } - -//___________________________________________________________________ - void ScRangeStringConverter::GetStringFromAddress( OUString& rString, const table::CellAddress& rAddress, @@ -1005,8 +974,6 @@ ScRangeData* ScRangeStringConverter::GetRangeDataFromString(const OUString& rStr return pData; } -//======================================================================== - ScArea::ScArea( SCTAB tab, SCCOL colStart, SCROW rowStart, SCCOL colEnd, SCROW rowEnd ) : @@ -1016,8 +983,6 @@ ScArea::ScArea( SCTAB tab, { } -//------------------------------------------------------------------------ - ScArea::ScArea( const ScArea& r ) : nTab ( r.nTab ), nColStart( r.nColStart ), nRowStart( r.nRowStart ), @@ -1025,8 +990,6 @@ ScArea::ScArea( const ScArea& r ) : { } -//------------------------------------------------------------------------ - ScArea& ScArea::operator=( const ScArea& r ) { nTab = r.nTab; @@ -1037,8 +1000,6 @@ ScArea& ScArea::operator=( const ScArea& r ) return *this; } -//------------------------------------------------------------------------ - sal_Bool ScArea::operator==( const ScArea& r ) const { return ( (nTab == r.nTab) @@ -1048,8 +1009,6 @@ sal_Bool ScArea::operator==( const ScArea& r ) const && (nRowEnd == r.nRowEnd) ); } -//------------------------------------------------------------------------ - ScAreaNameIterator::ScAreaNameIterator( ScDocument* pDoc ) : pRangeName(pDoc->GetRangeName()), pDBCollection(pDoc->GetDBCollection()), @@ -1117,7 +1076,4 @@ bool ScAreaNameIterator::Next( String& rName, ScRange& rRange ) } } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx index 7ec8f2b3c7ac..606941aaa6c3 100644 --- a/sc/source/core/tool/rechead.cxx +++ b/sc/source/core/tool/rechead.cxx @@ -20,9 +20,7 @@ #include "rechead.hxx" #include "scerrors.hxx" -// STATIC DATA ----------------------------------------------------------- - -// ======================================================================= +// STATIC DATA ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) : rStream( rNewStream ) @@ -107,8 +105,6 @@ sal_uLong ScMultipleReadHeader::BytesLeft() const return 0; } -// ----------------------------------------------------------------------- - ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault) : rStream( rNewStream ), aMemStream( 4096, 4096 ) @@ -150,8 +146,4 @@ void ScMultipleWriteHeader::StartEntry() nEntryStart = nPos; } - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx index 8c0fe9224891..e461920ce22b 100644 --- a/sc/source/core/tool/reffind.cxx +++ b/sc/source/core/tool/reffind.cxx @@ -22,8 +22,7 @@ #include "compiler.hxx" #include "document.hxx" -// STATIC DATA ----------------------------------------------------------- - +// STATIC DATA namespace { // Include colon; addresses in range reference are handled individually. @@ -31,8 +30,6 @@ const sal_Unicode pDelimiters[] = { '=','(',')','+','-','*','/','^','&',' ','{','}','<','>',':', 0 }; -// ======================================================================= - inline bool IsText( sal_Unicode c ) { bool bFound = ScGlobal::UnicodeStrChr( pDelimiters, c ); @@ -296,7 +293,4 @@ void ScRefFinder::ToggleRel( sal_Int32 nStartPos, sal_Int32 nEndPos ) maFormula = aTotal; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx index 5ae57bef63ec..7cab89909de8 100644 --- a/sc/source/core/tool/refupdat.cxx +++ b/sc/source/core/tool/refupdat.cxx @@ -23,8 +23,6 @@ #include "bigrange.hxx" #include "chgtrack.hxx" -//------------------------------------------------------------------------ - template< typename R, typename S, typename U > static bool lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask ) { @@ -199,7 +197,6 @@ bool IsExpand( R n1, R n2, U nStart, S nD ) ); // n1 < nStart <= n2 wird sowieso expanded! } - template< typename R, typename S, typename U > void Expand( R& n1, R& n2, U nStart, S nD ) { //! nach normalem Move..., nur wenn IsExpand vorher true war! @@ -213,7 +210,6 @@ void Expand( R& n1, R& n2, U nStart, S nD ) n1 = sal::static_int_cast<R>( n1 - nD ); } - static bool lcl_IsWrapBig( sal_Int32 nRef, sal_Int32 nDelta ) { if ( nRef > 0 && nDelta > 0 ) @@ -223,7 +219,6 @@ static bool lcl_IsWrapBig( sal_Int32 nRef, sal_Int32 nDelta ) return false; } - static bool lcl_MoveBig( sal_Int32& rRef, sal_Int32 nStart, sal_Int32 nDelta ) { bool bCut = false; @@ -246,7 +241,6 @@ static bool lcl_MoveItCutBig( sal_Int32& rRef, sal_Int32 nDelta ) return bCut; } - ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, @@ -386,7 +380,6 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMo return eRet; } - // simples UpdateReference fuer ScBigRange (ScChangeAction/ScChangeTrack) // Referenzen koennen auch ausserhalb des Dokuments liegen! // Ganze Spalten/Zeilen (nInt32Min..nInt32Max) bleiben immer solche! @@ -526,8 +519,6 @@ void ScRefUpdate::MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos, rRef.SetRange(aAbsRange, rPos); } -//------------------------------------------------------------------ - void ScRefUpdate::DoTranspose( SCsCOL& rCol, SCsROW& rRow, SCsTAB& rTab, ScDocument* pDoc, const ScRange& rSource, const ScAddress& rDest ) { @@ -573,12 +564,9 @@ ScRefUpdateRes ScRefUpdate::UpdateTranspose( return eRet; } -//------------------------------------------------------------------ - // UpdateGrow - erweitert Referenzen, die genau auf den Bereich zeigen // kommt ohne Dokument aus - ScRefUpdateRes ScRefUpdate::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY, ScRange& rRef ) { @@ -611,5 +599,4 @@ ScRefUpdateRes ScRefUpdate::UpdateGrow( return eRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 1147efd7e26a..286b42548ccc 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scmatrix.hxx" #include "global.hxx" #include "address.hxx" @@ -64,8 +63,6 @@ struct custom_string_trait typedef mdds::mtv::custom_block_func1<sc::string_block> element_block_func; }; -// ============================================================================ - namespace { typedef mdds::multi_type_matrix<custom_string_trait> MatrixImplType; @@ -1053,7 +1050,6 @@ size_t WalkAndMatchElements<OUString>::compare(const MatrixImplType::element_blo return ResultNotSet; } - struct MaxOp { static double init() { return -std::numeric_limits<double>::max(); } @@ -1387,8 +1383,6 @@ void ScMatrixImpl::CalcPosition(SCSIZE nIndex, SCSIZE& rC, SCSIZE& rR) const rR = nIndex - rC*nRowSize; } -// ============================================================================ - void ScMatrix::IncRef() const { ++nRefCnt; diff --git a/sc/source/core/tool/simplerangelist.cxx b/sc/source/core/tool/simplerangelist.cxx index b6b6b05ddf6c..4c428e21d240 100644 --- a/sc/source/core/tool/simplerangelist.cxx +++ b/sc/source/core/tool/simplerangelist.cxx @@ -24,13 +24,9 @@ using ::std::list; using ::std::pair; using ::std::max; -// ============================================================================ - ScSimpleRangeList::Range::Range(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) : mnCol1(nCol1), mnRow1(nRow1), mnCol2(nCol2), mnRow2(nRow2) {} -// ---------------------------------------------------------------------------- - ScSimpleRangeList::ScSimpleRangeList() { } diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx index fcaae9d6d5a1..2a65642a990f 100644 --- a/sc/source/core/tool/stringutil.cxx +++ b/sc/source/core/tool/stringutil.cxx @@ -45,8 +45,6 @@ void ScSetStringParam::setNumericInput() meSetTextNumFormat = Never; } -// ============================================================================- - bool ScStringUtil::parseSimpleNumber( const OUString& rStr, sal_Unicode dsep, sal_Unicode gsep, double& rVal) { diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index 17fe72f5fdfe..883d02d98c69 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -27,14 +27,9 @@ using namespace utl; using namespace com::sun::star::uno; - -// -------------------------------------------------------------------- - const sal_Unicode cDelim = 0x01; // Delimiter zwischen From und To - -// --- ScUnitConverterData -------------------------------------------- - +// ScUnitConverterData ScUnitConverterData::ScUnitConverterData( const OUString& rFromUnit, const OUString& rToUnit, double fValue ) : maIndexString(BuildIndexString(rFromUnit, rToUnit)), @@ -65,8 +60,7 @@ OUString ScUnitConverterData::BuildIndexString( return aBuf.makeStringAndClear(); } -// --- ScUnitConverter ------------------------------------------------ - +// ScUnitConverter #define CFGPATH_UNIT "Office.Calc/UnitConversion" #define CFGSTR_UNIT_FROM "FromUnit" #define CFGSTR_UNIT_TO "ToUnit" @@ -147,5 +141,4 @@ bool ScUnitConverter::GetValue( return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 964b623f2ff2..cd266a533916 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -34,15 +34,9 @@ using namespace utl; using namespace com::sun::star::uno; - -//------------------------------------------------------------------ - TYPEINIT1(ScTpViewItem, SfxPoolItem); -//======================================================================== // class ScGridOptions -//======================================================================== - void ScGridOptions::SetDefaults() { @@ -69,8 +63,6 @@ void ScGridOptions::SetDefaults() nFldDivisionY = 1; } -//------------------------------------------------------------------------ - const ScGridOptions& ScGridOptions::operator=( const ScGridOptions& rCpy ) { nFldDrawX = rCpy.nFldDrawX; // UINT32 @@ -87,8 +79,6 @@ const ScGridOptions& ScGridOptions::operator=( const ScGridOptions& rCpy ) return *this; } -//------------------------------------------------------------------------ - bool ScGridOptions::operator==( const ScGridOptions& rCpy ) const { return ( nFldDrawX == rCpy.nFldDrawX @@ -103,31 +93,22 @@ bool ScGridOptions::operator==( const ScGridOptions& rCpy ) const && bEqualGrid == rCpy.bEqualGrid ); } - -//======================================================================== // class ScViewOptions -//======================================================================== ScViewOptions::ScViewOptions() { SetDefaults(); } -//------------------------------------------------------------------------ - ScViewOptions::ScViewOptions( const ScViewOptions& rCpy ) { *this = rCpy; } -//------------------------------------------------------------------------ - ScViewOptions::~ScViewOptions() { } -//------------------------------------------------------------------------ - void ScViewOptions::SetDefaults() { aOptArr[ VOPT_FORMULAS ] = false; @@ -156,8 +137,6 @@ void ScViewOptions::SetDefaults() aGridOpt.SetDefaults(); } -//------------------------------------------------------------------------ - Color ScViewOptions::GetGridColor( String* pStrName ) const { if ( pStrName ) @@ -166,8 +145,6 @@ Color ScViewOptions::GetGridColor( String* pStrName ) const return aGridCol; } -//------------------------------------------------------------------------ - const ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy ) { sal_uInt16 i; @@ -182,8 +159,6 @@ const ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy ) return *this; } -//------------------------------------------------------------------------ - int ScViewOptions::operator==( const ScViewOptions& rOpt ) const { sal_Bool bEqual = sal_True; @@ -199,8 +174,6 @@ int ScViewOptions::operator==( const ScViewOptions& rOpt ) const return bEqual; } -//------------------------------------------------------------------------ - SvxGridItem* ScViewOptions::CreateGridItem( sal_uInt16 nId /* = SID_ATTR_GRID_OPTIONS */ ) const { SvxGridItem* pItem = new SvxGridItem( nId ); @@ -219,11 +192,7 @@ SvxGridItem* ScViewOptions::CreateGridItem( sal_uInt16 nId /* = SID_ATTR_GRID_OP return pItem; } -//======================================================================== // ScTpViewItem - Daten fuer die ViewOptions-TabPage -//======================================================================== - -//------------------------------------------------------------------------ ScTpViewItem::ScTpViewItem( sal_uInt16 nWhichP, const ScViewOptions& rOpt ) : SfxPoolItem ( nWhichP ), @@ -231,29 +200,21 @@ ScTpViewItem::ScTpViewItem( sal_uInt16 nWhichP, const ScViewOptions& rOpt ) { } -//------------------------------------------------------------------------ - ScTpViewItem::ScTpViewItem( const ScTpViewItem& rItem ) : SfxPoolItem ( rItem ), theOptions ( rItem.theOptions ) { } -//------------------------------------------------------------------------ - ScTpViewItem::~ScTpViewItem() { } -//------------------------------------------------------------------------ - OUString ScTpViewItem::GetValueText() const { return OUString("ScTpViewItem"); } -//------------------------------------------------------------------------ - int ScTpViewItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -263,16 +224,12 @@ int ScTpViewItem::operator==( const SfxPoolItem& rItem ) const return ( theOptions == rPItem.theOptions ); } -//------------------------------------------------------------------------ - SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const { return new ScTpViewItem( *this ); } -//================================================================== // Config Item containing view options -//================================================================== #define CFGPATH_LAYOUT "Office.Calc/Layout" @@ -315,7 +272,6 @@ SfxPoolItem* ScTpViewItem::Clone( SfxItemPool * ) const #define SCGRIDOPT_SIZETOGRID 9 #define SCGRIDOPT_COUNT 10 - Sequence<OUString> ScViewCfg::GetLayoutPropertyNames() { static const char* aPropNames[] = @@ -393,7 +349,6 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames() return aNames; } - ScViewCfg::ScViewCfg() : aLayoutItem( OUString( CFGPATH_LAYOUT ) ), aDisplayItem( OUString( CFGPATH_DISPLAY ) ), @@ -718,5 +673,4 @@ void ScViewCfg::SetOptions( const ScViewOptions& rNew ) aGridItem.SetModified(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 3611c71fd466..1655b2da8bd8 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <vcl/svapp.hxx> @@ -25,8 +24,6 @@ #include "zforauto.hxx" #include "global.hxx" -//------------------------------------------------------------------------ - ScNumFormatAbbrev::ScNumFormatAbbrev() : sFormatstring ( "Standard" ), eLnge (LANGUAGE_SYSTEM), |