diff options
Diffstat (limited to 'sc/source/core')
49 files changed, 322 insertions, 322 deletions
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index bcfdb477f059..0ad67fca8261 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -48,7 +48,7 @@ // STATIC DATA ----------------------------------------------------------- -//------------------------------------------------------------------------ + using ::editeng::SvxBorderLine; ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) : @@ -63,7 +63,7 @@ ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) : pData[0].pPattern = pDocument->GetDefPattern(); // no put } -//------------------------------------------------------------------------ + ScAttrArray::~ScAttrArray() { @@ -78,7 +78,7 @@ ScAttrArray::~ScAttrArray() delete[] pData; } -//------------------------------------------------------------------------ + #if OSL_DEBUG_LEVEL > 1 void ScAttrArray::TestData() const { @@ -107,7 +107,7 @@ void ScAttrArray::TestData() const } #endif -//------------------------------------------------------------------------ + void ScAttrArray::Reset( const ScPatternAttr* pPattern ) { @@ -179,7 +179,7 @@ bool ScAttrArray::Concat(SCSIZE nPos) return bRet; } -//------------------------------------------------------------------------ + bool ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const { @@ -342,7 +342,7 @@ void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 n } -//------------------------------------------------------------------------ + void ScAttrArray::SetPattern( SCROW nRow, const ScPatternAttr* pPattern, bool bPutToPool ) { diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index d6d3b4f125bc..d47a519b47da 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + TYPEINIT1(ScMergeAttr, SfxPoolItem); TYPEINIT1_AUTOFACTORY(ScProtectionAttr, SfxPoolItem); @@ -53,7 +53,7 @@ TYPEINIT1(ScDoubleItem, SfxPoolItem); TYPEINIT1(ScPageScaleToItem, SfxPoolItem); TYPEINIT1(ScCondFormatItem, SfxPoolItem); -//------------------------------------------------------------------------ + // // General Help Function @@ -92,9 +92,9 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB // Item - Implementierungen // -//------------------------------------------------------------------------ + // Merge -//------------------------------------------------------------------------ + ScMergeAttr::ScMergeAttr(): SfxPoolItem(ATTR_MERGE), @@ -102,7 +102,7 @@ ScMergeAttr::ScMergeAttr(): nRowMerge(0) {} -//------------------------------------------------------------------------ + ScMergeAttr::ScMergeAttr( SCsCOL nCol, SCsROW nRow): SfxPoolItem(ATTR_MERGE), @@ -110,7 +110,7 @@ ScMergeAttr::ScMergeAttr( SCsCOL nCol, SCsROW nRow): nRowMerge(nRow) {} -//------------------------------------------------------------------------ + ScMergeAttr::ScMergeAttr(const ScMergeAttr& rItem): SfxPoolItem(ATTR_MERGE) @@ -123,7 +123,7 @@ ScMergeAttr::~ScMergeAttr() { } -//------------------------------------------------------------------------ + OUString ScMergeAttr::GetValueText() const { @@ -135,7 +135,7 @@ OUString ScMergeAttr::GetValueText() const return aRet; } -//------------------------------------------------------------------------ + bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const { @@ -145,14 +145,14 @@ bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const && (nRowMerge == ((ScMergeAttr&)rItem).nRowMerge); } -//------------------------------------------------------------------------ + SfxPoolItem* ScMergeAttr::Clone( SfxItemPool * ) const { return new ScMergeAttr(*this); } -//------------------------------------------------------------------------ + SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) const { @@ -163,16 +163,16 @@ SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) con return new ScMergeAttr(static_cast<SCCOL>(nCol),static_cast<SCROW>(nRow)); } -//------------------------------------------------------------------------ + // MergeFlag -//------------------------------------------------------------------------ + ScMergeFlagAttr::ScMergeFlagAttr(): SfxInt16Item(ATTR_MERGE_FLAG, 0) { } -//------------------------------------------------------------------------ + ScMergeFlagAttr::ScMergeFlagAttr(sal_Int16 nFlags): SfxInt16Item(ATTR_MERGE_FLAG, nFlags) @@ -193,9 +193,9 @@ bool ScMergeFlagAttr::HasPivotPopupButton() const return (GetValue() & SC_MF_BUTTON_POPUP) != 0; } -//------------------------------------------------------------------------ + // Protection -//------------------------------------------------------------------------ + ScProtectionAttr::ScProtectionAttr(): SfxPoolItem(ATTR_PROTECTION), @@ -206,7 +206,7 @@ ScProtectionAttr::ScProtectionAttr(): { } -//------------------------------------------------------------------------ + ScProtectionAttr::ScProtectionAttr( bool bProtect, bool bHFormula, bool bHCell, bool bHPrint): @@ -218,7 +218,7 @@ ScProtectionAttr::ScProtectionAttr( bool bProtect, bool bHFormula, { } -//------------------------------------------------------------------------ + ScProtectionAttr::ScProtectionAttr(const ScProtectionAttr& rItem): SfxPoolItem(ATTR_PROTECTION) @@ -233,7 +233,7 @@ ScProtectionAttr::~ScProtectionAttr() { } -//------------------------------------------------------------------------ + bool ScProtectionAttr::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { @@ -305,7 +305,7 @@ bool ScProtectionAttr::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -//------------------------------------------------------------------------ + OUString ScProtectionAttr::GetValueText() const { @@ -325,7 +325,7 @@ OUString ScProtectionAttr::GetValueText() const return aValue; } -//------------------------------------------------------------------------ + SfxItemPresentation ScProtectionAttr::GetPresentation ( @@ -374,7 +374,7 @@ SfxItemPresentation ScProtectionAttr::GetPresentation return ePres; } -//------------------------------------------------------------------------ + bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const { @@ -386,14 +386,14 @@ bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const && (bHidePrint == ((ScProtectionAttr&)rItem).bHidePrint); } -//------------------------------------------------------------------------ + SfxPoolItem* ScProtectionAttr::Clone( SfxItemPool * ) const { return new ScProtectionAttr(*this); } -//------------------------------------------------------------------------ + SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, sal_uInt16 /* n */ ) const { @@ -410,7 +410,7 @@ SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, sal_uInt16 /* n */ ) c return new ScProtectionAttr(bProtect,bHFormula,bHCell,bHPrint); } -//------------------------------------------------------------------------ + bool ScProtectionAttr::SetProtection( bool bProtect) { @@ -418,7 +418,7 @@ bool ScProtectionAttr::SetProtection( bool bProtect) return true; } -//------------------------------------------------------------------------ + bool ScProtectionAttr::SetHideFormula( bool bHFormula) { @@ -426,7 +426,7 @@ bool ScProtectionAttr::SetHideFormula( bool bHFormula) return true; } -//------------------------------------------------------------------------ + bool ScProtectionAttr::SetHideCell( bool bHCell) { @@ -434,7 +434,7 @@ bool ScProtectionAttr::SetHideCell( bool bHCell) return true; } -//------------------------------------------------------------------------ + bool ScProtectionAttr::SetHidePrint( bool bHPrint) { @@ -442,9 +442,9 @@ bool ScProtectionAttr::SetHidePrint( bool bHPrint) return true; } -// ----------------------------------------------------------------------- + // ScRangeItem - Tabellenbereich -// ----------------------------------------------------------------------- + bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const { @@ -453,14 +453,14 @@ bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const return ( aRange == ( (ScRangeItem&)rAttr ).aRange ); } -// ----------------------------------------------------------------------- + SfxPoolItem* ScRangeItem::Clone( SfxItemPool* ) const { return new ScRangeItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation ScRangeItem::GetPresentation ( @@ -495,9 +495,9 @@ SfxItemPresentation ScRangeItem::GetPresentation return ePres; } -// ----------------------------------------------------------------------- + // ScTableListItem - List from Tables (-numbers) -// ----------------------------------------------------------------------- + ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) : SfxPoolItem ( rCpy.Which() ), @@ -514,7 +514,7 @@ ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) pTabArr = NULL; } -// ----------------------------------------------------------------------- + ScTableListItem::~ScTableListItem() @@ -522,7 +522,7 @@ ScTableListItem::~ScTableListItem() delete [] pTabArr; } -// ----------------------------------------------------------------------- + ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy ) { @@ -542,7 +542,7 @@ ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy ) return *this; } -// ----------------------------------------------------------------------- + bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const { @@ -566,14 +566,14 @@ bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const return bEqual; } -// ----------------------------------------------------------------------- + SfxPoolItem* ScTableListItem::Clone( SfxItemPool* ) const { return new ScTableListItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation ScTableListItem::GetPresentation ( @@ -618,9 +618,9 @@ SfxItemPresentation ScTableListItem::GetPresentation } -// ----------------------------------------------------------------------- + // ScPageHFItem - Dates from the Head and Foot lines -// ----------------------------------------------------------------------- + ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP ) : SfxPoolItem ( nWhichP ), @@ -630,7 +630,7 @@ ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP ) { } -//------------------------------------------------------------------------ + ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem ) : SfxPoolItem ( rItem ), @@ -646,7 +646,7 @@ ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem ) pRightArea = rItem.pRightArea->Clone(); } -//------------------------------------------------------------------------ + ScPageHFItem::~ScPageHFItem() { @@ -655,7 +655,7 @@ ScPageHFItem::~ScPageHFItem() delete pRightArea; } -//------------------------------------------------------------------------ + bool ScPageHFItem::QueryValue( uno::Any& rVal, sal_uInt8 /* nMemberId */ ) const { @@ -715,14 +715,14 @@ bool ScPageHFItem::PutValue( const uno::Any& rVal, sal_uInt8 /* nMemberId */ ) return true; } -//------------------------------------------------------------------------ + OUString ScPageHFItem::GetValueText() const { return OUString("ScPageHFItem"); } -//------------------------------------------------------------------------ + bool ScPageHFItem::operator==( const SfxPoolItem& rItem ) const { @@ -735,14 +735,14 @@ bool ScPageHFItem::operator==( const SfxPoolItem& rItem ) const && ScGlobal::EETextObjEqual(pRightArea, r.pRightArea); } -//------------------------------------------------------------------------ + SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const { return new ScPageHFItem( *this ); } -//------------------------------------------------------------------------ + static void lcl_SetSpace( OUString& rStr, const ESelection& rSel ) { @@ -885,7 +885,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const return pItem; } -//------------------------------------------------------------------------ + void ScPageHFItem::SetLeftArea( const EditTextObject& rNew ) @@ -894,7 +894,7 @@ void ScPageHFItem::SetLeftArea( const EditTextObject& rNew ) pLeftArea = rNew.Clone(); } -//------------------------------------------------------------------------ + void ScPageHFItem::SetCenterArea( const EditTextObject& rNew ) { @@ -902,7 +902,7 @@ void ScPageHFItem::SetCenterArea( const EditTextObject& rNew ) pCenterArea = rNew.Clone(); } -//------------------------------------------------------------------------ + void ScPageHFItem::SetRightArea( const EditTextObject& rNew ) { @@ -922,29 +922,29 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea ) } } -//----------------------------------------------------------------------- + // ScViewObjectModeItem - Display Mode of View Objects -//----------------------------------------------------------------------- + ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP ) : SfxEnumItem( nWhichP, VOBJ_MODE_SHOW ) { } -//------------------------------------------------------------------------ + ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP, ScVObjMode eMode ) : SfxEnumItem( nWhichP, sal::static_int_cast<sal_uInt16>(eMode) ) { } -//------------------------------------------------------------------------ + ScViewObjectModeItem::~ScViewObjectModeItem() { } -//------------------------------------------------------------------------ + SfxItemPresentation ScViewObjectModeItem::GetPresentation ( @@ -994,7 +994,7 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation return ePres; } -//------------------------------------------------------------------------ + OUString ScViewObjectModeItem::GetValueText( sal_uInt16 nVal ) const { @@ -1003,28 +1003,28 @@ OUString ScViewObjectModeItem::GetValueText( sal_uInt16 nVal ) const return ScGlobal::GetRscString( STR_VOBJ_MODE_SHOW + (nVal % 2)); } -//------------------------------------------------------------------------ + sal_uInt16 ScViewObjectModeItem::GetValueCount() const { return 2; } -//------------------------------------------------------------------------ + SfxPoolItem* ScViewObjectModeItem::Clone( SfxItemPool* ) const { return new ScViewObjectModeItem( *this ); } -//------------------------------------------------------------------------ + sal_uInt16 ScViewObjectModeItem::GetVersion( sal_uInt16 /* nFileVersion */ ) const { return 1; } -//------------------------------------------------------------------------ + SfxPoolItem* ScViewObjectModeItem::Create( SvStream& rStream, @@ -1047,9 +1047,9 @@ SfxPoolItem* ScViewObjectModeItem::Create( } } -// ----------------------------------------------------------------------- + // double -// ----------------------------------------------------------------------- + ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal ) : SfxPoolItem ( nWhichP ), @@ -1057,7 +1057,7 @@ ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal ) { } -//------------------------------------------------------------------------ + ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem ) : SfxPoolItem ( rItem ) @@ -1065,14 +1065,14 @@ ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem ) nValue = rItem.nValue; } -//------------------------------------------------------------------------ + OUString ScDoubleItem::GetValueText() const { return OUString("ScDoubleItem"); } -//------------------------------------------------------------------------ + bool ScDoubleItem::operator==( const SfxPoolItem& rItem ) const { @@ -1081,14 +1081,14 @@ bool ScDoubleItem::operator==( const SfxPoolItem& rItem ) const return nValue == _rItem.nValue; } -//------------------------------------------------------------------------ + SfxPoolItem* ScDoubleItem::Clone( SfxItemPool* ) const { return new ScDoubleItem( *this ); } -//------------------------------------------------------------------------ + SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) const { @@ -1100,7 +1100,7 @@ SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) co return pItem; } -//------------------------------------------------------------------------ + ScDoubleItem::~ScDoubleItem() { diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 45c2d6ddc70d..203ed3ea3e35 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -67,12 +67,12 @@ #include <boost/scoped_ptr.hpp> -// ----------------------------------------------------------------------- + // factor from font size to optimal cell height (text width) #define SC_ROT_BREAK_FACTOR 6 -// ----------------------------------------------------------------------- + inline bool IsAmbiguousScript( sal_uInt8 nScript ) { @@ -82,13 +82,13 @@ inline bool IsAmbiguousScript( sal_uInt8 nScript ) nScript != SCRIPTTYPE_COMPLEX ); } -// ----------------------------------------------------------------------------------------- + // // Data operations // -// ----------------------------------------------------------------------------------------- + long ScColumn::GetNeededSize( diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 5974b8f27603..d70b43f9d96d 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -43,7 +43,7 @@ #include "svl/sharedstring.hxx" using namespace formula; -//------------------------------------------------------------------------ + ScFormatEntry::ScFormatEntry(ScDocument* pDoc): mpDoc(pDoc) @@ -1541,7 +1541,7 @@ void ScConditionEntry::endRendering() mpCache.reset(); } -//------------------------------------------------------------------------ + ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, const OUString& rExpr1, const OUString& rExpr2, @@ -1597,7 +1597,7 @@ ScFormatEntry* ScCondFormatEntry::Clone( ScDocument* pDoc ) const return new ScCondFormatEntry( pDoc, *this ); } -//------------------------------------------------------------------------ + ScCondDateFormatEntry::ScCondDateFormatEntry( ScDocument* pDoc ) : ScFormatEntry( pDoc ) @@ -1787,7 +1787,7 @@ void ScCondDateFormatEntry::endRendering() mpCache.reset(); } -//------------------------------------------------------------------------ + ScConditionalFormat::ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument) : pDoc( pDocument ), @@ -2091,7 +2091,7 @@ void ScConditionalFormat::endRendering() } } -//------------------------------------------------------------------------ + ScConditionalFormatList::ScConditionalFormatList(const ScConditionalFormatList& rList) { diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx index d97847d16800..d89e3592ad45 100644 --- a/sc/source/core/data/dbdocutl.cxx +++ b/sc/source/core/data/dbdocutl.cxx @@ -30,14 +30,14 @@ using namespace ::com::sun::star; -// ---------------------------------------------------------------------------- + ScDatabaseDocUtil::StrData::StrData() : mbSimpleText(true), mnStrLength(0) { } -// ---------------------------------------------------------------------------- + void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const uno::Reference<sdbc::XRow>& xRow, long nRowPos, diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index f33ff41e2f90..35eb8d572405 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -350,7 +350,7 @@ bool ScDBQueryDataIterator::IsQueryValid( return rDoc.maTabs[nTab]->ValidQuery(nRow, rParam, pCell); } -// ---------------------------------------------------------------------------- + ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) : DataAccess(pParent), @@ -536,7 +536,7 @@ void ScDBQueryDataIterator::DataAccessInternal::setPos(size_t nPos) nRow = nPos; } -// ---------------------------------------------------------------------------- + ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam) : DataAccess(pParent), @@ -765,7 +765,7 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM return false; } -// ---------------------------------------------------------------------------- + ScDBQueryDataIterator::Value::Value() : mnError(0), mbIsNumber(true) @@ -773,7 +773,7 @@ ScDBQueryDataIterator::Value::Value() : ::rtl::math::setNan(&mfValue); } -// ---------------------------------------------------------------------------- + ScDBQueryDataIterator::ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam) : mpParam (pParam) @@ -1054,7 +1054,7 @@ bool ScCellIterator::next() return getCurrent(); } -//------------------------------------------------------------------------------- + ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable, const ScQueryParam& rParam, bool bMod ) : @@ -1922,7 +1922,7 @@ bool ScQueryCellIterator::BinarySearch() } -//------------------------------------------------------------------------------- + ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) : @@ -2155,7 +2155,7 @@ void ScHorizontalCellIterator::SkipInvalid() mbMore = false; } -//------------------------------------------------------------------------ + ScHorizontalValueIterator::ScHorizontalValueIterator( ScDocument* pDocument, const ScRange& rRange, bool bSTotal, bool bTextZero ) : @@ -2277,7 +2277,7 @@ bool ScHorizontalValueIterator::GetNext( double& rValue, sal_uInt16& rErr ) return bFound; } -//------------------------------------------------------------------------------- + ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) : @@ -2422,7 +2422,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo } } -//------------------------------------------------------------------------------- + inline bool IsGreater( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { @@ -2526,7 +2526,7 @@ const ScRefCellValue& ScUsedAreaIterator::GetCell() const return maFoundCell; } -//------------------------------------------------------------------------------- + ScDocAttrIterator::ScDocAttrIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, @@ -2659,7 +2659,7 @@ void ScDocRowHeightUpdater::updateAll() } } -//------------------------------------------------------------------------------- + ScAttrRectIterator::ScAttrRectIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 1990b2db7dc1..e614bac560fe 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -186,7 +186,7 @@ static SfxItemInfo const aItemInfos[] = { SID_SCGRIDSHOW, SFX_ITEM_POOLABLE } }; -// ----------------------------------------------------------------------- + ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool) @@ -597,7 +597,7 @@ void ScDocumentPool::DeleteVersionMaps() pVersionMap1 = 0; } -// ---------------------------------------------------------------------------------------- + // // Fuer die Pattern-Attribute (SetItems) kann der sal_uInt16 RefCount leicht ueberlaufen // (z.B. 600 ganze Zeilen abwechselnd formatieren). @@ -654,7 +654,7 @@ void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) } } -// ---------------------------------------------------------------------------------------- + void ScDocumentPool::StyleDeleted( ScStyleSheet* pStyle ) { diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 1087b3f25c93..bfd0d29fa0ba 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -48,7 +48,7 @@ using namespace formula; -// ----------------------------------------------------------------------- + /** (Goal Seek) Find a value of x that is a root of f(x) This function is used internally for the goal seek operation. It uses the @@ -892,7 +892,7 @@ void ScDocument::DeleteConditionalFormat(sal_uLong nOldIndex, SCTAB nTab) maTabs[nTab]->DeleteConditionalFormat(nOldIndex); } -//------------------------------------------------------------------------ + bool ScDocument::HasDetectiveOperations() const { @@ -919,11 +919,11 @@ void ScDocument::SetDetOpList(ScDetOpList* pNew) pDetOpList = pNew; } -//------------------------------------------------------------------------ + // // Vergleich von Dokumenten // -//------------------------------------------------------------------------ + // Pfriemel-Faktoren #define SC_DOCCOMP_MAXDIFF 256 diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index b769c4d68487..293e1af90532 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; -// ----------------------------------------------------------------------- + static void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xChartDoc, OUString& rRanges, chart::ChartDataRowSource& rDataRowSource, diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index b9b8d5f4dbe9..3de5b0727127 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -42,7 +42,7 @@ using namespace com::sun::star; // put functions here that need exceptions! // -// ----------------------------------------------------------------------- + const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator() { diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index ac3f3cf2ed69..0faa829969d4 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -47,7 +47,7 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkA // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + void ScDocument::StartListeningArea( const ScRange& rRange, SvtListener* pListener diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 1c750ce9d419..e5cf04e52120 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -109,7 +109,7 @@ void ScDocument::ImplCreateOptions() pViewOptions = new ScViewOptions(); } -//------------------------------------------------------------------------ + void ScDocument::ImplDeleteOptions() { @@ -118,7 +118,7 @@ void ScDocument::ImplDeleteOptions() delete pExtDocOptions; } -//------------------------------------------------------------------------ + SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist) { @@ -150,7 +150,7 @@ SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist) return pPrinter; } -//------------------------------------------------------------------------ + void ScDocument::SetPrinter( SfxPrinter* pNewPrinter ) { @@ -172,7 +172,7 @@ void ScDocument::SetPrinter( SfxPrinter* pNewPrinter ) InvalidateTextWidth(NULL, NULL, false); // in both cases } -//------------------------------------------------------------------------ + void ScDocument::SetPrintOptions() { @@ -196,7 +196,7 @@ void ScDocument::SetPrintOptions() } } -//------------------------------------------------------------------------ + VirtualDevice* ScDocument::GetVirtualDevice_100th_mm() { @@ -226,7 +226,7 @@ OutputDevice* ScDocument::GetRefDevice() return pRefDevice; } -//------------------------------------------------------------------------ + void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, const SfxItemSet& rChanges ) @@ -309,7 +309,7 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, } } -//------------------------------------------------------------------------ + void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc ) { @@ -318,7 +318,7 @@ void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc ) xPoolHelper->GetStylePool()->CopyStdStylesFrom( pSrcDoc->xPoolHelper->GetStylePool() ); } -//------------------------------------------------------------------------ + void ScDocument::InvalidateTextWidth( const OUString& rStyleName ) { @@ -328,7 +328,7 @@ void ScDocument::InvalidateTextWidth( const OUString& rStyleName ) InvalidateTextWidth( i ); } -//------------------------------------------------------------------------ + void ScDocument::InvalidateTextWidth( SCTAB nTab ) { @@ -337,7 +337,7 @@ void ScDocument::InvalidateTextWidth( SCTAB nTab ) InvalidateTextWidth( &aAdrFrom, &aAdrTo, false ); } -//------------------------------------------------------------------------ + bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab ) { @@ -354,7 +354,7 @@ bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab return bInUse; } -//------------------------------------------------------------------------ + bool ScDocument::RemovePageStyleInUse( const OUString& rStyle ) { @@ -386,7 +386,7 @@ bool ScDocument::RenamePageStyleInUse( const OUString& rOld, const OUString& rNe return bWasInUse; } -//------------------------------------------------------------------------ + sal_uInt8 ScDocument::GetEditTextDirection(SCTAB nTab) const { @@ -485,7 +485,7 @@ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress } } -//------------------------------------------------------------------------ + #define CALCMAX 1000 // Berechnungen #define ABORT_EVENTS (VCL_INPUT_ANY & ~VCL_INPUT_TIMER & ~VCL_INPUT_OTHER) @@ -963,7 +963,7 @@ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, size_t nDdePos } // namespace -// ---------------------------------------------------------------------------- + bool ScDocument::FindDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, size_t& rnDdePos ) @@ -1040,7 +1040,7 @@ bool ScDocument::SetDdeLinkResultMatrix( size_t nDdePos, ScMatrixRef pResults ) return false; } -//------------------------------------------------------------------------ + bool ScDocument::HasAreaLinks() const { @@ -1163,7 +1163,7 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, } } -//------------------------------------------------------------------------ + // TimerDelays etc. void ScDocument::KeyInput( const KeyEvent& ) @@ -1184,7 +1184,7 @@ bool ScDocument::CheckMacroWarn() return true; } -//------------------------------------------------------------------------ + SfxBindings* ScDocument::GetViewBindings() { @@ -1213,7 +1213,7 @@ ScDrawLayer* ScDocument::GetDrawLayer() return pDrawLayer; } -//------------------------------------------------------------------------ + void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ) { diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 1953f7d3c5ed..9ceb12b03490 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star; #include <stdio.h> -// ----------------------------------------------------------------------- + SfxBroadcaster* ScDocument::GetDrawBroadcaster() diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 3f51268c91ff..7f2025d89597 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -596,7 +596,7 @@ struct ScDPSaveGroupSourceNameFunc } // namespace -// ---------------------------------------------------------------------------- + ScDPDimensionSaveData::ScDPDimensionSaveData() { diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index a5e969461cdc..68e8ce2a9b27 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -102,7 +102,7 @@ size_t ScDPFilteredCache::GroupFilter::getMatchItemCount() const return maItems.size(); } -// ---------------------------------------------------------------------------- + ScDPFilteredCache::Criterion::Criterion() : mnFieldIndex(-1), @@ -110,7 +110,7 @@ ScDPFilteredCache::Criterion::Criterion() : { } -// ---------------------------------------------------------------------------- + ScDPFilteredCache::ScDPFilteredCache(const ScDPCache& rCache) : maShowByFilter(0, MAXROW+1, false), maShowByPage(0, MAXROW+1, true), mrCache(rCache) diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index 361a74febc13..cca401505376 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -126,7 +126,7 @@ private: ScDPNumGroupInfo maNumInfo; }; -// ---------------------------------------------------------------------------- + ScDPGroupDateFilter::ScDPGroupDateFilter( const std::vector<ScDPItemData>& rValues, const Date& rNullDate, const ScDPNumGroupInfo& rNumInfo) : @@ -350,7 +350,7 @@ void ScDPGroupItem::FillGroupFilter( ScDPFilteredCache::GroupFilter& rFilter ) c rFilter.addMatchItem(*itr); } -// ----------------------------------------------------------------------- + ScDPGroupDimension::ScDPGroupDimension( long nSource, const OUString& rNewName ) : nSourceDim( nSource ), @@ -447,7 +447,7 @@ bool ScDPGroupDimension::IsDateDimension() const return mbDateDimension; } -// ----------------------------------------------------------------------- + ScDPNumGroupDimension::ScDPNumGroupDimension() : mbDateDimension(false) {} diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index bc9949f8fcfe..bf2c1654d34c 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -100,7 +100,7 @@ using ::com::sun::star::beans::XPropertySet; #define SC_DBPROP_COMMAND "Command" #define SC_DBPROP_COMMANDTYPE "CommandType" -// ----------------------------------------------------------------------- + #define SCDPSOURCE_SERVICE "com.sun.star.sheet.DataPilotSource" @@ -2471,7 +2471,7 @@ bool ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< return bRet; } -//------------------------------------------------------------------------ + // convert old pivot tables into new datapilot tables namespace { @@ -2658,7 +2658,7 @@ bool ScDPObject::IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags ) return bAllowed; } -// ----------------------------------------------------------------------- + bool ScDPObject::HasRegisteredSources() { diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index cb43eccd54db..adff9b10e6d8 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -324,7 +324,7 @@ void lcl_SetFrame( ScDocument* pDoc, SCTAB nTab, pDoc->ApplyFrameAreaTab( ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ), &aBox, &aBoxInfo ); } -// ----------------------------------------------------------------------- + void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, const uno::Reference<sheet::XDataPilotMemberResults>& xLevRes, diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index 27405bc00960..9d3157cd207a 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -160,7 +160,7 @@ void ScDatabaseDPData::ReloadCacheTable() CreateCacheTable(); } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 5230632c9d83..b544387e4006 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -39,7 +39,7 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; using ::std::vector; -// ----------------------------------------------------------------------- + ScSheetDPData::ScSheetDPData(ScDocument* pD, const ScSheetSourceDesc& rDesc, const ScDPCache& rCache) : ScDPTableData(pD), diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index 494c492c1f1a..bfe57793df20 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -38,7 +38,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::std::vector; -// --------------------------------------------------------------------------- + ScDPTableData::CalcInfo::CalcInfo() : pInitState( NULL ), @@ -48,7 +48,7 @@ ScDPTableData::CalcInfo::CalcInfo() : { } -// --------------------------------------------------------------------------- + ScDPTableData::ScDPTableData(ScDocument* pDoc) : mpDoc(pDoc) @@ -251,7 +251,7 @@ void ScDPTableData::GetItemData(const ScDPFilteredCache& rCacheTable, sal_Int32 } } -// ----------------------------------------------------------------------- + long ScDPTableData::GetMembersCount( long nDim ) { diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index a1d299bfeec1..76af9eda863c 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -385,7 +385,7 @@ void ScDPRunningTotalState::RemoveRowIndex() } } -// ----------------------------------------------------------------------- + ScDPRelativePos::ScDPRelativePos( long nBase, long nDir ) : nBasePos( nBase ), @@ -393,7 +393,7 @@ ScDPRelativePos::ScDPRelativePos( long nBase, long nDir ) : { } -// ----------------------------------------------------------------------- + void ScDPAggData::Update( const ScDPValue& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ) { @@ -682,7 +682,7 @@ void ScDPAggData::Dump(int nIndent) const } #endif -// ----------------------------------------------------------------------- + ScDPRowTotals::ScDPRowTotals() : bIsInColRoot( false ) @@ -725,7 +725,7 @@ ScDPAggData* ScDPRowTotals::GetGrandTotal( long nMeasure ) return lcl_GetChildTotal( &aGrandTotal, nMeasure ); } -// ----------------------------------------------------------------------- + static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo ) { @@ -755,7 +755,7 @@ static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo ) return eRet; } -// ----------------------------------------------------------------------- + ScDPResultData::ScDPResultData( ScDPSource& rSrc ) : mrSource(rSrc), @@ -950,7 +950,7 @@ ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDi return maDimMembers[nDim]; } -// ----------------------------------------------------------------------- + ScDPResultMember::ScDPResultMember( @@ -1836,7 +1836,7 @@ void ScDPResultMember::FillVisibilityData(ScDPResultVisibilityData& rData) const pChildDimension->FillVisibilityData(rData); } -// ----------------------------------------------------------------------- + ScDPDataMember::ScDPDataMember( const ScDPResultData* pData, const ScDPResultMember* pRes ) : pResultData( pData ), @@ -2688,7 +2688,7 @@ void ScDPDataMember::Dump(int nIndent) const } #endif -// ----------------------------------------------------------------------- + // Helper class to select the members to include in // ScDPResultDimension::InitFrom or LateInitFrom if groups are used @@ -2768,7 +2768,7 @@ bool ScDPGroupCompare::TestIncluded( const ScDPMember& rMember ) return bInclude; } -// ----------------------------------------------------------------------- + ScDPResultDimension::ScDPResultDimension( const ScDPResultData* pData ) : pResultData( pData ), @@ -3559,7 +3559,7 @@ void ScDPResultDimension::FillVisibilityData(ScDPResultVisibilityData& rData) co } } -// ----------------------------------------------------------------------- + ScDPDataDimension::ScDPDataDimension( const ScDPResultData* pData ) : pResultData( pData ), @@ -3914,7 +3914,7 @@ ScDPDataMember* ScDPDataDimension::GetMember(long n) return maMembers[n]; } -// ---------------------------------------------------------------------------- + ScDPResultVisibilityData::ScDPResultVisibilityData( ScDPSource* pSource) : @@ -4105,7 +4105,7 @@ ResultMembers::~ResultMembers() for ( DimMemberHash::const_iterator iter = maMemberHash.begin(); iter != maMemberHash.end(); ++iter ) delete iter->second; } -// ----------------------------------------------------------------------- + LateInitParams::LateInitParams( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, bool bRow, bool bInitChild, bool bAllChildren ) : mppDim( ppDim ), diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 979e7fa0293c..8b8075ece756 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -69,11 +69,11 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; -// ----------------------------------------------------------------------- + #define SC_MINCOUNT_LIMIT 1000000 -// ----------------------------------------------------------------------- + SC_SIMPLE_SERVICE_INFO( ScDPSource, "ScDPSource", "com.sun.star.sheet.DataPilotSource" ) SC_SIMPLE_SERVICE_INFO( ScDPDimensions, "ScDPDimensions", "com.sun.star.sheet.DataPilotSourceDimensions" ) @@ -85,12 +85,12 @@ SC_SIMPLE_SERVICE_INFO( ScDPLevel, "ScDPLevel", "com.sun.star.sheet. SC_SIMPLE_SERVICE_INFO( ScDPMembers, "ScDPMembers", "com.sun.star.sheet.DataPilotSourceMembers" ) SC_SIMPLE_SERVICE_INFO( ScDPMember, "ScDPMember", "com.sun.star.sheet.DataPilotSourceMember" ) -// ----------------------------------------------------------------------- + // property maps for PropertySetInfo // DataDescription / NumberFormat are internal -// ----------------------------------------------------------------------- + //! move to a header? static sal_Bool lcl_GetBoolFromAny( const uno::Any& aAny ) @@ -105,7 +105,7 @@ static void lcl_SetBoolInAny( uno::Any& rAny, sal_Bool bValue ) rAny.setValue( &bValue, getBooleanCppuType() ); } -// ----------------------------------------------------------------------- + ScDPSource::ScDPSource( ScDPTableData* pD ) : pData( pD ), @@ -970,7 +970,7 @@ void ScDPSource::CreateRes_Impl() pColResRoot->CheckShowEmpty(); pRowResRoot->CheckShowEmpty(); - // ---------------------------------------------------------------- + // With all data processed, calculate the final results: // UpdateDataResults calculates all original results from the collected values, @@ -1223,7 +1223,7 @@ void ScDPSource::DumpResults() const SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPSource ) -// ----------------------------------------------------------------------- + ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) : pSource( pSrc ), @@ -1352,7 +1352,7 @@ ScDPDimension* ScDPDimensions::getByIndex(long nIndex) const return NULL; //! exception? } -// ----------------------------------------------------------------------- + ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) : pSource( pSrc ), @@ -1727,7 +1727,7 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const OUString& aPropertyName SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPDimension ) -// ----------------------------------------------------------------------- + ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) : pSource( pSrc ), @@ -1835,7 +1835,7 @@ ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const return NULL; //! exception? } -// ----------------------------------------------------------------------- + ScDPHierarchy::ScDPHierarchy( ScDPSource* pSrc, long nD, long nH ) : pSource( pSrc ), @@ -1896,7 +1896,7 @@ void SAL_CALL ScDPHierarchy::setName( const OUString& /* rNewName */ ) throw(uno OSL_FAIL("not implemented"); //! exception? } -// ----------------------------------------------------------------------- + ScDPLevels::ScDPLevels( ScDPSource* pSrc, long nD, long nH ) : pSource( pSrc ), @@ -2015,7 +2015,7 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const return NULL; //! exception? } -// ----------------------------------------------------------------------- + class ScDPGlobalMembersOrder { @@ -2046,7 +2046,7 @@ sal_Bool ScDPGlobalMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex return bAscending ? (nCompare < 0) : (nCompare > 0); } -// ----------------------------------------------------------------------- + ScDPLevel::ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ) : pSource( pSrc ), @@ -2320,7 +2320,7 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const OUString& aPropertyName ) SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPLevel ) -// ----------------------------------------------------------------------- + ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) : pSource( pSrc ), @@ -2593,7 +2593,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const return NULL; //! exception? } -// ----------------------------------------------------------------------- + ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL, SCROW nIndex) : diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx index 64c8c7704e76..fc0feca48f17 100644 --- a/sc/source/core/data/drawpage.cxx +++ b/sc/source/core/data/drawpage.cxx @@ -26,7 +26,7 @@ // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage) : FmFormPage(rNewModel, bMasterPage) @@ -34,13 +34,13 @@ ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage) : SetSize( Size( LONG_MAX, LONG_MAX ) ); } -// ----------------------------------------------------------------------- + ScDrawPage::~ScDrawPage() { } -// ----------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ScDrawPage::createUnoPage() { diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index eff38fa156f7..b7d654a54825 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -95,7 +95,7 @@ SfxObjectShell* ScDrawLayer::pGlobalDrawPersist = NULL; sal_Bool bDrawIsInUndo = false; //! Member -// ----------------------------------------------------------------------- + ScUndoObjData::ScUndoObjData( SdrObject* pObjP, const ScAddress& rOS, const ScAddress& rOE, const ScAddress& rNS, const ScAddress& rNE ) : @@ -133,7 +133,7 @@ void ScUndoObjData::Redo() } } -// ----------------------------------------------------------------------- + ScTabDeletedHint::ScTabDeletedHint( SCTAB nTabNo ) : nTab( nTabNo ) @@ -153,7 +153,7 @@ ScTabSizeChangedHint::~ScTabSizeChangedHint() { } -// ----------------------------------------------------------------------- + #define MAXMM 10000000 @@ -187,7 +187,7 @@ static void lcl_ReverseTwipsToMM( Rectangle& rRect ) ReverseTwipsToMM( rRect.Bottom() ); } -// ----------------------------------------------------------------------- + ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 225c0cec5769..f9dd04db2568 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -678,7 +678,7 @@ void ScDocument::FillInfo( if(pCondFormList) pCondFormList->endRendering(); - //------------------------------------------------------------------------- + // bedingte Formatierung auswerten ::boost::ptr_vector<ScPatternAttr> aAltPatterns; // favour preview over condition @@ -741,7 +741,7 @@ void ScDocument::FillInfo( } // bedingte Formatierung Ende - //------------------------------------------------------------------------- + // // Daten von zusammengefassten Zellen anpassen diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 5323fa647370..0cc761ce34db 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -80,7 +80,7 @@ #include "random.hxx" #include "editutil.hxx" -// ----------------------------------------------------------------------- + ScDocShellRef* ScGlobal::pDrawClipDocShellRef = NULL; @@ -156,7 +156,7 @@ bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs, const SfxItemState eNewState = rNewAttrs.GetItemState( nWhich ); const SfxItemState eOldState = rOldAttrs.GetItemState( nWhich ); - //---------------------------------------------------------- + if ( eNewState == eOldState ) { @@ -221,7 +221,7 @@ SvNumberFormatter* ScGlobal::GetEnglishFormatter() } -//------------------------------------------------------------------------ + bool ScGlobal::CheckWidthInvalidate( bool& bNumFormatChanged, const SfxItemSet& rNewAttrs, @@ -685,7 +685,7 @@ void ScGlobal::Clear() DELETEZ(pEmptyOUString); } -//------------------------------------------------------------------------ + rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet ) { @@ -710,7 +710,7 @@ rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet ) else return osl_getThreadTextEncoding(); } -//------------------------------------------------------------------------ + OUString ScGlobal::GetCharsetString( rtl_TextEncoding eVal ) { @@ -735,7 +735,7 @@ OUString ScGlobal::GetCharsetString( rtl_TextEncoding eVal ) return OUString::createFromAscii(pChar); } -//------------------------------------------------------------------------ + bool ScGlobal::HasStarCalcFunctionList() { @@ -750,7 +750,7 @@ ScFunctionList* ScGlobal::GetStarCalcFunctionList() return pStarCalcFunctionList; } -//------------------------------------------------------------------------ + ScFunctionMgr* ScGlobal::GetStarCalcFunctionMgr() { @@ -768,7 +768,7 @@ void ScGlobal::ResetFunctionList() DELETEZ( pStarCalcFunctionList ); } -//------------------------------------------------------------------------ + ScUnitConverter* ScGlobal::GetUnitConverter() { @@ -779,7 +779,7 @@ ScUnitConverter* ScGlobal::GetUnitConverter() } -//------------------------------------------------------------------------ + const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c ) @@ -795,7 +795,7 @@ const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, return NULL; } -// ---------------------------------------------------------------------------- + OUString ScGlobal::addToken(const OUString& rTokenList, const OUString& rToken, sal_Unicode cSep, sal_Int32 nSepCount, bool bForceSep) @@ -888,7 +888,7 @@ const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unico return NULL; } -//------------------------------------------------------------------------ + bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1, const EditTextObject* pObj2 ) @@ -970,7 +970,7 @@ void ScGlobal::OpenURL( const OUString& rURL, const OUString& rTarget ) 0L ); } -//------------------------------------------------------------------------ + bool ScGlobal::IsSystemRTL() { @@ -1082,7 +1082,7 @@ sal_uInt16 ScGlobal::GetScriptedWhichID( sal_uInt8 nScriptType, sal_uInt16 nWhic return nWhich; } -//------------------------------------------------------------------------ + void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter ) { @@ -1108,11 +1108,11 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter ) } -//-------------------------------------------------------------------- -//------------------------------------------------------------------------ + + utl::TransliterationWrapper* ScGlobal::GetpTransliteration() { diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index 324b1c0d2be1..b19f1bebb4ba 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -38,9 +38,9 @@ using ::std::vector; -// ----------------------------------------------------------------------- -//------------------------------------------------------------------------ + + // struct ScImportParam: ScImportParam::ScImportParam() : @@ -105,7 +105,7 @@ bool ScImportParam::operator==( const ScImportParam& rOther ) const //! nQuerySh und pConnection sind gleich ? } -//------------------------------------------------------------------------ + // struct ScConsolidateParam: ScConsolidateParam::ScConsolidateParam() : @@ -114,7 +114,7 @@ ScConsolidateParam::ScConsolidateParam() : Clear(); } -//------------------------------------------------------------------------ + ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) : nCol(r.nCol),nRow(r.nRow),nTab(r.nTab), @@ -131,14 +131,14 @@ ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) : } } -//------------------------------------------------------------------------ + ScConsolidateParam::~ScConsolidateParam() { ClearDataAreas(); } -//------------------------------------------------------------------------ + void ScConsolidateParam::ClearDataAreas() { @@ -152,7 +152,7 @@ void ScConsolidateParam::ClearDataAreas() nDataAreaCount = 0; } -//------------------------------------------------------------------------ + void ScConsolidateParam::Clear() { @@ -165,7 +165,7 @@ void ScConsolidateParam::Clear() eFunction = SUBTOTAL_FUNC_SUM; } -//------------------------------------------------------------------------ + ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r ) { @@ -181,7 +181,7 @@ ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r ) return *this; } -//------------------------------------------------------------------------ + bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const { @@ -206,7 +206,7 @@ bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const return bEqual; } -//------------------------------------------------------------------------ + void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, sal_uInt16 nCount ) { @@ -220,7 +220,7 @@ void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, sal_uInt16 nCount ) } } -//------------------------------------------------------------------------ + // struct ScSolveParam ScSolveParam::ScSolveParam() @@ -228,7 +228,7 @@ ScSolveParam::ScSolveParam() { } -//------------------------------------------------------------------------ + ScSolveParam::ScSolveParam( const ScSolveParam& r ) : aRefFormulaCell ( r.aRefFormulaCell ), @@ -239,7 +239,7 @@ ScSolveParam::ScSolveParam( const ScSolveParam& r ) { } -//------------------------------------------------------------------------ + ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell, const ScAddress& rVariableCell, @@ -250,14 +250,14 @@ ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell, { } -//------------------------------------------------------------------------ + ScSolveParam::~ScSolveParam() { delete pStrTargetVal; } -//------------------------------------------------------------------------ + ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r ) { @@ -271,7 +271,7 @@ ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r ) return *this; } -//------------------------------------------------------------------------ + bool ScSolveParam::operator==( const ScSolveParam& r ) const { @@ -291,7 +291,7 @@ bool ScSolveParam::operator==( const ScSolveParam& r ) const return bEqual; } -//------------------------------------------------------------------------ + // struct ScTabOpParam ScTabOpParam::ScTabOpParam() : meMode(Column) {} @@ -305,7 +305,7 @@ ScTabOpParam::ScTabOpParam( const ScTabOpParam& r ) { } -//------------------------------------------------------------------------ + ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell, const ScRefAddress& rFormulaEnd, @@ -320,7 +320,7 @@ ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell, { } -//------------------------------------------------------------------------ + ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r ) { @@ -332,7 +332,7 @@ ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r ) return *this; } -//------------------------------------------------------------------------ + bool ScTabOpParam::operator==( const ScTabOpParam& r ) const { diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index 71ee12087aeb..40d977df360d 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -23,7 +23,7 @@ // STATIC DATA ----------------------------------------------------------- -//------------------------------------------------------------------------ + ScMarkArray::ScMarkArray() : nCount( 0 ), @@ -33,14 +33,14 @@ ScMarkArray::ScMarkArray() : // special case "no marks" with pData = NULL } -//------------------------------------------------------------------------ + ScMarkArray::~ScMarkArray() { delete[] pData; } -//------------------------------------------------------------------------ + void ScMarkArray::Reset( bool bMarked ) { @@ -55,7 +55,7 @@ void ScMarkArray::Reset( bool bMarked ) pData[0].bMarked = bMarked; } -//------------------------------------------------------------------------ + bool ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const { @@ -103,7 +103,7 @@ bool ScMarkArray::GetMark( SCROW nRow ) const } -//------------------------------------------------------------------------ + void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, bool bMarked ) { diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index 39ef79213a5f..0ca8ebc7ee82 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.cxx @@ -27,7 +27,7 @@ // STATIC DATA ----------------------------------------------------------- -//------------------------------------------------------------------------ + ScMarkData::ScMarkData() : maTabMarked(), diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index 941e5293d218..80ba6fea82bb 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.cxx @@ -25,7 +25,7 @@ #include "address.hxx" #include "table.hxx" -//------------------------------------------------------------------------ + ScOutlineEntry::ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, bool bNewHidden ) : nStart ( nNewStart ), @@ -104,7 +104,7 @@ void ScOutlineEntry::SetVisible( bool bNewVisible ) bVisible = bNewVisible; } -//------------------------------------------------------------------------ + ScOutlineCollection::ScOutlineCollection() {} @@ -159,7 +159,7 @@ ScOutlineCollection::iterator ScOutlineCollection::FindStart(SCCOLROW nMinStart) return maEntries.lower_bound(nMinStart); } -//------------------------------------------------------------------------ + ScOutlineArray::ScOutlineArray() : nDepth(0) {} @@ -793,7 +793,7 @@ void ScOutlineArray::RemoveAll() nDepth = 0; } -//------------------------------------------------------------------------ + ScOutlineTable::ScOutlineTable() { @@ -835,7 +835,7 @@ bool ScOutlineTable::DeleteRow( SCROW nStartRow, SCSIZE nSize ) return aRowOutline.DeleteSpace( nStartRow, nSize ); } -//------------------------------------------------------------------------ + ScSubOutlineIterator::ScSubOutlineIterator( ScOutlineArray* pOutlineArray ) : pArray( pOutlineArray ), diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx index 96a02adb16fc..606aefd2a0dd 100644 --- a/sc/source/core/data/pagepar.cxx +++ b/sc/source/core/data/pagepar.cxx @@ -30,13 +30,13 @@ ScPageTableParam::ScPageTableParam() Reset(); } -//------------------------------------------------------------------------ + ScPageTableParam::~ScPageTableParam() { } -//------------------------------------------------------------------------ + void ScPageTableParam::Reset() { @@ -50,7 +50,7 @@ void ScPageTableParam::Reset() nFirstPageNo = 1; } -//------------------------------------------------------------------------ + bool ScPageTableParam::operator==( const ScPageTableParam& r ) const { @@ -65,13 +65,13 @@ ScPageAreaParam::ScPageAreaParam() Reset(); } -//------------------------------------------------------------------------ + ScPageAreaParam::~ScPageAreaParam() { } -//------------------------------------------------------------------------ + void ScPageAreaParam::Reset() { @@ -82,7 +82,7 @@ void ScPageAreaParam::Reset() memset( &aRepeatCol, 0, sizeof(ScRange) ); } -//------------------------------------------------------------------------ + bool ScPageAreaParam::operator==( const ScPageAreaParam& r ) const { diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index bf3d179ae5f1..88ab4affac69 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -65,12 +65,12 @@ ScDocument* ScPatternAttr::pDoc = NULL; -// ----------------------------------------------------------------------- + using sc::HMMToTwips; using sc::TwipsToHMM; -// ----------------------------------------------------------------------- + ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const OUString& rStyleName ) : SfxSetItem ( ATTR_PATTERN, pItemSet ), @@ -934,7 +934,7 @@ static SfxStyleSheetBase* lcl_CopyStyleToPool return NULL; } - //-------------------------------------------------------- + const OUString aStrSrcStyle = pSrcStyle->GetName(); const SfxStyleFamily eFamily = pSrcStyle->GetFamily(); diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index 74d5cbe274fe..e2aa81063d8b 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -25,7 +25,7 @@ #include "docpool.hxx" #include "stlpool.hxx" -// ----------------------------------------------------------------------- + ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc ) :pFormTable(NULL) @@ -120,7 +120,7 @@ void ScPoolHelper::SourceDocumentGone() pFormTable->SetColorLink( Link() ); } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 6a980d1413b1..798eb8962469 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -80,7 +80,7 @@ public: static void SetCaptionItems( SdrCaptionObj& rCaption, const SfxItemSet& rItemSet ); }; -// ---------------------------------------------------------------------------- + void ScCaptionUtil::SetCaptionLayer( SdrCaptionObj& rCaption, bool bShown ) { @@ -206,7 +206,7 @@ private: bool mbNegPage; }; -// ---------------------------------------------------------------------------- + ScCaptionCreator::ScCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, bool bShown, bool bTailFront ) : mrDoc( rDoc ), @@ -416,7 +416,7 @@ public: explicit ScNoteCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, SdrCaptionObj& rCaption, bool bShown ); }; -// ---------------------------------------------------------------------------- + ScNoteCaptionCreator::ScNoteCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, ScNoteData& rNoteData ) : ScCaptionCreator( rDoc, rPos ) // use helper c'tor that does not create the caption yet @@ -475,7 +475,7 @@ struct ScCaptionInitData explicit ScCaptionInitData(); }; -// ---------------------------------------------------------------------------- + ScCaptionInitData::ScCaptionInitData() : mbDefaultPosSize( true ) diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index 3af5c64beb2a..2d768e8449de 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -247,7 +247,7 @@ public: } }; -// ---------------------------------------------------------------------------- + class ScFlatBoolSegmentsImpl : public ScFlatSegmentsImpl<bool> { @@ -304,7 +304,7 @@ SCROW ScFlatBoolRowSegments::ForwardIterator::getLastPos() const return mnLastPos; } -// ---------------------------------------------------------------------------- + ScFlatBoolRowSegments::RangeIterator::RangeIterator(ScFlatBoolRowSegments& rSegs) : mrSegs(rSegs) @@ -335,7 +335,7 @@ bool ScFlatBoolRowSegments::RangeIterator::getNext(RangeData& rRange) return true; } -// ---------------------------------------------------------------------------- + ScFlatBoolRowSegments::ScFlatBoolRowSegments() : mpImpl(new ScFlatBoolSegmentsImpl(static_cast<SCCOLROW>(MAXROW))) @@ -486,7 +486,7 @@ SCROW ScFlatUInt16RowSegments::ForwardIterator::getLastPos() const return mnLastPos; } -// ---------------------------------------------------------------------------- + ScFlatUInt16RowSegments::ScFlatUInt16RowSegments(sal_uInt16 nDefault) : mpImpl(new ScFlatUInt16SegmentsImpl(static_cast<SCCOLROW>(MAXROW), nDefault)) diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index 231f3a2cf9a7..ca382f575f0a 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -19,7 +19,7 @@ #include "sheetevents.hxx" #include <com/sun/star/script/vba/VBAEventId.hpp> -// ----------------------------------------------------------------------- + OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) { @@ -71,7 +71,7 @@ sal_Int32 ScSheetEvents::GetVbaDocumentEventId(sal_Int32 nEvent) return (nSheetEventId != NO_EVENT) ? (nSheetEventId + USERDEFINED_START) : NO_EVENT; } -// ----------------------------------------------------------------------- + ScSheetEvents::ScSheetEvents() : mpScriptNames(NULL) diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index d416f32ed0db..d0efd196b958 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -24,14 +24,14 @@ #include "subtotalparam.hxx" -//------------------------------------------------------------------------ + ScSortParam::ScSortParam() { Clear(); } -//------------------------------------------------------------------------ + ScSortParam::ScSortParam( const ScSortParam& r ) : nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nUserIndex(r.nUserIndex), @@ -47,7 +47,7 @@ ScSortParam::ScSortParam( const ScSortParam& r ) : ScSortParam::~ScSortParam() {} -//------------------------------------------------------------------------ + void ScSortParam::Clear() { @@ -71,7 +71,7 @@ void ScSortParam::Clear() maKeyState.assign( DEFSORT, aKeyState ); } -//------------------------------------------------------------------------ + ScSortParam& ScSortParam::operator=( const ScSortParam& r ) { @@ -98,7 +98,7 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r ) return *this; } -//------------------------------------------------------------------------ + bool ScSortParam::operator==( const ScSortParam& rOther ) const { @@ -154,7 +154,7 @@ bool ScSortParam::operator==( const ScSortParam& rOther ) const return bEqual; } -//------------------------------------------------------------------------ + ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) : nCol1(rSub.nCol1),nRow1(rSub.nRow1),nCol2(rSub.nCol2),nRow2(rSub.nRow2),nUserIndex(rSub.nUserIndex), @@ -199,7 +199,7 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) } } -//------------------------------------------------------------------------ + ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) : nCol1(nCol),nRow1(rParam.nRow1),nCol2(nCol),nRow2(rParam.nRow2),nUserIndex(0), @@ -225,7 +225,7 @@ ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) : maKeyState.push_back( aKeyState ); } -//------------------------------------------------------------------------ + void ScSortParam::MoveToDest() { diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 9d4a4262b31e..dcd04fa0ebb9 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -66,20 +66,20 @@ ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP, { } -//------------------------------------------------------------------------ + ScStyleSheetPool::~ScStyleSheetPool() { } -//------------------------------------------------------------------------ + void ScStyleSheetPool::SetDocument( ScDocument* pDocument ) { pDoc = pDocument; } -//------------------------------------------------------------------------ + SfxStyleSheetBase& ScStyleSheetPool::Make( const OUString& rName, SfxStyleFamily eFam, sal_uInt16 mask) @@ -106,7 +106,7 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const OUString& rName, return SfxStyleSheetPool::Make(rName, eFam, mask); } -//------------------------------------------------------------------------ + SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString& rName, SfxStyleFamily eFamily, @@ -119,7 +119,7 @@ SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString& rName, return pSheet; } -//------------------------------------------------------------------------ + SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle ) { @@ -127,7 +127,7 @@ SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle ) return new ScStyleSheet( (const ScStyleSheet&) rStyle ); } -//------------------------------------------------------------------------ + void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle ) { @@ -141,7 +141,7 @@ void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle ) } } -//------------------------------------------------------------------------ + void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, const OUString& rName, SfxStyleFamily eFamily ) @@ -197,11 +197,11 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, } } -//------------------------------------------------------------------------ + // // Standard-Vorlagen // -//------------------------------------------------------------------------ + #define SCSTR(id) ScGlobal::GetRscString(id) @@ -218,7 +218,7 @@ void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ) CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_REPORT), SFX_STYLE_FAMILY_PAGE ); } -//------------------------------------------------------------------------ + static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, sal_uInt16 nFontType, sal_uInt16 nItemId ) { @@ -264,9 +264,9 @@ void ScStyleSheetPool::CreateStandardStyles() // Zellformatvorlagen: //========================================================== - //------------ + // 1. Standard - //------------ + pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_STD ); @@ -296,9 +296,9 @@ void ScStyleSheetPool::CreateStandardStyles() // if ( eCtl == LANGUAGE_THAI ) // pSet->Put( SvxFontHeightItem( 300, 100, ATTR_CTL_FONT_HEIGHT ) ); // 15 pt - //------------ + // 2. Ergebnis - //------------ + pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT ), SFX_STYLE_FAMILY_PARA, @@ -310,9 +310,9 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); pSet->Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) ); - //------------- + // 3. Ergebnis1 - //------------- + pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT1 ), SFX_STYLE_FAMILY_PARA, @@ -321,9 +321,9 @@ void ScStyleSheetPool::CreateStandardStyles() pSheet->SetParent( SCSTR( STR_STYLENAME_RESULT ) ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_ERG1 ); - //---------------- + // 4. Ueberschrift - //---------------- + pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE ), SFX_STYLE_FAMILY_PARA, @@ -337,9 +337,9 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); pSet->Put( SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) ); - //----------------- + // 5. Ueberschrift1 - //----------------- + pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE1 ), SFX_STYLE_FAMILY_PARA, @@ -354,9 +354,9 @@ void ScStyleSheetPool::CreateStandardStyles() // Seitenformat-Vorlagen: //========================================================== - //------------ + // 1. Standard - //------------ + pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PAGE, @@ -371,10 +371,10 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET ); DELETEZ( pHFSetItem ); - //---------------------------------------- + // Kopfzeile: // [leer][\TABELLE\][leer] - //---------------------------------------- + pEdEngine->SetText(EMPTY_OUSTRING); pEdEngine->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection() ); pTxtObj = pEdEngine->CreateTextObject(); @@ -384,10 +384,10 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHeaderItem ); DELETEZ( pTxtObj ); - //---------------------------------------- + // Fusszeile: // [leer][Seite \SEITE\][leer] - //---------------------------------------- + aStr = SCSTR( STR_PAGE ) + " "; pEdEngine->SetText( aStr ); nStrLen = aStr.getLength(); @@ -399,9 +399,9 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pFooterItem ); DELETEZ( pTxtObj ); - //---------- + // 2. Report - //---------- + pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_REPORT ), SFX_STYLE_FAMILY_PAGE, @@ -433,10 +433,10 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET ); DELETEZ( pHFSetItem ); - //---------------------------------------- + // Kopfzeile: // [\TABELLE\ (\DATEI\)][leer][\DATUM\, \ZEIT\] - //---------------------------------------- + aStr = " ()"; pEdEngine->SetText( aStr ); pEdEngine->QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) ); @@ -455,10 +455,10 @@ void ScStyleSheetPool::CreateStandardStyles() DELETEZ( pTxtObj ); pSet->Put( *pHeaderItem ); - //---------------------------------------- + // Fusszeile: // [leer][Seite: \SEITE\ / \SEITEN\][leer] - //---------------------------------------- + aStr = SCSTR( STR_PAGE ) + " "; nStrLen = aStr.getLength(); aStr += " / "; @@ -473,14 +473,14 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pFooterItem ); DELETEZ( pTxtObj ); - //---------------------------------------------------- + DELETEZ( pEmptyTxtObj ); DELETEZ( pHeaderItem ); DELETEZ( pFooterItem ); DELETEZ( pEdEngine ); } -//------------------------------------------------------------------------ + ScStyleSheet* ScStyleSheetPool::FindCaseIns( const OUString& rName, SfxStyleFamily eFam ) diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 04322d84824b..ef19a93c0891 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -41,7 +41,7 @@ #include "globstr.hrc" #include "sc.hrc" -//------------------------------------------------------------------------ + TYPEINIT1(ScStyleSheet, SfxStyleSheet); @@ -60,7 +60,7 @@ ScStyleSheet::ScStyleSheet( const OUString& rName, { } -//------------------------------------------------------------------------ + ScStyleSheet::ScStyleSheet( const ScStyleSheet& rStyle ) : SfxStyleSheet ( rStyle ) @@ -68,20 +68,20 @@ ScStyleSheet::ScStyleSheet( const ScStyleSheet& rStyle ) { } -//------------------------------------------------------------------------ + ScStyleSheet::~ScStyleSheet() { } -//------------------------------------------------------------------------ + bool ScStyleSheet::HasFollowSupport() const { return false; } -//------------------------------------------------------------------------ + bool ScStyleSheet::HasParentSupport () const { @@ -100,7 +100,7 @@ bool ScStyleSheet::HasParentSupport () const return bHasParentSupport; } -//------------------------------------------------------------------------ + bool ScStyleSheet::SetParent( const OUString& rParentName ) { @@ -135,7 +135,7 @@ bool ScStyleSheet::SetParent( const OUString& rParentName ) return bResult; } -//------------------------------------------------------------------------ + SfxItemSet& ScStyleSheet::GetItemSet() { @@ -252,7 +252,7 @@ SfxItemSet& ScStyleSheet::GetItemSet() return *pSet; } -//------------------------------------------------------------------------ + bool ScStyleSheet::IsUsed() const { @@ -271,7 +271,7 @@ bool ScStyleSheet::IsUsed() const return true; } -//------------------------------------------------------------------------ + void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint ) { @@ -280,7 +280,7 @@ void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint ) GetItemSet().SetParent( NULL ); } -//------------------------------------------------------------------------ + // schmutzige Tricks, um die Standard-Vorlage immer als "Standard" zu speichern, // obwohl der fuer den Benutzer sichtbare Name uebersetzt ist: diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx index b449ba2db353..a93d341f072f 100644 --- a/sc/source/core/data/subtotalparam.cxx +++ b/sc/source/core/data/subtotalparam.cxx @@ -22,7 +22,7 @@ ScSubTotalParam::ScSubTotalParam() Clear(); } -//------------------------------------------------------------------------ + ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) : nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nUserIndex(r.nUserIndex), @@ -56,7 +56,7 @@ ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) : } } -//------------------------------------------------------------------------ + void ScSubTotalParam::Clear() { @@ -81,7 +81,7 @@ void ScSubTotalParam::Clear() } } -//------------------------------------------------------------------------ + ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r ) { @@ -130,7 +130,7 @@ ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r ) return *this; } -//------------------------------------------------------------------------ + bool ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const { @@ -172,7 +172,7 @@ bool ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const return bEqual; } -//------------------------------------------------------------------------ + void ScSubTotalParam::SetSubTotals( sal_uInt16 nGroup, const SCCOL* ptrSubTotals, diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 45180cff6014..552292dee0e3 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -219,7 +219,7 @@ bool SetOptimalHeightsToRows(OptimalHeightsFuncObjBase& rFuncObj, } -// ----------------------------------------------------------------------- + ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName, bool bColInfo, bool bRowInfo ) : diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index e3545f7ac768..4cb85abc355f 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -149,7 +149,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) } } - //-------------------------------------------------------------------------- + long nPageSizeX = aPageSizeTwips.Width(); long nPageSizeY = aPageSizeTwips.Height(); diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index e1a650d1220a..c544beccd61a 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -33,7 +33,7 @@ #include "postit.hxx" #include "stringutil.hxx" -//-------------------------------------------------------------------------- + using ::com::sun::star::util::SearchOptions; diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index d4226fd01f2e..9b26930e7c72 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.cxx @@ -21,7 +21,7 @@ #include "drwlayer.hxx" #include "rechead.hxx" -// ----------------------------------------------------------------------- + ScDrawObjFactory::ScDrawObjFactory() { @@ -52,7 +52,7 @@ IMPL_LINK_INLINE_START( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFac } IMPL_LINK_INLINE_END( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory ) -//------------------------------------------------------------------------ + ScDrawObjData::ScDrawObjData() : SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA, 0 ), @@ -67,7 +67,7 @@ ScDrawObjData* ScDrawObjData::Clone( SdrObject* ) const return new ScDrawObjData( *this ); } -//------------------------------------------------------------------------ + ScIMapInfo::ScIMapInfo() : SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA, 0 ) @@ -95,7 +95,7 @@ SdrObjUserData* ScIMapInfo::Clone( SdrObject* ) const return new ScIMapInfo( *this ); } -//------------------------------------------------------------------------ + ScMacroInfo::ScMacroInfo() : SdrObjUserData( SC_DRAWLAYER, SC_UD_MACRODATA, 0 ) diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 7ca9589e1c2f..68d407fde46f 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -605,7 +605,7 @@ rtl_uString* ScStringTokenIterator::Next() return (mbSkipEmpty && maCurString.isValid() && maCurString.isEmpty()) ? Next() : maCurString.getData(); } -// ---------------------------------------------------------------------------- + /** Returns the number format of the passed cell, or the standard format. */ sal_uLong lclGetCellFormat( ScDocument& rDoc, const ScAddress& rPos ) @@ -618,7 +618,7 @@ sal_uLong lclGetCellFormat( ScDocument& rDoc, const ScAddress& rPos ) } // namespace -// ---------------------------------------------------------------------------- + bool ScValidationData::HasSelectionList() const { @@ -839,7 +839,7 @@ bool ScValidationData::FillSelectionList(std::vector<ScTypedStrData>& rStrColl, return bOk; } -// ---------------------------------------------------------------------------- + bool ScValidationData::IsEqualToTokenArray( ScRefCellValue& rCell, const ScAddress& rPos, const ScTokenArray& rTokArr ) const { diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx index 349afdfc3048..c06f55cdbc0b 100644 --- a/sc/source/core/opencl/op_math.cxx +++ b/sc/source/core/opencl/op_math.cxx @@ -348,7 +348,7 @@ void OpCombina::GenSlidingWindowFunction(std::stringstream &ss, ss << " arg0 = trunc(arg0);\n"; ss << " arg1 = trunc(arg1);\n"; ss << " if(arg0 >= arg1 && arg0 > 0 && arg1 > 0)\n"; - ss << " tem = bik(arg0+arg1-1,arg1);\n"; + ss << " tem = bik(arg0+arg1-1,arg1);\n"; ss << " else if(arg0 == 0 && arg1 == 0)\n"; ss << " tem = 0;\n"; ss << " else if(arg0 > 0 && arg1 == 0)\n"; @@ -1409,14 +1409,14 @@ void OpArcCotHyp::GenSlidingWindowFunction(std::stringstream &ss, <const formula::SingleVectorRefToken *>(tmpCur); ss << " arg0 = "; ss << vSubArguments[0]->GenSlidingWindowDeclRef(); - ss << ";\n"; + ss << ";\n"; #ifdef ISNAN ss << " if(isNan("; ss << vSubArguments[0]->GenSlidingWindowDeclRef(); ss << ")||(gid0>="; ss << tmpCurDVR->GetArrayLength(); ss << "))\n"; - ss << " { arg0 = 0.0f; }\n"; + ss << " { arg0 = 0.0f; }\n"; #endif } else if(tmpCur->GetType() == formula::svDouble) @@ -2994,12 +2994,12 @@ void OpAverageIf::GenSlidingWindowFunction(std::stringstream &ss, if(paraOneWidth > 1) { throw Unhandled(); - } + } } if(vSubArguments[paraOneWidth]->GetFormulaToken()->GetType() == formula::svDoubleVectorRef) - + { FormulaToken *tmpCur1 = vSubArguments[1]->GetFormulaToken(); const formula::DoubleVectorRefToken*pCurDVR1= static_cast<const @@ -3108,7 +3108,7 @@ void OpAverageIf::GenSlidingWindowFunction(std::stringstream &ss, ss << " count+=1.0;\n"; ss << " }\n"; } - + ss << " if(count!=0)\n"; ss << " tmp=tmp/count;\n"; ss << " else\n"; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 205d61f68e06..114ffb84f0a7 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -81,9 +81,9 @@ using ::std::auto_ptr; //-----------------------------static data ----------------- -//------------------------------------------------------------------------- + // Funktionen fuer den Zugriff auf das Document -//------------------------------------------------------------------------- + void ScInterpreter::ReplaceCell( ScAddress& rPos ) @@ -847,9 +847,9 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } -//----------------------------------------------------------------------------- + // Stack operations -//----------------------------------------------------------------------------- + // Also releases a TempToken if appropriate. @@ -3690,7 +3690,7 @@ void ScInterpreter::ScTTT() PushError(errNoValue); } -// ------------------------------------------------------------------------- + ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc, diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 769b88686f41..463fd06e29a4 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -746,7 +746,7 @@ ScRefList* ScToken::GetRefList() } // ========================================================================== // real implementations of virtual functions -// -------------------------------------------------------------------------- + |