diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 17:13:43 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 17:19:54 +0200 |
| commit | c4c51709eaa02a5c9a2af3e5d436790307109813 (patch) | |
| tree | c67362b4f2c3d3f34655ca65ec10d54e1509cf73 /sc | |
| parent | c78f918a7cb267a713804b8feacc3425196d4428 (diff) | |
whitespace cleanup in sc
Change-Id: Id1dcadcac179c52977e48a6912ce4d5fd542f60c
Diffstat (limited to 'sc')
801 files changed, 0 insertions, 7654 deletions
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index 3ce1a5d7e53d..3b23866c9158 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -33,8 +33,6 @@ #include <cppuhelper/implbase4.hxx> #include <rtl/ustring.hxx> - - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL ScSpreadsheetSettings_CreateInstance( const com::sun::star::uno::Reference< @@ -287,8 +285,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index a3d29a6cf698..e2b45e4d488b 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -297,8 +297,6 @@ public: const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; }; - - class ScDoubleItem : public SfxPoolItem { public: diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index b3010118f0d4..138cb51d7c2a 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -75,8 +75,6 @@ public: friend inline SvStream& ReadScBigAddress( SvStream& rStream, ScBigAddress& rAdr ); }; - - inline void ScBigAddress::PutInOrder( ScBigAddress& r ) { sal_Int32 nTmp; @@ -245,8 +243,6 @@ inline SvStream& ReadScBigRange( SvStream& rStream, ScBigRange& rRange ) return rStream; } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index cc1d0f77ebcd..193f49ce7477 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -138,8 +138,6 @@ public: void SetTheActionRange( sal_uLong nFirst, sal_uLong nLast ) { mnFirstAction = nFirst; mnLastAction = nLast; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index 80e81941fbd4..70ea459b0bd6 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -688,8 +688,6 @@ public: ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx index 2f7d636405b0..81bf34452633 100644 --- a/sc/inc/detfunc.hxx +++ b/sc/inc/detfunc.hxx @@ -156,8 +156,6 @@ public: static void AppendChangTrackNoteSeparator(OUString &str); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 209ba12ed675..34d568243462 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -478,8 +478,6 @@ public: bool GetNext( double& rValue, sal_uInt16& rErr ); }; - - // returns all areas with non-default formatting (horizontal) diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index 37ccf79b8f88..e7e5272d2c67 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -70,8 +70,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 6a9e72b7844a..793f7b24844d 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -899,8 +899,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 55e002d87b5e..62dd9e66ff17 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -48,8 +48,6 @@ class ScDPTableData; // classes to save Data Pilot settings - - class ScDPSaveMember { private: diff --git a/sc/inc/dpsdbtab.hxx b/sc/inc/dpsdbtab.hxx index 90b1e952664c..d0f9f095bc82 100644 --- a/sc/inc/dpsdbtab.hxx +++ b/sc/inc/dpsdbtab.hxx @@ -81,8 +81,6 @@ public: virtual void ReloadCacheTable() SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/dpshttab.hxx b/sc/inc/dpshttab.hxx index 4e29f168af18..448f3a26d427 100644 --- a/sc/inc/dpshttab.hxx +++ b/sc/inc/dpshttab.hxx @@ -121,8 +121,6 @@ public: virtual void ReloadCacheTable() SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 003cf10c7e07..e3a2afff5e3f 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -74,8 +74,6 @@ class ScDPTableData; // implementation of DataPilotSource using ScDPTableData - - class ScDPDimensions; class ScDPDimension; class ScDPHierarchies; diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index b40976914ace..3db47f6f2ffc 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -143,8 +143,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - class ScTableConditionalEntry : public cppu::WeakImplHelper3< com::sun::star::sheet::XSheetCondition2, com::sun::star::sheet::XSheetConditionalEntry, @@ -194,8 +192,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - class ScTableValidationObj : public cppu::WeakImplHelper5< com::sun::star::sheet::XSheetCondition2, com::sun::star::sheet::XMultiFormulaTokens, diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index ed36268fa9e5..3068428976cb 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -196,8 +196,6 @@ public: ParameterFlags() : bOptional(false), bSuppress(false) {} }; - - OUString *pFuncName; /**< Function name */ OUString *pFuncDesc; /**< Description of function */ std::vector<OUString> maDefArgNames; /**< Parameter name(s) */ diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index 9444c0a01c9b..ce59965f1473 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -54,8 +54,6 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener > XRefreshListenerRef; typedef boost::ptr_vector<XRefreshListenerRef> XRefreshListenerArr_Impl; - - class ScSheetLinkObj : public cppu::WeakImplHelper4< com::sun::star::container::XNamed, com::sun::star::util::XRefreshable, diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index 49620813139d..17ec61e621d3 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -71,8 +71,6 @@ public: bool Next( SCROW& rTop, SCROW& rBottom ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index f667f0b6adfa..84a9cd784360 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -200,8 +200,6 @@ public: } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 5bacedcf076e..e1eedd409d7d 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -430,8 +430,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx index 383980d58a00..b05c3912d411 100644 --- a/sc/inc/reffind.hxx +++ b/sc/inc/reffind.hxx @@ -48,8 +48,6 @@ public: void ToggleRel( sal_Int32 nStartPos, sal_Int32 nEndPos ); }; - - #endif diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx index 2dd3686b9dd7..908ad9e15881 100644 --- a/sc/inc/servuno.hxx +++ b/sc/inc/servuno.hxx @@ -104,8 +104,6 @@ public: static sal_uInt16 GetProviderType(const OUString& rServiceName); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/warnpassword.hxx b/sc/inc/warnpassword.hxx index 3e4b7cbcc671..998b6902b306 100644 --- a/sc/inc/warnpassword.hxx +++ b/sc/inc/warnpassword.hxx @@ -20,8 +20,6 @@ #ifndef SC_WARNPASSWORD_HXX #define SC_WARNPASSWORD_HXX - - class SfxMedium; /** Static API helper functions. */ class ScWarnPassword diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx index 3e927970dcac..f76ed1375391 100644 --- a/sc/inc/zforauto.hxx +++ b/sc/inc/zforauto.hxx @@ -57,8 +57,6 @@ public: inline LanguageType GetLanguage() const { return eLnge; } }; - - #endif diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index f670e9ccbd38..68d1b2e82ae3 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -3966,8 +3966,6 @@ void Test::testRenameTable() m_pDoc->DeleteTab(1); } - - void Test::testSetBackgroundColor() { //test set background color @@ -3998,8 +3996,6 @@ void Test::testSetBackgroundColor() m_pDoc->DeleteTab(0); } - - void Test::testUpdateReference() { //test that formulas are correctly updated during sheet delete diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index 352091cc1012..c3a3b3ee108d 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -63,8 +63,6 @@ ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) : pData[0].pPattern = pDocument->GetDefPattern(); // no put } - - ScAttrArray::~ScAttrArray() { #if OSL_DEBUG_LEVEL > 1 @@ -107,8 +105,6 @@ void ScAttrArray::TestData() const } #endif - - void ScAttrArray::Reset( const ScPatternAttr* pPattern ) { ScDocumentPool* pDocPool = pDocument->GetPool(); @@ -179,8 +175,6 @@ bool ScAttrArray::Concat(SCSIZE nPos) return bRet; } - - bool ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const { long nHi = static_cast<long>(nCount) - 1; @@ -342,8 +336,6 @@ void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 n } - - void ScAttrArray::SetPattern( SCROW nRow, const ScPatternAttr* pPattern, bool bPutToPool ) { SetPatternArea( nRow, nRow, pPattern, bPutToPool ); @@ -971,8 +963,6 @@ void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow, } } - - // assemble border static bool lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pNewLine, diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index c1f38a018032..ae0335b4b1ce 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -41,8 +41,6 @@ using namespace com::sun::star; - - TYPEINIT1(ScMergeAttr, SfxPoolItem); TYPEINIT1_AUTOFACTORY(ScProtectionAttr, SfxPoolItem); TYPEINIT1(ScRangeItem, SfxPoolItem); @@ -54,8 +52,6 @@ TYPEINIT1(ScPageScaleToItem, SfxPoolItem); TYPEINIT1(ScCondFormatItem, SfxPoolItem); - - // General Help Function @@ -87,12 +83,8 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB } } - - // Item - Implementierungen - - // Merge @@ -102,16 +94,12 @@ ScMergeAttr::ScMergeAttr(): nRowMerge(0) {} - - ScMergeAttr::ScMergeAttr( SCsCOL nCol, SCsROW nRow): SfxPoolItem(ATTR_MERGE), nColMerge(nCol), nRowMerge(nRow) {} - - ScMergeAttr::ScMergeAttr(const ScMergeAttr& rItem): SfxPoolItem(ATTR_MERGE) { @@ -123,8 +111,6 @@ ScMergeAttr::~ScMergeAttr() { } - - OUString ScMergeAttr::GetValueText() const { OUString aRet = "(" @@ -135,8 +121,6 @@ OUString ScMergeAttr::GetValueText() const return aRet; } - - bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( Which() != rItem.Which() || Type() == rItem.Type(), "which ==, type !=" ); @@ -145,15 +129,11 @@ 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 { sal_Int16 nCol; @@ -172,8 +152,6 @@ ScMergeFlagAttr::ScMergeFlagAttr(): { } - - ScMergeFlagAttr::ScMergeFlagAttr(sal_Int16 nFlags): SfxInt16Item(ATTR_MERGE_FLAG, nFlags) { @@ -206,8 +184,6 @@ ScProtectionAttr::ScProtectionAttr(): { } - - ScProtectionAttr::ScProtectionAttr( bool bProtect, bool bHFormula, bool bHCell, bool bHPrint): SfxPoolItem(ATTR_PROTECTION), @@ -218,8 +194,6 @@ ScProtectionAttr::ScProtectionAttr( bool bProtect, bool bHFormula, { } - - ScProtectionAttr::ScProtectionAttr(const ScProtectionAttr& rItem): SfxPoolItem(ATTR_PROTECTION) { @@ -233,8 +207,6 @@ ScProtectionAttr::~ScProtectionAttr() { } - - bool ScProtectionAttr::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -305,8 +277,6 @@ bool ScProtectionAttr::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } - - OUString ScProtectionAttr::GetValueText() const { const OUString aStrYes ( ScGlobal::GetRscString(STR_YES) ); @@ -325,8 +295,6 @@ OUString ScProtectionAttr::GetValueText() const return aValue; } - - SfxItemPresentation ScProtectionAttr::GetPresentation ( SfxItemPresentation ePres, @@ -374,8 +342,6 @@ SfxItemPresentation ScProtectionAttr::GetPresentation return ePres; } - - bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( Which() != rItem.Which() || Type() == rItem.Type(), "which ==, type !=" ); @@ -386,15 +352,11 @@ 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 { sal_Bool bProtect; @@ -410,32 +372,24 @@ SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, sal_uInt16 /* n */ ) c return new ScProtectionAttr(bProtect,bHFormula,bHCell,bHPrint); } - - bool ScProtectionAttr::SetProtection( bool bProtect) { bProtection = bProtect; return true; } - - bool ScProtectionAttr::SetHideFormula( bool bHFormula) { bHideFormula = bHFormula; return true; } - - bool ScProtectionAttr::SetHideCell( bool bHCell) { bHideCell = bHCell; return true; } - - bool ScProtectionAttr::SetHidePrint( bool bHPrint) { bHidePrint = bHPrint; @@ -453,15 +407,11 @@ bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const return ( aRange == ( (ScRangeItem&)rAttr ).aRange ); } - - SfxPoolItem* ScRangeItem::Clone( SfxItemPool* ) const { return new ScRangeItem( *this ); } - - SfxItemPresentation ScRangeItem::GetPresentation ( SfxItemPresentation ePres, @@ -515,15 +465,11 @@ ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) } - - ScTableListItem::~ScTableListItem() { delete [] pTabArr; } - - ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy ) { delete [] pTabArr; @@ -542,8 +488,6 @@ ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy ) return *this; } - - bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -566,15 +510,11 @@ bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const return bEqual; } - - SfxPoolItem* ScTableListItem::Clone( SfxItemPool* ) const { return new ScTableListItem( *this ); } - - SfxItemPresentation ScTableListItem::GetPresentation ( SfxItemPresentation ePres, @@ -617,8 +557,6 @@ SfxItemPresentation ScTableListItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } - - // ScPageHFItem - Dates from the Head and Foot lines @@ -630,8 +568,6 @@ ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP ) { } - - ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem ) : SfxPoolItem ( rItem ), pLeftArea ( NULL ), @@ -646,8 +582,6 @@ ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem ) pRightArea = rItem.pRightArea->Clone(); } - - ScPageHFItem::~ScPageHFItem() { delete pLeftArea; @@ -655,8 +589,6 @@ ScPageHFItem::~ScPageHFItem() delete pRightArea; } - - bool ScPageHFItem::QueryValue( uno::Any& rVal, sal_uInt8 /* nMemberId */ ) const { uno::Reference<sheet::XHeaderFooterContent> xContent = @@ -715,15 +647,11 @@ 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 { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -735,15 +663,11 @@ 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 ) { // Text replaced by a space to ensure they are positions: @@ -886,24 +810,18 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const } - - void ScPageHFItem::SetLeftArea( const EditTextObject& rNew ) { delete pLeftArea; pLeftArea = rNew.Clone(); } - - void ScPageHFItem::SetCenterArea( const EditTextObject& rNew ) { delete pCenterArea; pCenterArea = rNew.Clone(); } - - void ScPageHFItem::SetRightArea( const EditTextObject& rNew ) { delete pRightArea; @@ -931,21 +849,15 @@ ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP ) { } - - ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP, ScVObjMode eMode ) : SfxEnumItem( nWhichP, sal::static_int_cast<sal_uInt16>(eMode) ) { } - - ScViewObjectModeItem::~ScViewObjectModeItem() { } - - SfxItemPresentation ScViewObjectModeItem::GetPresentation ( SfxItemPresentation ePres, @@ -994,8 +906,6 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation return ePres; } - - OUString ScViewObjectModeItem::GetValueText( sal_uInt16 nVal ) const { OSL_ENSURE( nVal <= VOBJ_MODE_HIDE, "enum overflow!" ); @@ -1003,29 +913,21 @@ 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, sal_uInt16 nVersion ) const @@ -1057,23 +959,17 @@ ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal ) { } - - ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem ) : SfxPoolItem ( rItem ) { nValue = rItem.nValue; } - - OUString ScDoubleItem::GetValueText() const { return OUString("ScDoubleItem"); } - - bool ScDoubleItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -1081,15 +977,11 @@ 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 { double nTmp=0; @@ -1100,15 +992,11 @@ SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) co return pItem; } - - ScDoubleItem::~ScDoubleItem() { } - - ScPageScaleToItem::ScPageScaleToItem() : SfxPoolItem( ATTR_PAGE_SCALETO ), mnWidth( 0 ), @@ -1217,8 +1105,6 @@ bool ScPageScaleToItem::PutValue( const uno::Any& rAny, sal_uInt8 nMemberId ) return bRet; } - - ScCondFormatItem::ScCondFormatItem(): SfxPoolItem( ATTR_CONDITIONAL ) { diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 8b4b61981097..a5d982f9eedb 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -67,13 +67,9 @@ #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 ) { //! move to a header file @@ -83,14 +79,10 @@ inline bool IsAmbiguousScript( sal_uInt8 nScript ) } - - // Data operations - - long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index a35a5421c59b..7bb2f4596ec7 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1541,8 +1541,6 @@ void ScConditionEntry::endRendering() mpCache.reset(); } - - ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, const OUString& rExpr1, const OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, @@ -1597,8 +1595,6 @@ ScFormatEntry* ScCondFormatEntry::Clone( ScDocument* pDoc ) const return new ScCondFormatEntry( pDoc, *this ); } - - ScCondDateFormatEntry::ScCondDateFormatEntry( ScDocument* pDoc ) : ScFormatEntry( pDoc ) , meType(condformat::TODAY) @@ -1787,8 +1783,6 @@ void ScCondDateFormatEntry::endRendering() mpCache.reset(); } - - ScConditionalFormat::ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument) : pDoc( pDocument ), nKey( nNewKey ) @@ -2091,8 +2085,6 @@ void ScConditionalFormat::endRendering() } } - - ScConditionalFormatList::ScConditionalFormatList(const ScConditionalFormatList& rList) { for(const_iterator itr = rList.begin(); itr != rList.end(); ++itr) diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx index d89e3592ad45..586f8d0bdeee 100644 --- a/sc/source/core/data/dbdocutl.cxx +++ b/sc/source/core/data/dbdocutl.cxx @@ -30,15 +30,11 @@ 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, long nType, bool bCurrency, StrData* pStrData ) diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 060ac3b2fcf8..09f9da567fa5 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -316,8 +316,6 @@ bool ScValueIterator::GetNext(double& rValue, sal_uInt16& rErr) return GetThis(rValue, rErr); } - - ScDBQueryDataIterator::DataAccess::DataAccess(const ScDBQueryDataIterator* pParent) : mpParent(pParent) { @@ -758,16 +756,12 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM return false; } - - ScDBQueryDataIterator::Value::Value() : mnError(0), mbIsNumber(true) { ::rtl::math::setNan(&mfValue); } - - ScDBQueryDataIterator::ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam) : mpParam (pParam) { @@ -1037,8 +1031,6 @@ bool ScCellIterator::next() return getCurrent(); } - - ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable, const ScQueryParam& rParam, bool bMod ) : mpParam(new ScQueryParam(rParam)), @@ -1907,8 +1899,6 @@ bool ScQueryCellIterator::BinarySearch() } - - ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) : pDoc( pDocument ), @@ -2140,8 +2130,6 @@ void ScHorizontalCellIterator::SkipInvalid() mbMore = false; } - - ScHorizontalValueIterator::ScHorizontalValueIterator( ScDocument* pDocument, const ScRange& rRange, bool bSTotal, bool bTextZero ) : pDoc( pDocument ), @@ -2262,8 +2250,6 @@ bool ScHorizontalValueIterator::GetNext( double& rValue, sal_uInt16& rErr ) return bFound; } - - ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) : pDoc( pDocument ), @@ -2407,8 +2393,6 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo } } - - inline bool IsGreater( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { return ( nRow1 > nRow2 ) || ( nRow1 == nRow2 && nCol1 > nCol2 ); @@ -2515,8 +2499,6 @@ const ScRefCellValue& ScUsedAreaIterator::GetCell() const return maFoundCell; } - - ScDocAttrIterator::ScDocAttrIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) : @@ -2559,8 +2541,6 @@ const ScPatternAttr* ScDocAttrIterator::GetNext( SCCOL& rCol, SCROW& rRow1, SCRO return NULL; // Nothing anymore } - - ScDocRowHeightUpdater::TabRanges::TabRanges(SCTAB nTab) : mnTab(nTab), mpRanges(new ScFlatBoolRowSegments) { @@ -2648,8 +2628,6 @@ void ScDocRowHeightUpdater::updateAll() } } - - ScAttrRectIterator::ScAttrRectIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) : @@ -2718,8 +2696,6 @@ const ScPatternAttr* ScAttrRectIterator::GetNext( SCCOL& rCol1, SCCOL& rCol2, return NULL; // Nothing anymore } - - SCROW ScRowBreakIterator::NOT_FOUND = -1; ScRowBreakIterator::ScRowBreakIterator(set<SCROW>& rBreaks) : diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 3c7e52dac489..880f02d273d4 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -185,8 +185,6 @@ static SfxItemInfo const aItemInfos[] = { SID_SCATTR_PAGE_SCALETO, SFX_ITEM_POOLABLE } // ATTR_PAGE_SCALETO }; - - ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool) : SfxItemPool ( OUString("ScDocumentPool"), @@ -596,8 +594,6 @@ void ScDocumentPool::DeleteVersionMaps() pVersionMap1 = 0; } - - // Fuer die Pattern-Attribute (SetItems) kann der sal_uInt16 RefCount leicht ueberlaufen // (z.B. 600 ganze Zeilen abwechselnd formatieren). // Darum wird der RefCount bei SC_MAX_POOLREF festgehalten und nicht mehr hoch- oder @@ -653,8 +649,6 @@ void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) } } - - void ScDocumentPool::StyleDeleted( ScStyleSheet* pStyle ) { sal_uInt32 nCount = GetItemCount2(ATTR_PATTERN); diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 03e616013043..3390f8af0675 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -1136,8 +1136,6 @@ void ScDocument::SetChangeViewSettings(const ScChangeViewSettings& rNew) *pChangeViewSettings=rNew; } - - ScFieldEditEngine* ScDocument::CreateFieldEditEngine() { ScFieldEditEngine* pNewEditEngine = NULL; @@ -1174,15 +1172,11 @@ void ScDocument::DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine) rpEditEngine = NULL; } - - ScRecursionHelper* ScDocument::CreateRecursionHelperInstance() { return new ScRecursionHelper; } - - ScLookupCache & ScDocument::GetLookupCache( const ScRange & rRange ) { ScLookupCache* pCache = 0; diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 3972f8e830f4..6e3cd333b685 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -892,8 +892,6 @@ void ScDocument::DeleteConditionalFormat(sal_uLong nOldIndex, SCTAB nTab) maTabs[nTab]->DeleteConditionalFormat(nOldIndex); } - - bool ScDocument::HasDetectiveOperations() const { return pDetOpList && pDetOpList->Count(); @@ -919,12 +917,8 @@ void ScDocument::SetDetOpList(ScDetOpList* pNew) pDetOpList = pNew; } - - // Vergleich von Dokumenten - - // Pfriemel-Faktoren #define SC_DOCCOMP_MAXDIFF 256 #define SC_DOCCOMP_MINGOOD 128 @@ -1382,6 +1376,4 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 293e1af90532..ff49e24c65ba 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star; - - static void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xChartDoc, OUString& rRanges, chart::ChartDataRowSource& rDataRowSource, bool& rHasCategories, bool& rFirstCellAsLabel ) diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index a4a83e4af6c1..22b6c77cb7fe 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -42,8 +42,6 @@ using namespace com::sun::star; // put functions here that need exceptions! - - const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator() { if ( !pScriptTypeData ) diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index 658bd8d3448f..e79ff3393c12 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -48,8 +48,6 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkA // STATIC DATA ----------------------------------------------------------- - - void ScDocument::StartListeningArea( const ScRange& rRange, SvtListener* pListener ) @@ -634,6 +632,4 @@ void ScDocument::SetAutoCalc( bool bNewAutoCalc ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index e14236df2d91..5ab1e3129796 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -109,8 +109,6 @@ void ScDocument::ImplCreateOptions() pViewOptions = new ScViewOptions(); } - - void ScDocument::ImplDeleteOptions() { delete pDocOptions; @@ -118,8 +116,6 @@ void ScDocument::ImplDeleteOptions() delete pExtDocOptions; } - - SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist) { if ( !pPrinter && bCreateIfNotExist ) @@ -150,8 +146,6 @@ SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist) return pPrinter; } - - void ScDocument::SetPrinter( SfxPrinter* pNewPrinter ) { if ( pNewPrinter == pPrinter ) @@ -172,8 +166,6 @@ void ScDocument::SetPrinter( SfxPrinter* pNewPrinter ) InvalidateTextWidth(NULL, NULL, false); // in both cases } - - void ScDocument::SetPrintOptions() { if ( !pPrinter ) GetPrinter(); // setzt pPrinter @@ -196,8 +188,6 @@ void ScDocument::SetPrintOptions() } } - - VirtualDevice* ScDocument::GetVirtualDevice_100th_mm() { if (!pVirtualDevice_100th_mm) @@ -226,8 +216,6 @@ OutputDevice* ScDocument::GetRefDevice() return pRefDevice; } - - void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, const SfxItemSet& rChanges ) { @@ -309,8 +297,6 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, } } - - void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc ) { // number format exchange list has to be handled here, too @@ -318,8 +304,6 @@ void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc ) xPoolHelper->GetStylePool()->CopyStdStylesFrom( pSrcDoc->xPoolHelper->GetStylePool() ); } - - void ScDocument::InvalidateTextWidth( const OUString& rStyleName ) { const SCTAB nCount = GetTableCount(); @@ -328,8 +312,6 @@ void ScDocument::InvalidateTextWidth( const OUString& rStyleName ) InvalidateTextWidth( i ); } - - void ScDocument::InvalidateTextWidth( SCTAB nTab ) { ScAddress aAdrFrom( 0, 0, nTab ); @@ -337,8 +319,6 @@ void ScDocument::InvalidateTextWidth( SCTAB nTab ) InvalidateTextWidth( &aAdrFrom, &aAdrTo, false ); } - - bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab ) { bool bInUse = false; @@ -354,8 +334,6 @@ bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab return bInUse; } - - bool ScDocument::RemovePageStyleInUse( const OUString& rStyle ) { bool bWasInUse = false; @@ -386,8 +364,6 @@ bool ScDocument::RenamePageStyleInUse( const OUString& rOld, const OUString& rNe return bWasInUse; } - - sal_uInt8 ScDocument::GetEditTextDirection(SCTAB nTab) const { EEHorizontalTextDirection eRet = EE_HTEXTDIR_DEFAULT; @@ -476,8 +452,6 @@ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress } } - - #define CALCMAX 1000 // Berechnungen #define ABORT_EVENTS (VCL_INPUT_ANY & ~VCL_INPUT_TIMER & ~VCL_INPUT_OTHER) @@ -954,8 +928,6 @@ 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 ) { @@ -1031,8 +1003,6 @@ bool ScDocument::SetDdeLinkResultMatrix( size_t nDdePos, ScMatrixRef pResults ) return false; } - - bool ScDocument::HasAreaLinks() const { const sfx2::LinkManager* pMgr = GetDocLinkManager().getExistingLinkManager(); @@ -1154,8 +1124,6 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, } } - - // TimerDelays etc. void ScDocument::KeyInput( const KeyEvent& ) { @@ -1165,8 +1133,6 @@ void ScDocument::KeyInput( const KeyEvent& ) apTemporaryChartLock->StartOrContinueLocking(); } - - bool ScDocument::CheckMacroWarn() { // The check for macro configuration, macro warning and disabling is now handled @@ -1175,8 +1141,6 @@ bool ScDocument::CheckMacroWarn() return true; } - - SfxBindings* ScDocument::GetViewBindings() { // used to invalidate slots after changes to this document @@ -1204,8 +1168,6 @@ ScDrawLayer* ScDocument::GetDrawLayer() return pDrawLayer; } - - void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ) { OSL_ENSURE( rMultiMark.IsMultiMarked(), "TransliterateText: no selection" ); diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 816a597e5fc8..4d7920e78d06 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -59,8 +59,6 @@ using namespace ::com::sun::star; #include <stdio.h> - - SfxBroadcaster* ScDocument::GetDrawBroadcaster() { return pDrawLayer; diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 421d64e898f6..b5f412b8a26b 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -3794,8 +3794,6 @@ void ScDocument::ResetChanged( const ScRange& rRange ) // Spaltenbreiten / Zeilenhoehen -------------------------------------- - - void ScDocument::SetColWidth( SCCOL nCol, SCTAB nTab, sal_uInt16 nNewWidth ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4014,8 +4012,6 @@ void ScDocument::UpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkDa } } - - // Spalten-/Zeilen-Flags ---------------------------------------------- @@ -5641,8 +5637,6 @@ ScDocumentPool* ScDocument::GetPool() return xPoolHelper->GetDocPool(); } - - ScStyleSheetPool* ScDocument::GetStyleSheetPool() const { return xPoolHelper->GetStylePool(); @@ -5690,8 +5684,6 @@ void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, // Datei-Operationen - - void ScDocument::UpdStlShtPtrsFrmNms() { ScPatternAttr::pDoc = this; diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 93ed4136810f..9deb8a92909d 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -36,8 +36,6 @@ using namespace com::sun::star; - - ScDPSaveGroupItem::ScDPSaveGroupItem( const OUString& rName ) : aGroupName(rName) {} @@ -131,8 +129,6 @@ void ScDPSaveGroupItem::AddToData(ScDPGroupDimension& rDataDim) const rDataDim.AddItem(aGroup); } - - ScDPSaveGroupDimension::ScDPSaveGroupDimension( const OUString& rSource, const OUString& rName ) : aSourceDim( rSource ), aGroupDimName( rName ), @@ -426,8 +422,6 @@ void ScDPSaveGroupDimension::AddToCache(ScDPCache& rCache) const } } - - ScDPSaveNumGroupDimension::ScDPSaveNumGroupDimension( const OUString& rName, const ScDPNumGroupInfo& rInfo ) : aDimensionName( rName ), aGroupInfo( rInfo ), @@ -576,8 +570,6 @@ void ScDPSaveNumGroupDimension::SetDateInfo( const ScDPNumGroupInfo& rInfo, sal_ nDatePart = nPart; } - - namespace { struct ScDPSaveGroupDimNameFunc @@ -596,8 +588,6 @@ struct ScDPSaveGroupSourceNameFunc } // namespace - - ScDPDimensionSaveData::ScDPDimensionSaveData() { } @@ -855,6 +845,4 @@ OUString ScDPDimensionSaveData::CreateDateGroupDimName( return CreateGroupDimName( aPartName, rObject, bAllowSource, pDeletedNames ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 45ddaf8df74f..3a95fac2c720 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -97,16 +97,12 @@ size_t ScDPFilteredCache::GroupFilter::getMatchItemCount() const return maItems.size(); } - - ScDPFilteredCache::Criterion::Criterion() : mnFieldIndex(-1), mpFilter(static_cast<FilterBase*>(NULL)) { } - - 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 9a9ae44a5cc0..f39b425dcf25 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -126,8 +126,6 @@ private: ScDPNumGroupInfo maNumInfo; }; - - ScDPGroupDateFilter::ScDPGroupDateFilter( const std::vector<ScDPItemData>& rValues, const Date& rNullDate, const ScDPNumGroupInfo& rNumInfo) : maValues(rValues), @@ -350,8 +348,6 @@ void ScDPGroupItem::FillGroupFilter( ScDPFilteredCache::GroupFilter& rFilter ) c rFilter.addMatchItem(*itr); } - - ScDPGroupDimension::ScDPGroupDimension( long nSource, const OUString& rNewName ) : nSourceDim( nSource ), nGroupDim( -1 ), @@ -404,8 +400,6 @@ const std::vector<SCROW>& ScDPGroupDimension::GetColumnEntries( return maMemberEntries; } - - const ScDPGroupItem* ScDPGroupDimension::GetGroupForData( const ScDPItemData& rData ) const { for (ScDPGroupItemVec::const_iterator aIter = aItems.begin(); aIter != aItems.end(); ++aIter) @@ -447,8 +441,6 @@ bool ScDPGroupDimension::IsDateDimension() const return mbDateDimension; } - - ScDPNumGroupDimension::ScDPNumGroupDimension() : mbDateDimension(false) {} ScDPNumGroupDimension::ScDPNumGroupDimension( const ScDPNumGroupInfo& rInfo ) : diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 5efc3a69b4c3..df1419c3a5fa 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -100,8 +100,6 @@ using ::com::sun::star::beans::XPropertySet; #define SC_DBPROP_COMMAND "Command" #define SC_DBPROP_COMMANDTYPE "CommandType" - - #define SCDPSOURCE_SERVICE "com.sun.star.sheet.DataPilotSource" namespace { @@ -2658,8 +2656,6 @@ bool ScDPObject::IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags ) return bAllowed; } - - bool ScDPObject::HasRegisteredSources() { bool bFound = false; diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index d31ac4247121..1bae406b31fa 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -324,8 +324,6 @@ 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, const uno::Reference<container::XIndexAccess>& xDims ) diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index 9d3157cd207a..efbdccf506ff 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -161,6 +161,4 @@ void ScDatabaseDPData::ReloadCacheTable() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index b544387e4006..2a03978b7bcb 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -39,8 +39,6 @@ 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), aQuery ( rDesc.GetQueryParam() ), diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index bfe57793df20..7056a9f7a52b 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -38,8 +38,6 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::std::vector; - - ScDPTableData::CalcInfo::CalcInfo() : pInitState( NULL ), pColRoot( NULL ), @@ -48,8 +46,6 @@ ScDPTableData::CalcInfo::CalcInfo() : { } - - ScDPTableData::ScDPTableData(ScDocument* pDoc) : mpDoc(pDoc) { @@ -251,8 +247,6 @@ void ScDPTableData::GetItemData(const ScDPFilteredCache& rCacheTable, sal_Int32 } } - - long ScDPTableData::GetMembersCount( long nDim ) { if ( nDim > MAXCOL ) diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 854734b587f0..792ebb43b497 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -385,16 +385,12 @@ void ScDPRunningTotalState::RemoveRowIndex() } } - - ScDPRelativePos::ScDPRelativePos( long nBase, long nDir ) : nBasePos( nBase ), nDirection( nDir ) { } - - void ScDPAggData::Update( const ScDPValue& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ) { if (nCount<0) // error? @@ -682,8 +678,6 @@ void ScDPAggData::Dump(int nIndent) const } #endif - - ScDPRowTotals::ScDPRowTotals() : bIsInColRoot( false ) { @@ -725,8 +719,6 @@ ScDPAggData* ScDPRowTotals::GetGrandTotal( long nMeasure ) return lcl_GetChildTotal( &aGrandTotal, nMeasure ); } - - static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo ) { ScSubTotalFunc eRet = SUBTOTAL_FUNC_NONE; @@ -755,8 +747,6 @@ static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo ) return eRet; } - - ScDPResultData::ScDPResultData( ScDPSource& rSrc ) : mrSource(rSrc), bLateInit( false ), @@ -951,8 +941,6 @@ ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDi } - - ScDPResultMember::ScDPResultMember( const ScDPResultData* pData, const ScDPParentDimData& rParentDimData, bool bForceSub ) : pResultData( pData ), @@ -1836,8 +1824,6 @@ void ScDPResultMember::FillVisibilityData(ScDPResultVisibilityData& rData) const pChildDimension->FillVisibilityData(rData); } - - ScDPDataMember::ScDPDataMember( const ScDPResultData* pData, const ScDPResultMember* pRes ) : pResultData( pData ), pResultMember( pRes ), @@ -2688,8 +2674,6 @@ 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,8 +2752,6 @@ bool ScDPGroupCompare::TestIncluded( const ScDPMember& rMember ) return bInclude; } - - ScDPResultDimension::ScDPResultDimension( const ScDPResultData* pData ) : pResultData( pData ), nSortMeasure( 0 ), @@ -3559,8 +3541,6 @@ void ScDPResultDimension::FillVisibilityData(ScDPResultVisibilityData& rData) co } } - - ScDPDataDimension::ScDPDataDimension( const ScDPResultData* pData ) : pResultData( pData ), pResultDimension( NULL ), @@ -3914,8 +3894,6 @@ ScDPDataMember* ScDPDataDimension::GetMember(long n) return maMembers[n]; } - - ScDPResultVisibilityData::ScDPResultVisibilityData( ScDPSource* pSource) : mpSource(pSource) diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 9e5b5751e32a..3fbb0bdad387 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -69,12 +69,8 @@ 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" ) SC_SIMPLE_SERVICE_INFO( ScDPDimension, "ScDPDimension", "com.sun.star.sheet.DataPilotSourceDimension" ) @@ -85,13 +81,9 @@ 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,8 +97,6 @@ static void lcl_SetBoolInAny( uno::Any& rAny, sal_Bool bValue ) rAny.setValue( &bValue, getBooleanCppuType() ); } - - ScDPSource::ScDPSource( ScDPTableData* pD ) : pData( pD ), pDimensions( NULL ), @@ -1223,8 +1213,6 @@ void ScDPSource::DumpResults() const SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPSource ) - - ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) : pSource( pSrc ), ppDims( NULL ) @@ -1352,8 +1340,6 @@ ScDPDimension* ScDPDimensions::getByIndex(long nIndex) const return NULL; //! exception? } - - ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) : pSource( pSrc ), nDim( nD ), @@ -1727,8 +1713,6 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const OUString& aPropertyName SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPDimension ) - - ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) : pSource( pSrc ), nDim( nD ), @@ -1835,8 +1819,6 @@ ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const return NULL; //! exception? } - - ScDPHierarchy::ScDPHierarchy( ScDPSource* pSrc, long nD, long nH ) : pSource( pSrc ), nDim( nD ), @@ -1896,8 +1878,6 @@ 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 ), nDim( nD ), @@ -2015,8 +1995,6 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const return NULL; //! exception? } - - class ScDPGlobalMembersOrder { ScDPLevel& rLevel; @@ -2046,8 +2024,6 @@ 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 ), nDim( nD ), @@ -2320,8 +2296,6 @@ 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 ), nDim( nD ), @@ -2593,8 +2567,6 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const return NULL; //! exception? } - - ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL, SCROW nIndex) : pSource( pSrc ), diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx index fc0feca48f17..63ac4fddac24 100644 --- a/sc/source/core/data/drawpage.cxx +++ b/sc/source/core/data/drawpage.cxx @@ -26,22 +26,16 @@ // STATIC DATA ----------------------------------------------------------- - - ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage) : FmFormPage(rNewModel, bMasterPage) { SetSize( Size( LONG_MAX, LONG_MAX ) ); } - - ScDrawPage::~ScDrawPage() { } - - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ScDrawPage::createUnoPage() { return static_cast<cppu::OWeakObject*>( new ScPageObj( this ) ); diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index a0877eb0ddb1..5a7e3025b6ff 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -95,8 +95,6 @@ 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 ) : SdrUndoObj( *pObjP ), @@ -133,8 +131,6 @@ void ScUndoObjData::Redo() } } - - ScTabDeletedHint::ScTabDeletedHint( SCTAB nTabNo ) : nTab( nTabNo ) { @@ -153,8 +149,6 @@ ScTabSizeChangedHint::~ScTabSizeChangedHint() { } - - #define MAXMM 10000000 inline long TwipsToHmm (long nVal) @@ -188,8 +182,6 @@ static void lcl_ReverseTwipsToMM( Rectangle& rRect ) } - - ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : FmFormModel( SvtPathOptions().GetPalettePath(), NULL, // SfxItemPool* Pool diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 71c2e61d1f4f..650d28b51641 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -742,8 +742,6 @@ 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 49e90cc757f4..fb2a5781005d 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -81,8 +81,6 @@ #include "editutil.hxx" - - ScDocShellRef* ScGlobal::pDrawClipDocShellRef = NULL; SvxSearchItem* ScGlobal::pSearchItem = NULL; ScAutoFormat* ScGlobal::pAutoFormat = NULL; @@ -142,12 +140,8 @@ sal_uInt16 nScFillModeMouseModifier = 0; //! dito void global_InitAppOptions(); - - // statische Funktionen - - bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs, const SfxItemSet& rOldAttrs, const sal_uInt16 nWhich ) @@ -156,8 +150,6 @@ bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs, const SfxItemState eNewState = rNewAttrs.GetItemState( nWhich ); const SfxItemState eOldState = rOldAttrs.GetItemState( nWhich ); - - if ( eNewState == eOldState ) { // beide Items gesetzt @@ -210,8 +202,6 @@ SvNumberFormatter* ScGlobal::GetEnglishFormatter() } - - bool ScGlobal::CheckWidthInvalidate( bool& bNumFormatChanged, const SfxItemSet& rNewAttrs, const SfxItemSet& rOldAttrs ) @@ -674,8 +664,6 @@ void ScGlobal::Clear() DELETEZ(pEmptyOUString); } - - rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet ) { // new TextEncoding values @@ -699,8 +687,6 @@ rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet ) else return osl_getThreadTextEncoding(); } - - OUString ScGlobal::GetCharsetString( rtl_TextEncoding eVal ) { const sal_Char* pChar; @@ -724,8 +710,6 @@ OUString ScGlobal::GetCharsetString( rtl_TextEncoding eVal ) return OUString::createFromAscii(pChar); } - - bool ScGlobal::HasStarCalcFunctionList() { return ( pStarCalcFunctionList != NULL ); @@ -739,8 +723,6 @@ ScFunctionList* ScGlobal::GetStarCalcFunctionList() return pStarCalcFunctionList; } - - ScFunctionMgr* ScGlobal::GetStarCalcFunctionMgr() { if ( !pStarCalcFunctionMgr ) @@ -757,8 +739,6 @@ void ScGlobal::ResetFunctionList() DELETEZ( pStarCalcFunctionList ); } - - ScUnitConverter* ScGlobal::GetUnitConverter() { if ( !pUnitConverter ) @@ -768,8 +748,6 @@ ScUnitConverter* ScGlobal::GetUnitConverter() } - - const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c ) { @@ -784,8 +762,6 @@ 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) { @@ -877,8 +853,6 @@ const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unico return NULL; } - - bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1, const EditTextObject* pObj2 ) { @@ -959,8 +933,6 @@ void ScGlobal::OpenURL( const OUString& rURL, const OUString& rTarget ) 0L ); } - - bool ScGlobal::IsSystemRTL() { return MsLangId::isRightToLeft( Application::GetSettings().GetLanguageTag().getLanguageType() ); @@ -1071,8 +1043,6 @@ sal_uInt16 ScGlobal::GetScriptedWhichID( sal_uInt8 nScriptType, sal_uInt16 nWhic return nWhich; } - - void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter ) { OSL_ENSURE( rSet.GetItemState( ATTR_LANGUAGE_FORMAT, false ) == SFX_ITEM_DEFAULT, @@ -1099,10 +1069,6 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter ) - - - - utl::TransliterationWrapper* ScGlobal::GetpTransliteration() { if ( !pTransliteration ) diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index b19f1bebb4ba..4d7ab25865a9 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -39,8 +39,6 @@ using ::std::vector; - - // struct ScImportParam: ScImportParam::ScImportParam() : @@ -114,8 +112,6 @@ ScConsolidateParam::ScConsolidateParam() : Clear(); } - - ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) : nCol(r.nCol),nRow(r.nRow),nTab(r.nTab), eFunction(r.eFunction),nDataAreaCount(0), @@ -131,15 +127,11 @@ ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) : } } - - ScConsolidateParam::~ScConsolidateParam() { ClearDataAreas(); } - - void ScConsolidateParam::ClearDataAreas() { if ( ppDataAreas ) @@ -152,8 +144,6 @@ void ScConsolidateParam::ClearDataAreas() nDataAreaCount = 0; } - - void ScConsolidateParam::Clear() { ClearDataAreas(); @@ -165,8 +155,6 @@ void ScConsolidateParam::Clear() eFunction = SUBTOTAL_FUNC_SUM; } - - ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r ) { nCol = r.nCol; @@ -181,8 +169,6 @@ ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r ) return *this; } - - bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const { bool bEqual = (nCol == r.nCol) @@ -206,8 +192,6 @@ bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const return bEqual; } - - void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, sal_uInt16 nCount ) { ClearDataAreas(); @@ -228,8 +212,6 @@ ScSolveParam::ScSolveParam() { } - - ScSolveParam::ScSolveParam( const ScSolveParam& r ) : aRefFormulaCell ( r.aRefFormulaCell ), aRefVariableCell( r.aRefVariableCell ), @@ -239,8 +221,6 @@ ScSolveParam::ScSolveParam( const ScSolveParam& r ) { } - - ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell, const ScAddress& rVariableCell, const OUString& rTargetValStr ) @@ -250,15 +230,11 @@ ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell, { } - - ScSolveParam::~ScSolveParam() { delete pStrTargetVal; } - - ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r ) { delete pStrTargetVal; @@ -271,8 +247,6 @@ ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r ) return *this; } - - bool ScSolveParam::operator==( const ScSolveParam& r ) const { bool bEqual = (aRefFormulaCell == r.aRefFormulaCell) @@ -305,8 +279,6 @@ ScTabOpParam::ScTabOpParam( const ScTabOpParam& r ) { } - - ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell, const ScRefAddress& rFormulaEnd, const ScRefAddress& rRowCell, @@ -320,8 +292,6 @@ ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell, { } - - ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r ) { aRefFormulaCell = r.aRefFormulaCell; @@ -332,8 +302,6 @@ ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r ) return *this; } - - bool ScTabOpParam::operator==( const ScTabOpParam& r ) const { return ( (aRefFormulaCell == r.aRefFormulaCell) diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index 179c833b37f9..348696b20431 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -23,8 +23,6 @@ // STATIC DATA ----------------------------------------------------------- - - ScMarkArray::ScMarkArray() : nCount( 0 ), nLimit( 0 ), @@ -33,15 +31,11 @@ ScMarkArray::ScMarkArray() : // special case "no marks" with pData = NULL } - - ScMarkArray::~ScMarkArray() { delete[] pData; } - - void ScMarkArray::Reset( bool bMarked ) { // always create pData here @@ -55,8 +49,6 @@ void ScMarkArray::Reset( bool bMarked ) pData[0].bMarked = bMarked; } - - bool ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const { long nHi = static_cast<long>(nCount) - 1; @@ -103,8 +95,6 @@ bool ScMarkArray::GetMark( SCROW nRow ) const } - - void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, bool bMarked ) { if (ValidRow(nStartRow) && ValidRow(nEndRow)) @@ -382,6 +372,4 @@ bool ScMarkArrayIter::Next( SCROW& rTop, SCROW& rBottom ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index 04277bfb101c..a062593735f0 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.cxx @@ -27,8 +27,6 @@ // STATIC DATA ----------------------------------------------------------- - - ScMarkData::ScMarkData() : maTabMarked(), pMultiSel( NULL ) @@ -566,6 +564,4 @@ ScMarkData::const_iterator ScMarkData::end() const - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index 80ba6fea82bb..a3bebc34a50e 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.cxx @@ -25,8 +25,6 @@ #include "address.hxx" #include "table.hxx" - - ScOutlineEntry::ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, bool bNewHidden ) : nStart ( nNewStart ), nSize ( nNewSize ), @@ -104,8 +102,6 @@ void ScOutlineEntry::SetVisible( bool bNewVisible ) bVisible = bNewVisible; } - - ScOutlineCollection::ScOutlineCollection() {} size_t ScOutlineCollection::size() const @@ -159,8 +155,6 @@ ScOutlineCollection::iterator ScOutlineCollection::FindStart(SCCOLROW nMinStart) return maEntries.lower_bound(nMinStart); } - - ScOutlineArray::ScOutlineArray() : nDepth(0) {} @@ -793,8 +787,6 @@ void ScOutlineArray::RemoveAll() nDepth = 0; } - - ScOutlineTable::ScOutlineTable() { } @@ -835,8 +827,6 @@ bool ScOutlineTable::DeleteRow( SCROW nStartRow, SCSIZE nSize ) return aRowOutline.DeleteSpace( nStartRow, nSize ); } - - ScSubOutlineIterator::ScSubOutlineIterator( ScOutlineArray* pOutlineArray ) : pArray( pOutlineArray ), nStart( 0 ), diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx index 57ca8edee4e7..2e64611f07c4 100644 --- a/sc/source/core/data/pagepar.cxx +++ b/sc/source/core/data/pagepar.cxx @@ -21,8 +21,6 @@ #include "pagepar.hxx" - - // struct ScPageTableParam: ScPageTableParam::ScPageTableParam() @@ -30,14 +28,10 @@ ScPageTableParam::ScPageTableParam() Reset(); } - - ScPageTableParam::~ScPageTableParam() { } - - void ScPageTableParam::Reset() { bCellContent = true; @@ -50,8 +44,6 @@ void ScPageTableParam::Reset() nFirstPageNo = 1; } - - bool ScPageTableParam::operator==( const ScPageTableParam& r ) const { return ( memcmp( this, &r, sizeof(ScPageTableParam) ) == 0 ); @@ -65,14 +57,10 @@ ScPageAreaParam::ScPageAreaParam() Reset(); } - - ScPageAreaParam::~ScPageAreaParam() { } - - void ScPageAreaParam::Reset() { bPrintArea = bRepeatRow = bRepeatCol = false; @@ -82,8 +70,6 @@ void ScPageAreaParam::Reset() memset( &aRepeatCol, 0, sizeof(ScRange) ); } - - bool ScPageAreaParam::operator==( const ScPageAreaParam& r ) const { bool bEqual = diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 88ab4affac69..fc01c59e32b1 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -65,13 +65,9 @@ ScDocument* ScPatternAttr::pDoc = NULL; - - using sc::HMMToTwips; using sc::TwipsToHMM; - - ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const OUString& rStyleName ) : SfxSetItem ( ATTR_PATTERN, pItemSet ), pName ( new OUString( rStyleName ) ), @@ -934,8 +930,6 @@ static SfxStyleSheetBase* lcl_CopyStyleToPool return NULL; } - - const OUString aStrSrcStyle = pSrcStyle->GetName(); const SfxStyleFamily eFamily = pSrcStyle->GetFamily(); SfxStyleSheetBase* pDestStyle = pDestPool->Find( aStrSrcStyle, eFamily ); @@ -1294,6 +1288,4 @@ sal_uInt8 ScPatternAttr::GetRotateDir( const SfxItemSet* pCondSet ) const } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index e2aa81063d8b..699b8133a21c 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -25,8 +25,6 @@ #include "docpool.hxx" #include "stlpool.hxx" - - ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc ) :pFormTable(NULL) ,pEditPool(NULL) @@ -121,6 +119,4 @@ void ScPoolHelper::SourceDocumentGone() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 46716c98cebe..a3459af1c2ce 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -50,8 +50,6 @@ #include <utility> - - namespace { const long SC_NOTECAPTION_WIDTH = 2900; /// Default width of note caption textbox. @@ -62,8 +60,6 @@ const long SC_NOTECAPTION_OFFSET_Y = -1500; /// Default Y offset of const long SC_NOTECAPTION_OFFSET_X = 1500; /// Default X offset of note captions to left border of anchor cell. const long SC_NOTECAPTION_BORDERDIST_TEMP = 100; /// Distance of temporary note captions to visible sheet area. - - /** Static helper functions for caption objects. */ class ScCaptionUtil { @@ -80,8 +76,6 @@ public: static void SetCaptionItems( SdrCaptionObj& rCaption, const SfxItemSet& rItemSet ); }; - - void ScCaptionUtil::SetCaptionLayer( SdrCaptionObj& rCaption, bool bShown ) { SdrLayerID nLayer = bShown ? SC_LAYER_INTERN : SC_LAYER_HIDDEN; @@ -158,8 +152,6 @@ void ScCaptionUtil::SetCaptionItems( SdrCaptionObj& rCaption, const SfxItemSet& rCaption.SetSpecialTextBoxShadow(); } - - /** Helper for creation and manipulation of caption drawing objects independent from cell annotations. */ class ScCaptionCreator @@ -206,8 +198,6 @@ private: bool mbNegPage; }; - - ScCaptionCreator::ScCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, bool bShown, bool bTailFront ) : mrDoc( rDoc ), maPos( rPos ), @@ -404,8 +394,6 @@ void ScCaptionCreator::Initialize() } } - - /** Helper for creation of permanent caption drawing objects for cell notes. */ class ScNoteCaptionCreator : public ScCaptionCreator { @@ -416,8 +404,6 @@ 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 { @@ -458,8 +444,6 @@ ScNoteCaptionCreator::ScNoteCaptionCreator( ScDocument& rDoc, const ScAddress& r } // namespace - - struct ScCaptionInitData { typedef ::std::auto_ptr< SfxItemSet > SfxItemSetPtr; @@ -475,15 +459,11 @@ struct ScCaptionInitData explicit ScCaptionInitData(); }; - - ScCaptionInitData::ScCaptionInitData() : mbDefaultPosSize( true ) { } - - ScNoteData::ScNoteData( bool bShown ) : mpCaption( 0 ), mbShown( bShown ) @@ -494,8 +474,6 @@ ScNoteData::~ScNoteData() { } - - ScPostIt::ScPostIt( ScDocument& rDoc, const ScAddress& rPos, bool bShown ) : mrDoc( rDoc ), maNoteData( bShown ) @@ -791,8 +769,6 @@ void ScPostIt::RemoveCaption() maNoteData.mpCaption = 0; } - - SdrCaptionObj* ScNoteUtil::CreateTempCaption( ScDocument& rDoc, const ScAddress& rPos, SdrPage& rDrawPage, const OUString& rUserText, const Rectangle& rVisRect, bool bTailFront ) diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index bcd5469c5810..caf7201c9422 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -26,8 +26,6 @@ using ::std::numeric_limits; - - template<typename _ValueType, typename _ExtValueType = _ValueType> class ScFlatSegmentsImpl { @@ -236,8 +234,6 @@ bool ScFlatSegmentsImpl<_ValueType, _ExtValueType>::getNext(RangeData& rData) return true; } - - class ScFlatUInt16SegmentsImpl : public ScFlatSegmentsImpl<sal_uInt16, sal_uInt32> { public: @@ -247,8 +243,6 @@ public: } }; - - class ScFlatBoolSegmentsImpl : public ScFlatSegmentsImpl<bool> { public: @@ -271,8 +265,6 @@ bool ScFlatBoolSegmentsImpl::setFalse(SCCOLROW nPos1, SCCOLROW nPos2) return setValue(nPos1, nPos2, false); } - - ScFlatBoolRowSegments::ForwardIterator::ForwardIterator(ScFlatBoolRowSegments& rSegs) : mrSegs(rSegs), mnCurPos(0), mnLastPos(-1), mbCurValue(false) { @@ -304,8 +296,6 @@ SCROW ScFlatBoolRowSegments::ForwardIterator::getLastPos() const return mnLastPos; } - - ScFlatBoolRowSegments::RangeIterator::RangeIterator(ScFlatBoolRowSegments& rSegs) : mrSegs(rSegs) { @@ -335,8 +325,6 @@ bool ScFlatBoolRowSegments::RangeIterator::getNext(RangeData& rRange) return true; } - - ScFlatBoolRowSegments::ScFlatBoolRowSegments() : mpImpl(new ScFlatBoolSegmentsImpl(static_cast<SCCOLROW>(MAXROW))) { @@ -400,8 +388,6 @@ SCROW ScFlatBoolRowSegments::findLastNotOf(bool bValue) const return static_cast<SCROW>(mpImpl->findLastNotOf(bValue)); } - - ScFlatBoolColSegments::ScFlatBoolColSegments() : mpImpl(new ScFlatBoolSegmentsImpl(static_cast<SCCOLROW>(MAXCOL))) { @@ -448,8 +434,6 @@ void ScFlatBoolColSegments::insertSegment(SCCOL nCol, SCCOL nSize, bool bSkipSta mpImpl->insertSegment(static_cast<SCCOLROW>(nCol), static_cast<SCCOLROW>(nSize), bSkipStartBoundary); } - - ScFlatUInt16RowSegments::ForwardIterator::ForwardIterator(ScFlatUInt16RowSegments& rSegs) : mrSegs(rSegs), mnCurPos(0), mnLastPos(-1), mnCurValue(0) { @@ -481,8 +465,6 @@ 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 ca382f575f0a..d7a19d5a8713 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -71,8 +71,6 @@ 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 d0efd196b958..34392e06d013 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -24,15 +24,11 @@ #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), bHasHeader(r.bHasHeader),bByRow(r.bByRow),bCaseSens(r.bCaseSens), @@ -47,8 +43,6 @@ ScSortParam::ScSortParam( const ScSortParam& r ) : ScSortParam::~ScSortParam() {} - - void ScSortParam::Clear() { ScSortKeyState aKeyState; @@ -71,8 +65,6 @@ void ScSortParam::Clear() maKeyState.assign( DEFSORT, aKeyState ); } - - ScSortParam& ScSortParam::operator=( const ScSortParam& r ) { nCol1 = r.nCol1; @@ -98,8 +90,6 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r ) return *this; } - - bool ScSortParam::operator==( const ScSortParam& rOther ) const { bool bEqual = false; @@ -154,8 +144,6 @@ 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), bHasHeader(true),bByRow(true),bCaseSens(rSub.bCaseSens),bNaturalSort(rOld.bNaturalSort), @@ -199,8 +187,6 @@ 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), bHasHeader(rParam.bHasHeader),bByRow(true),bCaseSens(rParam.bCaseSens), @@ -225,8 +211,6 @@ ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) : maKeyState.push_back( aKeyState ); } - - void ScSortParam::MoveToDest() { if (!bInplace) diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index e5ee60f083a4..3e0fc00e21c9 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -56,8 +56,6 @@ #include "patattr.hxx" - - ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP, ScDocument* pDocument ) : SfxStyleSheetPool( rPoolP ), @@ -67,21 +65,15 @@ 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,8 +98,6 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const OUString& rName, return SfxStyleSheetPool::Make(rName, eFam, mask); } - - SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 nMaskP ) @@ -119,16 +109,12 @@ SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString& rName, return pSheet; } - - SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle ) { OSL_ENSURE( rStyle.ISA(ScStyleSheet), "Invalid StyleSheet-class! :-/" ); return new ScStyleSheet( (const ScStyleSheet&) rStyle ); } - - void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle ) { if ( pStyle ) @@ -141,8 +127,6 @@ void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle ) } } - - void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, const OUString& rName, SfxStyleFamily eFamily ) { @@ -197,12 +181,8 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, } } - - // Standard-Vorlagen - - #define SCSTR(id) ScGlobal::GetRscString(id) void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ) @@ -218,8 +198,6 @@ 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 ) { if ( eLang != LANGUAGE_NONE && eLang != LANGUAGE_DONTKNOW && eLang != LANGUAGE_SYSTEM ) @@ -263,8 +241,6 @@ void ScStyleSheetPool::CreateStandardStyles() // Zellformatvorlagen: - - // 1. Standard pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); @@ -353,8 +329,6 @@ void ScStyleSheetPool::CreateStandardStyles() // Seitenformat-Vorlagen: - - // 1. Standard diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 4e4a0a2517ec..0e7fd7ca172f 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -48,8 +48,6 @@ TYPEINIT1(ScStyleSheet, SfxStyleSheet); #define TWO_CM 1134 #define HFDIST_CM 142 - - ScStyleSheet::ScStyleSheet( const OUString& rName, ScStyleSheetPool& rPoolP, SfxStyleFamily eFamily, @@ -60,29 +58,21 @@ ScStyleSheet::ScStyleSheet( const OUString& rName, { } - - ScStyleSheet::ScStyleSheet( const ScStyleSheet& rStyle ) : SfxStyleSheet ( rStyle ) , eUsage( UNKNOWN ) { } - - ScStyleSheet::~ScStyleSheet() { } - - bool ScStyleSheet::HasFollowSupport() const { return false; } - - bool ScStyleSheet::HasParentSupport () const { bool bHasParentSupport = false; @@ -100,8 +90,6 @@ bool ScStyleSheet::HasParentSupport () const return bHasParentSupport; } - - bool ScStyleSheet::SetParent( const OUString& rParentName ) { bool bResult = false; @@ -135,8 +123,6 @@ bool ScStyleSheet::SetParent( const OUString& rParentName ) return bResult; } - - SfxItemSet& ScStyleSheet::GetItemSet() { if ( !pSet ) @@ -252,8 +238,6 @@ SfxItemSet& ScStyleSheet::GetItemSet() return *pSet; } - - bool ScStyleSheet::IsUsed() const { if ( GetFamily() == SFX_STYLE_FAMILY_PARA ) @@ -271,8 +255,6 @@ bool ScStyleSheet::IsUsed() const return true; } - - void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.ISA(SfxSimpleHint) ) @@ -280,8 +262,6 @@ 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: @@ -332,6 +312,4 @@ bool ScStyleSheet::SetName( const OUString& rNew ) return SfxStyleSheet::SetName( rNew ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx index a93d341f072f..e066c6e2e596 100644 --- a/sc/source/core/data/subtotalparam.cxx +++ b/sc/source/core/data/subtotalparam.cxx @@ -22,8 +22,6 @@ ScSubTotalParam::ScSubTotalParam() Clear(); } - - ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) : nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nUserIndex(r.nUserIndex), bRemoveOnly(r.bRemoveOnly),bReplace(r.bReplace),bPagebreak(r.bPagebreak),bCaseSens(r.bCaseSens), @@ -56,8 +54,6 @@ ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) : } } - - void ScSubTotalParam::Clear() { nCol1=nCol2= 0; @@ -81,8 +77,6 @@ void ScSubTotalParam::Clear() } } - - ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r ) { nCol1 = r.nCol1; @@ -130,8 +124,6 @@ ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r ) return *this; } - - bool ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const { bool bEqual = (nCol1 == rOther.nCol1) @@ -172,8 +164,6 @@ bool ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const return bEqual; } - - void ScSubTotalParam::SetSubTotals( sal_uInt16 nGroup, const SCCOL* ptrSubTotals, const ScSubTotalFunc* ptrFunctions, diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index dac210bb4936..77de5a8de3da 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -219,8 +219,6 @@ bool SetOptimalHeightsToRows(OptimalHeightsFuncObjBase& rFuncObj, } - - ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName, bool bColInfo, bool bRowInfo ) : aName( rNewName ), diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index c4ceabc4258b..d72a43617a73 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -2330,8 +2330,6 @@ bool ScTable::IsSelectionEditable( const ScMarkData& rMark, return bIsEditable; } - - void ScTable::LockTable() { ++nLockCount; @@ -2463,8 +2461,6 @@ void ScTable::RemoveCondFormatData( const ScRangeList& rRange, sal_uInt32 nIndex } } - - void ScTable::ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ) { if (ValidColRow(nCol,nRow)) diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index 4cb85abc355f..dfe229f6da80 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -149,8 +149,6 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) } } - - long nPageSizeX = aPageSizeTwips.Width(); long nPageSizeY = aPageSizeTwips.Height(); @@ -1248,6 +1246,4 @@ void ScTable::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* p - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index 4e975903523c..1644f4229ae1 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -34,8 +34,6 @@ #include "stringutil.hxx" - - using ::com::sun::star::util::SearchOptions; namespace { diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index a8aa2787543e..f8a6a1209514 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -33,8 +33,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; using ::std::vector; - - bool ScPassHashHelper::needsPassHashRegen(const ScDocument& rDoc, ScPasswordHash eHash1, ScPasswordHash eHash2) { if (rDoc.IsDocProtected()) @@ -83,14 +81,10 @@ ScPasswordHash ScPassHashHelper::getHashTypeFromURI(const OUString& rURI) return PASSHASH_UNSPECIFIED; } - - ScPassHashProtectable::~ScPassHashProtectable() { } - - class ScTableProtectionImpl { public: @@ -554,8 +548,6 @@ void ScDocProtection::setOption(Option eOption, bool bEnabled) mpImpl->setOption(eOption, bEnabled); } - - ScTableProtection::ScTableProtection() : mpImpl(new ScTableProtectionImpl(static_cast<SCSIZE>(ScTableProtection::NONE))) { diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index 9b26930e7c72..cb5566eed828 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.cxx @@ -21,8 +21,6 @@ #include "drwlayer.hxx" #include "rechead.hxx" - - ScDrawObjFactory::ScDrawObjFactory() { SdrObjFactory::InsertMakeUserDataHdl( LINK ( this, ScDrawObjFactory, MakeUserData ) ); @@ -52,8 +50,6 @@ 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 ), maStart( ScAddress::INITIALIZE_INVALID ), @@ -67,8 +63,6 @@ ScDrawObjData* ScDrawObjData::Clone( SdrObject* ) const return new ScDrawObjData( *this ); } - - ScIMapInfo::ScIMapInfo() : SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA, 0 ) { @@ -95,8 +89,6 @@ 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 abfe67d4a4d4..2ad85815e84b 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -605,8 +605,6 @@ 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,8 +616,6 @@ sal_uLong lclGetCellFormat( ScDocument& rDoc, const ScAddress& rPos ) } // namespace - - bool ScValidationData::HasSelectionList() const { return (eDataMode == SC_VALID_LIST) && (mnListType != ValidListType::INVISIBLE); @@ -849,8 +845,6 @@ bool ScValidationData::FillSelectionList(std::vector<ScTypedStrData>& rStrColl, return bOk; } - - bool ScValidationData::IsEqualToTokenArray( ScRefCellValue& rCell, const ScAddress& rPos, const ScTokenArray& rTokArr ) const { // create a condition entry that tests on equality and set the passed token array @@ -915,8 +909,6 @@ bool ScValidationData::IsListValid( ScRefCellValue& rCell, const ScAddress& rPos } - - ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList) { // fuer Ref-Undo - echte Kopie mit neuen Tokens! diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx index 7d9b46f17fe0..ba18204dd9a3 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.hxx @@ -23,8 +23,6 @@ #include <rtl/ustring.hxx> #include <rtl/string.hxx> - - struct ScUnoAddInHelpId; /** Generates help IDs for standard Calc AddIns. */ @@ -46,8 +44,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index 4509cc95134c..53379587bc50 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -79,8 +79,6 @@ inline bool ScBroadcastArea::operator==( const ScBroadcastArea & rArea ) const return aRange == rArea.aRange; } - - struct ScBroadcastAreaEntry { ScBroadcastArea* mpArea; @@ -107,8 +105,6 @@ struct ScBroadcastAreaEqual typedef ::boost::unordered_set< ScBroadcastAreaEntry, ScBroadcastAreaHash, ScBroadcastAreaEqual > ScBroadcastAreas; - - struct ScBroadcastAreaBulkHash { size_t operator()( const ScBroadcastArea* p ) const @@ -128,8 +124,6 @@ struct ScBroadcastAreaBulkEqual typedef ::boost::unordered_set< const ScBroadcastArea*, ScBroadcastAreaBulkHash, ScBroadcastAreaBulkEqual > ScBroadcastAreasBulk; - - class ScBroadcastAreaSlotMachine; /// Collection of BroadcastAreas diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 094da69e42b0..5f33c17ed4ba 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -27,8 +27,6 @@ class ScDocument; struct ScDBQueryParamBase; struct ScQueryParamBase; - - /** * Base class for abstracting range data backends for database functions. */ @@ -88,8 +86,6 @@ private: RefType meType; }; - - class ScDBInternalRange : public ScDBRangeBase { public: @@ -131,8 +127,6 @@ private: ScRange maRange; }; - - class ScDBExternalRange : public ScDBRangeBase { public: diff --git a/sc/source/core/opencl/clcc/clew.h b/sc/source/core/opencl/clcc/clew.h index 64508a548f81..a372db4625d5 100644 --- a/sc/source/core/opencl/clcc/clew.h +++ b/sc/source/core/opencl/clcc/clew.h @@ -357,8 +357,6 @@ typedef struct _cl_image_format { cl_channel_type image_channel_data_type; } cl_image_format; - - /******************************************************************************/ // Error Codes diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx index 07e2946f7f06..3972639a9fd0 100644 --- a/sc/source/core/opencl/op_financial.cxx +++ b/sc/source/core/opencl/op_financial.cxx @@ -4799,8 +4799,6 @@ void OpTbillyield::GenSlidingWindowFunction( ss << "double tmp001;\n\t"; ss << "double tmp002;\n\t"; - - #ifdef ISNAN FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken(); const formula::SingleVectorRefToken*tmpCurDVR0= static_cast<const diff --git a/sc/source/core/opencl/opencl_device_selection.h b/sc/source/core/opencl/opencl_device_selection.h index 153c9549297c..562fa7ff5074 100644 --- a/sc/source/core/opencl/opencl_device_selection.h +++ b/sc/source/core/opencl/opencl_device_selection.h @@ -260,8 +260,6 @@ inline ds_status profileDevices(ds_profile* profile, const ds_evaluation_type ty #define DS_DEVICE_NATIVE_CPU_STRING "native_cpu" - - typedef ds_status(* ds_score_serializer)(ds_device* device, void** serializedScore, unsigned int* serializedScoreSize); inline ds_status writeProfileToFile(ds_profile* profile, ds_score_serializer serializer, const char* file) { diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx b/sc/source/core/opencl/opinlinefun_finacial.cxx index 154a9f5eebff..04601b83c4ea 100644 --- a/sc/source/core/opencl/opinlinefun_finacial.cxx +++ b/sc/source/core/opencl/opinlinefun_finacial.cxx @@ -578,8 +578,6 @@ std::string getDiff= " return nDiff > 0 ? nDiff : 0;\n" "}\n"; - - std::string lcl_GetcoupdaybsDecl= "int lcl_Getcoupdaybs(int nNullDate,int nSettle, int nMat,int nFreq,int nBase);\n"; diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index a06d9bc20555..bb7df2120574 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -1145,8 +1145,6 @@ sal_uInt16 ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2 - - bool ScDetectiveFunc::ShowPred( SCCOL nCol, SCROW nRow ) { ScDrawLayer* pModel = pDoc->GetDrawLayer(); diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 130b074820c9..9412c4269d5c 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2647,8 +2647,6 @@ void ScInterpreter::ScFormula() PushString( aFormula ); } - - void ScInterpreter::ScIsNV() { nFuncFmtType = NUMBERFORMAT_LOGICAL; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 1048c1a4430f..f2ff1d63e810 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -84,8 +84,6 @@ using ::std::auto_ptr; // Funktionen fuer den Zugriff auf das Document - - void ScInterpreter::ReplaceCell( ScAddress& rPos ) { size_t ListSize = pDok->aTableOpList.size(); @@ -875,12 +873,8 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, return true; } - - // Stack operations - - // Also releases a TempToken if appropriate. void ScInterpreter::PushWithoutError( FormulaToken& r ) @@ -3730,8 +3724,6 @@ void ScInterpreter::ScTTT() } - - ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc, const ScAddress& rPos, ScTokenArray& r ) : aCode( r ), diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index dcbc3c6f1258..634f167dce6d 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -159,8 +159,6 @@ void ScProgress::CreateInterpretProgress( ScDocument* pDoc, bool bWait ) } } - - void ScProgress::DeleteInterpretProgress() { if ( bAllowInterpretProgress && nInterpretProgress ) @@ -186,6 +184,4 @@ void ScProgress::DeleteInterpretProgress() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/recursionhelper.cxx b/sc/source/core/tool/recursionhelper.cxx index 2df758eecc66..68ad21e287b3 100644 --- a/sc/source/core/tool/recursionhelper.cxx +++ b/sc/source/core/tool/recursionhelper.cxx @@ -98,5 +98,3 @@ void ScRecursionHelper::Clear() - - diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index e2a0fdb45352..7af3123c4a04 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -272,8 +272,6 @@ void ScRawToken::SetExternalName( sal_uInt16 nFileId, const OUString& rName ) extname.cName[n] = 0; } - - void ScRawToken::SetExternal( const sal_Unicode* pStr ) { eOp = ocExternal; @@ -749,8 +747,6 @@ ScRefList* ScToken::GetRefList() - - const ScSingleRefData& ScSingleRefToken::GetSingleRef() const { return aSingleRef; } ScSingleRefData& ScSingleRefToken::GetSingleRef() { return aSingleRef; } bool ScSingleRefToken::operator==( const FormulaToken& r ) const @@ -852,8 +848,6 @@ FormulaToken* ScMatrixRangeToken::Clone() const return new ScMatrixRangeToken(*this); } - - ScExternalSingleRefToken::ScExternalSingleRefToken( sal_uInt16 nFileId, const svl::SharedString& rTabName, const ScSingleRefData& r ) : ScToken( svExternalSingleRef, ocPush), mnFileId(nFileId), @@ -908,8 +902,6 @@ bool ScExternalSingleRefToken::operator ==( const FormulaToken& r ) const return maSingleRef == static_cast<const ScToken&>(r).GetSingleRef(); } - - ScExternalDoubleRefToken::ScExternalDoubleRefToken( sal_uInt16 nFileId, const svl::SharedString& rTabName, const ScComplexRefData& r ) : ScToken( svExternalDoubleRef, ocPush), mnFileId(nFileId), @@ -984,8 +976,6 @@ bool ScExternalDoubleRefToken::operator ==( const FormulaToken& r ) const return maDoubleRef == static_cast<const ScToken&>(r).GetDoubleRef(); } - - ScExternalNameToken::ScExternalNameToken( sal_uInt16 nFileId, const svl::SharedString& rName ) : ScToken( svExternalName, ocPush), mnFileId(nFileId), @@ -1023,8 +1013,6 @@ bool ScExternalNameToken::operator==( const FormulaToken& r ) const return maName.getData() == r.GetString().getData(); } - - ScJumpMatrix* ScJumpMatrixToken::GetJumpMatrix() const { return pJumpMatrix; } bool ScJumpMatrixToken::operator==( const FormulaToken& r ) const { @@ -1187,8 +1175,6 @@ bool ScHybridCellToken::operator==( const FormulaToken& r ) const - - bool ScTokenArray::AddFormulaToken(const com::sun::star::sheet::FormulaToken& _aToken,formula::ExternalReferenceHelper* _pRef) { bool bError = FormulaTokenArray::AddFormulaToken(_aToken,_pRef); @@ -1732,8 +1718,6 @@ bool ScTokenArray::IsValidReference( ScRange& rRange, const ScAddress& rPos ) co return ImplGetReference(rRange, rPos, true); } - - ScTokenArray::ScTokenArray() : FormulaTokenArray(), mnHashValue(0), diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index f34750e01f4f..0419c9f107cf 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -297,6 +297,4 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index f2e5a4575d60..e31975048ada 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -977,6 +977,4 @@ void DifAttrCache::Apply( ScDocument& rDoc, SCTAB nTab ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx index 534f44e4ca9a..c048ab86802c 100644 --- a/sc/source/filter/excel/colrowst.cxx +++ b/sc/source/filter/excel/colrowst.cxx @@ -32,15 +32,11 @@ // for filter manager #include "excimp8.hxx" - - const sal_uInt8 EXC_COLROW_USED = 0x01; const sal_uInt8 EXC_COLROW_DEFAULT = 0x02; const sal_uInt8 EXC_COLROW_HIDDEN = 0x04; const sal_uInt8 EXC_COLROW_MAN = 0x08; - - XclImpColRowSettings::XclImpColRowSettings( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maColWidths(0, MAXCOLCOUNT, 0), @@ -286,8 +282,6 @@ void XclImpColRowSettings::Convert( SCTAB nScTab ) nPrevFlags = nFlags; } - - mbDirty = false; } diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index dea00ad809cc..80faea664427 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -219,6 +219,4 @@ FltError ScFormatFilterPluginImpl::ScExportExcel5( SfxMedium& rMedium, ScDocumen return eRet; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index f85d2ee9b68a..a25dc74ff481 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -181,8 +181,6 @@ void ImportExcel::Formula( } - - ExcelToSc::ExcelToSc( const XclImpRoot& rRoot ) : ExcelConverterBase( 512 ), XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index 740c770e7844..e0b1b77d49e0 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -79,8 +79,6 @@ ExcelToSc8::ExternalTabInfo::ExternalTabInfo() : { } - - ExcelToSc8::ExcelToSc8( const XclImpRoot& rRoot ) : ExcelToSc( rRoot ), rLinkMan( rRoot.GetLinkManager() ) diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 72d949be52f8..8209a86bb8d4 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -534,8 +534,6 @@ void ImportExcel8::AutoFilter( void ) pData->ReadAutoFilter(aIn, GetDoc().GetSharedStringPool()); } - - XclImpAutoFilterData::XclImpAutoFilterData( RootData* pRoot, const ScRange& rRange ) : ExcRoot( pRoot ), pCurrDBData(NULL), diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 5097c800ff83..4dc124386b21 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -186,8 +186,6 @@ sal_Size ExcBoolRecord::GetLen( void ) const } - - //--------------------------------------------------------- class ExcBof_Base - ExcBof_Base::ExcBof_Base() : @@ -196,8 +194,6 @@ ExcBof_Base::ExcBof_Base() : { } - - //-------------------------------------------------------------- class ExcBof - ExcBof::ExcBof( void ) @@ -224,8 +220,6 @@ sal_Size ExcBof::GetLen( void ) const return 8; } - - //------------------------------------------------------------- class ExcBofW - ExcBofW::ExcBofW( void ) @@ -240,22 +234,16 @@ void ExcBofW::SaveCont( XclExpStream& rStrm ) rStrm << nVers << nDocType << nRupBuild << nRupYear; } - - sal_uInt16 ExcBofW::GetNum( void ) const { return 0x0809; } - - sal_Size ExcBofW::GetLen( void ) const { return 8; } - - //-------------------------------------------------------------- class ExcEof - sal_uInt16 ExcEof::GetNum( void ) const @@ -269,8 +257,6 @@ sal_Size ExcEof::GetLen( void ) const return 0; } - - //--------------------------------------------------------- class ExcDummy_00 - sal_Size ExcDummy_00::GetLen( void ) const @@ -284,8 +270,6 @@ const sal_uInt8* ExcDummy_00::GetData( void ) const return pMyData; } - - //-------------------------------------------------------- class ExcDummy_04x - sal_Size ExcDummy_040::GetLen( void ) const @@ -300,8 +284,6 @@ const sal_uInt8* ExcDummy_040::GetData( void ) const } - - sal_Size ExcDummy_041::GetLen( void ) const { return nMyLen; @@ -313,8 +295,6 @@ const sal_uInt8* ExcDummy_041::GetData( void ) const return pMyData; } - - //------------------------------------------------------------- class Exc1904 - Exc1904::Exc1904( ScDocument& rDoc ) @@ -350,8 +330,6 @@ void Exc1904::SaveXml( XclExpXmlStream& rStrm ) } } - - //------------------------------------------------------ class ExcBundlesheet - ExcBundlesheetBase::ExcBundlesheetBase( RootData& rRootData, SCTAB nTabNum ) : @@ -387,8 +365,6 @@ sal_uInt16 ExcBundlesheetBase::GetNum( void ) const } - - ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) : ExcBundlesheetBase( rRootData, _nTab ) { @@ -568,23 +544,17 @@ void XclExpPassHash::WriteBody(XclExpStream& rStrm) rStrm << mnHash; } - - XclExpFiltermode::XclExpFiltermode() : XclExpEmptyRecord( EXC_ID_FILTERMODE ) { } - - XclExpAutofilterinfo::XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nScCol ) : XclExpUInt16Record( EXC_ID_AUTOFILTERINFO, static_cast< sal_uInt16 >( nScCol ) ), maStartPos( rStartPos ) { } - - ExcFilterCondition::ExcFilterCondition() : nType( EXC_AFTYPE_NOTUSED ), nOper( EXC_AFOPER_EQUAL ), @@ -681,8 +651,6 @@ void ExcFilterCondition::SaveText( XclExpStream& rStrm ) } } - - XclExpAutofilter::XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ) : XclExpRecord( EXC_ID_AUTOFILTER, 24 ), XclExpRoot( rRoot ), @@ -904,8 +872,6 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_filterColumn ); } - - ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) : XclExpRoot( rRoot ), pFilterMode( NULL ), @@ -1076,8 +1042,6 @@ bool ExcAutoFilterRecs::HasFilterMode() const return pFilterMode != NULL; } - - XclExpFilterManager::XclExpFilterManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -1111,6 +1075,4 @@ bool XclExpFilterManager::HasFilterMode( SCTAB nScTab ) return false; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index 9f22bbef3d63..8f9ebf9c0eba 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -119,8 +119,6 @@ FltError ExportBiff5::Write() return eERR_OK; } - - ExportBiff8::ExportBiff8( XclExpRootData& rExpData, SvStream& rStrm ) : ExportBiff5( rExpData, rStrm ) { diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx index 2d0dbba9f2cb..75859817b74e 100644 --- a/sc/source/filter/excel/fontbuff.cxx +++ b/sc/source/filter/excel/fontbuff.cxx @@ -147,6 +147,4 @@ void LotusFontBuffer::MakeFont( ENTRY* pEntry ) pEntry->pTmpName = NULL; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index 6d167fff5b5b..5210f71ebdfc 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -189,8 +189,6 @@ void ConverterBase::Reset() } - - ExcelConverterBase::ExcelConverterBase( sal_uInt16 nNewBuffer ) : ConverterBase( nNewBuffer ) { @@ -213,8 +211,6 @@ void ExcelConverterBase::Reset() } - - LotusConverterBase::LotusConverterBase( SvStream &rStr, sal_uInt16 nNewBuffer ) : ConverterBase( nNewBuffer ), aIn( rStr ), diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 4bc69bb122d5..8ee0d7d7f53e 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -416,8 +416,6 @@ void ImportExcel::Window1() } - - void ImportExcel::Row25( void ) { sal_uInt16 nRow, nRowHeight; diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index 50496be6e76b..85dfb194cc4a 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -49,8 +49,6 @@ sal_uInt32 StringHashEntry::MakeHashCode( const OUString& r ) } - - NameBuffer::~NameBuffer() { std::vector<StringHashEntry*>::iterator pIter; @@ -197,8 +195,6 @@ void ExtSheetBuffer::Reset( void ) } - - bool ExtName::IsDDE( void ) const { return ( nFlags & 0x0001 ) != 0; diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 16cb97b7ba5f..05d2fca9b0f5 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -767,8 +767,6 @@ FltError ImportExcel::Read( void ) } - - FltError ImportExcel8::Read( void ) { #ifdef EXC_INCL_DUMPER @@ -1320,6 +1318,4 @@ FltError ImportExcel8::Read( void ) return eLastErr; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 9443c0e1269b..843158385e8a 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -46,8 +46,6 @@ TokenStack::~TokenStack() - - // !ACHTUNG!: nach Aussen hin beginnt die Nummerierung mit 1! // !ACHTUNG!: SC-Token werden mit einem Offset nScTokenOff abgelegt // -> Unterscheidung von anderen Token diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 2a8f39670ca8..f4c3dd98af94 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -249,8 +249,6 @@ struct XclExpChRootData : public XclChRootData void FinalizeFutureRecBlock( XclExpStream& rStrm ); }; - - void XclExpChRootData::RegisterFutureRecBlock( const XclChFrBlock& rFrBlock ) { maUnwrittenFrBlocks.push_back( rFrBlock ); @@ -297,8 +295,6 @@ void XclExpChRootData::FinalizeFutureRecBlock( XclExpStream& rStrm ) } } - - XclExpChRoot::XclExpChRoot( const XclExpRoot& rRoot, XclExpChChart& rChartData ) : XclExpRoot( rRoot ), mxChData( new XclExpChRootData( rChartData ) ) @@ -427,8 +423,6 @@ void XclExpChRoot::FinalizeFutureRecBlock( XclExpStream& rStrm ) mxChData->FinalizeFutureRecBlock( rStrm ); } - - XclExpChGroupBase::XclExpChGroupBase( const XclExpChRoot& rRoot, sal_uInt16 nFrType, sal_uInt16 nRecId, sal_Size nRecSize ) : XclExpRecord( nRecId, nRecSize ), @@ -473,8 +467,6 @@ void XclExpChGroupBase::SetFutureRecordContext( sal_uInt16 nFrContext, sal_uInt1 maFrBlock.mnValue2 = nFrValue2; } - - XclExpChFutureRecordBase::XclExpChFutureRecordBase( const XclExpChRoot& rRoot, XclFutureRecType eRecType, sal_uInt16 nRecId, sal_Size nRecSize ) : XclExpFutureRecord( eRecType, nRecId, nRecSize ), @@ -502,8 +494,6 @@ void XclExpChFramePos::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnTLMode << maData.mnBRMode << maData.maRect; } - - XclExpChLineFormat::XclExpChLineFormat( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHLINEFORMAT, (rRoot.GetBiff() == EXC_BIFF8) ? 12 : 10 ), mnColorId( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_CHWINDOWTEXT ) ) @@ -585,8 +575,6 @@ XclExpChLineFormatRef lclCreateLineFormat( const XclExpChRoot& rRoot, } // namespace - - XclExpChAreaFormat::XclExpChAreaFormat( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHAREAFORMAT, (rRoot.GetBiff() == EXC_BIFF8) ? 16 : 12 ), mnPattColorId( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_CHWINDOWBACK ) ), @@ -663,8 +651,6 @@ void XclExpChAreaFormat::WriteBody( XclExpStream& rStrm ) } } - - XclExpChEscherFormat::XclExpChEscherFormat( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_UNKNOWN, EXC_ID_CHESCHERFORMAT ), mnColor1Id( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_CHWINDOWBACK ) ), @@ -739,8 +725,6 @@ void XclExpChEscherFormat::WriteBody( XclExpStream& rStrm ) rStrm.CopyFromStream( aMemStrm ); } - - XclExpChFrameBase::XclExpChFrameBase() { } @@ -801,8 +785,6 @@ void XclExpChFrameBase::WriteFrameRecords( XclExpStream& rStrm ) lclSaveRecord( rStrm, mxEscherFmt ); } - - XclExpChFrame::XclExpChFrame( const XclExpChRoot& rRoot, XclChObjectType eObjType ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_FRAME, EXC_ID_CHFRAME, 4 ), meObjType( eObjType ) @@ -896,8 +878,6 @@ void lclAddDoubleRefData( } // namespace - - XclExpChSourceLink::XclExpChSourceLink( const XclExpChRoot& rRoot, sal_uInt8 nDestType ) : XclExpRecord( EXC_ID_CHSOURCELINK ), XclExpChRoot( rRoot ) @@ -1113,8 +1093,6 @@ XclExpChFont::XclExpChFont( sal_uInt16 nFontIdx ) : { } - - XclExpChObjectLink::XclExpChObjectLink( sal_uInt16 nLinkTarget, const XclChDataPointPos& rPointPos ) : XclExpRecord( EXC_ID_CHOBJECTLINK, 6 ) { @@ -1127,8 +1105,6 @@ void XclExpChObjectLink::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnTarget << maData.maPointPos.mnSeriesIdx << maData.maPointPos.mnPointIdx; } - - XclExpChFrLabelProps::XclExpChFrLabelProps( const XclExpChRoot& rRoot ) : XclExpChFutureRecordBase( rRoot, EXC_FUTUREREC_UNUSEDREF, EXC_ID_CHFRLABELPROPS, 4 ) { @@ -1156,8 +1132,6 @@ void XclExpChFrLabelProps::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnFlags << aXclSep; } - - XclExpChFontBase::~XclExpChFontBase() { } @@ -1183,8 +1157,6 @@ void XclExpChFontBase::ConvertRotationBase( SetRotation( nRotation ); } - - XclExpChText::XclExpChText( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_TEXT, EXC_ID_CHTEXT, (rRoot.GetBiff() == EXC_BIFF8) ? 32 : 26 ), mnTextColorId( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_CHWINDOWTEXT ) ) @@ -1438,8 +1410,6 @@ void XclExpChText::WriteBody( XclExpStream& rStrm ) } } - - namespace { /** Creates and returns an Excel text object from the passed title. */ @@ -1532,8 +1502,6 @@ void XclExpChMarkerFormat::WriteBody( XclExpStream& rStrm ) } } - - XclExpChPieFormat::XclExpChPieFormat() : XclExpUInt16Record( EXC_ID_CHPIEFORMAT, 0 ) { @@ -1546,8 +1514,6 @@ void XclExpChPieFormat::Convert( const ScfPropertySet& rPropSet ) SetValue( limit_cast< sal_uInt16 >( fApiDist * 100.0, 0, 100 ) ); } - - XclExpCh3dDataFormat::XclExpCh3dDataFormat() : XclExpRecord( EXC_ID_CH3DDATAFORMAT, 2 ) { @@ -1588,15 +1554,11 @@ void XclExpCh3dDataFormat::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnBase << maData.mnTop; } - - XclExpChAttachedLabel::XclExpChAttachedLabel( sal_uInt16 nFlags ) : XclExpUInt16Record( EXC_ID_CHATTACHEDLABEL, nFlags ) { } - - XclExpChDataFormat::XclExpChDataFormat( const XclExpChRoot& rRoot, const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_DATAFORMAT, EXC_ID_CHDATAFORMAT, 8 ) @@ -1678,8 +1640,6 @@ void XclExpChDataFormat::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } - - XclExpChSerTrendLine::XclExpChSerTrendLine( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHSERTRENDLINE, 28 ), XclExpChRoot( rRoot ) @@ -1773,8 +1733,6 @@ void XclExpChSerTrendLine::WriteBody( XclExpStream& rStrm ) << maData.mfForecastBack; } - - XclExpChSerErrorBar::XclExpChSerErrorBar( const XclExpChRoot& rRoot, sal_uInt8 nBarType ) : XclExpRecord( EXC_ID_CHSERERRORBAR, 14 ), XclExpChRoot( rRoot ) @@ -1853,8 +1811,6 @@ void XclExpChSerErrorBar::WriteBody( XclExpStream& rStrm ) << maData.mnValueCount; } - - namespace { /** Returns the property set of the specified data point. */ @@ -2268,8 +2224,6 @@ void XclExpChType::WriteBody( XclExpStream& rStrm ) } } - - XclExpChChart3d::XclExpChChart3d() : XclExpRecord( EXC_ID_CHCHART3D, 14 ) { @@ -2323,8 +2277,6 @@ void XclExpChChart3d::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } - - XclExpChLegend::XclExpChLegend( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_LEGEND, EXC_ID_CHLEGEND, 20 ) { @@ -2422,8 +2374,6 @@ void XclExpChLegend::WriteBody( XclExpStream& rStrm ) rStrm << maData.maRect << maData.mnDockMode << maData.mnSpacing << maData.mnFlags; } - - XclExpChDropBar::XclExpChDropBar( const XclExpChRoot& rRoot, XclChObjectType eObjType ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_DROPBAR, EXC_ID_CHDROPBAR, 2 ), meObjType( eObjType ), @@ -2449,8 +2399,6 @@ void XclExpChDropBar::WriteBody( XclExpStream& rStrm ) rStrm << mnBarDist; } - - XclExpChTypeGroup::XclExpChTypeGroup( const XclExpChRoot& rRoot, sal_uInt16 nGroupIdx ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_TYPEGROUP, EXC_ID_CHTYPEGROUP, 20 ), maType( rRoot ), @@ -2776,8 +2724,6 @@ void XclExpChLabelRange::WriteBody( XclExpStream& rStrm ) rStrm << maLabelData.mnCross << maLabelData.mnLabelFreq << maLabelData.mnTickFreq << maLabelData.mnFlags; } - - XclExpChValueRange::XclExpChValueRange( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHVALUERANGE, 42 ), XclExpChRoot( rRoot ) @@ -2852,8 +2798,6 @@ void XclExpChValueRange::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } - - namespace { sal_uInt8 lclGetXclTickPos( sal_Int32 nApiTickmarks ) @@ -2942,8 +2886,6 @@ void XclExpChTick::WriteBody( XclExpStream& rStrm ) rStrm << GetPalette().GetColorIndex( mnTextColorId ) << maData.mnRotation; } - - namespace { /** Returns an API axis object from the passed coordinate system. */ @@ -3122,8 +3064,6 @@ void XclExpChAxis::WriteBody( XclExpStream& rStrm ) rStrm.WriteZeroBytes( 16 ); } - - XclExpChAxesSet::XclExpChAxesSet( const XclExpChRoot& rRoot, sal_uInt16 nAxesSetId ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_AXESSET, EXC_ID_CHAXESSET, 18 ) { @@ -3494,8 +3434,6 @@ void XclExpChChart::WriteBody( XclExpStream& rStrm ) rStrm << maRect; } - - XclExpChartDrawing::XclExpChartDrawing( const XclExpRoot& rRoot, const Reference< XModel >& rxModel, const Size& rChartSize ) : XclExpRoot( rRoot ) @@ -3530,8 +3468,6 @@ void XclExpChartDrawing::Save( XclExpStream& rStrm ) mxObjRecs->Save( rStrm ); } - - XclExpChart::XclExpChart( const XclExpRoot& rRoot, Reference< XModel > xModel, const Rectangle& rChartRect ) : XclExpSubStream( EXC_BOF_CHART ), XclExpRoot( rRoot ) @@ -3545,6 +3481,4 @@ XclExpChart::XclExpChart( const XclExpRoot& rRoot, Reference< XModel > xModel, c AppendNewRecord( new XclExpChChart( rRoot, xChartDoc, rChartRect ) ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 0df97bbe030a..290f79fb4f51 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -77,8 +77,6 @@ struct XclExpHashEntrySWO { return *rLeft.mpString < *rRight.mpString; } }; - - /** Implementation of the SST export. @descr Stores all passed strings in a hash table and prevents repeated insertion of equal strings. */ @@ -105,8 +103,6 @@ private: sal_uInt32 mnSize; /// Size of the SST (count of unique strings). }; - - const sal_uInt32 EXC_SST_HASHTABLE_SIZE = 2048; XclExpSstImpl::XclExpSstImpl() : @@ -229,8 +225,6 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) rStrm.PopStream(); } - - XclExpSst::XclExpSst() : mxImpl( new XclExpSstImpl ) { @@ -602,8 +596,6 @@ private: bool mbPattUsed; /// true = Pattern attribute used. }; - - XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority ) : XclExpRoot( rRoot ), mrFormatEntry( rFormatEntry ), @@ -960,8 +952,6 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_cfRule ); } - - XclExpCF::XclExpCF( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority = 0 ) : XclExpRecord( EXC_ID_CF ), XclExpRoot( rRoot ), @@ -1131,8 +1121,6 @@ void XclExpColScaleCol::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_color ); } - - XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat& rCondFormat, XclExtLstRef xExtLst, sal_Int32& rIndex ) : XclExpRecord( EXC_ID_CONDFMT ), XclExpRoot( rRoot ) @@ -1204,8 +1192,6 @@ void XclExpCondfmt::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_conditionalFormatting ); } - - XclExpColorScale::XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ): XclExpRecord(), XclExpRoot( rRoot ), @@ -1389,8 +1375,6 @@ void XclExpIconSet::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_cfRule ); } - - XclExpCondFormatBuffer::XclExpCondFormatBuffer( const XclExpRoot& rRoot, XclExtLstRef xExtLst ) : XclExpRoot( rRoot ) { @@ -1474,8 +1458,6 @@ const char* lcl_GetOperatorType( sal_uInt32 nFlags ) } // namespace - - XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : XclExpRecord( EXC_ID_DV ), XclExpRoot( rRoot ), @@ -1693,8 +1675,6 @@ void XclExpDV::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_dataValidation ); } - - XclExpDval::XclExpDval( const XclExpRoot& rRoot ) : XclExpRecord( EXC_ID_DVAL, 18 ), XclExpRoot( rRoot ) @@ -1904,8 +1884,6 @@ void XclExpWebQuery::Save( XclExpStream& rStrm ) } } - - XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) { SCTAB nScTab = rRoot.GetCurrScTab(); @@ -1974,6 +1952,4 @@ XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index f3530b3c4e10..10ed6364db6e 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -245,8 +245,6 @@ void XclExpDffAnchorBase::ImplCalcAnchorRect( const Rectangle&, MapUnit ) OSL_FAIL( "XclExpDffAnchorBase::ImplCalcAnchorRect - not implemented" ); } - - XclExpDffSheetAnchor::XclExpDffSheetAnchor( const XclExpRoot& rRoot ) : XclExpDffAnchorBase( rRoot ), mnScTab( rRoot.GetCurrScTab() ) @@ -267,8 +265,6 @@ void XclExpDffSheetAnchor::ImplCalcAnchorRect( const Rectangle& rRect, MapUnit e maAnchor.SetRect( GetRoot(), mnScTab, rRect, eMapUnit ); } - - XclExpDffEmbeddedAnchor::XclExpDffEmbeddedAnchor( const XclExpRoot& rRoot, const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ) : XclExpDffAnchorBase( rRoot ), @@ -288,16 +284,12 @@ void XclExpDffEmbeddedAnchor::ImplCalcAnchorRect( const Rectangle& rRect, MapUni maAnchor.SetRect( maPageSize, mnScaleX, mnScaleY, rRect, eMapUnit, true ); } - - XclExpDffNoteAnchor::XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectangle& rRect ) : XclExpDffAnchorBase( rRoot, EXC_ESC_ANCHOR_SIZELOCKED ) { maAnchor.SetRect( rRoot, rRoot.GetCurrScTab(), rRect, MAP_100TH_MM ); } - - XclExpDffDropDownAnchor::XclExpDffDropDownAnchor( const XclExpRoot& rRoot, const ScAddress& rScPos ) : XclExpDffAnchorBase( rRoot, EXC_ESC_ANCHOR_POSLOCKED ) { @@ -323,8 +315,6 @@ void XclExpMsoDrawingBase::WriteBody( XclExpStream& rStrm ) rStrm.CopyFromStream( mrEscherEx.GetStream(), mrEscherEx.GetDffFragmentSize( mnFragmentKey ) ); } - - XclExpMsoDrawingGroup::XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ) : XclExpMsoDrawingBase( rEscherEx, EXC_ID_MSODRAWINGGROUP ) { @@ -355,15 +345,11 @@ XclExpMsoDrawingGroup::XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ) : mrEscherEx.UpdateDffFragmentEnd(); } - - XclExpMsoDrawing::XclExpMsoDrawing( XclEscherEx& rEscherEx ) : XclExpMsoDrawingBase( rEscherEx, EXC_ID_MSODRAWING ) { } - - XclExpImgData::XclExpImgData( const Graphic& rGraphic, sal_uInt16 nRecId ) : maGraphic( rGraphic ), mnRecId( nRecId ) @@ -423,8 +409,6 @@ void XclExpImgData::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - XclExpControlHelper::XclExpControlHelper( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnEntryCount( 0 ) @@ -504,8 +488,6 @@ void XclExpControlHelper::WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nS rStrm.EndRecord(); } - - //delete for exporting OCX //#if EXC_EXP_OCX_CTRL @@ -1042,8 +1024,6 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm ) //#endif - - XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape > xShape, const Rectangle* pChildAnchor ) : XclObj( rObjMgr, EXC_OBJTYPE_CHART ), XclExpRoot( rObjMgr.GetRoot() ), mxShape( xShape ) @@ -1208,8 +1188,6 @@ void XclExpChartObj::WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, pFS->endElementNS( XML_xdr, XML_xfrm ); } - - XclExpNote::XclExpNote( const XclExpRoot& rRoot, const ScAddress& rScPos, const ScPostIt* pScNote, const OUString& rAddText ) : XclExpRecord( EXC_ID_NOTE ), @@ -1388,8 +1366,6 @@ void XclExpNote::WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm ) rComments->endElement( XML_comment ); } - - XclMacroHelper::XclMacroHelper( const XclExpRoot& rRoot ) : XclExpControlHelper( rRoot ) { @@ -1454,8 +1430,6 @@ void XclExpShapeObj::WriteSubRecs( XclExpStream& rStrm ) WriteMacroSubRec( rStrm ); } - - XclExpComments::XclExpComments( SCTAB nTab, XclExpRecordList< XclExpNote >& rNotes ) : mnTab( nTab ), mrNotes( rNotes ) { @@ -1637,8 +1611,6 @@ void XclExpObjectManager::InitStream( bool bTempFile ) mxDffStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); } - - XclExpEmbeddedObjectManager::XclExpEmbeddedObjectManager( const XclExpObjectManager& rParent, const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ) : XclExpObjectManager( rParent ), @@ -1653,6 +1625,4 @@ XclExpDffAnchorBase* XclExpEmbeddedObjectManager::CreateDffAnchor() const return new XclExpDffEmbeddedAnchor( GetRoot(), maPageSize, mnScaleX, mnScaleY ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 4e1dc5191e89..0231faf207fb 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -63,8 +63,6 @@ struct XclExpScToken inline OpCode GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); } }; - - /** Effective token class conversion types. */ enum XclExpClassConv { @@ -73,8 +71,6 @@ enum XclExpClassConv EXC_CLASSCONV_ARR /// Convert VAL tokens to ARR class (REF remains uncahnged). }; - - /** Token class conversion and position of a token in the token array. */ struct XclExpTokenConvInfo { @@ -103,8 +99,6 @@ void XclExpOperandList::AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eCon typedef boost::shared_ptr< XclExpOperandList > XclExpOperandListRef; typedef ::std::vector< XclExpOperandListRef > XclExpOperandListVector; - - /** Encapsulates all data needed for a call to an external function (macro, add-in). */ struct XclExpExtFuncData { @@ -123,8 +117,6 @@ void XclExpExtFuncData::Set( const OUString& rFuncName, bool bVBasic, bool bHidd mbHidden = bHidden; } - - /** Encapsulates all data needed to process an entire function. */ class XclExpFuncData { @@ -261,8 +253,6 @@ static const XclExpCompConfig spConfigTable[] = { EXC_FMLATYPE_LISTVAL, EXC_CLASSTYPE_NAME, true, false, false, false } }; - - /** Working data of the formula compiler. Used to push onto a stack for recursive calls. */ struct XclExpCompData { @@ -300,8 +290,6 @@ XclExpCompData::XclExpCompData( const XclExpCompConfig* pCfg ) : } // namespace - - /** Implementation class of the export formula compiler. */ class XclExpFmlaCompImpl : protected XclExpRoot, protected XclTokenArrayHelper { @@ -480,8 +468,6 @@ private: const sal_uInt32 mnMaxRowMask; /// Mask to delete invalid bits in row fields. }; - - XclExpFmlaCompImpl::XclExpFmlaCompImpl( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), maFuncProv( rRoot ), @@ -2552,8 +2538,6 @@ void XclExpFmlaCompImpl::AppendExt( const OUString& rString ) lclAppend( mxData->maExtDataVec, GetRoot(), rString, (meBiff == EXC_BIFF8) ? EXC_STR_DEFAULT : EXC_STR_8BITLENGTH ); } - - namespace { void lclInitOwnTab( ScSingleRefData& rRef, const ScAddress& rScPos, SCTAB nCurrScTab, bool b3DRefOnly ) @@ -2595,8 +2579,6 @@ void lclPutRangeToTokenArray( ScTokenArray& rScTokArr, const ScRange& rScRange, } // namespace - - XclExpFormulaCompiler::XclExpFormulaCompiler( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mxImpl( new XclExpFmlaCompImpl( rRoot ) ) diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 5d2526d06bca..c5301d6bd546 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -149,8 +149,6 @@ inline void lclFillAddress( XclAddress& rXclPos, SCCOL nScCol, SCROW nScRow ) } // namespace - - XclExpAddressConverter::XclExpAddressConverter( const XclExpRoot& rRoot ) : XclAddressConverterBase( rRoot.GetTracer(), rRoot.GetXclMaxPos() ) { @@ -286,8 +284,6 @@ OUString lclGetUrlRepresentation( const SvxURLField& rUrlField ) } // namespace - - XclExpHyperlinkHelper::XclExpHyperlinkHelper( const XclExpRoot& rRoot, const ScAddress& rScPos ) : XclExpRoot( rRoot ), maScPos( rScPos ), @@ -333,8 +329,6 @@ XclExpHyperlinkHelper::XclExpHyperlinkRef XclExpHyperlinkHelper::GetLinkRecord() return XclExpHyperlinkRef(); } - - namespace { /** Creates a new formatted string from the passed unformatted string. @@ -526,8 +520,6 @@ XclExpStringRef lclCreateFormattedString( } // namespace - - XclExpStringRef XclExpStringHelper::CreateString( const XclExpRoot& rRoot, const OUString& rString, XclStrFlags nFlags, sal_uInt16 nMaxLen ) { @@ -962,8 +954,6 @@ OUString lclEncodeDosUrl( } // namespace - - OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName ) { OUString aDosUrl = INetURLObject(rAbsUrl).getFSysPath(INetURLObject::FSYS_DOS); @@ -1064,6 +1054,4 @@ void XclExpCachedMatrix::Save( XclExpStream& rStrm ) const } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 9f6f0f0cb302..1e431a480288 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -68,8 +68,6 @@ private: sal_uInt16 mnFlags; /// Flags for record export. }; - - /** Represents an EXTERNNAME record for an add-in function name. */ class XclExpExtNameAddIn : public XclExpExtNameBase { @@ -81,8 +79,6 @@ private: virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - /** Represents an EXTERNNAME record for a DDE link. */ class XclExpExtNameDde : public XclExpExtNameBase { @@ -99,8 +95,6 @@ private: XclExpCachedMatRef mxMatrix; /// Cached results of the DDE link. }; - - class XclExpSupbook; class XclExpExtName : public XclExpExtNameBase @@ -183,8 +177,6 @@ private: SCROW mnScRow; /// Row index of the external cells. }; - - /** Represents the record XCT which is the header record of a CRN record list. */ class XclExpXct : public XclExpRecordBase, protected XclExpRoot @@ -367,8 +359,6 @@ inline bool operator==( const XclExpXti& rLeft, const XclExpXti& rRight ) (rLeft.mnLastSBTab == rRight.mnLastSBTab); } - - /** Contains a list of all SUPBOOK records and index arrays of external sheets. */ class XclExpSupbookBuffer : public XclExpRecordBase, protected XclExpRoot { @@ -500,8 +490,6 @@ protected: explicit XclExpLinkManagerImpl( const XclExpRoot& rRoot ); }; - - /** Implementation of the link manager for BIFF5/BIFF7. */ class XclExpLinkManagerImpl5 : public XclExpLinkManagerImpl { @@ -570,8 +558,6 @@ private: XclExpCodeMap maCodeMap; /// Maps special external codes to EXTERNSHEET records. }; - - /** Implementation of the link manager for BIFF8. */ class XclExpLinkManagerImpl8 : public XclExpLinkManagerImpl { @@ -636,8 +622,6 @@ const sal_uInt8 EXC_TABBUF_VISIBLE = 0x10; /// Sheet is visible. const sal_uInt8 EXC_TABBUF_SELECTED = 0x20; /// Sheet is selected. const sal_uInt8 EXC_TABBUF_MIRRORED = 0x40; /// Sheet is mirrored (right-to-left). - - XclExpTabInfo::XclExpTabInfo( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnScCnt( 0 ), @@ -896,8 +880,6 @@ void XclExpExtNameBase::WriteAddData( XclExpStream& /*rStrm*/ ) { } - - XclExpExtNameAddIn::XclExpExtNameAddIn( const XclExpRoot& rRoot, const OUString& rName ) : XclExpExtNameBase( rRoot, rName ) { @@ -910,8 +892,6 @@ void XclExpExtNameAddIn::WriteAddData( XclExpStream& rStrm ) rStrm << sal_uInt16( 2 ) << EXC_TOKID_ERR << EXC_ERR_REF; } - - XclExpExtNameDde::XclExpExtNameDde( const XclExpRoot& rRoot, const OUString& rName, sal_uInt16 nFlags, const ScMatrix* pResults ) : XclExpExtNameBase( rRoot, rName, nFlags ) @@ -929,8 +909,6 @@ void XclExpExtNameDde::WriteAddData( XclExpStream& rStrm ) mxMatrix->Save( rStrm ); } - - XclExpExtName::XclExpExtName( const XclExpRoot& rRoot, const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) : XclExpExtNameBase( rRoot, rName ), @@ -1918,8 +1896,6 @@ XclExpLinkManagerImpl::XclExpLinkManagerImpl( const XclExpRoot& rRoot ) : { } - - XclExpLinkManagerImpl5::XclExpLinkManagerImpl5( const XclExpRoot& rRoot ) : XclExpLinkManagerImpl( rRoot ) { @@ -2103,8 +2079,6 @@ XclExpLinkManagerImpl5::XclExpExtSheetRef XclExpLinkManagerImpl5::FindInternal( return xExtSheet; } - - XclExpLinkManagerImpl8::XclExpLinkManagerImpl8( const XclExpRoot& rRoot ) : XclExpLinkManagerImpl( rRoot ), maSBBuffer( rRoot ) @@ -2249,8 +2223,6 @@ sal_uInt16 XclExpLinkManagerImpl8::InsertXti( const XclExpXti& rXti ) return ulimit_cast< sal_uInt16 >( maXtiVec.size() - 1 ); } - - XclExpLinkManager::XclExpLinkManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -2348,6 +2320,4 @@ void XclExpLinkManager::Save( XclExpStream& rStrm ) mxImpl->Save( rStrm ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 42268fab2c1f..f62ee680c587 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -36,8 +36,6 @@ using namespace ::oox; - - // *** Helper classes *** @@ -109,8 +107,6 @@ private: sal_uInt16 mnXclTab; /// The 1-based Excel sheet index for local names. }; - - class ScRangeData; class ScDBData; @@ -349,8 +345,6 @@ void XclExpName::WriteBody( XclExpStream& rStrm ) mxTokArr->WriteArray( rStrm ); // token array without size } - - XclExpNameManagerImpl::XclExpNameManagerImpl( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnFirstUserIdx( 0 ) @@ -678,8 +672,6 @@ void XclExpNameManagerImpl::CreateUserNames() } } - - XclExpNameManager::XclExpNameManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mxImpl( new XclExpNameManagerImpl( rRoot ) ) @@ -761,6 +753,4 @@ void XclExpNameManager::SaveXml( XclExpXmlStream& rStrm ) mxImpl->SaveXml( rStrm ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 23091a4e174b..8db13be1d52c 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -411,8 +411,6 @@ void XclExpPageSettings::SaveXml( XclExpXmlStream& rStrm ) XclExpImgData( *pGraphic, EXC_ID8_IMGDATA ).SaveXml( rStrm ); } - - XclExpChartPageSettings::XclExpChartPageSettings( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -428,6 +426,4 @@ void XclExpChartPageSettings::Save( XclExpStream& rStrm ) XclExpUInt16Record( EXC_ID_PRINTSIZE, EXC_PRINTSIZE_FULL ).Save( rStrm ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 09dadf7f840f..e7a3d2047626 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -56,8 +56,6 @@ using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; using ::com::sun::star::sheet::DataPilotFieldLayoutInfo; using ::com::sun::star::sheet::DataPilotFieldReference; - - // Pivot cache @@ -92,8 +90,6 @@ static const sal_uInt16 spnPCItemFlags[] = } // namespace - - XclExpPCItem::XclExpPCItem( const OUString& rText ) : XclExpRecord( (!rText.isEmpty()) ? EXC_ID_SXSTRING : EXC_ID_SXEMPTY, 0 ), mnTypeFlag( EXC_PCITEM_DATA_STRING ) @@ -133,8 +129,6 @@ XclExpPCItem::XclExpPCItem( bool bValue ) : SetBool( bValue ); } - - bool XclExpPCItem::EqualsText( const OUString& rText ) const { return rText.isEmpty() ? IsEmpty() : (GetText() && (*GetText() == rText)); @@ -155,8 +149,6 @@ bool XclExpPCItem::EqualsBool( bool bValue ) const return GetBool() && (*GetBool() == bValue); } - - void XclExpPCItem::WriteBody( XclExpStream& rStrm ) { if( const OUString* pText = GetText() ) @@ -193,8 +185,6 @@ void XclExpPCItem::WriteBody( XclExpStream& rStrm ) } } - - XclExpPCField::XclExpPCField( const XclExpRoot& rRoot, const XclExpPivotCache& rPCache, sal_uInt16 nFieldIdx, const ScDPObject& rDPObj, const ScRange& rRange ) : @@ -624,8 +614,6 @@ void XclExpPCField::WriteBody( XclExpStream& rStrm ) rStrm << maFieldInfo; } - - XclExpPivotCache::XclExpPivotCache( const XclExpRoot& rRoot, const ScDPObject& rDPObj, sal_uInt16 nListIdx ) : XclExpRoot( rRoot ), mnListIdx( nListIdx ), @@ -917,8 +905,6 @@ void XclExpPivotCache::WriteSxindexlistList( XclExpStream& rStrm ) const namespace { - - /** Returns a display string for a data field containing the field name and aggregation function. */ OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFunc ) { @@ -947,12 +933,8 @@ OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFu return( aCaption ); } - - } // namespace - - XclExpPTItem::XclExpPTItem( const XclExpPCField& rCacheField, sal_uInt16 nCacheIdx ) : XclExpRecord( EXC_ID_SXVI, 8 ), mpCacheItem( rCacheField.GetItem( nCacheIdx ) ) @@ -994,8 +976,6 @@ void XclExpPTItem::WriteBody( XclExpStream& rStrm ) rStrm << maItemInfo; } - - XclExpPTField::XclExpPTField( const XclExpPivotTable& rPTable, sal_uInt16 nCacheIdx ) : mrPTable( rPTable ), mpCacheField( rPTable.GetCacheField( nCacheIdx ) ) @@ -1241,8 +1221,6 @@ void XclExpPTField::WriteSxvdex( XclExpStream& rStrm ) const rStrm.EndRecord(); } - - XclExpPivotTable::XclExpPivotTable( const XclExpRoot& rRoot, const ScDPObject& rDPObj, const XclExpPivotCache& rPCache, size_t nId ) : XclExpRoot( rRoot ), mrPCache( rPCache ), @@ -1798,8 +1776,6 @@ void XclExpPivotTable::WriteSxViewEx9( XclExpStream& rStrm ) const } } - - namespace { const SCTAB EXC_PTMGR_PIVOTCACHES = SCTAB_MAX; @@ -1840,8 +1816,6 @@ void XclExpPivotRecWrapper::SaveXml( XclExpXmlStream& rStrm ) } // namespace - - XclExpPivotTableManager::XclExpPivotTableManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mbShareCaches( true ) @@ -1950,6 +1924,4 @@ const XclExpPivotCache* XclExpPivotTableManager::CreatePivotCache( const ScDPObj return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index 74c37287b29e..45a62f135a42 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -36,8 +36,6 @@ void XclExpRecordBase::SaveXml( XclExpXmlStream& /*rStrm*/ ) { } - - XclExpDelegatingRecord::XclExpDelegatingRecord( XclExpRecordBase* pRecord ) : mpRecord( pRecord ) { @@ -55,8 +53,6 @@ void XclExpDelegatingRecord::SaveXml( XclExpXmlStream& rStrm ) mpRecord->SaveXml( rStrm ); } - - XclExpXmlElementRecord::XclExpXmlElementRecord(sal_Int32 const nElement) : mnElement( nElement ) { @@ -66,8 +62,6 @@ XclExpXmlElementRecord::~XclExpXmlElementRecord() { } - - XclExpXmlStartElementRecord::XclExpXmlStartElementRecord(sal_Int32 const nElement) : XclExpXmlElementRecord(nElement) { @@ -85,8 +79,6 @@ void XclExpXmlStartElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStream->startElement( mnElement, FSEND ); } - - XclExpXmlEndElementRecord::XclExpXmlEndElementRecord( sal_Int32 nElement ) : XclExpXmlElementRecord( nElement ) { @@ -101,8 +93,6 @@ void XclExpXmlEndElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->endElement( mnElement ); } - - XclExpXmlStartSingleElementRecord::XclExpXmlStartSingleElementRecord( sal_Int32 const nElement) : XclExpXmlElementRecord( nElement ) @@ -119,8 +109,6 @@ void XclExpXmlStartSingleElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStream->write( "<" )->writeId( mnElement ); } - - XclExpXmlEndSingleElementRecord::XclExpXmlEndSingleElementRecord() { } @@ -134,8 +122,6 @@ void XclExpXmlEndSingleElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->write( "/>" ); } - - XclExpRecord::XclExpRecord( sal_uInt16 nRecId, sal_Size nRecSize ) : mnRecSize( nRecSize ), mnRecId( nRecId ) @@ -164,8 +150,6 @@ void XclExpRecord::Save( XclExpStream& rStrm ) rStrm.EndRecord(); } - - template<> void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm ) { @@ -176,8 +160,6 @@ void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - void XclExpBoolRecord::WriteBody( XclExpStream& rStrm ) { rStrm << (static_cast< sal_uInt16 >( mbValue ? 1 : 0 )); @@ -194,8 +176,6 @@ void XclExpBoolRecord::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - XclExpDummyRecord::XclExpDummyRecord( sal_uInt16 nRecId, const void* pRecData, sal_Size nRecSize ) : XclExpRecord( nRecId ) { @@ -231,8 +211,6 @@ void XclExpFutureRecord::Save( XclExpStream& rStrm ) rStrm.EndRecord(); } - - XclExpSubStream::XclExpSubStream( sal_uInt16 nSubStrmType ) : mnSubStrmType( nSubStrmType ) { @@ -281,6 +259,4 @@ void XclExpSubStream::Save( XclExpStream& rStrm ) rStrm.EndRecord(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 3da442773401..683f9097804b 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -63,8 +63,6 @@ XclExpRootData::~XclExpRootData() { } - - XclExpRoot::XclExpRoot( XclExpRootData& rExpRootData ) : XclRoot( rExpRootData ), mrExpData( rExpRootData ) @@ -356,6 +354,4 @@ XclExpRootData::XclExpLinkMgrRef XclExpRoot::GetLocalLinkMgrRef() const return IsInGlobals() ? mrExpData.mxGlobLinkMgr : mrExpData.mxLocLinkMgr; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 04a8298585a9..9ca1a4749171 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -77,8 +77,6 @@ using namespace ::com::sun::star::uno; using namespace ::formula; using namespace ::oox; - - XclExpStream::XclExpStream( SvStream& rOutStrm, const XclExpRoot& rRoot, sal_uInt16 nMaxRecSize ) : mrStrm( rOutStrm ), mrRoot( rRoot ), @@ -459,8 +457,6 @@ void XclExpStream::WriteRawZeroBytes( sal_Size nBytes ) mrStrm.Write( &nData, nBytesLeft ); } - - XclExpBiff8Encrypter::XclExpBiff8Encrypter( const XclExpRoot& rRoot ) : mnOldPos(STREAM_SEEK_TO_END), mbValid(false) @@ -933,8 +929,6 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper } - - XclExpXmlStream::XclExpXmlStream( const Reference< XComponentContext >& rCC ) : XmlFilterBase( rCC ), mpRoot( NULL ) diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index f3b8069c011e..685d4479ca25 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -28,8 +28,6 @@ using namespace ::oox; - - namespace { // compare vectors @@ -438,8 +436,6 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const } } - - bool XclExpString::IsWriteFlags() const { return mbIsBiff8 && (!IsEmpty() || !mbSmartFlags); @@ -560,6 +556,4 @@ void XclExpString::PrepareWrite( XclExpStream& rStrm, sal_uInt16 nBytes ) const rStrm.SetSliceSize( nBytes + (mbIsUnicode ? 2 : 1) ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index 573ca8aac387..7f7c90a4a321 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -177,8 +177,6 @@ void XclListColor::Merge( const XclListColor& rColor ) AddWeighting( nWeight2 ); } - - /** Data for each inserted original color, represented by a color ID. */ struct XclColorIdData { @@ -224,8 +222,6 @@ typedef ::std::vector< XclNearest > XclNearestVec; } // namespace - - class XclExpPaletteImpl { public: @@ -318,8 +314,6 @@ private: sal_uInt32 mnLastIdx; /// Last insertion index for search opt. }; - - const sal_uInt32 EXC_PAL_INDEXBASE = 0xFFFF0000; const sal_uInt32 EXC_PAL_MAXRAWSIZE = 1024; @@ -762,8 +756,6 @@ sal_Int32 XclExpPaletteImpl::GetNearPaletteColors( return nDist1; } - - XclExpPalette::XclExpPalette( const XclExpRoot& rRoot ) : XclDefaultPalette( rRoot ), XclExpRecord( EXC_ID_PALETTE ) @@ -939,8 +931,6 @@ bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rI return bUsed; } - - namespace { sal_uInt32 lclCalcHash( const XclFontData& rFontData ) @@ -962,8 +952,6 @@ sal_uInt32 lclCalcHash( const XclFontData& rFontData ) } // namespace - - XclExpFont::XclExpFont( const XclExpRoot& rRoot, const XclFontData& rFontData, XclExpColorType eColorType ) : XclExpRecord( EXC_ID2_FONT, 14 ), @@ -1022,8 +1010,6 @@ void XclExpFont::WriteBody( XclExpStream& rStrm ) << aFontName; } - - XclExpBlindFont::XclExpBlindFont( const XclExpRoot& rRoot ) : XclExpFont( rRoot, XclFontData(), EXC_COLOR_CELLTEXT ) { @@ -1039,8 +1025,6 @@ void XclExpBlindFont::Save( XclExpStream& /*rStrm*/ ) // do nothing } - - XclExpFontBuffer::XclExpFontBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnXclMaxSize( 0 ) @@ -1205,8 +1189,6 @@ struct XclExpNumFmtPred { return rFormat.mnScNumFmt == mnScNumFmt; } }; - - void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) { sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream(); @@ -1216,8 +1198,6 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - XclExpNumFmtBuffer::XclExpNumFmtBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), /* Compiler needs a hint, this doesn't work: new NfKeywordTable; @@ -1383,8 +1363,6 @@ void XclExpCellProt::SaveXml( XclExpXmlStream& rStrm ) const FSEND ); } - - bool XclExpCellAlign::FillFromItemSet( const SfxItemSet& rItemSet, bool bForceLineBreak, XclBiff eBiff, bool bStyle ) { @@ -1541,8 +1519,6 @@ void XclExpCellAlign::SaveXml( XclExpXmlStream& rStrm ) const FSEND ); } - - namespace { void lclGetBorderLine( @@ -1613,8 +1589,6 @@ void lclGetBorderLine( } // namespace - - XclExpCellBorder::XclExpCellBorder() : mnLeftColorId( XclExpPalette::GetColorIdFromIndex( mnLeftColor ) ), mnRightColorId( XclExpPalette::GetColorIdFromIndex( mnRightColor ) ), @@ -1794,8 +1768,6 @@ void XclExpCellBorder::SaveXml( XclExpXmlStream& rStrm ) const rStyleSheet->endElement( XML_border ); } - - XclExpCellArea::XclExpCellArea() : mnForeColorId( XclExpPalette::GetColorIdFromIndex( mnForeColor ) ), mnBackColorId( XclExpPalette::GetColorIdFromIndex( mnBackColor ) ) @@ -1924,8 +1896,6 @@ void XclExpColor::SaveXml( XclExpXmlStream& rStrm ) const rStyleSheet->endElement( XML_fill ); } - - XclExpXFId::XclExpXFId() : mnXFId( XclExpXFBuffer::GetDefCellXFId() ), mnXFIndex( EXC_XF_DEFAULTCELL ) @@ -1943,8 +1913,6 @@ void XclExpXFId::ConvertXFIndex( const XclExpRoot& rRoot ) mnXFIndex = rRoot.GetXFBuffer().GetXFIndex( mnXFId ); } - - XclExpXF::XclExpXF( const XclExpRoot& rRoot, const ScPatternAttr& rPattern, sal_Int16 nScript, sal_uLong nForceScNumFmt, sal_uInt16 nForceXclFont, bool bForceLineBreak ) : @@ -2159,8 +2127,6 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_xf ); } - - XclExpDefaultXF::XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF ) : XclExpXF( rRoot, bCellXF ) { @@ -2178,8 +2144,6 @@ void XclExpDefaultXF::SetNumFmt( sal_uInt16 nXclNumFmt ) mbFmtUsed = true; } - - XclExpStyle::XclExpStyle( sal_uInt32 nXFId, const OUString& rStyleName ) : XclExpRecord( EXC_ID_STYLE, 4 ), maName( rStyleName ), @@ -2265,8 +2229,6 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_extLst } - - namespace { const sal_uInt32 EXC_XFLIST_INDEXBASE = 0xFFFE0000; @@ -2282,8 +2244,6 @@ bool lclIsBuiltInStyle( const OUString& rStyleName ) } // namespace - - XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() : mnStyleId( EXC_STYLE_USERDEF ), mnLevel( EXC_STYLE_NOLEVEL ), @@ -2292,8 +2252,6 @@ XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() : { } - - /** Predicate for search algorithm. */ struct XclExpBorderPred { @@ -3020,8 +2978,6 @@ void XclExpDxfs::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_dxfs ); } - - XclExpDxf::XclExpDxf( const XclExpRoot& rRoot, XclExpCellAlign* pAlign, XclExpCellBorder* pBorder, XclExpFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpColor* pColor) : XclExpRoot( rRoot ), @@ -3058,8 +3014,6 @@ void XclExpDxf::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_dxf ); } - - XclExpXmlStyleSheet::XclExpXmlStyleSheet( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -3090,6 +3044,4 @@ void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm ) rStrm.PopStream(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 18b9e0ec9359..a1c9585372a8 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -130,8 +130,6 @@ void XclExpArray::WriteBody( XclExpStream& rStrm ) rStrm << nFlags << sal_uInt32( 0 ) << *mxTokArr; } - - XclExpArrayBuffer::XclExpArrayBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -199,8 +197,6 @@ void XclExpShrfmla::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt8( 0 ) << mnUsedCount << *mxTokArr; } - - XclExpShrfmlaBuffer::XclExpShrfmlaBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -439,8 +435,6 @@ void XclExpTableop::WriteBody( XclExpStream& rStrm ) rStrm << mnColInpXclRow << mnColInpXclCol << sal_uInt32( 0 ); } - - XclExpTableopBuffer::XclExpTableopBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -613,8 +607,6 @@ void XclExpSingleCellBase::WriteBody( XclExpStream& rStrm ) WriteContents( rStrm ); } - - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell ) XclExpNumberCell::XclExpNumberCell( @@ -659,8 +651,6 @@ void XclExpNumberCell::WriteContents( XclExpStream& rStrm ) rStrm << mfValue; } - - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell ) XclExpBooleanCell::XclExpBooleanCell( @@ -809,8 +799,6 @@ void XclExpLabelCell::WriteContents( XclExpStream& rStrm ) } } - - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell ) XclExpFormulaCell::XclExpFormulaCell( @@ -1249,8 +1237,6 @@ void XclExpMultiCellBase::RemoveUnusedXFIndexes( const ScfUInt16Vec& rXFIndexes // The Save() function will skip all XF indexes equal to EXC_XF_NOTFOUND. } - - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell ) XclExpBlankCell::XclExpBlankCell( const XclAddress& rXclPos, const XclExpMultiXFId& rXFId ) : @@ -1299,8 +1285,6 @@ void XclExpBlankCell::WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress FSEND ); } - - IMPL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell ) XclExpRkCell::XclExpRkCell( @@ -1408,8 +1392,6 @@ void XclExpOutlineBuffer::UpdateColRow( SCCOLROW nScPos ) } } - - XclExpGuts::XclExpGuts( const XclExpRoot& rRoot ) : XclExpRecord( EXC_ID_GUTS, 8 ), mnColLevels( 0 ), @@ -1444,8 +1426,6 @@ void XclExpGuts::WriteBody( XclExpStream& rStrm ) rStrm << mnRowWidth << mnColWidth << mnRowLevels << mnColLevels; } - - XclExpDimensions::XclExpDimensions( const XclExpRoot& rRoot ) : mnFirstUsedXclRow( 0 ), mnFirstFreeXclRow( 0 ), @@ -1502,8 +1482,6 @@ void XclExpDimensions::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt16( 0 ); } - - namespace { double lclGetCorrectedColWidth( const XclExpRoot& rRoot, sal_uInt16 nXclColWidth ) @@ -1514,8 +1492,6 @@ double lclGetCorrectedColWidth( const XclExpRoot& rRoot, sal_uInt16 nXclColWidth } // namespace - - XclExpDefcolwidth::XclExpDefcolwidth( const XclExpRoot& rRoot ) : XclExpUInt16Record( EXC_ID_DEFCOLWIDTH, EXC_DEFCOLWIDTH_DEF ), XclExpRoot( rRoot ) @@ -1535,8 +1511,6 @@ void XclExpDefcolwidth::SetDefWidth( sal_uInt16 nXclColWidth ) SetValue( limit_cast< sal_uInt16 >( fNewColWidth / 256.0 + 0.5 ) ); } - - XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot, SCCOL nScCol, SCROW nLastScRow, XclExpColOutlineBuffer& rOutlineBfr ) : XclExpRecord( EXC_ID_COLINFO, 12 ), @@ -1627,8 +1601,6 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - XclExpColinfoBuffer::XclExpColinfoBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), maDefcolwidth( rRoot ), @@ -1723,8 +1695,6 @@ void XclExpColinfoBuffer::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_cols ); } - - XclExpDefaultRowData::XclExpDefaultRowData() : mnFlags( EXC_DEFROW_DEFAULTFLAGS ), mnHeight( EXC_DEFROW_DEFAULTHEIGHT ) @@ -1745,8 +1715,6 @@ bool operator<( const XclExpDefaultRowData& rLeft, const XclExpDefaultRowData& r ((rLeft.mnHeight == rRight.mnHeight) && (rLeft.mnFlags < rRight.mnFlags)); } - - XclExpDefrowheight::XclExpDefrowheight() : XclExpRecord( EXC_ID3_DEFROWHEIGHT, 4 ) { @@ -1763,8 +1731,6 @@ void XclExpDefrowheight::WriteBody( XclExpStream& rStrm ) rStrm << maDefData.mnFlags << maDefData.mnHeight; } - - XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt32 nXclRow, XclExpRowOutlineBuffer& rOutlineBfr, bool bAlwaysEmpty ) : XclExpRecord( EXC_ID3_ROW, 16 ), @@ -2060,8 +2026,6 @@ void XclExpRow::SaveXml( XclExpXmlStream& rStrm ) } } - - XclExpRowBuffer::XclExpRowBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), maOutlineBfr( rRoot ), @@ -2557,6 +2521,4 @@ void XclExpCellTable::SaveXml( XclExpXmlStream& rStrm ) mxExtLst->SaveXml( rStrm ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index 53cf362d562a..c2da6eed2e2e 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -131,8 +131,6 @@ void XclExpWindow2::WriteBody( XclExpStream& rStrm ) } } - - XclExpScl::XclExpScl( sal_uInt16 nZoom ) : XclExpRecord( EXC_ID_SCL, 4 ), mnNum( nZoom ), @@ -157,8 +155,6 @@ void XclExpScl::WriteBody( XclExpStream& rStrm ) rStrm << mnNum << mnDenom; } - - XclExpPane::XclExpPane( const XclTabViewData& rData ) : XclExpRecord( EXC_ID_PANE, 10 ), mnSplitX( rData.mnSplitX ), @@ -203,8 +199,6 @@ void XclExpPane::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt8( 0 ); } - - XclExpSelection::XclExpSelection( const XclTabViewData& rData, sal_uInt8 nPane ) : XclExpRecord( EXC_ID_SELECTION, 15 ), mnPane( nPane ) @@ -246,8 +240,6 @@ void XclExpSelection::WriteBody( XclExpStream& rStrm ) maSelData.maXclSelection.Write( rStrm, false ); } - - XclExpTabBgColor::XclExpTabBgColor( const XclTabViewData& rTabViewData ) : XclExpRecord( EXC_ID_SHEETEXT, 18 ), mrTabViewData( rTabViewData ) @@ -288,8 +280,6 @@ sal_uInt16 lclGetXclZoom( long nScZoom, sal_uInt16 nDefXclZoom ) } // namespace - - XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nScTab ) : XclExpRoot( rRoot ), mnGridColorId( XclExpPalette::GetColorIdFromIndex( EXC_COLOR_WINDOWTEXT ) ) diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index b00c49cd574e..b70aee53b8fb 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -207,8 +207,6 @@ struct XclImpChRootData : public XclChRootData inline explicit XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {} }; - - XclImpChRoot::XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ) : XclImpRoot( rRoot ), mxChData( new XclImpChRootData( rChartData ) ) @@ -377,8 +375,6 @@ void XclImpChRoot::ConvertPieRotation( ScfPropertySet& rPropSet, sal_uInt16 nAng rPropSet.SetProperty( EXC_CHPROP_STARTINGANGLE, nApiRot ); } - - XclImpChGroupBase::~XclImpChGroupBase() { } @@ -441,8 +437,6 @@ void XclImpChFramePos::ReadChFramePos( XclImpStream& rStrm ) maData.maRect.mnHeight = rStrm.ReadInt16(); rStrm.Ignore( 2 ); } - - void XclImpChLineFormat::ReadChLineFormat( XclImpStream& rStrm ) { rStrm >> maData.maColor >> maData.mnPattern >> maData.mnWeight >> maData.mnFlags; @@ -473,8 +467,6 @@ void XclImpChLineFormat::Convert( const XclImpChRoot& rRoot, } } - - void XclImpChAreaFormat::ReadChAreaFormat( XclImpStream& rStrm ) { rStrm >> maData.maPattColor >> maData.maBackColor >> maData.mnPattern >> maData.mnFlags; @@ -508,8 +500,6 @@ void XclImpChAreaFormat::Convert( const XclImpChRoot& rRoot, } } - - XclImpChEscherFormat::XclImpChEscherFormat( const XclImpRoot& rRoot ) : mnDffFillType( mso_fillSolid ) { @@ -548,8 +538,6 @@ void XclImpChEscherFormat::Convert( const XclImpChRoot& rRoot, rRoot.ConvertEscherFormat( rPropSet, maData, bUsePicFmt ? &maPicFmt : 0, mnDffFillType, rFmtInfo.mePropMode ); } - - XclImpChFrameBase::XclImpChFrameBase( const XclChFormatInfo& rFmtInfo ) { if( rFmtInfo.mbCreateDefFrame ) switch( rFmtInfo.meDefFrameType ) @@ -625,8 +613,6 @@ void XclImpChFrameBase::ConvertFrameBase( const XclImpChRoot& rRoot, ConvertAreaBase( rRoot, rPropSet, eObjType, nFormatIdx, bUsePicFmt ); } - - XclImpChFrame::XclImpChFrame( const XclImpChRoot& rRoot, XclChObjectType eObjType ) : XclImpChFrameBase( rRoot.GetFormatInfo( eObjType ) ), XclImpChRoot( rRoot ), @@ -723,8 +709,6 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence( } // namespace - - XclImpChSourceLink::XclImpChSourceLink( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -920,8 +904,6 @@ void XclImpChFontBase::ConvertRotationBase( const XclImpChRoot& rRoot, ScfProper rRoot.GetChartPropSetHelper().WriteRotationProperties( rPropSet, GetRotation(), bSupportsStacked ); } - - XclImpChFont::XclImpChFont() : mnFontIdx( EXC_FONT_NOTFOUND ) { @@ -932,8 +914,6 @@ void XclImpChFont::ReadChFont( XclImpStream& rStrm ) rStrm >> mnFontIdx; } - - XclImpChText::XclImpChText( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -1306,8 +1286,6 @@ void XclImpChMarkerFormat::ConvertColor( const XclImpChRoot& rRoot, rPropSet.SetColorProperty( EXC_CHPROP_COLOR, aLineColor ); } - - XclImpChPieFormat::XclImpChPieFormat() : mnPieDist( 0 ) { @@ -1324,8 +1302,6 @@ void XclImpChPieFormat::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_OFFSET, fApiDist ); } - - XclImpChSeriesFormat::XclImpChSeriesFormat() : mnFlags( 0 ) { @@ -1336,8 +1312,6 @@ void XclImpChSeriesFormat::ReadChSeriesFormat( XclImpStream& rStrm ) rStrm >> mnFlags; } - - void XclImpCh3dDataFormat::ReadCh3dDataFormat( XclImpStream& rStrm ) { rStrm >> maData.mnBase >> maData.mnTop; @@ -1352,8 +1326,6 @@ void XclImpCh3dDataFormat::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_GEOMETRY3D, nApiType ); } - - XclImpChAttachedLabel::XclImpChAttachedLabel( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ), mnFlags( 0 ) @@ -1379,8 +1351,6 @@ XclImpChTextRef XclImpChAttachedLabel::CreateDataLabel( const XclImpChText* pPar return xLabel; } - - XclImpChDataFormat::XclImpChDataFormat( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -1593,8 +1563,6 @@ void XclImpChDataFormat::UpdateDataLabel( const XclImpChDataFormat* pParentFmt ) mxLabel = mxAttLabel->CreateDataLabel( pDefText ); } - - XclImpChSerTrendLine::XclImpChSerTrendLine( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -1681,8 +1649,6 @@ Reference< XRegressionCurve > XclImpChSerTrendLine::CreateRegressionCurve() cons return xRegCurve; } - - XclImpChSerErrorBar::XclImpChSerErrorBar( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -1782,8 +1748,6 @@ Reference< XPropertySet > XclImpChSerErrorBar::CreateErrorBar( const XclImpChSer return xErrorBar; } - - XclImpChSeries::XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx ) : XclImpChRoot( rRoot ), mnGroupIdx( EXC_CHSERGROUP_NONE ), @@ -2399,8 +2363,6 @@ Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi return xChartType; } - - void XclImpChChart3d::ReadChChart3d( XclImpStream& rStrm ) { rStrm >> maData.mnRotation @@ -2480,8 +2442,6 @@ void XclImpChChart3d::Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) con rPropSet.SetProperty( EXC_CHPROP_D3DSCENELIGHTDIR2, cssd::Direction3D( 0.2, 0.4, 1.0 ) ); } - - XclImpChLegend::XclImpChLegend( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -2619,8 +2579,6 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const return xLegend; } - - XclImpChDropBar::XclImpChDropBar( sal_uInt16 nDropBar ) : mnDropBar( nDropBar ), mnBarDist( 0 ) @@ -2643,8 +2601,6 @@ void XclImpChDropBar::Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropS ConvertFrameBase( rRoot, rPropSet, eObjType ); } - - XclImpChTypeGroup::XclImpChTypeGroup( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ), maType( rRoot ), @@ -3058,8 +3014,6 @@ void XclImpChLabelRange::ConvertAxisPosition( ScfPropertySet& rPropSet, bool b3d } } - - XclImpChValueRange::XclImpChValueRange( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) { @@ -3135,8 +3089,6 @@ void XclImpChValueRange::ConvertAxisPosition( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_CROSSOVERVALUE, fCrossingPos ); } - - namespace { sal_Int32 lclGetApiTickmarks( sal_uInt8 nXclTickPos ) @@ -3215,8 +3167,6 @@ void XclImpChTick::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_MARKPOSITION, cssc::ChartAxisMarkPosition_AT_AXIS ); } - - XclImpChAxis::XclImpChAxis( const XclImpChRoot& rRoot, sal_uInt16 nAxisType ) : XclImpChRoot( rRoot ), mnNumFmtIdx( EXC_FORMAT_NOTFOUND ) @@ -3490,8 +3440,6 @@ void XclImpChAxis::CreateWallFrame() } } - - XclImpChAxesSet::XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId ) : XclImpChRoot( rRoot ) { @@ -4190,8 +4138,6 @@ Reference< XDiagram > XclImpChChart::CreateDiagram() const return xDiagram; } - - XclImpChartDrawing::XclImpChartDrawing( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpDrawing( rRoot, bOwnTab ), // sheet charts may contain OLE objects mnScTab( rRoot.GetCurrScTab() ), @@ -4252,8 +4198,6 @@ void XclImpChartDrawing::OnObjectInserted( const XclImpDrawObjBase& ) { } - - XclImpChart::XclImpChart( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpRoot( rRoot ), mbOwnTab( bOwnTab ), @@ -4383,6 +4327,4 @@ void XclImpChart::ReadChChart( XclImpStream& rStrm ) mxChartData->ReadRecordGroup( rStrm ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 8e45697bfbf9..76a8a2e88ae5 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -214,8 +214,6 @@ void lclInsertUrl( XclImpRoot& rRoot, const OUString& rUrl, SCCOL nScCol, SCROW } // namespace - - void XclImpHyperlink::ReadHlink( XclImpStream& rStrm ) { XclRange aXclRange( ScAddress::UNINITIALIZED ); @@ -683,8 +681,6 @@ void XclImpCondFormat::Apply() } } - - XclImpCondFormatManager::XclImpCondFormatManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -995,8 +991,6 @@ void XclImpWebQuery::Apply( ScDocument& rDoc, const OUString& rFilterName ) } } - - XclImpWebQueryBuffer::XclImpWebQueryBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -1141,8 +1135,6 @@ XclImpDecrypterRef lclReadFilepass8( XclImpStream& rStrm ) } // namespace - - ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm ) { XclImpDecrypterRef xDecr; @@ -1233,8 +1225,6 @@ XclImpSheetProtectBuffer::Sheet::Sheet() : { } - - XclImpSheetProtectBuffer::Sheet::Sheet(const Sheet& r) : mbProtected(r.mbProtected), mnPasswordHash(r.mnPasswordHash), @@ -1359,6 +1349,4 @@ XclImpSheetProtectBuffer::Sheet* XclImpSheetProtectBuffer::GetSheetItem( SCTAB n return &itr->second; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index e558273c86b0..1b7ecc60ce8b 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -142,8 +142,6 @@ using ::com::sun::star::script::XEventAttacherManager; using ::com::sun::star::table::CellAddress; using ::com::sun::star::table::CellRangeAddress; - - namespace { /** Helper class which mimics the auto_ptr< SdrObject > semantics, but calls @@ -963,8 +961,6 @@ void XclImpDrawObjBase::ImplReadObj8( XclImpStream& rStrm ) } } - - void XclImpDrawObjVector::InsertGrouped( XclImpDrawObjRef xDrawObj ) { if( !empty() ) @@ -982,16 +978,12 @@ sal_Size XclImpDrawObjVector::GetProgressSize() const return nProgressSize; } - - XclImpPhObj::XclImpPhObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ) { SetProcessSdrObj( false ); } - - XclImpGroupObj::XclImpGroupObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), mnFirstUngrouped( 0 ) @@ -1048,8 +1040,6 @@ SdrObject* XclImpGroupObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const R return xSdrObj.release(); } - - XclImpLineObj::XclImpLineObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), mnArrows( 0 ), @@ -1177,8 +1167,6 @@ SdrObject* XclImpLineObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } - - XclImpRectObj::XclImpRectObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), mnFrameFlags( 0 ) @@ -1225,8 +1213,6 @@ SdrObject* XclImpRectObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } - - XclImpOvalObj::XclImpOvalObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ) { @@ -1240,8 +1226,6 @@ SdrObject* XclImpOvalObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } - - XclImpArcObj::XclImpArcObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), mnQuadrant( EXC_OBJ_ARC_TR ) @@ -1312,8 +1296,6 @@ SdrObject* XclImpArcObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rec return xSdrObj.release(); } - - XclImpPolygonObj::XclImpPolygonObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ), mnPolyFlags( 0 ), @@ -1391,8 +1373,6 @@ SdrObject* XclImpPolygonObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const return xSdrObj.release(); } - - void XclImpObjTextData::ReadByteString( XclImpStream& rStrm ) { mxString.reset(); @@ -1412,8 +1392,6 @@ void XclImpObjTextData::ReadFormats( XclImpStream& rStrm ) rStrm.Ignore( maData.mnFormatSize ); } - - XclImpTextObj::XclImpTextObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ) { @@ -1615,8 +1593,6 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& XclImpRectObj::DoPreProcessSdrObj( rDffConv, rSdrObj ); } - - XclImpChartObj::XclImpChartObj( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpRectObj( rRoot ), mbOwnTab( bOwnTab ) @@ -1799,8 +1775,6 @@ void XclImpChartObj::FinalizeTabChart() SetAnchor( aAnchor ); } - - XclImpNoteObj::XclImpNoteObj( const XclImpRoot& rRoot ) : XclImpTextObj( rRoot ), maScPos( ScAddress::INITIALIZE_INVALID ), @@ -1835,8 +1809,6 @@ void XclImpNoteObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& } } - - XclImpControlHelper::XclImpControlHelper( const XclImpRoot& rRoot, XclCtrlBindMode eBindMode ) : mrRoot( rRoot ), meBindMode( eBindMode ) @@ -2013,8 +1985,6 @@ void XclImpControlHelper::ReadRangeList( ScRangeList& rScRanges, XclImpStream& r } } - - XclImpTbxObjBase::XclImpTbxObjBase( const XclImpRoot& rRoot ) : XclImpTextObj( rRoot ), XclImpControlHelper( rRoot, EXC_CTRL_BINDPOSITION ) @@ -2109,8 +2079,6 @@ void XclImpTbxObjBase::DoPreProcessSdrObj( XclImpDffConverter& /*rDffConv*/, Sdr ProcessControl( *this ); } - - XclImpButtonObj::XclImpButtonObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) { @@ -2173,8 +2141,6 @@ XclTbxEventType XclImpButtonObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } - - XclImpCheckBoxObj::XclImpCheckBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), mnState( EXC_OBJ_CHECKBOX_UNCHECKED ), @@ -2262,8 +2228,6 @@ XclTbxEventType XclImpCheckBoxObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } - - XclImpOptionButtonObj::XclImpOptionButtonObj( const XclImpRoot& rRoot ) : XclImpCheckBoxObj( rRoot ), mnNextInGroup( 0 ), @@ -2353,8 +2317,6 @@ XclTbxEventType XclImpOptionButtonObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } - - XclImpLabelObj::XclImpLabelObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) { @@ -2384,8 +2346,6 @@ XclTbxEventType XclImpLabelObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } - - XclImpGroupBoxObj::XclImpGroupBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), mnGroupBoxFlags( 0 ) @@ -2433,8 +2393,6 @@ XclTbxEventType XclImpGroupBoxObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } - - XclImpDialogObj::XclImpDialogObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) { @@ -2457,8 +2415,6 @@ XclTbxEventType XclImpDialogObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } - - XclImpEditObj::XclImpEditObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), mnContentType( EXC_OBJ_EDIT_TEXT ), @@ -2531,8 +2487,6 @@ XclTbxEventType XclImpEditObj::DoGetEventType() const return EXC_TBX_EVENT_TEXT; } - - XclImpTbxObjScrollableBase::XclImpTbxObjScrollableBase( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), mnValue( 0 ), @@ -2567,8 +2521,6 @@ void XclImpTbxObjScrollableBase::DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt } } - - XclImpSpinButtonObj::XclImpSpinButtonObj( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ) { @@ -2606,8 +2558,6 @@ XclTbxEventType XclImpSpinButtonObj::DoGetEventType() const return EXC_TBX_EVENT_VALUE; } - - XclImpScrollBarObj::XclImpScrollBarObj( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ) { @@ -2648,8 +2598,6 @@ XclTbxEventType XclImpScrollBarObj::DoGetEventType() const return EXC_TBX_EVENT_VALUE; } - - XclImpTbxObjListBase::XclImpTbxObjListBase( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ), mnEntryCount( 0 ), @@ -2680,8 +2628,6 @@ void XclImpTbxObjListBase::SetBoxFormatting( ScfPropertySet& rPropSet ) const GetFontBuffer().WriteDefaultCtrlFontProperties( rPropSet ); } - - XclImpListBoxObj::XclImpListBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjListBase( rRoot ) { @@ -2767,8 +2713,6 @@ XclTbxEventType XclImpListBoxObj::DoGetEventType() const return EXC_TBX_EVENT_CHANGE; } - - XclImpDropDownObj::XclImpDropDownObj( const XclImpRoot& rRoot ) : XclImpTbxObjListBase( rRoot ), mnLeft( 0 ), @@ -2863,8 +2807,6 @@ XclTbxEventType XclImpDropDownObj::DoGetEventType() const return (GetDropDownType() == EXC_OBJ_DROPDOWN_COMBOBOX) ? EXC_TBX_EVENT_TEXT : EXC_TBX_EVENT_CHANGE; } - - XclImpPictureObj::XclImpPictureObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ), XclImpControlHelper( rRoot, EXC_CTRL_BINDCONTENT ), @@ -3237,8 +3179,6 @@ void XclImpSolverContainer::UpdateConnection( sal_uInt32 nDffShapeId, SdrObject* } } - - XclImpSimpleDffConverter::XclImpSimpleDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) : SvxMSDffManager( rDffStrm, rRoot.GetBasePath(), 0, 0, rRoot.GetDoc().GetDrawLayer(), 1440, COL_DEFAULT, 24, 0 ), XclImpRoot( rRoot ) @@ -4102,8 +4042,6 @@ void XclImpDrawing::ReadTxo( XclImpStream& rStrm ) } } - - XclImpSheetDrawing::XclImpSheetDrawing( const XclImpRoot& rRoot, SCTAB nScTab ) : XclImpDrawing( rRoot, true ), maScUsedArea( ScAddress::INITIALIZE_INVALID ) @@ -4337,6 +4275,4 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclImpDffPropSet& rPropSet ) return rStrm; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index f29636beb36a..ccc47475a9f9 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -44,8 +44,6 @@ private: const XclBiff meBiff; /// Cached BIFF version to save GetBiff() calls. }; - - XclImpFmlaCompImpl::XclImpFmlaCompImpl( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maFuncProv( rRoot ), @@ -89,8 +87,6 @@ const ScTokenArray* XclImpFmlaCompImpl::CreateFormula( return pArray; } - - XclImpFormulaCompiler::XclImpFormulaCompiler( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), mxImpl( new XclImpFmlaCompImpl( rRoot ) ) @@ -114,6 +110,4 @@ const ScTokenArray* XclImpFormulaCompiler::CreateFormula( return mxImpl->CreateFormula(eType, rXclTokArr); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index deab5bf5c8d0..6d17288efe52 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -51,8 +51,6 @@ inline void lclFillAddress( ScAddress& rScPos, sal_uInt16 nXclCol, sal_uInt32 nX } // namespace - - XclImpAddressConverter::XclImpAddressConverter( const XclImpRoot& rRoot ) : XclAddressConverterBase( rRoot.GetTracer(), rRoot.GetScMaxPos() ) { @@ -263,8 +261,6 @@ XclImpHFConverter::XclImpHFPortionInfo::XclImpHFPortionInfo() : maSel.nStartPos = maSel.nEndPos = 0; } - - XclImpHFConverter::XclImpHFConverter( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), mrEE( rRoot.GetHFEditEngine() ), @@ -897,6 +893,4 @@ ScMatrixRef XclImpCachedMatrix::CreateScMatrix( svl::SharedStringPool& rPool ) c return xScMatrix; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 8be264201a7e..6bcbdc30a404 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -36,8 +36,6 @@ using ::std::vector; - - // *** Helper classes *** @@ -157,8 +155,6 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti ) return rStrm >> rXti.mnSupbook >> rXti.mnSBTabFirst >> rXti.mnSBTabLast; } - - /** Implementation of the link manager. */ class XclImpLinkManagerImpl : protected XclImpRoot { @@ -866,8 +862,6 @@ void XclImpLinkManagerImpl::LoadCachedValues() itSupbook->LoadCachedValues(); } - - XclImpLinkManager::XclImpLinkManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), mxImpl( new XclImpLinkManagerImpl( rRoot ) ) @@ -939,6 +933,4 @@ const OUString& XclImpLinkManager::GetMacroName( sal_uInt16 nExtSheet, sal_uInt1 return mxImpl->GetMacroName( nExtSheet, nExtName ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 14391ba2f3c4..5defaecdc8f5 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -267,8 +267,6 @@ void XclImpName::InsertName(const ScTokenArray* pArray) mpScData = pData; // cache for later use } - - XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -311,6 +309,4 @@ void XclImpNameManager::ConvertAllTokens() it->ConvertTokens(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index 9c34d59ccdd0..d521f898d01b 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -170,8 +170,6 @@ void XclImpPageSettings::SetPaperSize( sal_uInt16 nXclPaperSize, bool bPortrait mbValidPaper = true; } - - namespace { void lclPutMarginItem( SfxItemSet& rItemSet, sal_uInt16 nRecId, double fMarginInch ) @@ -380,6 +378,4 @@ void XclImpPageSettings::Finalize() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 9ed241fe75e6..ad2ae652fdea 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -173,8 +173,6 @@ void XclImpPCItem::ReadSxempty( XclImpStream& rStrm ) SetEmpty(); } - - XclImpPCField::XclImpPCField( const XclImpRoot& rRoot, XclImpPivotCache& rPCache, sal_uInt16 nFieldIdx ) : XclPCField( EXC_PCFIELD_UNKNOWN, nFieldIdx ), XclImpRoot( rRoot ), @@ -582,8 +580,6 @@ const sal_Int16* XclImpPCField::GetDateGroupStep() const return 0; } - - XclImpPivotCache::XclImpPivotCache( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maSrcRange( ScAddress::INITIALIZE_INVALID ), @@ -915,8 +911,6 @@ void XclImpPTItem::ConvertItem( ScDPSaveDimension& rSaveDim ) const } } - - XclImpPTField::XclImpPTField( const XclImpPivotTable& rPTable, sal_uInt16 nCacheIdx ) : mrPTable( rPTable ) { @@ -1191,8 +1185,6 @@ void XclImpPTField::ConvertItems( ScDPSaveDimension& rSaveDim ) const (*aIt)->ConvertItem( rSaveDim ); } - - XclImpPivotTable::XclImpPivotTable( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maDataOrientField( *this, EXC_SXIVD_DATA ), @@ -1356,8 +1348,6 @@ void XclImpPivotTable::ReadSxViewEx9( XclImpStream& rStrm ) rStrm >> maPTViewEx9Info; } - - void XclImpPivotTable::Convert() { if( !mxPCache || !mxPCache->IsValid() ) @@ -1525,8 +1515,6 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD } } - - XclImpPivotTableManager::XclImpPivotTableManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -1628,8 +1616,6 @@ void XclImpPivotTableManager::ReadSxViewEx9( XclImpStream& rStrm ) maPTables.back()->ReadSxViewEx9( rStrm ); } - - void XclImpPivotTableManager::ReadPivotCaches( XclImpStream& rStrm ) { for( XclImpPivotCacheVec::iterator aIt = maPCaches.begin(), aEnd = maPCaches.end(); aIt != aEnd; ++aIt ) @@ -1648,6 +1634,4 @@ void XclImpPivotTableManager::MaybeRefreshPivotTables() (*aIt)->MaybeRefresh(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index 1d0d4be3011d..77db4fbc121c 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -52,8 +52,6 @@ XclImpRootData::~XclImpRootData() { } - - XclImpRoot::XclImpRoot( XclImpRootData& rImpRootData ) : XclRoot( rImpRootData ), mrImpData( rImpRootData ) @@ -302,6 +300,4 @@ ScDocumentImport& XclImpRoot::GetDocImport() return *mrImpData.mxDocImport; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 448f7cffd023..5419b8305a9e 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -1122,6 +1122,4 @@ sal_uInt16 XclImpStream::ReadRawData( void* pData, sal_uInt16 nBytes ) return nRet; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx index 51b4a04d98dc..c4165dd8b9c8 100644 --- a/sc/source/filter/excel/xistring.cxx +++ b/sc/source/filter/excel/xistring.cxx @@ -27,8 +27,6 @@ /** All allowed flags for import. */ const XclStrFlags nAllowedFlags = EXC_STR_8BITLENGTH | EXC_STR_SMARTFLAGS | EXC_STR_SEPARATEFORMATS; - - XclImpString::XclImpString() { } @@ -202,6 +200,4 @@ XclImpStringIterator& XclImpStringIterator::operator++() return *this; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 55549cbc9fd8..e591b156b7af 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -482,8 +482,6 @@ void XclImpFont::GuessScriptType() } } - - XclImpFontBuffer::XclImpFontBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), maFont4( rRoot ), @@ -738,8 +736,6 @@ void XclImpCellProt::FillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) c } - - void XclImpCellAlign::FillFromXF2( sal_uInt8 nFlags ) { mnHorAlign = ::extract_value< sal_uInt8 >( nFlags, 0, 3 ); @@ -824,8 +820,6 @@ void XclImpCellAlign::FillToItemSet( SfxItemSet& rItemSet, const XclImpFont* pFo ScfTools::PutItem( rItemSet, SvxFrameDirectionItem( GetScFrameDir(), ATTR_WRITINGDIR ), bSkipPoolDefs ); } - - XclImpCellBorder::XclImpCellBorder() { SetUsedFlags( false, false ); @@ -990,8 +984,6 @@ void XclImpCellBorder::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& } } - - XclImpCellArea::XclImpCellArea() { SetUsedFlags( false ); @@ -1078,8 +1070,6 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& r } - - XclImpXF::XclImpXF( const XclImpRoot& rRoot ) : XclXFBase( true ), // default is cell XF XclImpRoot( rRoot ), @@ -1431,8 +1421,6 @@ void XclImpXF::SetUsedFlags( sal_uInt8 nUsedFlags ) mbAreaUsed = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_AREA )); } - - XclImpStyle::XclImpStyle( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), mnXfId( EXC_XF_NOTFOUND ), @@ -1525,8 +1513,6 @@ void XclImpStyle::CreateUserStyle( const OUString& rFinalName ) CreateStyleSheet(); } - - XclImpXFBuffer::XclImpXFBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -1690,8 +1676,6 @@ bool XclImpXFRange::Expand( const XclImpXFRange& rNextRange ) return false; } - - void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex ) { // List should be empty when inserting the default column format. @@ -1702,8 +1686,6 @@ void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex ) maIndexList.push_back( new XclImpXFRange( 0, MAXROW, rXFIndex ) ); } - - void XclImpXFRangeColumn::SetXF( SCROW nScRow, const XclImpXFIndex& rXFIndex ) { XclImpXFRange* pPrevRange; @@ -1854,8 +1836,6 @@ void XclImpXFRangeColumn::TryConcatPrev( sal_uLong nIndex ) maIndexList.erase( maIndexList.begin() + nIndex ); } - - XclImpXFRangeBuffer::XclImpXFRangeBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -2051,6 +2031,4 @@ void XclImpXFRangeBuffer::Finalize() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx index b4e196d151a5..e7b91d4d804f 100644 --- a/sc/source/filter/excel/xiview.cxx +++ b/sc/source/filter/excel/xiview.cxx @@ -83,8 +83,6 @@ long lclGetScZoom( sal_uInt16 nXclZoom, sal_uInt16 nDefZoom ) } // namespace - - XclImpTabViewSettings::XclImpTabViewSettings( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { @@ -293,6 +291,4 @@ void XclImpTabViewSettings::Finalize() rDoc.SetTabBgColor(nScTab, maData.maTabBgColor); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx index 829523de9268..0fec06888933 100644 --- a/sc/source/filter/excel/xladdress.cxx +++ b/sc/source/filter/excel/xladdress.cxx @@ -22,8 +22,6 @@ #include "xltracer.hxx" #include "xistream.hxx" - - void XclAddress::Read( XclImpStream& rStrm, bool bCol16Bit ) { mnRow = rStrm.ReaduInt16(); @@ -42,8 +40,6 @@ void XclAddress::Write( XclExpStream& rStrm, bool bCol16Bit ) const rStrm << static_cast< sal_uInt8 >( mnCol ); } - - bool XclRange::Contains( const XclAddress& rPos ) const { return (maFirst.mnCol <= rPos.mnCol) && (rPos.mnCol <= maLast.mnCol) && @@ -73,8 +69,6 @@ void XclRange::Write( XclExpStream& rStrm, bool bCol16Bit ) const rStrm << static_cast< sal_uInt8 >( maFirst.mnCol ) << static_cast< sal_uInt8 >( maLast.mnCol ); } - - XclRange XclRangeList::GetEnclosingRange() const { XclRange aXclRange; @@ -126,8 +120,6 @@ void XclRangeList::WriteSubList( XclExpStream& rStrm, size_t nBegin, size_t nCou aIt->Write( rStrm, bCol16Bit ); } - - XclAddressConverterBase::XclAddressConverterBase( XclTracer& rTracer, const ScAddress& rMaxPos ) : mrTracer( rTracer ), maMaxPos( rMaxPos ), @@ -156,6 +148,4 @@ bool XclAddressConverterBase::CheckScTab( SCTAB nScTab, bool bWarn ) return bValid; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index e49b2445280d..4c359250a01d 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -71,8 +71,6 @@ XclChRectangle::XclChRectangle() : { } - - XclChDataPointPos::XclChDataPointPos( sal_uInt16 nSeriesIdx, sal_uInt16 nPointIdx ) : mnSeriesIdx( nSeriesIdx ), mnPointIdx( nPointIdx ) @@ -85,8 +83,6 @@ bool operator<( const XclChDataPointPos& rL, const XclChDataPointPos& rR ) ((rL.mnSeriesIdx == rR.mnSeriesIdx) && (rL.mnPointIdx < rR.mnPointIdx)); } - - XclChFrBlock::XclChFrBlock( sal_uInt16 nType ) : mnType( nType ), mnContext( 0 ), @@ -103,8 +99,6 @@ XclChFramePos::XclChFramePos() : { } - - XclChLineFormat::XclChLineFormat() : maColor( COL_BLACK ), mnPattern( EXC_CHLINEFORMAT_SOLID ), @@ -113,8 +107,6 @@ XclChLineFormat::XclChLineFormat() : { } - - XclChAreaFormat::XclChAreaFormat() : maPattColor( COL_WHITE ), maBackColor( COL_BLACK ), @@ -123,8 +115,6 @@ XclChAreaFormat::XclChAreaFormat() : { } - - XclChEscherFormat::XclChEscherFormat() { } @@ -133,8 +123,6 @@ XclChEscherFormat::~XclChEscherFormat() { } - - XclChPicFormat::XclChPicFormat() : mnBmpMode( EXC_CHPICFORMAT_NONE ), mnFlags( EXC_CHPICFORMAT_TOPBOTTOM | EXC_CHPICFORMAT_FRONTBACK | EXC_CHPICFORMAT_LEFTRIGHT ), @@ -142,8 +130,6 @@ XclChPicFormat::XclChPicFormat() : { } - - XclChFrame::XclChFrame() : mnFormat( EXC_CHFRAME_STANDARD ), mnFlags( EXC_CHFRAME_AUTOSIZE | EXC_CHFRAME_AUTOPOS ) @@ -167,15 +153,11 @@ XclChObjectLink::XclChObjectLink() : { } - - XclChFrLabelProps::XclChFrLabelProps() : mnFlags( 0 ) { } - - XclChText::XclChText() : maTextColor( COL_BLACK ), mnHAlign( EXC_CHTEXT_ALIGN_CENTER ), @@ -198,24 +180,18 @@ XclChMarkerFormat::XclChMarkerFormat() : { }; - - XclCh3dDataFormat::XclCh3dDataFormat() : mnBase( EXC_CH3DDATAFORMAT_RECT ), mnTop( EXC_CH3DDATAFORMAT_STRAIGHT ) { } - - XclChDataFormat::XclChDataFormat() : mnFormatIdx( EXC_CHDATAFORMAT_DEFAULT ), mnFlags( 0 ) { } - - XclChSerTrendLine::XclChSerTrendLine() : mfForecastFor( 0.0 ), mfForecastBack( 0.0 ), @@ -231,8 +207,6 @@ XclChSerTrendLine::XclChSerTrendLine() : pDouble->w32_parts.msw = pDouble->w32_parts.lsw = 0xFFFFFFFF; } - - XclChSerErrorBar::XclChSerErrorBar() : mfValue( 0.0 ), mnValueCount( 1 ), @@ -242,8 +216,6 @@ XclChSerErrorBar::XclChSerErrorBar() : { } - - XclChSeries::XclChSeries() : mnCategType( EXC_CHSERIES_NUMERIC ), mnValueType( EXC_CHSERIES_NUMERIC ), @@ -267,8 +239,6 @@ XclChType::XclChType() : { } - - XclChChart3d::XclChChart3d() : mnRotation( 20 ), mnElevation( 15 ), @@ -280,8 +250,6 @@ XclChChart3d::XclChChart3d() : { } - - XclChLegend::XclChLegend() : mnDockMode( EXC_CHLEGEND_RIGHT ), mnSpacing( EXC_CHLEGEND_MEDIUM ), @@ -290,16 +258,12 @@ XclChLegend::XclChLegend() : { } - - XclChTypeGroup::XclChTypeGroup() : mnFlags( 0 ), mnGroupIdx( EXC_CHSERGROUP_NONE ) { } - - XclChProperties::XclChProperties() : mnFlags( 0 ), mnEmptyMode( EXC_CHPROPS_EMPTY_SKIP ) @@ -316,8 +280,6 @@ XclChLabelRange::XclChLabelRange() : { } - - XclChDateRange::XclChDateRange() : mnMinDate( 0 ), mnMaxDate( 0 ), @@ -334,8 +296,6 @@ XclChDateRange::XclChDateRange() : { } - - XclChValueRange::XclChValueRange() : mfMin( 0.0 ), mfMax( 0.0 ), @@ -348,8 +308,6 @@ XclChValueRange::XclChValueRange() : { } - - XclChTick::XclChTick() : maTextColor( COL_BLACK ), mnMajor( EXC_CHTICK_INSIDE | EXC_CHTICK_OUTSIDE ), @@ -361,8 +319,6 @@ XclChTick::XclChTick() : { } - - XclChAxis::XclChAxis() : mnType( EXC_CHAXIS_NONE ) { @@ -380,8 +336,6 @@ sal_Int32 XclChAxis::GetApiAxisDimension() const return nApiAxisDim; } - - XclChAxesSet::XclChAxesSet() : mnAxesSetId( EXC_CHAXESSET_PRIMARY ) { @@ -492,8 +446,6 @@ static const XclChFormatInfo spFmtInfos[] = } - - XclChFormatInfoProvider::XclChFormatInfoProvider() { const XclChFormatInfo* pEnd = STATIC_ARRAY_END( spFmtInfos ); @@ -561,8 +513,6 @@ void XclChExtTypeInfo::Set( const XclChTypeInfo& rTypeInfo, bool b3dChart, bool mbSpline = bSpline; } - - XclChTypeInfoProvider::XclChTypeInfoProvider() { const XclChTypeInfo* pEnd = STATIC_ARRAY_END( spTypeInfos ); @@ -694,8 +644,6 @@ const sal_Char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "Fill } // namespace - - XclChPropSetHelper::XclChPropSetHelper() : maLineHlpCommon( sppcLineNamesCommon ), maLineHlpLinear( sppcLineNamesLinear ), @@ -1231,8 +1179,6 @@ ScfPropSetHelper& XclChPropSetHelper::GetHatchHelper( XclChPropertyMode ePropMod return maHatchHlpCommon; } - - namespace { /* The following local functions implement getting the XShape interface of all @@ -1273,8 +1219,6 @@ EXC_DEFINEFUNC_GETAXISTITLESHAPE( lclGetSecYAxisTitleShape, XSecondAxisTitleSupp } // namespace - - XclChRootData::XclChRootData() : mxTypeInfoProv( new XclChTypeInfoProvider ), mxFmtInfoProv( new XclChFormatInfoProvider ), @@ -1343,6 +1287,4 @@ Reference< XShape > XclChRootData::GetTitleShape( const XclChTextKey& rTitleKey return xTitleShape; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index e1787d21bc19..2d6d29e29c8b 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -134,8 +134,6 @@ sal_uInt16 lclGetEmbeddedScale( long nPageSize, sal_Int32 nPageScale, long nPos, } // namespace - - XclObjAnchor::XclObjAnchor() : mnLX( 0 ), mnTY( 0 ), @@ -206,8 +204,6 @@ void XclObjAnchor::SetRect( const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 Set( 0, 0, 0, 0 ); } - - XclObjLineData::XclObjLineData() : mnColorIdx( EXC_OBJ_LINE_AUTOCOLOR ), mnStyle( EXC_OBJ_LINE_SOLID ), @@ -225,8 +221,6 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData ) >> rLineData.mnAuto; } - - XclObjFillData::XclObjFillData() : mnBackColorIdx( EXC_OBJ_LINE_AUTOCOLOR ), mnPattColorIdx( EXC_OBJ_FILL_AUTOCOLOR ), @@ -244,8 +238,6 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData ) >> rFillData.mnAuto; } - - XclObjTextData::XclObjTextData() : mnTextLen( 0 ), mnFormatSize( 0 ), @@ -287,8 +279,6 @@ void XclObjTextData::ReadTxo8( XclImpStream& rStrm ) rStrm >> mnFlags >> mnOrient >> mnButtonFlags >> mnShortcut >> mnShortcutEA >> mnTextLen >> mnFormatSize; } - - Reference< XControlModel > XclControlHelper::GetControlModel( Reference< XShape > xShape ) { Reference< XControlModel > xCtrlModel; @@ -342,6 +332,4 @@ OUString XclControlHelper::ExtractFromMacroDescriptor( return OUString(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index e7222a75639d..b15cb426a586 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -594,8 +594,6 @@ static const XclFunctionInfo saFuncTable_OOoLO[] = #undef EXC_FUNCENTRY_OOO - - XclFunctionProvider::XclFunctionProvider( const XclRoot& rRoot ) { void (XclFunctionProvider::*pFillFunc)( const XclFunctionInfo*, const XclFunctionInfo* ) = @@ -759,8 +757,6 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArrayRef& rxTokArr return rStrm; } - - XclTokenArrayIterator::XclTokenArrayIterator() : mppScTokenBeg( 0 ), mppScTokenEnd( 0 ), @@ -955,6 +951,4 @@ bool XclTokenArrayHelper::GetMultipleOpRefs( return eState == stClose; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx index e9a96fa41e98..0cccec7f7349 100644 --- a/sc/source/filter/excel/xlpage.cxx +++ b/sc/source/filter/excel/xlpage.cxx @@ -261,6 +261,4 @@ void XclPageData::SetScPaperSize( const Size& rSize, bool bPortrait, bool bStric SetScPaperSize( rSize, bPortrait, true ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 8010d89cbb9a..ef4be100aaf6 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -109,8 +109,6 @@ void XclPCItem::SetBool( bool bValue ) mbValue = bValue; } - - bool XclPCItem::IsEqual( const XclPCItem& rItem ) const { if( meType == rItem.meType ) switch( meType ) @@ -413,8 +411,6 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedNam return rStrm; } - - const OUString* XclPTVisNameInfo::GetVisName() const { return HasVisName() ? &maVisName.maName : 0; @@ -935,8 +931,6 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo ) << EXC_PT_NOSTRING; // length of vacate style name } - - // Pivot table autoformat settings ============================================ /** diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index bf12dab002dc..2bb35751b2ea 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -75,8 +75,6 @@ XclDebugObjCounter::~XclDebugObjCounter() } #endif - - XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium, SotStorageRef xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc, bool bExport ) : meBiff( eBiff ), @@ -160,8 +158,6 @@ XclRootData::~XclRootData() { } - - XclRoot::XclRoot( XclRootData& rRootData ) : mrData( rRootData ) { @@ -408,6 +404,4 @@ XclTracer& XclRoot::GetTracer() const return *mrData.mxTracer; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index d237a9b4ce4f..d2bf5e4d48b0 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -85,8 +85,6 @@ static const ColorData spnDefColorTable8[] = #undef EXC_PALETTE_EGA_COLORS_LIGHT #undef EXC_PALETTE_EGA_COLORS_DARK - - XclDefaultPalette::XclDefaultPalette( const XclRoot& rRoot ) : mpnColorTable( 0 ), mnTableSize( 0 ) @@ -169,8 +167,6 @@ namespace AwtFontFamily = Awt::FontFamily; namespace AwtFontUnderline = Awt::FontUnderline; namespace AwtFontStrikeout = Awt::FontStrikeout; - - XclFontData::XclFontData() { Clear(); @@ -517,8 +513,6 @@ void XclFontData::SetApiStrikeout( sal_Int16 nApiStrikeout ) (nApiStrikeout != AwtFontStrikeout::DONTKNOW); } - - bool operator==( const XclFontData& rLeft, const XclFontData& rRight ) { return @@ -536,8 +530,6 @@ bool operator==( const XclFontData& rLeft, const XclFontData& rRight ) (rLeft.maName == rRight.maName); } - - namespace { /** Property names for common font settings. */ @@ -614,8 +606,6 @@ void lclWriteChartFont( ScfPropertySet& rPropSet, } // namespace - - XclFontPropSetHelper::XclFontPropSetHelper() : maHlpChCommon( sppcPropNamesChCommon ), maHlpChWstrn( sppcPropNamesChWstrn ), @@ -766,8 +756,6 @@ ScfPropSetHelper& XclFontPropSetHelper::GetChartHelper( sal_Int16 nScript ) namespace { - - /** Special number format index describing a reused format. */ const NfIndexTableOffset PRV_NF_INDEX_REUSE = NF_INDEX_TABLE_ENTRIES; @@ -778,8 +766,6 @@ const LanguageType PRV_LANGUAGE_FRENCH_PRIM = LANGUAGE_FRENCH & LANGUAGE_MASK_PR /** Parent language identifier for Asian languages. */ const LanguageType PRV_LANGUAGE_ASIAN_PRIM = LANGUAGE_CHINESE & LANGUAGE_MASK_PRIMARY; - - /** Stores the number format used in Calc for an Excel built-in number format. */ struct XclBuiltInFormat { @@ -789,8 +775,6 @@ struct XclBuiltInFormat sal_uInt16 mnXclReuseFmt; /// Use this Excel format, if meOffset==PRV_NF_INDEX_REUSE. }; - - /** Defines a literal Excel built-in number format. */ #define EXC_NUMFMT_STRING( nXclNumFmt, pcUtf8 ) \ { nXclNumFmt, pcUtf8, NF_NUMBER_STANDARD, 0 } @@ -807,8 +791,6 @@ struct XclBuiltInFormat #define EXC_NUMFMT_ENDTABLE() \ { EXC_FORMAT_NOTFOUND, 0, NF_NUMBER_STANDARD, 0 } - - // Currency unit characters #define UTF8_BAHT "\340\270\277" #define UTF8_EURO "\342\202\254" @@ -837,8 +819,6 @@ struct XclBuiltInFormat #define UTF8_KO_MIN "\353\266\204" #define UTF8_KO_SEC "\354\264\210" - - /** Default number format table. Last parent of all other tables, used for unknown languages. */ static const XclBuiltInFormat spBuiltInFormats_DONTKNOW[] = { @@ -1410,15 +1390,11 @@ static const XclBuiltInFormat spBuiltInFormats_THAI[] = EXC_NUMFMT_ENDTABLE() }; - - #undef EXC_NUMFMT_ENDTABLE #undef EXC_NUMFMT_REUSE #undef EXC_NUMFMT_OFFSET #undef EXC_NUMFMT_STRING - - /** Specifies a number format table for a specific language. */ struct XclBuiltInFormatTable { @@ -1471,12 +1447,8 @@ static const XclBuiltInFormatTable spBuiltInFormatTables[] = { LANGUAGE_THAI, LANGUAGE_DONTKNOW, spBuiltInFormats_THAI } }; - - } // namespace - - XclNumFmtBuffer::XclNumFmtBuffer( const XclRoot& rRoot ) : meSysLang( rRoot.GetSysLanguage() ), mnStdScNumFmt( rRoot.GetFormatter().GetStandardFormat( ScGlobal::eLnge ) ) @@ -1570,8 +1542,6 @@ bool operator==( const XclCellProt& rLeft, const XclCellProt& rRight ) return (rLeft.mbLocked == rRight.mbLocked) && (rLeft.mbHidden == rRight.mbHidden); } - - XclCellAlign::XclCellAlign() : mnHorAlign( EXC_XF_HOR_GENERAL ), mnVerAlign( EXC_XF_VER_BOTTOM ), @@ -1689,8 +1659,6 @@ bool operator==( const XclCellAlign& rLeft, const XclCellAlign& rRight ) (rLeft.mbLineBreak == rRight.mbLineBreak) && (rLeft.mbShrink == rRight.mbShrink); } - - XclCellBorder::XclCellBorder() : mnLeftColor( 0 ), mnRightColor( 0 ), @@ -1718,8 +1686,6 @@ bool operator==( const XclCellBorder& rLeft, const XclCellBorder& rRight ) (rLeft.mbDiagTLtoBR == rRight.mbDiagTLtoBR) && (rLeft.mbDiagBLtoTR == rRight.mbDiagBLtoTR); } - - XclCellArea::XclCellArea() : mnForeColor( EXC_COLOR_WINDOWTEXT ), mnBackColor( EXC_COLOR_WINDOWBACK ), @@ -1739,8 +1705,6 @@ bool operator==( const XclCellArea& rLeft, const XclCellArea& rRight ) (rLeft.mnPattern == rRight.mnPattern); } - - XclXFBase::XclXFBase( bool bCellXF ) : mnParent( bCellXF ? EXC_XF_DEFAULTSTYLE : EXC_XF_STYLEPARENT ), mbCellXF( bCellXF ) @@ -1771,6 +1735,4 @@ bool XclXFBase::Equals( const XclXFBase& rCmp ) const (mbBorderUsed == rCmp.mbBorderUsed) && (mbAreaUsed == rCmp.mbAreaUsed); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index e285bebd4edc..33aa2a43ea1b 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -67,8 +67,6 @@ OUString MSOExcelCommandConvertor::MSOTCIDToOOCommand( sal_Int16 key ) return sResult; } - - CTBS::CTBS() : bSignature(0), bVersion(0), reserved1(0), reserved2(0), reserved3(0), ctb(0), ctbViews(0), ictbView(0) { } diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index ce6e64611d86..f436152a60b6 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -728,6 +728,4 @@ XclExpStream& operator<<( XclExpStream& rStrm, const Color& rColor ) return rStrm << rColor.GetRed() << rColor.GetGreen() << rColor.GetBlue() << sal_uInt8( 0 ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx index a18b76decdab..6c7e632aebca 100644 --- a/sc/source/filter/excel/xltracer.cxx +++ b/sc/source/filter/excel/xltracer.cxx @@ -146,6 +146,4 @@ void XclTracer::TraceDVType( bool bType) ProcessTraceOnce(eDVType); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx index 0942f25d49bc..eb540a66def5 100644 --- a/sc/source/filter/excel/xlview.cxx +++ b/sc/source/filter/excel/xlview.cxx @@ -35,8 +35,6 @@ XclDocViewData::XclDocViewData() : { } - - XclTabViewData::XclTabViewData() : maFirstXclPos( ScAddress::UNINITIALIZED ), maSecondXclPos( ScAddress::UNINITIALIZED ) @@ -101,6 +99,4 @@ XclSelectionData& XclTabViewData::CreateSelectionData( sal_uInt8 nPane ) return *rxSelData; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 22a386487dba..1384c7ddbd31 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -278,8 +278,6 @@ void ScfPropertySet::SetProperties( const Sequence< OUString >& rPropNames, cons } } - - ScfPropSetHelper::ScfPropSetHelper( const sal_Char* const* ppcPropNames ) : mnNextIdx( 0 ) { @@ -384,6 +382,4 @@ Any* ScfPropSetHelper::GetNextAny() return pAny; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index 379850f3d964..bc3980d30a4f 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.cxx @@ -21,8 +21,6 @@ #include "global.hxx" #include "progress.hxx" - - ScfProgressBar::ScfProgressSegment::ScfProgressSegment( sal_Size nSize ) : mxProgress( 0 ), mnSize( nSize ), @@ -34,8 +32,6 @@ ScfProgressBar::ScfProgressSegment::~ScfProgressSegment() { } - - ScfProgressBar::ScfProgressBar( SfxObjectShell* pDocShell, const OUString& rText ) : maText( rText ) { @@ -194,8 +190,6 @@ void ScfProgressBar::Progress( sal_Size nDelta ) ProgressAbs( mpCurrSegment ? (mpCurrSegment->mnPos + nDelta) : 0 ); } - - ScfSimpleProgressBar::ScfSimpleProgressBar( sal_Size nSize, SfxObjectShell* pDocShell, const OUString& rText ) : maProgress( pDocShell, rText ) { @@ -237,6 +231,4 @@ void ScfStreamProgressBar::Init( SfxObjectShell* pDocShell, const OUString& rTex Progress(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 0787d204803b..2c56e435e766 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -86,8 +86,6 @@ using ::editeng::SvxBorderLine; using namespace ::com::sun::star; - - const static sal_Char sMyBegComment[] = "<!-- "; const static sal_Char sMyEndComment[] = " -->"; const static sal_Char sFontFamily[] = "font-family:"; @@ -130,8 +128,6 @@ const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] = - - FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const OUString& rBaseURL, ScDocument* pDoc, const ScRange& rRange, const rtl_TextEncoding /*eNach*/, bool bAll, const OUString& rStreamPath, OUString& rNonConvertibleChars ) @@ -206,8 +202,6 @@ static OString lcl_makeHTMLColorTriplet(const Color& rColor) return aStr.makeStringAndClear(); } - - ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const OUString& rBaseURL, ScDocument* pDocP, const ScRange& rRangeP, bool bAllP, const OUString& rStreamPathP ) : @@ -765,8 +759,6 @@ void ScHTMLExport::WriteTables() } } - - // <TBODY> // Re-enable only when THEAD and TFOOT are exported // IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tbody ); // At least old (3.x, 4.x?) Netscape doesn't follow <TABLE COLS=n> and diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index d0e69151c9f3..0c5fcdfa6817 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -40,8 +40,6 @@ using namespace com::sun::star; - - void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { @@ -238,6 +236,4 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf, } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index 496f57ba17b8..aae71d568564 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -43,8 +43,6 @@ #include "tokenarray.hxx" - - FltError ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc, ScRange& rRange, double nOutputFactor, bool bCalcWidthHeight, SvNumberFormatter* pFormatter, bool bConvertDate ) diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index fbcfbf5bfeae..0789782f421d 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -213,8 +213,6 @@ ScDocument& ScHTMLParser::GetDoc() return *mpDoc; } - - ScHTMLLayoutParser::ScHTMLLayoutParser( EditEngine* pEditP, const OUString& rBaseURL, const Size& aPageSizeP, ScDocument* pDocP ) : @@ -1762,8 +1760,6 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) } - - // HTML DATA QUERY PARSER @@ -1823,8 +1819,6 @@ void ScHTMLEntry::Strip( const EditEngine& rEditEngine ) } } - - /** A map of ScHTMLTable objects. Organizes the tables with a unique table key. Stores nested tables inside @@ -1872,8 +1866,6 @@ private: { if( pTable ) mpCurrTable = pTable; } }; - - ScHTMLTableMap::ScHTMLTableMap( ScHTMLTable& rParentTable ) : mrParentTable(rParentTable), mpCurrTable(NULL) @@ -1913,8 +1905,6 @@ ScHTMLTable* ScHTMLTableMap::CreateTable( const ImportInfo& rInfo, bool bPreForm return pTable; } - - /** Simplified forward iterator for convenience. Before the iterator can be dereferenced, it must be tested with the is() @@ -1949,8 +1939,6 @@ ScHTMLTableIterator::ScHTMLTableIterator( const ScHTMLTableMap* pTableMap ) : } } - - ScHTMLTableAutoId::ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ) : mnTableId( rnUnusedId ), mrnUnusedId( rnUnusedId ) @@ -1958,8 +1946,6 @@ ScHTMLTableAutoId::ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ) : ++mrnUnusedId; } - - ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const ImportInfo& rInfo, bool bPreFormText ) : mpParentTable( &rParentTable ), maTableId( rParentTable.maTableId.mrnUnusedId ), @@ -2417,8 +2403,6 @@ SvNumberFormatter* ScHTMLTable::GetFormatTable() return mpParser->GetDoc().GetFormatTable(); } - - bool ScHTMLTable::IsEmptyCell() const { return mpCurrEntryList && mpCurrEntryList->empty(); @@ -2709,8 +2693,6 @@ void ScHTMLTable::CalcNeededDocSize( SetDocSize( eOrient, nCellPos, nRealDocSize ); } - - void ScHTMLTable::FillEmptyCells() { for( ScHTMLTableIterator aIter( mxNestedTables.get() ); aIter.is(); ++aIter ) @@ -2883,8 +2865,6 @@ void ScHTMLTable::RecalcDocPos( const ScHTMLPos& rBasePos ) } } - - ScHTMLGlobalTable::ScHTMLGlobalTable( SfxItemPool& rPool, EditEngine& rEditEngine, @@ -2910,8 +2890,6 @@ void ScHTMLGlobalTable::Recalc() RecalcDocPos( GetDocPos() ); } - - ScHTMLQueryParser::ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ) : ScHTMLParser( pEditEngine, pDoc ), mnUnusedId( SC_HTML_GLOBAL_TABLE ), @@ -3273,8 +3251,6 @@ void ScHTMLQueryParser::ParseStyle(const OUString&) {} #endif - - IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, const ImportInfo*, pInfo ) { switch( pInfo->eState ) @@ -3307,6 +3283,4 @@ IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, const ImportInfo*, pInfo ) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index b392de9232f9..f16539dcb08e 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -614,8 +614,6 @@ public: void WriteXml( XclExpXmlStream& rStrm ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index fc5a6ec225d4..e9ecb98d8c0b 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -27,16 +27,12 @@ #include "imp_op.hxx" - - struct ScCellValue; class ScChangeAction; class ScChangeTrack; class XclImpChTrFmlConverter; - - struct XclImpChTrRecHeader { sal_uInt32 nSize; @@ -51,8 +47,6 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecH return rStrm; } - - class XclImpChangeTrack : protected XclImpRoot { private: @@ -179,8 +173,6 @@ inline XclImpChTrFmlConverter::XclImpChTrFmlConverter( { } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index 7691557aaf78..8811c1407c72 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -31,8 +31,6 @@ namespace xls { class BiffInputStream; - - /** A vector of com.sun.star.table.CellRangeAddress elements and additional functionality. */ class ApiCellRangeList : public ::std::vector< ::com::sun::star::table::CellRangeAddress > @@ -45,8 +43,6 @@ public: getBaseAddress() const; }; - - /** A 2D cell address struct for binary filters. */ struct BinAddress { @@ -64,8 +60,6 @@ struct BinAddress void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); }; - - inline bool operator==( const BinAddress& rL, const BinAddress& rR ) { return (rL.mnCol == rR.mnCol) && (rL.mnRow == rR.mnRow); @@ -88,8 +82,6 @@ inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinAddress& orPos ) return rStrm; } - - /** A 2D cell range address struct for binary filters. */ struct BinRange { @@ -121,8 +113,6 @@ struct BinRange void read( BiffInputStream& rStrm, bool bCol16Bit = true, bool bRow32Bit = false ); }; - - inline bool operator==( const BinRange& rL, const BinRange& rR ) { return (rL.maFirst == rR.maFirst) && (rL.maLast == rR.maLast); @@ -145,8 +135,6 @@ inline BiffInputStream& operator>>( BiffInputStream& rStrm, BinRange& orRange ) return rStrm; } - - /** A 2D cell range address list for binary filters. */ class BinRangeList : public ::std::vector< BinRange > { @@ -156,16 +144,12 @@ public: void read( SequenceInputStream& rStrm ); }; - - inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, BinRangeList& orRanges ) { orRanges.read( rStrm ); return rStrm; } - - /** Different target types that can be encoded in a BIFF URL. */ enum BiffTargetType { @@ -177,8 +161,6 @@ enum BiffTargetType }; - - /** Converter for cell addresses and cell ranges for OOXML and BIFF filters. */ class AddressConverter : public WorkbookHelper @@ -186,8 +168,6 @@ class AddressConverter : public WorkbookHelper public: explicit AddressConverter( const WorkbookHelper& rHelper ); - - /** Tries to parse the passed string for a 2d cell address in A1 notation. This function accepts all strings that match the regular expression @@ -241,8 +221,6 @@ public: sal_Int32 nStart = 0, sal_Int32 nLength = SAL_MAX_INT32 ); - - /** Returns the biggest valid cell address in the own Calc document. */ inline const ::com::sun::star::table::CellAddress& getMaxApiAddress() const { return maMaxApiPos; } @@ -264,8 +242,6 @@ public: /** Returns the sheet overflow status. */ inline bool isTabOverflow() const { return mbTabOverflow; } - - /** Checks if the passed column index is valid. @param nCol The column index to check. @@ -293,8 +269,6 @@ public: */ bool checkTab( sal_Int16 nSheet, bool bTrackOverflow ); - - /** Checks the passed cell address if it fits into the spreadsheet limits. @param rAddress The cell address to be checked. @@ -394,8 +368,6 @@ public: sal_Int16 nSheet, bool bTrackOverflow ); - - /** Checks the passed cell range if it fits into the spreadsheet limits. @param rRange The cell range address to be checked. @@ -528,8 +500,6 @@ public: sal_Int16 nSheet, bool bAllowOverflow, bool bTrackOverflow ); - - /** Tries to restrict the passed cell range list to current sheet limits. @param orRanges (in-out-parameter) Restricts the cell range addresses @@ -613,8 +583,6 @@ private: bool mbTabOverflow; /// Flag for "tables overflow". }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index 6507a1874ee4..848e33793019 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -33,8 +33,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Contains UNO API filter settings for a column in a filtered range. */ struct ApiFilterSettings { @@ -50,8 +48,6 @@ struct ApiFilterSettings void appendField( bool bAnd, const std::vector<OUString>& rValues ); }; - - /** Base class for specific filter settings for a column in a filtered range. */ class FilterSettingsBase : public WorkbookHelper @@ -70,8 +66,6 @@ public: typedef ::boost::shared_ptr< FilterSettingsBase > FilterSettingsRef; - - /** Settings for a discrete filter, specifying a list of values to be shown in the filtered range. */ @@ -96,8 +90,6 @@ private: bool mbShowBlank; }; - - /** Settings for a top-10 filter. */ class Top10Filter : public FilterSettingsBase { @@ -118,8 +110,6 @@ private: bool mbPercent; /// True = percentage, false = number of items. }; - - /** A filter criterion for a custom filter. */ struct FilterCriterionModel { @@ -137,8 +127,6 @@ struct FilterCriterionModel void readBiffData( SequenceInputStream& rStrm ); }; - - /** Settings for a custom filter, specifying one or two comparison operators associated with some values. */ @@ -166,8 +154,6 @@ private: bool mbAnd; }; - - /** A column in a filtered range. Contains an object with specific filter settings for the cells in the column. */ @@ -200,8 +186,6 @@ private: bool mbShowButton; }; - - class AutoFilter : public WorkbookHelper { public: @@ -227,8 +211,6 @@ private: ::com::sun::star::table::CellRangeAddress maRange; }; - - class AutoFilterBuffer : public WorkbookHelper { public: @@ -254,8 +236,6 @@ private: AutoFilterVector maAutoFilters; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/autofiltercontext.hxx b/sc/source/filter/inc/autofiltercontext.hxx index 8c958189c0b6..d4946addf663 100644 --- a/sc/source/filter/inc/autofiltercontext.hxx +++ b/sc/source/filter/inc/autofiltercontext.hxx @@ -29,8 +29,6 @@ class AutoFilter; class FilterColumn; class FilterSettingsBase; - - class FilterSettingsContext : public WorksheetContextBase { public: @@ -47,8 +45,6 @@ private: FilterSettingsBase& mrFilterSettings; }; - - class FilterColumnContext : public WorksheetContextBase { public: @@ -65,8 +61,6 @@ private: FilterColumn& mrFilterColumn; }; - - class AutoFilterContext : public WorksheetContextBase { public: @@ -83,8 +77,6 @@ private: AutoFilter& mrAutoFilter; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 8031fbbc6b87..306f7ccbaccf 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -28,12 +28,8 @@ namespace oox { namespace xls { - - const sal_Int64 BIFF_RCF_BLOCKSIZE = 1024; - - /** Base class for BIFF stream decoders. */ class BiffDecoderBase : public ::comphelper::IDocPasswordVerifier { @@ -80,8 +76,6 @@ private: typedef ::boost::shared_ptr< BiffDecoderBase > BiffDecoderRef; - - /** Decodes BIFF stream contents that are encoded using the old XOR algorithm. */ class BiffDecoder_XOR : public BiffDecoderBase { @@ -111,8 +105,6 @@ private: sal_uInt16 mnHash; }; - - /** Decodes BIFF stream contents that are encoded using the RC4 algorithm. */ class BiffDecoder_RCF : public BiffDecoderBase { @@ -142,8 +134,6 @@ private: ::std::vector< sal_uInt8 > maVerifierHash; }; - - /** Helper for BIFF stream codecs. Holds the used codec object. */ class BiffCodecHelper : public WorkbookHelper { @@ -157,8 +147,6 @@ private: BiffDecoderRef mxDecoder; /// The decoder for import filter. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx index 77851dc0fdad..c209f668d53b 100644 --- a/sc/source/filter/inc/biffhelper.hxx +++ b/sc/source/filter/inc/biffhelper.hxx @@ -588,8 +588,6 @@ const sal_uInt8 BIFF_STRF_PHONETIC = 0x04; const sal_uInt8 BIFF_STRF_RICH = 0x08; const sal_uInt8 BIFF_STRF_UNKNOWN = 0xF2; - - /** Static helper functions for BIFF filters. */ class BiffHelper { @@ -633,8 +631,6 @@ private: ~BiffHelper(); // not implemented }; - - /** BIFF12 stream operator for an OUString, reads 32-bit string length and Unicode array. */ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, OUString& orString ) { @@ -642,8 +638,6 @@ inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, OUString& or return rStrm; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 11f324677bbd..c015823285b9 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -29,8 +29,6 @@ namespace oox { namespace xls { - - namespace prv { /** Buffers the contents of a raw record and encapsulates stream decoding. */ @@ -102,8 +100,6 @@ private: } // namespace prv - - /** This class is used to read BIFF record streams. An instance is constructed with a BinaryInputStream object. The passed @@ -335,8 +331,6 @@ private: bool mbCont; /// True = automatic CONTINUE lookup enabled. }; - - class BiffInputStreamPos { public: @@ -352,8 +346,6 @@ private: sal_Int64 mnRecPos; }; - - /** Stores the current position of the passed stream on construction and restores it automatically on destruction. */ class BiffInputStreamPosGuard : private BiffInputStreamPos @@ -363,8 +355,6 @@ public: ~BiffInputStreamPosGuard(); }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx index cc9e9449dbbc..48dae48f19c5 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -25,8 +25,6 @@ namespace oox { namespace xls { - - class ChartsheetFragment : public WorksheetFragmentBase { public: diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index f46795f7bb3b..cce007e0b643 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -23,8 +23,6 @@ #include "xiroot.hxx" #include <mdds/flat_segment_tree.hpp> - - class XclImpColRowSettings : protected XclImpRoot { public: @@ -74,8 +72,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index 68fb1636e89e..522c4c596339 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -27,8 +27,6 @@ namespace oox { namespace xls { - - struct CommentModel { ::com::sun::star::table::CellRangeAddress @@ -51,8 +49,6 @@ struct CommentModel explicit CommentModel(); }; - - class Comment : public WorksheetHelper { public: @@ -77,8 +73,6 @@ private: typedef ::boost::shared_ptr< Comment > CommentRef; - - class CommentsBuffer : public WorksheetHelper { public: @@ -100,8 +94,6 @@ private: CommentVector maComments; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx index 97a59ace922b..2ef52b067ed5 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - class CommentsFragment : public WorksheetFragmentBase { public: @@ -54,8 +52,6 @@ private: CommentRef mxComment; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index dbe4d8d53586..22ef3d9abf2c 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -41,8 +41,6 @@ namespace xls { class CondFormat; - - /** Model for a single rule in a conditional formatting. */ struct CondFormatRuleModel { @@ -145,8 +143,6 @@ private: - - /** Represents a single rule in a conditional formatting. */ class CondFormatRule : public WorksheetHelper { @@ -182,8 +178,6 @@ private: typedef ::boost::shared_ptr< CondFormatRule > CondFormatRuleRef; - - /** Model for a conditional formatting object. */ struct CondFormatModel { @@ -193,8 +187,6 @@ struct CondFormatModel explicit CondFormatModel(); }; - - /** Represents a conditional formatting object with a list of affected cell ranges. */ class CondFormat : public WorksheetHelper { @@ -273,8 +265,6 @@ public: typedef ::boost::shared_ptr< CondFormat > CondFormatRef; typedef ::boost::shared_ptr< ExtCfRule > ExtCfRuleRef; - - class CondFormatBuffer : public WorksheetHelper { public: @@ -300,8 +290,6 @@ private: ExtCfRuleVec maCfRules; /// All external conditional formatting rules in a sheet. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx index c2fc442e81fb..4324dfba0472 100644 --- a/sc/source/filter/inc/condformatcontext.hxx +++ b/sc/source/filter/inc/condformatcontext.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - class CondFormatContext; class ColorScaleContext : public WorksheetContextBase @@ -85,8 +83,6 @@ private: CondFormatRuleRef mxRule; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/connectionsbuffer.hxx b/sc/source/filter/inc/connectionsbuffer.hxx index 7e86049a4c35..0115ad696dd1 100644 --- a/sc/source/filter/inc/connectionsbuffer.hxx +++ b/sc/source/filter/inc/connectionsbuffer.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - const sal_Int32 BIFF12_CONNECTION_UNKNOWN = 0; const sal_Int32 BIFF12_CONNECTION_ODBC = 1; const sal_Int32 BIFF12_CONNECTION_DAO = 2; @@ -38,8 +36,6 @@ const sal_Int32 BIFF12_CONNECTION_TEXT = 6; const sal_Int32 BIFF12_CONNECTION_ADO = 7; const sal_Int32 BIFF12_CONNECTION_DSP = 8; - - /** Special properties for data connections representing web queries. */ struct WebPrModel { @@ -63,8 +59,6 @@ struct WebPrModel explicit WebPrModel(); }; - - /** Common properties of an external data connection. */ struct ConnectionModel { @@ -95,8 +89,6 @@ struct ConnectionModel WebPrModel& createWebPr(); }; - - /** An external data connection (database, web query, etc.). */ class Connection : public WorkbookHelper { @@ -134,8 +126,6 @@ private: typedef ::boost::shared_ptr< Connection > ConnectionRef; - - class ConnectionsBuffer : public WorkbookHelper { public: @@ -163,8 +153,6 @@ private: sal_Int32 mnUnusedId; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx index 5b4ecd2cb97c..bb8939281720 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -27,8 +27,6 @@ namespace xls { class Connection; - - class ConnectionContext : public WorkbookContextBase { public: @@ -45,8 +43,6 @@ private: Connection& mrConnection; }; - - class ConnectionsFragment : public WorkbookFragmentBase { public: @@ -62,8 +58,6 @@ protected: virtual void finalizeImport() SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/defnamesbuffer.hxx b/sc/source/filter/inc/defnamesbuffer.hxx index 301ac815a656..489fb0813b41 100644 --- a/sc/source/filter/inc/defnamesbuffer.hxx +++ b/sc/source/filter/inc/defnamesbuffer.hxx @@ -32,8 +32,6 @@ namespace xls { class BiffInputStreamPos; - - // codes for built-in names const sal_Unicode BIFF_DEFNAME_CONSOLIDATEAREA = '\x00'; const sal_Unicode BIFF_DEFNAME_AUTOOPEN = '\x01'; // Sheet macro executed when workbook is opened. @@ -51,8 +49,6 @@ const sal_Unicode BIFF_DEFNAME_SHEETTITLE = '\x0C'; const sal_Unicode BIFF_DEFNAME_FILTERDATABASE = '\x0D'; // Sheet range autofilter or advanced filter works on. const sal_Unicode BIFF_DEFNAME_UNKNOWN = '\x0E'; - - struct DefinedNameModel { OUString maName; /// The original name. @@ -67,8 +63,6 @@ struct DefinedNameModel explicit DefinedNameModel(); }; - - /** Base class for defined names and external names. */ class DefinedNameBase : public WorkbookHelper { @@ -100,8 +94,6 @@ protected: ::com::sun::star::uno::Any maRefAny; /// Single cell/range reference. }; - - class DefinedName : public DefinedNameBase { public: @@ -158,8 +150,6 @@ private: typedef ::boost::shared_ptr< DefinedName > DefinedNameRef; - - class DefinedNamesBuffer : public WorkbookHelper { public: @@ -205,8 +195,6 @@ private: DefNameTokenIdMap maTokenIdMap; /// Maps all defined names by API token index. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index 8ca3bc38cca0..ba9784f2b849 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -29,8 +29,6 @@ namespace oox { namespace xls { - - /** Absolute position in a spreadsheet (in EMUs) independent from cells. */ struct AnchorPointModel : public ::oox::drawingml::EmuPoint { @@ -38,8 +36,6 @@ struct AnchorPointModel : public ::oox::drawingml::EmuPoint inline bool isValid() const { return (X >= 0) && (Y >= 0); } }; - - /** Absolute size in a spreadsheet (in EMUs). */ struct AnchorSizeModel : public ::oox::drawingml::EmuSize { @@ -47,8 +43,6 @@ struct AnchorSizeModel : public ::oox::drawingml::EmuSize inline bool isValid() const { return (Width >= 0) && (Height >= 0); } }; - - /** Position in spreadsheet (cell position and offset inside cell). */ struct CellAnchorModel { @@ -61,8 +55,6 @@ struct CellAnchorModel inline bool isValid() const { return (mnCol >= 0) && (mnRow >= 0); } }; - - /** Application-specific client data of a shape. */ struct AnchorClientDataModel { @@ -72,8 +64,6 @@ struct AnchorClientDataModel explicit AnchorClientDataModel(); }; - - /** Contains the position of a shape in the spreadsheet. Supports different shape anchor modes (absolute, one-cell, two-cell). */ class ShapeAnchor : public WorksheetHelper @@ -134,8 +124,6 @@ private: AnchorType meEditAs; /// Anchor mode as shown in the UI. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 5796788d807b..52b23cb4e91b 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -57,8 +57,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; }; - - class Shape : public ::oox::drawingml::Shape, public WorksheetHelper { public: @@ -76,8 +74,6 @@ private: OUString maMacroName; }; - - /** Context handler for creation of shapes embedded in group shapes. */ class GroupShapeContext : public ::oox::drawingml::ShapeGroupContext, public WorksheetHelper { @@ -104,8 +100,6 @@ protected: const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; }; - - /** Fragment handler for a complete sheet drawing. */ class DrawingFragment : public WorksheetFragmentBase { @@ -149,8 +143,6 @@ private: sal_Int32 mnDropStyle; }; - - class VmlDrawing : public ::oox::vml::Drawing, public WorksheetHelper { public: @@ -205,8 +197,6 @@ private: ::oox::vml::TextFontModel maListBoxFont; }; - - class VmlDrawingFragment : public ::oox::vml::DrawingFragment, public WorksheetHelper { public: @@ -218,8 +208,6 @@ protected: virtual void finalizeImport() SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index c374594979e6..6bd3a9d42714 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -33,8 +33,6 @@ namespace oox { namespace drawingml { class ShapePropertyMap; } } namespace oox { namespace xls { - - const sal_uInt16 BIFF_OBJ_INVALID_ID = 0; @@ -52,8 +50,6 @@ struct BiffObjLineModel explicit BiffObjLineModel(); }; - - /** This structure contains fill formatting attributes from an OBJ record. */ struct BiffObjFillModel { @@ -73,8 +69,6 @@ class BiffDrawingBase; class BiffDrawingObjectBase; typedef ::boost::shared_ptr< BiffDrawingObjectBase > BiffDrawingObjectRef; - - class BiffDrawingObjectContainer { public: @@ -93,8 +87,6 @@ private: BiffDrawingObjectVector maObjects; }; - - /** Base class for all BIFF drawing objects (OBJ records). */ class BiffDrawingObjectBase : public WorksheetHelper { @@ -208,8 +200,6 @@ private: BiffObjIdVector maSkipObjs; /// Identifiers of all objects to be skipped. }; - - /** Drawing manager of a single sheet. */ class BiffSheetDrawing : public BiffDrawingBase { @@ -222,8 +212,6 @@ public: const ::com::sun::star::awt::Rectangle& rShapeRect ) SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index 6fb3da11370a..cdaad9adf38a 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -132,8 +132,6 @@ public: const ScEEParseEntry* ListEntry( size_t index ) const { return maList[ index ]; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx index 5ba6a097c2ea..8466ac91d12f 100644 --- a/sc/source/filter/inc/excdefs.hxx +++ b/sc/source/filter/inc/excdefs.hxx @@ -92,8 +92,6 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06; #define EXC_CHTR_ACCEPT 0x0001 #define EXC_CHTR_REJECT 0x0003 - - #endif // _EXCDEFS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index 43f80c5bba98..24c2cbbdda99 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - class ExcelChartConverter : public ::oox::drawingml::chart::ChartConverter, public WorkbookHelper { public: @@ -45,8 +43,6 @@ public: const ::oox::drawingml::chart::DataSequenceModel& rDataSeq ) SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index bc472de4c738..90c015938be2 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -27,8 +27,6 @@ namespace xls { class WorkbookGlobals; - - class ExcelFilter : public ::oox::core::XmlFilterBase { public: diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index d97e5bd70303..be853d9a4136 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -27,8 +27,6 @@ namespace oox { namespace xls { - - /** Context handler derived from the WorkbookHelper helper class. Used to import contexts in global workbook fragments. @@ -41,8 +39,6 @@ public: ::oox::core::ContextHandler2( rParent ), WorkbookHelper( rParent ) {} }; - - /** Context handler derived from the WorksheetHelper helper class. Used to import contexts in sheet fragments. @@ -55,8 +51,6 @@ public: ::oox::core::ContextHandler2( rParent ), WorksheetHelper( rParent ) {} }; - - /** Fragment handler derived from the WorkbookHelper helper class. Used to import global workbook fragments. @@ -69,8 +63,6 @@ public: const OUString& rFragmentPath ); }; - - /** Fragment handler derived from the WorksheetHelper helper class. Used to import sheet fragments. @@ -84,8 +76,6 @@ public: }; - - /** Base class for all BIFF context handlers. Derived handlers have to implement the importRecord() function that has to @@ -100,8 +90,6 @@ public: virtual void importRecord( BiffInputStream& rStrm ) = 0; }; - - /** Context handler derived from the WorksheetHelper helper class. Used to import contexts in sheet fragments. @@ -112,8 +100,6 @@ protected: explicit BiffWorksheetContextBase( const WorksheetHelper& rHelper ); }; - - /** An enumeration for all types of fragments in a BIFF workbook stream. */ enum BiffFragmentType { @@ -127,8 +113,6 @@ enum BiffFragmentType BIFF_FRAGMENT_UNKNOWN /// Unknown fragment/error. }; - - class BiffFragmentHandler { public: @@ -167,8 +151,6 @@ private: BiffInputStreamRef mxBiffStrm; }; - - /** Fragment handler derived from the WorkbookHelper helper class. Used to import global workbook fragments. @@ -182,8 +164,6 @@ protected: bool bCloneDecoder = false ); }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx index 9bc706c55847..37401b2efb4c 100644 --- a/sc/source/filter/inc/excelvbaproject.hxx +++ b/sc/source/filter/inc/excelvbaproject.hxx @@ -29,8 +29,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Special implementation of the VBA project for the Excel filters. */ class ExcelVbaProject : public ::oox::ole::VbaProject { @@ -48,8 +46,6 @@ private: mxDocument; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index cd6d2539da7e..87cb42dd1f20 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -95,8 +95,6 @@ inline bool ExcelToSc::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 return ( ( nRow1 & 0x3FFF ) == 0x0000 ) && ( ( nRow2 & 0x3FFF ) == 0x3FFF ); } - - class XclImpLinkManager; class XclImpExtName; @@ -149,8 +147,6 @@ inline bool ExcelToSc8::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt1 - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index b5c102965b78..b0df0ba0b9f4 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -34,8 +34,6 @@ class ScDBData; class XclImpStream; - - class ImportExcel8 : public ImportExcel { public: @@ -75,8 +73,6 @@ private: }; - - // classes AutoFilterData, AutoFilterBuffer class XclImpAutoFilterData : private ExcRoot diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 22892b1c9bec..3db24063c007 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -228,8 +228,6 @@ public: virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; - - class ExcDummy_041 : public ExcDummyRec { private: @@ -276,8 +274,6 @@ public: virtual sal_uInt16 GetNum() const SAL_OVERRIDE; }; - - class ExcBundlesheet : public ExcBundlesheetBase { private: @@ -304,8 +300,6 @@ public: }; - - /** This record contains the Windows country IDs for the UI and document language. */ class XclExpCountry : public XclExpRecord { @@ -354,8 +348,6 @@ public: explicit XclExpFiltermode(); }; - - class XclExpAutofilterinfo : public XclExpUInt16Record { public: @@ -368,8 +360,6 @@ private: ScAddress maStartPos; }; - - class ExcFilterCondition { private: @@ -394,8 +384,6 @@ public: void SaveText( XclExpStream& rStrm ); }; - - class XclExpAutofilter : public XclExpRecord, protected XclExpRoot { private: @@ -425,8 +413,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class ExcAutoFilterRecs : public XclExpRecordBase, protected XclExpRoot { public: @@ -455,8 +441,6 @@ private: bool mbAutoFilter; }; - - /** Sheet filter manager. Contains auto filters or advanced filters from all sheets. */ class XclExpFilterManager : protected XclExpRoot { diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index 374f08551dd6..53fe60540190 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -50,8 +50,6 @@ public: virtual FltError Write() = 0; }; - - class ExportBiff5 : public ExportTyp, protected XclExpRoot { private: @@ -67,8 +65,6 @@ public: }; - - class ExportBiff8 : public ExportBiff5 { public: diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx index 8a22d471c391..655d2b8ac5e2 100644 --- a/sc/source/filter/inc/externallinkbuffer.hxx +++ b/sc/source/filter/inc/externallinkbuffer.hxx @@ -38,8 +38,6 @@ namespace oox { namespace core { namespace oox { namespace xls { - - struct ExternalNameModel { bool mbBuiltIn; /// Name is a built-in name. @@ -52,8 +50,6 @@ struct ExternalNameModel explicit ExternalNameModel(); }; - - class ExternalLink; class ExternalName : public DefinedNameBase @@ -126,8 +122,6 @@ private: typedef ::boost::shared_ptr< ExternalName > ExternalNameRef; - - /** Contains indexes for a range of sheets in the spreadsheet document. */ class LinkSheetRange { @@ -172,8 +166,6 @@ private: sal_Int32 mnLast; /// Index of the last sheet or index of last external sheet cache. }; - - enum ExternalLinkType { LINKTYPE_SELF, /// Link refers to the current workbook. @@ -188,8 +180,6 @@ enum ExternalLinkType LINKTYPE_UNKNOWN /// Unknown or unsupported link type. }; - - class ExternalLink : public WorkbookHelper { public: @@ -290,8 +280,6 @@ private: typedef ::boost::shared_ptr< ExternalLink > ExternalLinkRef; - - /** Represents a REF entry in the BIFF12 EXTERNALSHEETS or in the BIFF8 EXTERNSHEET record. @@ -310,8 +298,6 @@ struct RefSheetsModel void readBiff12Data( SequenceInputStream& rStrm ); }; - - class ExternalLinkBuffer : public WorkbookHelper { public: @@ -361,8 +347,6 @@ private: bool mbUseRefSheets; /// True = use maRefSheets list (BIFF12 only). }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 1402b9f2112a..e71ebc878f07 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -29,8 +29,6 @@ namespace xls { class ExternalLink; - - /** This class implements importing the sheetData element in external sheets. The sheetData element embedded in the externalBook element contains cached @@ -74,8 +72,6 @@ private: sal_Int32 mnCurrType; /// Data type of current cell. }; - - class ExternalLinkFragment : public WorkbookFragmentBase { public: @@ -103,8 +99,6 @@ private: sal_Int32 mnResultType; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index d1f20da5cf2e..c0d1166b96f7 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -200,8 +200,6 @@ private: css::uno::Reference< css::beans::XMultiPropertySet > mxMultiPropSet; /// The optional multi property set interface. }; - - /** Generic helper class for reading from and writing to property sets. Usage: @@ -268,8 +266,6 @@ private: size_t mnNextIdx; /// Counter for next Any to be processed. }; - - template< typename Type > bool ScfPropSetHelper::ReadValue( Type& rValue ) { @@ -299,8 +295,6 @@ ScfPropSetHelper& operator<<( ScfPropSetHelper& rPropSetHelper, const Type& rVal return rPropSetHelper; } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/formulabase.hxx b/sc/source/filter/inc/formulabase.hxx index dd4bf610309f..b46ade5f885c 100644 --- a/sc/source/filter/inc/formulabase.hxx +++ b/sc/source/filter/inc/formulabase.hxx @@ -242,8 +242,6 @@ struct BinSingleRef2d void readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffset ); }; - - /** A 2D formula cell range reference struct with relative flags. */ struct BinComplexRef2d { @@ -472,8 +470,6 @@ enum FunctionLibraryType FUNCLIB_EUROTOOL /// EuroTool add-in with EUROCONVERT function. }; - - /** Represents information for a spreadsheet function. The member mpParamInfos points to a C-array of type information structures @@ -634,8 +630,6 @@ class FormulaProcessorBase : public OpCodeProvider, protected ApiOpCodes, public public: explicit FormulaProcessorBase( const WorkbookHelper& rHelper ); - - /** Generates a cell address string in A1 notation from the passed cell address. @@ -656,8 +650,6 @@ public: const BinAddress& rAddress, bool bAbsolute ); - - /** Generates a string in Calc formula notation from the passed string. @param rString The string value. @@ -674,8 +666,6 @@ public: */ static OUString generateApiArray( const Matrix< ::com::sun::star::uno::Any >& rMatrix ); - - /** Tries to extract a single cell reference from a formula token sequence. @param rTokens The token sequence to be parsed. Should contain exactly @@ -792,8 +782,6 @@ public: bool bTrimLeadingSpaces ) const; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx index ec8413d900bc..a8fc93aad6f5 100644 --- a/sc/source/filter/inc/formulaparser.hxx +++ b/sc/source/filter/inc/formulaparser.hxx @@ -89,8 +89,6 @@ private: ApiTokenVector maTokens; }; - - class FormulaParserImpl; /** Import formula parser for OOXML and BIFF filters. @@ -144,8 +142,6 @@ private: ::std::auto_ptr< FormulaParserImpl > mxImpl; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index 0ec11a5cef1b..7764118792d2 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -29,12 +29,8 @@ class SfxObjectShell; class ScProgress; - - const sal_Int32 SCF_INV_SEGMENT = -1; - - /** Progress bar for complex progress representation. The progress bar contains one or more segments, each with customable @@ -186,8 +182,6 @@ private: bool mbInProgress; /// true = progress bar started. }; - - /** A simplified progress bar with only one segment. */ class ScfSimpleProgressBar { @@ -208,8 +202,6 @@ private: ScfProgressBar maProgress; /// The used progress bar. }; - - /** A simplified progress bar based on the stream position of an existing stream. */ class ScfStreamProgressBar { @@ -230,8 +222,6 @@ private: SvStream& mrStrm; /// The used stream. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index c8c0164c39e1..40431c2728f7 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -118,8 +118,6 @@ void insert_value( Type& rnBitField, InsertType nValue, sal_uInt8 nStartBit, sal (rnBitField &= ~(nMask << nStartBit)) |= (nNewValue << nStartBit); } - - class Color; class SfxPoolItem; class SfxItemSet; @@ -270,8 +268,6 @@ typedef ::std::vector< sal_Int32 > ScfInt32Vec; typedef ::std::vector< sal_uInt32 > ScfUInt32Vec; typedef ::std::vector< OUString > ScfStringVec; - - class ScFormatFilterPluginImpl : public ScFormatFilterPlugin { public: @@ -310,8 +306,6 @@ public: virtual ScOrcusFilters* GetOrcusFilters() SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index e50b0d9e9348..a667dde7da1c 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -98,8 +98,6 @@ public: }; - - typedef o3tl::sorted_vector<sal_uLong> ScHTMLColOffset; struct ScHTMLTableStackEntry @@ -151,8 +149,6 @@ struct ScHTMLAdjustStackEntry typedef ::std::stack< ScHTMLAdjustStackEntry* > ScHTMLAdjustStack; - - class EditEngine; class ScDocument; class HTMLOption; @@ -231,8 +227,6 @@ public: }; - - // HTML DATA QUERY PARSER @@ -246,8 +240,6 @@ const ScHTMLTableId SC_HTML_GLOBAL_TABLE = 0; /** Used as table index for normal (non-table) entries in ScHTMLEntry structs. */ const ScHTMLTableId SC_HTML_NO_TABLE = 0; - - /** A 2D cell position in an HTML table. */ struct ScHTMLPos { @@ -281,8 +273,6 @@ inline bool operator<( const ScHTMLPos& rPos1, const ScHTMLPos& rPos2 ) return (rPos1.mnRow < rPos2.mnRow) || ((rPos1.mnRow == rPos2.mnRow) && (rPos1.mnCol < rPos2.mnCol)); } - - /** A 2D cell size in an HTML table. */ struct ScHTMLSize { @@ -306,8 +296,6 @@ inline bool operator==( const ScHTMLSize& rSize1, const ScHTMLSize& rSize2 ) return (rSize1.mnRows == rSize2.mnRows) && (rSize1.mnCols == rSize2.mnCols); } - - /** A single entry containing a line of text or representing a table. */ struct ScHTMLEntry : public ScEEParseEntry { @@ -343,8 +331,6 @@ private: bool mbImportAlways; /// true = Always import this entry. }; - - /** This struct handles creation of unique table identifiers. */ struct ScHTMLTableAutoId { @@ -355,8 +341,6 @@ struct ScHTMLTableAutoId explicit ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ); }; - - class ScHTMLTableMap; /** Stores data for one table in an HTML document. @@ -590,8 +574,6 @@ private: bool mbPushEmptyLine:1; /// true = Insert empty line before current entry. }; - - /** The "global table" representing the entire HTML document. */ class ScHTMLGlobalTable : public ScHTMLTable { @@ -608,8 +590,6 @@ public: void Recalc(); }; - - /** The HTML parser for data queries. Focuses on data import, not on layout. Builds the table structure correctly, ignores extended formatting like @@ -668,8 +648,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index 084fa507b5d4..fe056fc3879d 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -95,8 +95,6 @@ private: ENTRY pData[ nSize ]; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 661b9eb04ce5..a5c4c9d37110 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -57,8 +57,6 @@ enum FUNC_TYPE }; - - class LotusToSc : public LotusConverterBase { private: @@ -115,8 +113,6 @@ inline void LotusToSc::SetWK3( void ) bWK3 = true; } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index f1157a607ddf..98aada0d32dc 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -154,8 +154,6 @@ inline void ImportLotus::Skip( const sal_uInt16 n ) pIn->SeekRel( n ); } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index f34fe9d910b5..ead34cc451fb 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -35,8 +35,6 @@ class ScTokenArray; class NameBuffer; - - class StringHashEntry { private: @@ -92,8 +90,6 @@ inline bool StringHashEntry::operator ==( const StringHashEntry& r ) const return ( nHash == r.nHash && aString == r.aString ); } - - class NameBuffer : public ExcRoot { private: @@ -218,8 +214,6 @@ inline void RangeNameBufferWK3::Add( const OUString& rName, const ScRange& aScRa } - - class ExtSheetBuffer : public ExcRoot { private: @@ -271,8 +265,6 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) } - - struct ExtName { OUString aName; @@ -286,8 +278,6 @@ struct ExtName }; - - class ExtNameBuff : protected XclImpRoot { public: diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx b/sc/source/filter/inc/numberformatsbuffer.hxx index 2ed51e73372b..446b4320cca5 100644 --- a/sc/source/filter/inc/numberformatsbuffer.hxx +++ b/sc/source/filter/inc/numberformatsbuffer.hxx @@ -33,8 +33,6 @@ namespace oox { class PropertyMap; } namespace oox { namespace xls { - - struct NumFmtModel { ::com::sun::star::lang::Locale maLocale; @@ -44,8 +42,6 @@ struct NumFmtModel explicit NumFmtModel(); }; - - /** Contains all API number format attributes. */ struct ApiNumFmtData { @@ -54,8 +50,6 @@ struct ApiNumFmtData explicit ApiNumFmtData(); }; - - /** Contains all data for a number format code. */ class NumberFormat : public WorkbookHelper { @@ -88,8 +82,6 @@ private: typedef ::boost::shared_ptr< NumberFormat > NumberFormatRef; - - class NumberFormatsBuffer : public WorkbookHelper { public: @@ -123,8 +115,6 @@ private: sal_Int32 mnHighestId; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index e6adca8cfa9c..b4e1346a9e3a 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -33,8 +33,6 @@ namespace xls { class OOXMLFormulaParserImpl; - - typedef ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, @@ -100,8 +98,6 @@ OUString SAL_CALL OOXMLFormulaParser_getImplementationName(); css::uno::Sequence< OUString > SAL_CALL OOXMLFormulaParser_getSupportedServiceNames(); - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pagesettings.hxx b/sc/source/filter/inc/pagesettings.hxx index 5ce87a9d7487..548ba5ac7263 100644 --- a/sc/source/filter/inc/pagesettings.hxx +++ b/sc/source/filter/inc/pagesettings.hxx @@ -30,8 +30,6 @@ namespace xls { class HeaderFooterParser; - - /** Holds page style data for a single sheet. */ struct PageSettingsModel { @@ -81,8 +79,6 @@ struct PageSettingsModel void setBiffPrintErrors( sal_uInt8 nPrintErrors ); }; - - class PageSettings : public WorksheetHelper { public: @@ -130,8 +126,6 @@ private: PageSettingsModel maModel; }; - - class PageSettingsConverter : public WorkbookHelper { public: @@ -180,8 +174,6 @@ private: HFHelperData maFooterData; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx b/sc/source/filter/inc/pivotcachebuffer.hxx index e24c5042c060..033daef3006f 100644 --- a/sc/source/filter/inc/pivotcachebuffer.hxx +++ b/sc/source/filter/inc/pivotcachebuffer.hxx @@ -38,8 +38,6 @@ namespace xls { class WorksheetHelper; - - typedef ::std::pair< sal_Int32, OUString > IdCaptionPair; typedef ::std::vector< IdCaptionPair > IdCaptionPairList; @@ -105,8 +103,6 @@ friend class PivotCacheItemList; bool mbUnused; }; - - class PivotCacheItemList : public WorkbookHelper { public: @@ -141,8 +137,6 @@ private: CacheItemVector maItems; /// All items of this list. }; - - struct PCFieldModel { OUString maName; /// Fixed name of the cache field. @@ -162,8 +156,6 @@ struct PCFieldModel explicit PCFieldModel(); }; - - struct PCSharedItemsModel { bool mbHasSemiMixed; /// True = has (blank|string|bool|error) item(s), maybe other types. @@ -180,8 +172,6 @@ struct PCSharedItemsModel explicit PCSharedItemsModel(); }; - - struct PCFieldGroupModel { ::com::sun::star::util::DateTime maStartDate; /// Manual or calculated start date for range grouping. @@ -203,8 +193,6 @@ struct PCFieldGroupModel void setBiffGroupBy( sal_uInt8 nGroupBy ); }; - - /** Helper struct for mapping original item names from/to group item names. */ struct PivotCacheGroupItem { @@ -217,8 +205,6 @@ struct PivotCacheGroupItem typedef ::std::vector< PivotCacheGroupItem > PivotCacheGroupItemVector; - - class PivotCacheField : public WorkbookHelper { public: @@ -337,8 +323,6 @@ private: PCFieldGroupModel maFieldGroupModel; /// Settings for item grouping. }; - - struct PCDefinitionModel { OUString maRelId; /// Relation identifier for cache records fragment. @@ -361,8 +345,6 @@ struct PCDefinitionModel explicit PCDefinitionModel(); }; - - struct PCSourceModel { sal_Int32 mnSourceType; /// Type of the source data (sheet, consolidation, scenario, external). @@ -371,8 +353,6 @@ struct PCSourceModel explicit PCSourceModel(); }; - - struct PCWorksheetSourceModel { OUString maRelId; /// Relation identifier for an external document URL. @@ -384,8 +364,6 @@ struct PCWorksheetSourceModel explicit PCWorksheetSourceModel(); }; - - class PivotCache : public WorkbookHelper { public: @@ -473,8 +451,6 @@ private: bool mbDummySheet; /// True = pivot cache is based on a dummy sheet. }; - - class PivotCacheBuffer : public WorkbookHelper { public: @@ -501,8 +477,6 @@ private: PivotCacheIdVector maCacheIds; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index b35cd1527cba..86378ed9c63c 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -28,8 +28,6 @@ namespace xls { class PivotCache; class PivotCacheField; - - class PivotCacheFieldContext : public WorkbookContextBase { public: @@ -47,8 +45,6 @@ private: PivotCacheField& mrCacheField; }; - - class PivotCacheDefinitionFragment : public WorkbookFragmentBase { public: @@ -67,8 +63,6 @@ private: PivotCache& mrPivotCache; }; - - class PivotCacheRecordsFragment : public WorksheetFragmentBase { public: @@ -95,8 +89,6 @@ private: }; - - class BiffPivotCacheFragment : public BiffWorkbookFragmentBase { public: @@ -112,8 +104,6 @@ private: PivotCache& mrPivotCache; }; - - class BiffPivotCacheRecordsContext : public BiffWorksheetContextBase { public: @@ -139,8 +129,6 @@ private: bool mbInRow; /// True = a data row has been started. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivottablebuffer.hxx b/sc/source/filter/inc/pivottablebuffer.hxx index fff2b652a939..5ef56e924a8c 100644 --- a/sc/source/filter/inc/pivottablebuffer.hxx +++ b/sc/source/filter/inc/pivottablebuffer.hxx @@ -36,8 +36,6 @@ namespace xls { class PivotTable; - - struct PTFieldItemModel { sal_Int32 mnCacheItem; /// Index to shared item in pivot cache. @@ -52,8 +50,6 @@ struct PTFieldItemModel void setBiffType( sal_uInt16 nType ); }; - - struct PTFieldModel { sal_Int32 mnAxis; /// Axis this field is assigned to (none, row, column, page). @@ -91,8 +87,6 @@ struct PTFieldModel void setBiffAxis( sal_uInt8 nAxisFlags ); }; - - struct PTPageFieldModel { OUString maName; /// Unique name of the page field. @@ -102,8 +96,6 @@ struct PTPageFieldModel explicit PTPageFieldModel(); }; - - struct PTDataFieldModel { OUString maName; /// Name of the data field. @@ -122,8 +114,6 @@ struct PTDataFieldModel void setBiffShowDataAs( sal_Int32 nShowDataAs ); }; - - class PivotTableField : public WorkbookHelper { public: @@ -189,8 +179,6 @@ private: sal_Int32 mnFieldIndex; /// Zero-based index of this field. }; - - struct PTFilterModel { OUString maName; /// Name of the field filter. @@ -210,8 +198,6 @@ struct PTFilterModel explicit PTFilterModel(); }; - - class PivotTableFilter : public WorkbookHelper { public: @@ -235,8 +221,6 @@ private: PTFilterModel maModel; }; - - struct PTDefinitionModel : public AutoFormatModel { OUString maName; @@ -285,8 +269,6 @@ struct PTDefinitionModel : public AutoFormatModel explicit PTDefinitionModel(); }; - - struct PTLocationModel { ::com::sun::star::table::CellRangeAddress @@ -300,8 +282,6 @@ struct PTLocationModel explicit PTLocationModel(); }; - - class PivotTable : public WorkbookHelper { public: @@ -400,8 +380,6 @@ private: mxDPDescriptor; /// Descriptor of the DataPilot object. }; - - class PivotTableBuffer : public WorkbookHelper { public: @@ -418,8 +396,6 @@ private: PivotTableVector maTables; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index 7847f2be33fb..8bfb2dccbcbf 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -30,8 +30,6 @@ class PivotTable; class PivotTableField; class PivotTableFilter; - - class PivotTableFieldContext : public WorksheetContextBase { public: @@ -49,8 +47,6 @@ private: PivotTableField& mrTableField; }; - - class PivotTableFilterContext : public WorksheetContextBase { public: @@ -68,8 +64,6 @@ private: PivotTableFilter& mrTableFilter; }; - - class PivotTableFragment : public WorksheetFragmentBase { public: @@ -86,8 +80,6 @@ private: PivotTable& mrPivotTable; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/querytablebuffer.hxx b/sc/source/filter/inc/querytablebuffer.hxx index da1d952db855..3fb4b7d3dc2a 100644 --- a/sc/source/filter/inc/querytablebuffer.hxx +++ b/sc/source/filter/inc/querytablebuffer.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - struct QueryTableModel : public AutoFormatModel { OUString maDefName; /// Defined name containing the target cell range. @@ -49,8 +47,6 @@ struct QueryTableModel : public AutoFormatModel explicit QueryTableModel(); }; - - class QueryTable : public WorksheetHelper { public: @@ -68,8 +64,6 @@ private: QueryTableModel maModel; }; - - class QueryTableBuffer : public WorksheetHelper { public: @@ -86,8 +80,6 @@ private: QueryTableVector maQueryTables; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index 3539639793bc..30c9ae64256b 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -27,8 +27,6 @@ namespace xls { class QueryTable; - - class QueryTableFragment : public WorksheetFragmentBase { public: @@ -46,8 +44,6 @@ private: QueryTable& mrQueryTable; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 9dfa124f5c43..d29da6017a3e 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -34,8 +34,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Flags used to specify import/export mode of strings. */ typedef sal_Int32 BiffStringFlags; @@ -46,8 +44,6 @@ const BiffStringFlags BIFF_STR_SMARTFLAGS = 0x0004; /// Omit flags on empty const BiffStringFlags BIFF_STR_KEEPFONTS = 0x0008; /// Keep old fonts when reading unformatted string (default: clear fonts). Import only. const BiffStringFlags BIFF_STR_EXTRAFONTS = 0x0010; /// Read trailing rich-string font array (default: nothing). BIFF2-BIFF5 import only. - - /** Contains text data and font attributes for a part of a rich formatted string. */ class RichStringPortion : public WorkbookHelper { @@ -88,8 +84,6 @@ private: typedef ::boost::shared_ptr< RichStringPortion > RichStringPortionRef; - - enum BiffFontPortionMode { BIFF_FONTPORTION_8BIT, /// Font portion with 8-bit values. @@ -97,8 +91,6 @@ enum BiffFontPortionMode BIFF_FONTPORTION_OBJ /// Font portion in OBJ or TXO record. }; - - /** Represents a position in a rich-string containing current font identifier. This object stores the position of a formatted character in a rich-string @@ -117,8 +109,6 @@ struct FontPortionModel void read( SequenceInputStream& rStrm ); }; - - /** A vector with all font portions in a rich-string. */ class FontPortionModelList : public ::std::vector< FontPortionModel > { @@ -131,8 +121,6 @@ public: void importPortions( SequenceInputStream& rStrm ); }; - - struct PhoneticDataModel { sal_Int32 mnFontId; /// Font identifier for text formatting. @@ -145,8 +133,6 @@ struct PhoneticDataModel void setBiffData( sal_Int32 nType, sal_Int32 nAlignment ); }; - - class PhoneticSettings : public WorkbookHelper { public: @@ -164,8 +150,6 @@ private: PhoneticDataModel maModel; }; - - /** Contains text data and positioning information for a phonetic text portion. */ class RichStringPhonetic : public WorkbookHelper { @@ -187,8 +171,6 @@ private: typedef ::boost::shared_ptr< RichStringPhonetic > RichStringPhoneticRef; - - /** Represents a phonetic text portion in a rich-string with phonetic text. Used in binary filters only. */ struct PhoneticPortionModel @@ -204,8 +186,6 @@ struct PhoneticPortionModel void read( SequenceInputStream& rStrm ); }; - - /** A vector with all phonetic portions in a rich-string. */ class PhoneticPortionModelList : public ::std::vector< PhoneticPortionModel > { @@ -218,8 +198,6 @@ public: void importPortions( SequenceInputStream& rStrm ); }; - - /** Contains string data and a list of formatting runs for a rich formatted string. */ class RichString : public WorkbookHelper { @@ -280,8 +258,6 @@ private: typedef ::boost::shared_ptr< RichString > RichStringRef; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index e277f939caa7..e24a5e65d83b 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - class RichStringContext : public WorkbookContextBase { public: @@ -45,8 +43,6 @@ private: FontRef mxFont; /// Processed font of the portion. }; - - template< typename ParentType > RichStringContext::RichStringContext( ParentType& rParent, RichStringRef xString ) : WorkbookContextBase( rParent ), @@ -55,8 +51,6 @@ RichStringContext::RichStringContext( ParentType& rParent, RichStringRef xString OSL_ENSURE( mxString.get(), "RichStringContext::RichStringContext - missing string object" ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/scenariobuffer.hxx b/sc/source/filter/inc/scenariobuffer.hxx index f3fc8b33e47f..5c6385bd6414 100644 --- a/sc/source/filter/inc/scenariobuffer.hxx +++ b/sc/source/filter/inc/scenariobuffer.hxx @@ -28,8 +28,6 @@ namespace oox { namespace xls { - - struct ScenarioCellModel { ::com::sun::star::table::CellAddress maPos; @@ -40,8 +38,6 @@ struct ScenarioCellModel explicit ScenarioCellModel(); }; - - struct ScenarioModel { OUString maName; /// Name of the scenario. @@ -53,8 +49,6 @@ struct ScenarioModel explicit ScenarioModel(); }; - - class Scenario : public WorkbookHelper { public: @@ -81,8 +75,6 @@ private: sal_Int16 mnSheet; /// Index of the sheet this scenario is based on. }; - - struct SheetScenariosModel { sal_Int32 mnCurrent; /// Selected scenario. @@ -91,8 +83,6 @@ struct SheetScenariosModel explicit SheetScenariosModel(); }; - - class SheetScenarios : public WorkbookHelper { public: @@ -116,8 +106,6 @@ private: sal_Int16 mnSheet; }; - - class ScenarioBuffer : public WorkbookHelper { public: @@ -134,8 +122,6 @@ private: SheetScenariosMap maSheetScenarios; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/scenariocontext.hxx b/sc/source/filter/inc/scenariocontext.hxx index 7eafaf3bec24..8345cf953f89 100644 --- a/sc/source/filter/inc/scenariocontext.hxx +++ b/sc/source/filter/inc/scenariocontext.hxx @@ -28,8 +28,6 @@ namespace xls { class Scenario; class SheetScenarios; - - class ScenarioContext : public WorksheetContextBase { public: @@ -46,8 +44,6 @@ private: Scenario& mrScenario; }; - - class ScenariosContext : public WorksheetContextBase { public: @@ -64,8 +60,6 @@ private: SheetScenarios& mrSheetScenarios; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sharedstringsbuffer.hxx b/sc/source/filter/inc/sharedstringsbuffer.hxx index 31475d25629c..027a185fff39 100644 --- a/sc/source/filter/inc/sharedstringsbuffer.hxx +++ b/sc/source/filter/inc/sharedstringsbuffer.hxx @@ -25,8 +25,6 @@ namespace oox { namespace xls { - - /** Collects all strings from the shared strings substream. */ class SharedStringsBuffer : public WorkbookHelper { @@ -47,8 +45,6 @@ private: StringVector maStrings; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index c7e2633c22cd..f854e3acf498 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -25,8 +25,6 @@ namespace oox { namespace xls { - - class SharedStringsFragment : public WorkbookFragmentBase { public: @@ -42,8 +40,6 @@ protected: virtual void finalizeImport() SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index f2ffdd02d1ec..edbaa7aba67a 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -32,8 +32,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Stores basic data about cell values and formatting. */ struct CellModel { @@ -46,8 +44,6 @@ struct CellModel explicit CellModel(); }; - - /** Stores data about cell formulas. */ struct CellFormulaModel { @@ -64,8 +60,6 @@ struct CellFormulaModel bool isValidSharedRef( const ::com::sun::star::table::CellAddress& rCellAddr ); }; - - /** Stores data about table operations. */ struct DataTableModel { @@ -79,8 +73,6 @@ struct DataTableModel explicit DataTableModel(); }; - - /** Manages all cell blocks currently in use. */ class CellBlockBuffer : public WorksheetHelper { @@ -101,8 +93,6 @@ private: }; - - /** Manages the cell contents and cell formatting of a sheet. */ class SheetDataBuffer : public WorksheetHelper @@ -253,8 +243,6 @@ private: std::map< sal_Int32, std::vector< ValueRange > > maXfIdRowRangeList; /// Cached XF identifiers for a ranges of rows, we try and process rowranges with the same XF id together }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 45593235ba5d..ec2d447d3b0b 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -30,8 +30,6 @@ namespace oox { namespace xls { - - /** Used as base for sheet data context classes. Provides fast access to often used converter objects and sheet index, to improve performance. */ @@ -48,8 +46,6 @@ struct SheetDataContextBase virtual ~SheetDataContextBase(); }; - - /** This class implements importing the sheetData element. The sheetData element contains all row settings and all cells in a single @@ -134,8 +130,6 @@ private: }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index ff2a8550e315..7b8f19235689 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -48,8 +48,6 @@ namespace oox { class PropertySet; } namespace oox { namespace xls { - - const sal_Int32 OOX_COLOR_WINDOWTEXT3 = 24; /// System window text color (BIFF3-BIFF4). const sal_Int32 OOX_COLOR_WINDOWBACK3 = 25; /// System window background color (BIFF3-BIFF4). const sal_Int32 OOX_COLOR_WINDOWTEXT = 64; /// System window text color (BIFF5+). @@ -62,8 +60,6 @@ const sal_Int32 OOX_COLOR_NOTEBACK = 80; /// Note background colo const sal_Int32 OOX_COLOR_NOTETEXT = 81; /// Note text color. const sal_Int32 OOX_COLOR_FONTAUTO = 0x7FFF; /// Font auto color (system window text color). - - const sal_Int16 API_LINE_NONE = 0; const sal_Int16 API_LINE_HAIR = 1; const sal_Int16 API_LINE_THIN = 15; @@ -77,8 +73,6 @@ const sal_Int16 API_ESCAPE_SUBSCRIPT = -101; /// Subscript: lower cha const sal_Int8 API_ESCAPEHEIGHT_NONE = 100; /// Relative character height if not escaped. const sal_Int8 API_ESCAPEHEIGHT_DEFAULT = 58; /// Relative character height if escaped. - - /** Special implementation of the GraphicHelper for Excel palette and scheme colors. */ @@ -93,8 +87,6 @@ public: virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const SAL_OVERRIDE; }; - - class Color : public ::oox::drawingml::Color { public: @@ -119,12 +111,8 @@ public: inline bool isAuto() const { return isPlaceHolder(); } }; - - SequenceInputStream& operator>>( SequenceInputStream& rStrm, Color& orColor ); - - /** Stores all colors of the color palette. */ class ColorPalette : public WorkbookHelper { @@ -149,8 +137,6 @@ private: size_t mnAppendIndex; /// Index to append a new color. }; - - /** Contains all XML font attributes, e.g. from a font or rPr element. */ struct FontModel { @@ -177,8 +163,6 @@ struct FontModel void setBiffEscapement( sal_uInt16 nEscapement ); }; - - /** Enumerates different types of API font property sets. */ enum FontPropertyType { @@ -186,8 +170,6 @@ enum FontPropertyType FONT_PROPTYPE_TEXT /// Font properties in a text object (text::Text service). }; - - /** Contains used flags for all API font attributes. */ struct ApiFontUsedFlags { @@ -206,8 +188,6 @@ struct ApiFontUsedFlags explicit ApiFontUsedFlags( bool bAllUsed ); }; - - /** Contains API font name, family, and charset for a script type. */ struct ApiScriptFontName { @@ -218,8 +198,6 @@ struct ApiScriptFontName explicit ApiScriptFontName(); }; - - /** Contains all API font attributes. */ struct ApiFontData { @@ -238,8 +216,6 @@ struct ApiFontData explicit ApiFontData(); }; - - class Font : public WorkbookHelper { public: @@ -301,8 +277,6 @@ private: typedef ::boost::shared_ptr< Font > FontRef; - - /** Contains all XML cell alignment attributes, e.g. from an alignment element. */ struct AlignmentModel { @@ -323,8 +297,6 @@ struct AlignmentModel void setBiffVerAlign( sal_uInt8 nVerAlign ); }; - - /** Contains all API cell alignment attributes. */ struct ApiAlignmentData { @@ -347,8 +319,6 @@ struct ApiAlignmentData bool operator==( const ApiAlignmentData& rLeft, const ApiAlignmentData& rRight ); - - class Alignment : public WorkbookHelper { public: @@ -382,8 +352,6 @@ private: typedef ::boost::shared_ptr< Alignment > AlignmentRef; - - /** Contains all XML cell protection attributes, e.g. from a protection element. */ struct ProtectionModel { @@ -393,8 +361,6 @@ struct ProtectionModel explicit ProtectionModel(); }; - - /** Contains all API cell protection attributes. */ struct ApiProtectionData { @@ -407,8 +373,6 @@ struct ApiProtectionData bool operator==( const ApiProtectionData& rLeft, const ApiProtectionData& rRight ); - - class Protection : public WorkbookHelper { public: @@ -438,8 +402,6 @@ private: typedef ::boost::shared_ptr< Protection > ProtectionRef; - - /** Contains XML attributes of a single border line. */ struct BorderLineModel { @@ -453,8 +415,6 @@ struct BorderLineModel void setBiffStyle( sal_Int32 nLineStyle ); }; - - /** Contains XML attributes of a complete cell border. */ struct BorderModel { @@ -469,8 +429,6 @@ struct BorderModel explicit BorderModel( bool bDxf ); }; - - /** Contains API attributes of a complete cell border. */ struct ApiBorderData { @@ -493,8 +451,6 @@ struct ApiBorderData bool operator==( const ApiBorderData& rLeft, const ApiBorderData& rRight ); - - class Border : public WorkbookHelper { public: @@ -544,8 +500,6 @@ private: typedef ::boost::shared_ptr< Border > BorderRef; - - /** Contains XML pattern fill attributes from the patternFill element. */ struct PatternFillModel { @@ -562,8 +516,6 @@ struct PatternFillModel void setBiffPattern( sal_Int32 nPattern ); }; - - /** Contains XML gradient fill attributes from the gradientFill element. */ struct GradientFillModel { @@ -585,8 +537,6 @@ struct GradientFillModel void readGradientStop( SequenceInputStream& rStrm, bool bDxf ); }; - - /** Contains API fill attributes. */ struct ApiSolidFillData { @@ -599,8 +549,6 @@ struct ApiSolidFillData bool operator==( const ApiSolidFillData& rLeft, const ApiSolidFillData& rRight ); - - /** Contains cell fill attributes, either a pattern fill or a gradient fill. */ class Fill : public WorkbookHelper { @@ -657,8 +605,6 @@ private: typedef ::boost::shared_ptr< Fill > FillRef; - - /** Contains all data for a cell format or cell style. */ struct XfModel { @@ -680,8 +626,6 @@ struct XfModel bool operator==( const XfModel& rXfModel1, const XfModel& rXfModel2 ); - - /** Represents a cell format or a cell style (called XF, extended format). This class stores the type (cell/style), the index to the parent style (if @@ -743,8 +687,6 @@ bool operator==( const Xf& rXf1, const Xf& rXf2 ); typedef ::boost::shared_ptr< Xf > XfRef; - - class Dxf : public WorkbookHelper { public: @@ -779,8 +721,6 @@ private: typedef ::boost::shared_ptr< Dxf > DxfRef; - - /** Contains attributes of a cell style, e.g. from the cellStyle element. */ struct CellStyleModel { @@ -800,8 +740,6 @@ struct CellStyleModel bool isDefaultStyle() const; }; - - class CellStyle : public WorkbookHelper { public: @@ -833,8 +771,6 @@ private: typedef ::boost::shared_ptr< CellStyle > CellStyleRef; - - class CellStyleBuffer : public WorkbookHelper { public: @@ -873,8 +809,6 @@ private: CellStyleRef mxDefStyle; /// Default cell style. }; - - struct AutoFormatModel { sal_Int32 mnAutoFormatId; /// Index of predefined autoformatting. @@ -888,8 +822,6 @@ struct AutoFormatModel explicit AutoFormatModel(); }; - - class StylesBuffer : public WorkbookHelper { public: @@ -1002,8 +934,6 @@ private: mutable DxfStyleMap maDxfStyles; /// Maps DXF identifiers to Calc style sheet names. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index cdb90041d2bc..53a58131e80c 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - class IndexedColorsContext : public WorkbookContextBase { public: @@ -38,8 +36,6 @@ protected: virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; }; - - class FontContext : public WorkbookContextBase { public: @@ -54,8 +50,6 @@ private: FontRef mxFont; }; - - class BorderContext : public WorkbookContextBase { public: @@ -71,8 +65,6 @@ private: BorderRef mxBorder; }; - - class FillContext : public WorkbookContextBase { public: @@ -88,8 +80,6 @@ private: double mfGradPos; /// Gradient color position. }; - - class XfContext : public WorkbookContextBase { public: @@ -106,8 +96,6 @@ private: bool mbCellXf; /// True = cell XF, false = style XF. }; - - class DxfContext : public WorkbookContextBase { public: @@ -122,8 +110,6 @@ private: DxfRef mxDxf; }; - - class StylesFragment : public WorkbookFragmentBase { public: @@ -139,8 +125,6 @@ protected: virtual void finalizeImport() SAL_OVERRIDE; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tablebuffer.hxx b/sc/source/filter/inc/tablebuffer.hxx index 91042f17f9d3..5ef7fb4db610 100644 --- a/sc/source/filter/inc/tablebuffer.hxx +++ b/sc/source/filter/inc/tablebuffer.hxx @@ -27,8 +27,6 @@ namespace oox { namespace xls { - - struct TableModel { ::com::sun::star::table::CellRangeAddress @@ -43,8 +41,6 @@ struct TableModel explicit TableModel(); }; - - class Table : public WorkbookHelper { public: @@ -92,8 +88,6 @@ private: typedef ::boost::shared_ptr< Table > TableRef; - - class TableBuffer : public WorkbookHelper { public: @@ -125,8 +119,6 @@ private: TableNameMap maNameTables; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index 6e5bd4d0cd50..0b196b01a371 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -27,8 +27,6 @@ namespace xls { class Table; - - class TableFragment : public WorksheetFragmentBase { public: @@ -46,8 +44,6 @@ private: Table& mrTable; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/themebuffer.hxx b/sc/source/filter/inc/themebuffer.hxx index f1593beaf63b..9c458b45e4db 100644 --- a/sc/source/filter/inc/themebuffer.hxx +++ b/sc/source/filter/inc/themebuffer.hxx @@ -28,8 +28,6 @@ namespace xls { struct FontModel; - - class ThemeBuffer : public ::oox::drawingml::Theme, public WorkbookHelper { public: @@ -47,8 +45,6 @@ private: FontModelPtr mxDefFontModel; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 41b9ab1a2eac..d1de203d1d50 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -49,8 +49,6 @@ struct TokenId inline bool operator !=( sal_uInt16 n ) const { return nId != n; } }; - - struct ScComplexRefData; class TokenStack; @@ -74,8 +72,6 @@ enum E_TYPE }; - - class TokenPool { // !ACHTUNG!: externe Id-Basis ist 1, interne 0! @@ -223,8 +219,6 @@ class TokenPool }; - - class TokenStack // Stack fuer Token-Ids: Id 0 sollte reserviert bleiben als // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert @@ -246,8 +240,6 @@ class TokenStack }; - - inline const TokenId TokenStack::Get( void ) { OSL_ENSURE( nPos > 0, @@ -298,8 +290,6 @@ inline void TokenStack::Reset( void ) } - - inline TokenPool& TokenPool::operator <<( const TokenId nId ) { // POST: nId's werden hintereinander im Pool unter einer neuen Id diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index 9ba1b89fec65..9816c6707db4 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -99,8 +99,6 @@ public: #define __nSize 2048 - - class FormCache { private: diff --git a/sc/source/filter/inc/unitconverter.hxx b/sc/source/filter/inc/unitconverter.hxx index 18e7f5a08f7c..c73c1d8f7aa2 100644 --- a/sc/source/filter/inc/unitconverter.hxx +++ b/sc/source/filter/inc/unitconverter.hxx @@ -31,8 +31,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Units supported by the UnitConverter class. */ enum Unit { @@ -104,8 +102,6 @@ private: sal_Int32 mnNullDate; /// Nulldate of this workbook (number of days since 0000-01-01). }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/viewsettings.hxx b/sc/source/filter/inc/viewsettings.hxx index 8dfdfa5940a2..467cc39aed0e 100644 --- a/sc/source/filter/inc/viewsettings.hxx +++ b/sc/source/filter/inc/viewsettings.hxx @@ -29,8 +29,6 @@ namespace oox { namespace xls { - - /** Contains all settings for a selection in a single pane of a sheet. */ struct PaneSelectionModel { @@ -41,8 +39,6 @@ struct PaneSelectionModel explicit PaneSelectionModel(); }; - - /** Contains all view settings for a single sheet. */ struct SheetViewModel { @@ -93,8 +89,6 @@ struct SheetViewModel typedef ::boost::shared_ptr< SheetViewModel > SheetViewModelRef; - - class SheetViewSettings : public WorksheetHelper { public: @@ -132,8 +126,6 @@ private: SheetViewModelVec maSheetViews; }; - - /** Contains all view settings for the entire document. */ struct WorkbookViewModel { @@ -155,8 +147,6 @@ struct WorkbookViewModel typedef ::boost::shared_ptr< WorkbookViewModel > WorkbookViewModelRef; - - class ViewSettings : public WorkbookHelper { public: @@ -203,8 +193,6 @@ private: bool mbValidOleSize; /// True = imported OLE size is a valid cell range. }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx index df53df149b8b..5ef19dd2c491 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -28,8 +28,6 @@ namespace xls { class ExternalLink; - - class WorkbookFragment : public WorkbookFragmentBase { public: diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 2d0804929ad9..39dc56971af9 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -66,8 +66,6 @@ namespace xls { class ExcelFilter; - - /** An enumeration for all supported spreadsheet filter types. */ enum FilterType { @@ -76,16 +74,12 @@ enum FilterType FILTER_UNKNOWN /// Unknown filter type. }; - - /** Functor for case-insensitive string comparison, usable in maps etc. */ struct IgnoreCaseCompare { bool operator()( const OUString& rName1, const OUString& rName2 ) const; }; - - class AddressConverter; class BiffCodecHelper; class ConnectionsBuffer; @@ -289,8 +283,6 @@ private: WorkbookGlobals& mrBookGlob; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index 8c4e2219ede4..59bba3304437 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -27,8 +27,6 @@ namespace com { namespace sun { namespace star { namespace util { struct Date; } namespace oox { namespace xls { - - /** Settings for workbook write protection. */ struct FileSharingModel { @@ -39,8 +37,6 @@ struct FileSharingModel explicit FileSharingModel(); }; - - /** Global workbook settings. */ struct WorkbookSettingsModel { @@ -58,8 +54,6 @@ struct WorkbookSettingsModel void setBiffObjectMode( sal_uInt16 nObjMode ); }; - - /** Workbook calculation settings. */ struct CalcSettingsModel { @@ -79,8 +73,6 @@ struct CalcSettingsModel explicit CalcSettingsModel(); }; - - class WorkbookSettings : public WorkbookHelper { public: @@ -118,8 +110,6 @@ private: CalcSettingsModel maCalcSettings; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/worksheetbuffer.hxx b/sc/source/filter/inc/worksheetbuffer.hxx index 8c996f01d234..a75027e73358 100644 --- a/sc/source/filter/inc/worksheetbuffer.hxx +++ b/sc/source/filter/inc/worksheetbuffer.hxx @@ -32,8 +32,6 @@ namespace com { namespace sun { namespace star { namespace oox { namespace xls { - - /** Contains data from the 'sheet' element describing a sheet in the workbook. */ struct SheetInfoModel { @@ -46,8 +44,6 @@ struct SheetInfoModel explicit SheetInfoModel(); }; - - /** Stores information about all sheets in a spreadsheet document. Information about sheets includes the sheet name, the visibility state, and @@ -111,8 +107,6 @@ private: SheetInfoMap maSheetInfosByName; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index fdf78f80af02..20d2f9692f73 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -25,8 +25,6 @@ namespace oox { namespace xls { - - class DataValidationsContext : public WorksheetContextBase { public: @@ -49,8 +47,6 @@ private: ::std::auto_ptr< ValidationModel > mxValModel; }; - - class WorksheetFragment : public WorksheetFragmentBase { public: diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index aa0f239e4fc1..b38132fc4afb 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -59,8 +59,6 @@ class WorksheetSettings; typedef ::std::map< OUString, void* > ExtLst; - - typedef ::std::map< BinAddress, sal_Int32 > SharedFormulaMap; /** An enumeration for all types of sheets in a workbook. */ @@ -74,8 +72,6 @@ enum WorksheetType SHEETTYPE_EMPTYSHEET /// Other (unsupported) sheet type. }; - - /** Stores settings and formatting data about a range of sheet columns. */ struct ColumnModel { @@ -93,8 +89,6 @@ struct ColumnModel bool isMergeable( const ColumnModel& rModel ) const; }; - - /** Stores settings and formatting data about a sheet row. */ struct RowModel { @@ -119,8 +113,6 @@ struct RowModel bool isMergeable( const RowModel& rModel ) const; }; - - /** Stores formatting data about a page break. */ struct PageBreakModel { @@ -132,8 +124,6 @@ struct PageBreakModel explicit PageBreakModel(); }; - - /** Stores data about a hyperlink range. */ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo { @@ -144,8 +134,6 @@ struct HyperlinkModel : public ::oox::ole::StdHlinkInfo explicit HyperlinkModel(); }; - - /** Stores data about ranges with data validation settings. */ struct ValidationModel { @@ -176,8 +164,6 @@ struct ValidationModel }; - - class WorksheetGlobals; typedef ::boost::shared_ptr< WorksheetGlobals > WorksheetGlobalsRef; @@ -203,8 +189,6 @@ public: // horrible accessor for hidden WorksheetGlobals ... static IWorksheetProgress *getWorksheetInterface( const WorksheetGlobalsRef &xRef ); - - /** Returns the type of this sheet. */ WorksheetType getSheetType() const; /** Returns the index of the current sheet. */ @@ -333,8 +317,6 @@ private: }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/worksheetsettings.hxx b/sc/source/filter/inc/worksheetsettings.hxx index 161492211813..02877c797c8e 100644 --- a/sc/source/filter/inc/worksheetsettings.hxx +++ b/sc/source/filter/inc/worksheetsettings.hxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - /** Sheet and outline settings. */ struct SheetSettingsModel { @@ -41,8 +39,6 @@ struct SheetSettingsModel explicit SheetSettingsModel(); }; - - /** Sheet protection settings. */ struct SheetProtectionModel { @@ -67,8 +63,6 @@ struct SheetProtectionModel explicit SheetProtectionModel(); }; - - class WorksheetSettings : public WorksheetHelper { public: @@ -109,8 +103,6 @@ private: SheetProtectionModel maSheetProt; }; - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index ba71aa5e039d..505de89540aa 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -29,8 +29,6 @@ namespace utl { class TempFile; } - - class SvStream; class XclEscherExGlobal : public EscherExGlobal, protected XclExpRoot @@ -49,8 +47,6 @@ private: SAL_WNODEPRECATED_DECLARATIONS_POP }; - - class XclObj; class XclExpDffAnchorBase; class XclEscherHostAppData; @@ -155,8 +151,6 @@ public: - - // --- class XclEscherClientData ------------------------------------- class XclEscherClientData : public EscherExClientRecord_Base @@ -189,8 +183,6 @@ public: virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; }; - - #endif // _XCL97ESC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index 023d929d0753..7c776d11d1ff 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -25,8 +25,6 @@ #include "xlstyle.hxx" #include "tabprotection.hxx" - - class XclObj; class XclExpMsoDrawing; class SdrCaptionObj; @@ -384,8 +382,6 @@ public: void SaveXml( XclExpXmlStream& rStrm ) const; }; - - class ExcEScenario : public ExcRecord { private: @@ -412,8 +408,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class ExcEScenarioManager : public ExcRecord { private: @@ -434,8 +428,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - - /** Represents a FEATHDR (SHEETPROTECTION) record that stores sheet protection options. Note that a sheet still needs to save its sheet protection options even when it's not protected. */ @@ -467,8 +459,6 @@ private: ScEnhancedProtection maEnhancedProtection; }; - - class XclCalccount : public ExcRecord { private: @@ -485,8 +475,6 @@ public: }; - - class XclIteration : public ExcRecord { private: @@ -503,8 +491,6 @@ public: }; - - class XclDelta : public ExcRecord { private: @@ -521,8 +507,6 @@ public: }; - - class XclRefmode : public XclExpBoolRecord { public: @@ -531,8 +515,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpFileEncryption : public XclExpRecord { public: @@ -546,8 +528,6 @@ private: const XclExpRoot& mrRoot; }; - - /** Beginning of User Interface Records */ class XclExpInterfaceHdr : public XclExpUInt16Record { @@ -558,8 +538,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - /** End of User Interface Records */ class XclExpInterfaceEnd : public XclExpRecord { @@ -571,8 +549,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - /** Write Access User Name - This record contains the user name, which is the name you type when you install Excel. */ class XclExpWriteAccess : public XclExpRecord @@ -585,8 +561,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpFileSharing : public XclExpRecord { public: @@ -603,8 +577,6 @@ private: bool mbRecommendReadOnly; }; - - class XclExpProt4Rev : public XclExpRecord { public: @@ -615,8 +587,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpProt4RevPass : public XclExpRecord { public: @@ -627,16 +597,12 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpRecalcId : public XclExpDummyRecord { public: explicit XclExpRecalcId(); }; - - class XclExpBookExt : public XclExpDummyRecord { public: diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 4a48d46f9442..fc152284f272 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -154,8 +154,6 @@ private: XclExpChRootDataRef mxChData; /// Reference to the root data object. }; - - /** Base class for chart record groups. Provides helper functions to write sub records. A chart record group consists of a header record, followed by a CHBEGIN @@ -185,8 +183,6 @@ private: XclChFrBlock maFrBlock; /// Future records block settings. }; - - /** Base class for chart future records. On saving, the record writes missing CHFRBLOCKBEGIN records automatically. */ @@ -219,8 +215,6 @@ private: typedef boost::shared_ptr< XclExpChFramePos > XclExpChFramePosRef; - - class XclExpChLineFormat : public XclExpRecord { public: @@ -254,8 +248,6 @@ private: typedef boost::shared_ptr< XclExpChLineFormat > XclExpChLineFormatRef; - - class XclExpChAreaFormat : public XclExpRecord { public: @@ -288,8 +280,6 @@ private: typedef boost::shared_ptr< XclExpChAreaFormat > XclExpChAreaFormatRef; - - class XclExpChEscherFormat : public XclExpChGroupBase { public: @@ -323,8 +313,6 @@ private: typedef boost::shared_ptr< XclExpChEscherFormat > XclExpChEscherFormatRef; - - /** Base class for record groups containing frame formatting. Frame formatting can be part of several record groups, e.g. CHFRAME, @@ -357,8 +345,6 @@ private: XclExpChEscherFormatRef mxEscherFmt; /// Complex area format (CHESCHERFORMAT record). }; - - /** Represents the CHFRAME record group containing object frame properties. The CHFRAME group consists of: CHFRAME, CHBEGIN, CHLINEFORMAT, @@ -445,8 +431,6 @@ public: typedef boost::shared_ptr< XclExpChFont > XclExpChFontRef; - - /** The CHOBJECTLINK record linking a text object to a specific chart object. */ class XclExpChObjectLink : public XclExpRecord { @@ -462,8 +446,6 @@ private: typedef boost::shared_ptr< XclExpChObjectLink > XclExpChObjectLinkRef; - - /** Additional data label settings in the future record CHFRLABELPROPS. */ class XclExpChFrLabelProps : public XclExpChFutureRecordBase { @@ -485,8 +467,6 @@ private: typedef boost::shared_ptr< XclExpChFrLabelProps > XclExpChFrLabelPropsRef; - - /** Base class for objects with font settings. Provides font conversion helper functions. */ class XclExpChFontBase { @@ -506,8 +486,6 @@ public: void ConvertRotationBase( const XclExpChRoot& rRoot, const ScfPropertySet& rPropSet, bool bSupportsStacked ); }; - - /** Represents the CHTEXT record group containing text object properties. The CHTEXT group consists of: CHTEXT, CHBEGIN, CHFRAMEPOS, CHFONT, @@ -597,8 +575,6 @@ private: typedef boost::shared_ptr< XclExpChMarkerFormat > XclExpChMarkerFormatRef; - - /** The CHPIEFORMAT record containing data point formatting data for pie segments. */ class XclExpChPieFormat : public XclExpUInt16Record { @@ -611,8 +587,6 @@ public: typedef boost::shared_ptr< XclExpChPieFormat > XclExpChPieFormatRef; - - /** The CH3DDATAFORMAT record containing the bar type in 3D bar charts. */ class XclExpCh3dDataFormat : public XclExpRecord { @@ -631,8 +605,6 @@ private: typedef boost::shared_ptr< XclExpCh3dDataFormat > XclExpCh3dDataFormatRef; - - /** The CHATTACHEDLABEL record that contains the type of a data point label. */ class XclExpChAttachedLabel : public XclExpUInt16Record { @@ -642,8 +614,6 @@ public: typedef boost::shared_ptr< XclExpChAttachedLabel > XclExpChAttLabelRef; - - /** Represents the CHDATAFORMAT record group containing data point properties. The CHDATAFORMAT group consists of: CHDATAFORMAT, CHBEGIN, CHFRAME group, @@ -683,8 +653,6 @@ private: typedef boost::shared_ptr< XclExpChDataFormat > XclExpChDataFormatRef; - - /** Represents the CHSERTRENDLINE record containing settings for a trend line. */ class XclExpChSerTrendLine : public XclExpRecord, protected XclExpChRoot { @@ -713,8 +681,6 @@ private: typedef boost::shared_ptr< XclExpChSerTrendLine > XclExpChSerTrendLineRef; - - /** Represents the CHSERERRORBAR record containing settings for error bars. */ class XclExpChSerErrorBar : public XclExpRecord, protected XclExpChRoot { @@ -733,8 +699,6 @@ private: typedef boost::shared_ptr< XclExpChSerErrorBar > XclExpChSerErrorBarRef; - - /** Represents the CHSERIES record group describing a data series in a chart. The CHSERIES group consists of: CHSERIES, CHBEGIN, CHSOURCELINK groups, @@ -838,8 +802,6 @@ private: XclChTypeInfo maTypeInfo; /// Chart type info for the contained type. }; - - /** Represents the CHCHART3D record that contains 3D view settings. */ class XclExpChChart3d : public XclExpRecord { @@ -863,8 +825,6 @@ private: typedef boost::shared_ptr< XclExpChChart3d > XclExpChChart3dRef; - - /** Represents the CHLEGEND record group describing the chart legend. The CHLEGEND group consists of: CHLEGEND, CHBEGIN, CHFRAMEPOS, CHFRAME @@ -893,8 +853,6 @@ private: typedef boost::shared_ptr< XclExpChLegend > XclExpChLegendRef; - - /** Represents the CHDROPBAR record group describing pos/neg bars in line charts. The CHDROPBAR group consists of: CHDROPBAR, CHBEGIN, CHLINEFORMAT, @@ -921,8 +879,6 @@ private: typedef boost::shared_ptr< XclExpChDropBar > XclExpChDropBarRef; - - /** Represents the CHTYPEGROUP record group describing a group of series. The CHTYPEGROUP group consists of: CHTYPEGROUP, CHBEGIN, a chart type @@ -1029,8 +985,6 @@ private: typedef boost::shared_ptr< XclExpChLabelRange > XclExpChLabelRangeRef; - - class XclExpChValueRange : public XclExpRecord, protected XclExpChRoot { public: @@ -1050,8 +1004,6 @@ private: typedef boost::shared_ptr< XclExpChValueRange > XclExpChValueRangeRef; - - class XclExpChTick : public XclExpRecord, protected XclExpChRoot { public: @@ -1074,8 +1026,6 @@ private: typedef boost::shared_ptr< XclExpChTick > XclExpChTickRef; - - /** Represents the CHAXIS record group describing an entire chart axis. The CHAXIS group consists of: CHAXIS, CHBEGIN, CHLABELRANGE, CHEXTRANGE, @@ -1129,8 +1079,6 @@ private: typedef boost::shared_ptr< XclExpChAxis > XclExpChAxisRef; - - /** Represents the CHAXESSET record group describing an axes set (X/Y/Z axes). The CHAXESSET group consists of: CHAXESSET, CHBEGIN, CHFRAMEPOS, CHAXIS @@ -1239,8 +1187,6 @@ private: XclExpChTextList maLabels; /// Data point labels (CHTEXT groups). }; - - /** Represents the group of DFF and OBJ records containing all drawing shapes embedded in the chart object. */ @@ -1260,8 +1206,6 @@ private: boost::shared_ptr< XclExpRecordBase > mxObjRecs; }; - - /** Represents the entire chart substream (all records in BOF/EOF block). */ class XclExpChart : public XclExpSubStream, protected XclExpRoot { @@ -1273,8 +1217,6 @@ public: XModelRef xModel, const Rectangle& rChartRect ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 545ff59f5ddf..f14a1ed69dea 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -220,8 +220,6 @@ private: const Color& mrColor; }; - - class ScConditionalFormat; /** Represents a CONDFMT record that contains all conditions of a conditional format. @@ -296,8 +294,6 @@ private: sal_Int32 mnPriority; }; - - /** Contains all conditional formats of a specific sheet. */ class XclExpCondFormatBuffer : public XclExpRecordBase, protected XclExpRoot { @@ -357,8 +353,6 @@ private: sal_uLong mnScHandle; /// The core handle for quick list search. }; - - /** This class contains the DV record list following the DVAL record. */ class XclExpDval : public XclExpRecord, protected XclExpRoot { @@ -416,8 +410,6 @@ private: bool mbEntireDoc; /// true = entire document. }; - - /** Contains all web query records for this document. */ class XclExpWebQueryBuffer : public XclExpRecordList< XclExpWebQuery > { @@ -425,8 +417,6 @@ public: explicit XclExpWebQueryBuffer( const XclExpRoot& rRoot ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index a51e5306341c..bb38e62fd735 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -65,8 +65,6 @@ protected: // for access in derived classes sal_uInt16 mnFlags; /// Flags for DFF stream export. }; - - /** Represents the position (anchor) of an object in a Calc sheet. */ class XclExpDffSheetAnchor : public XclExpDffAnchorBase { @@ -81,8 +79,6 @@ private: SCTAB mnScTab; /// Calc sheet index. }; - - /** Represents the position (anchor) of a shape in an embedded draw page. */ class XclExpDffEmbeddedAnchor : public XclExpDffAnchorBase { @@ -100,8 +96,6 @@ private: sal_Int32 mnScaleY; }; - - /** Represents the position (anchor) of a note object. */ class XclExpDffNoteAnchor : public XclExpDffAnchorBase { @@ -109,8 +103,6 @@ public: explicit XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectangle& rRect ); }; - - /** Represents the position (anchor) of a cell dropdown object. */ class XclExpDffDropDownAnchor : public XclExpDffAnchorBase { @@ -134,8 +126,6 @@ protected: sal_uInt32 mnFragmentKey; /// The key of the DFF stream fragment to be written by this record. }; - - /** The MSODRAWINGGROUP record contains the DGGCONTAINER with global DFF data such as the picture container. */ @@ -145,8 +135,6 @@ public: explicit XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ); }; - - /** One or more MSODRAWING records contain the DFF stream data for a drawing shape. */ @@ -156,8 +144,6 @@ public: explicit XclExpMsoDrawing( XclEscherEx& rEscherEx ); }; - - /** Provides export of bitmap data to an IMGDATA record. */ class XclExpImgData : public XclExpRecordBase { @@ -173,8 +159,6 @@ private: sal_uInt16 mnRecId; /// Record identifier for the IMGDATA record. }; - - /** Helper class for form controils to manage spreadsheet links . */ class XclExpControlHelper : protected XclExpRoot { @@ -234,8 +218,6 @@ private: virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - //delete for exporting OCX //#if EXC_EXP_OCX_CTRL @@ -302,8 +284,6 @@ private: //#endif - - class XclExpChart; /** A chart object. This is the drawing object wrapper for the chart data. */ @@ -331,8 +311,6 @@ private: XChartDocRef mxChartDoc; }; - - /** Represents a NOTE record containing the relevant data of a cell note. NOTE records differ significantly in various BIFF versions. This class @@ -387,8 +365,6 @@ private: Rectangle maCommentTo; /// To and To Offsets }; - - class XclExpComments : public XclExpRecord { public: @@ -452,8 +428,6 @@ private: boost::shared_ptr< XclExpObjList > mxObjList; }; - - class XclExpEmbeddedObjectManager : public XclExpObjectManager { public: @@ -472,8 +446,6 @@ private: sal_Int32 mnScaleY; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx index 14efdaf9a8e2..d7651ec83291 100644 --- a/sc/source/filter/inc/xeformula.hxx +++ b/sc/source/filter/inc/xeformula.hxx @@ -87,8 +87,6 @@ private: XclExpFmlaCompImplRef mxImpl; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 721efa08200d..fe6f5e210a7d 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -203,8 +203,6 @@ private: bool mbMultipleUrls; /// true = Multiple URL fields processed. }; - - class EditEngine; class EditTextObject; class SdrTextObj; @@ -435,8 +433,6 @@ private: const ScMatrix& mrMatrix; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index 01477085c362..e9c8cf2238de 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -205,8 +205,6 @@ private: XclExpLinkMgrImplPtr mxImpl; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index dfe639e2ef53..35692c70157b 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -26,8 +26,6 @@ #include "xeroot.hxx" #include <boost/shared_ptr.hpp> - - class ScRangeList; class XclExpNameManagerImpl; @@ -76,8 +74,6 @@ private: XclExpNameMgrImplRef mxImpl; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index a726b362d01f..db9c7068141d 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -104,8 +104,6 @@ private: XclPageData maData; /// Page settings data. }; - - /** Contains all page (print) settings records for a chart object. */ class XclExpChartPageSettings : public XclExpRecordBase, protected XclExpRoot { @@ -123,8 +121,6 @@ private: XclPageData maData; /// Page settings data. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 902d9088dba6..c462b6cf7515 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -61,8 +61,6 @@ private: sal_uInt16 mnTypeFlag; /// Data type flag. }; - - class XclExpPivotCache; class XclExpPCField : public XclExpRecord, public XclPCField, protected XclExpRoot @@ -164,8 +162,6 @@ private: sal_uInt16 mnTypeFlags; /// Collected item data type flags. }; - - class XclExpPivotCache : protected XclExpRoot { public: @@ -248,8 +244,6 @@ class XclExpPivotTable; /** Data field position specifying the pivot table field index (first) and data info index (second). */ typedef ::std::pair< sal_uInt16, sal_uInt16 > XclPTDataFieldPos; - - class XclExpPTItem : public XclExpRecord { public: @@ -271,8 +265,6 @@ private: XclPTItemInfo maItemInfo; /// General data for this item. }; - - class XclExpPTField : public XclExpRecordBase { public: @@ -338,8 +330,6 @@ private: XclExpPTItemList maItemList; /// List of all items of this field. }; - - class XclExpPivotTable : public XclExpRecordBase, protected XclExpRoot { public: @@ -425,8 +415,6 @@ private: size_t mnId; /// Stream ID }; - - /** The main class for pivot table export. This class contains all pivot caches and pivot tables in a Calc document. @@ -470,8 +458,6 @@ private: bool mbShareCaches; /// true = Tries to share caches between tables. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index c0678aa62965..ca02094b9d31 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -43,8 +43,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ); }; - - class XclExpDelegatingRecord : public XclExpRecordBase { public: @@ -56,8 +54,6 @@ private: XclExpRecordBase* mpRecord; }; - - class XclExpXmlElementRecord : public XclExpRecordBase { public: @@ -68,8 +64,6 @@ protected: sal_Int32 mnElement; }; - - class XclExpXmlStartElementRecord : public XclExpXmlElementRecord { public: @@ -80,8 +74,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpXmlEndElementRecord : public XclExpXmlElementRecord { public: @@ -92,8 +84,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpXmlStartSingleElementRecord : public XclExpXmlElementRecord { public: @@ -104,8 +94,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - class XclExpXmlEndSingleElementRecord : public XclExpRecordBase { public: @@ -116,8 +104,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - /** Base class for single records with any content. This class handles writing the record header. Derived classes only have to @@ -165,8 +151,6 @@ private: sal_uInt16 mnRecId; /// The record ID. }; - - /** A record without body. Only the record ID and the size 0 will be written. */ class XclExpEmptyRecord : public XclExpRecord { @@ -180,8 +164,6 @@ inline XclExpEmptyRecord::XclExpEmptyRecord( sal_uInt16 nRecId ) : { } - - /** A record with a single value of type Type. @descr Requires operator<<( XclExpStream&, const Type& ). */ template< typename Type > @@ -235,8 +217,6 @@ XclExpValueRecord< Type >* XclExpValueRecord< Type >::SetAttribute( sal_Int32 nI return this; } - - /** A record containing an unsigned 16-bit value. */ typedef XclExpValueRecord< sal_uInt16 > XclExpUInt16Record; @@ -246,8 +226,6 @@ typedef XclExpValueRecord< sal_uInt32 > XclExpUInt32Record; /** A record containing a double value. */ typedef XclExpValueRecord< double > XclExpDoubleRecord; - - /** Record which contains a Boolean value. @descr The value is stored as 16-bit value: 0x0000 = sal_False, 0x0001 = TRUE. */ class XclExpBoolRecord : public XclExpRecord @@ -274,8 +252,6 @@ private: sal_Int32 mnAttribute; /// The attribute to generate within SaveXml() }; - - /** Record which exports a memory data array. */ class XclExpDummyRecord : public XclExpRecord { @@ -388,8 +364,6 @@ private: RecordVec maRecs; }; - - /** Represents a complete substream of records enclosed into a pair of BOF/EOF records. */ class XclExpSubStream : public XclExpRecordList<> { @@ -403,8 +377,6 @@ private: sal_uInt16 mnSubStrmType; /// Substream type, stored in leading BOF record. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index 80a7ee58fa3c..e58ddf3a3033 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -99,8 +99,6 @@ struct XclExpRootData : public XclRootData virtual ~XclExpRootData(); }; - - /** Access to global data from other classes. */ class XclExpRoot : public XclRoot { @@ -173,8 +171,6 @@ private: XclExpRootData& mrExpData; /// Reference to the global export data struct. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 2ccc15ee8405..d852eaa6bd61 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef SC_XESTREAM_HXX #define SC_XESTREAM_HXX @@ -197,8 +195,6 @@ private: bool mbInRec; /// true = currently writing inside of a record. }; - - class XclExpBiff8Encrypter { public: @@ -243,8 +239,6 @@ private: - - // `s.GetChar(0) != 0` needed because some strings on export only contain NULL. #define XESTRING_TO_PSZ(s) \ (s.Len() && s.GetChar( 0 ) != 0 ? XclXmlUtils::ToOString( s ).getStr() : NULL) diff --git a/sc/source/filter/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 43431824a786..0a084754ab64 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -22,8 +22,6 @@ #include "xlstring.hxx" - - class XclExpStream; class XclExpXmlStream; @@ -265,8 +263,6 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const XclExpString& rStrin return rStrm; } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index 507b8d2ec59d..cf2c24023cfb 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -58,8 +58,6 @@ enum XclExpColorType EXC_COLOR_TABBG /// Spreadsheet tab bg color. }; - - class XclExpPaletteImpl; /** Stores all used colors in the document. @@ -131,8 +129,6 @@ class SvxFont; const size_t EXC_FONTLIST_NOTFOUND = static_cast< size_t >( -1 ); - - /** Static helper functions for font export. */ class XclExpFontHelper { @@ -161,8 +157,6 @@ private: ~XclExpFontHelper(); }; - - /** Stores all data of an Excel font and provides export of FONT records. */ class XclExpFont : public XclExpRecord, protected XclExpRoot { @@ -190,8 +184,6 @@ private: sal_uInt32 mnHash; /// Hash value for fast comparison. }; - - /** Used as placeholder for font index 4, which is not used in Excel. */ class XclExpBlindFont : public XclExpFont { @@ -205,8 +197,6 @@ public: virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - class ScPatternAttr; /** Stores the data of all fonts used in the document. */ @@ -275,8 +265,6 @@ struct XclExpNumFmt void SaveXml( XclExpXmlStream& rStrm ); }; - - class SvNumberFormatter; typedef ::std::auto_ptr< SvNumberFormatter > SvNumberFormatterPtr; @@ -333,8 +321,6 @@ struct XclExpCellProt : public XclCellProt void SaveXml( XclExpXmlStream& rStrm ) const; }; - - /** Extends the XclCellAlign struct for export. @descr Provides functions to fill from item sets and to fill to Excel record data. */ struct XclExpCellAlign : public XclCellAlign @@ -354,8 +340,6 @@ struct XclExpCellAlign : public XclCellAlign void SaveXml( XclExpXmlStream& rStrm ) const; }; - - /** Extends the XclCellBorder struct for export. @descr Provides functions to fill from item sets and to fill to Excel record data. */ struct XclExpCellBorder : public XclCellBorder @@ -387,8 +371,6 @@ struct XclExpCellBorder : public XclCellBorder void SaveXml( XclExpXmlStream& rStrm ) const; }; - - /** Extends the XclCellArea struct for export. @descr Provides functions to fill from item sets and to fill to Excel record data. */ struct XclExpCellArea : public XclCellArea @@ -426,8 +408,6 @@ struct XclExpColor void SaveXml( XclExpXmlStream& rStrm ) const; }; - - /** A combination of unique XF identifier with real Excel XF index. */ struct XclExpXFId { @@ -441,8 +421,6 @@ struct XclExpXFId void ConvertXFIndex( const XclExpRoot& rRoot ); }; - - class SfxStyleSheetBase; /** Represents an XF record which contains all formatting data of a cell or cell style. */ @@ -538,8 +516,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - - /** Represents a default XF record. Supports methods to set attributes directly. */ class XclExpDefaultXF : public XclExpXF { @@ -552,8 +528,6 @@ public: void SetNumFmt( sal_uInt16 nXclNumFmt ); }; - - /** Represents a STYLE record containing the data of a cell style. @descr The calss is able to store built-in and user-defined styles. */ class XclExpStyle : public XclExpRecord @@ -580,8 +554,6 @@ private: sal_uInt8 mnLevel; /// Outline level for RowLevel and ColLevel styles. }; - - /** Stores all XF records (cell formats and cell styles) in the document. Stores also the names of user defined cell styles (STYLE records). Supports @@ -763,8 +735,6 @@ private: boost::scoped_ptr<NfKeywordTable> mpKeywordTable; /// Replacement table. }; - - class XclExpXmlStyleSheet : public XclExpRecordBase, protected XclExpRoot { public: @@ -773,8 +743,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index a5173d4a41d0..06146cfe28a6 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -126,8 +126,6 @@ private: typedef boost::shared_ptr< XclExpArray > XclExpArrayRef; - - /** Caches all ARRAY records. */ class XclExpArrayBuffer : protected XclExpRoot { @@ -177,8 +175,6 @@ private: typedef boost::shared_ptr< XclExpShrfmla > XclExpShrfmlaRef; - - /** Caches all SHRFMLA records and provides functions to update their ranges. */ class XclExpShrfmlaBuffer : protected XclExpRoot { @@ -252,8 +248,6 @@ private: typedef boost::shared_ptr< XclExpTableop > XclExpTableopRef; - - /** Contains all created TABLEOP records and supports creating or updating them. */ class XclExpTableopBuffer : protected XclExpRoot { @@ -370,8 +364,6 @@ private: sal_Size mnContSize; /// The size of the cell contents. }; - - /** Represents a NUMBER record that describes a cell with a double value. */ class XclExpNumberCell : public XclExpSingleCellBase { @@ -390,8 +382,6 @@ private: double mfValue; /// The cell value. }; - - /** Represents a BOOLERR record that describes a cell with a Boolean value. */ class XclExpBooleanCell : public XclExpSingleCellBase { @@ -451,8 +441,6 @@ private: bool mbLineBreak; /// True = cell has automatic linebreaks enabled. }; - - class ScFormulaCell; /** Represents a FORMULA record that describes a cell with a formula. */ @@ -492,8 +480,6 @@ struct XclExpMultiXFId : public XclExpXFId XclExpXFId( nXFId ), mnCount( nCount ) {} }; - - /** Base class for all cell records supporting multiple contents. */ class XclExpMultiCellBase : public XclExpCellBase { @@ -554,8 +540,6 @@ private: XclExpMultiXFIdDeq maXFIds; /// The XF identifiers of the cell formatting. }; - - /** Represents a BLANK or MULBLANK record that describes empty but formatted cells. */ class XclExpBlankCell : public XclExpMultiCellBase { @@ -581,8 +565,6 @@ private: virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) SAL_OVERRIDE; }; - - /** Represents an RK or MULRK record that describes cells with a compressed double values. */ class XclExpRkCell : public XclExpMultiCellBase { @@ -644,8 +626,6 @@ private: bool mbCurrCollapse; /// true = Collapsed group ends at current position. }; - - /** The outline buffer for column outlines. */ class XclExpColOutlineBuffer : public XclExpOutlineBuffer { @@ -658,8 +638,6 @@ public: { UpdateColRow( static_cast< SCCOLROW >( nScCol ) ); } }; - - /** The outline buffer for row outlines. */ class XclExpRowOutlineBuffer : public XclExpOutlineBuffer { @@ -672,8 +650,6 @@ public: { UpdateColRow( static_cast< SCCOLROW >( nScRow ) ); } }; - - /** Represents a GUTS record containing the level count of row and column outlines. */ class XclExpGuts : public XclExpRecord { @@ -690,8 +666,6 @@ private: sal_uInt16 mnRowWidth; /// Width of row outline area (pixels). }; - - /** Represents a DIMENSIONS record containing the used area of a sheet. */ class XclExpDimensions : public XclExpRecord { @@ -715,8 +689,6 @@ private: sal_uInt16 mnFirstFreeXclCol; /// First free column after used area. }; - - /** Represents the DEFCOLWIDTH record containing the default column width of a sheet. Excel stores the default column width in entire character widths of the '0' @@ -741,8 +713,6 @@ public: void SetDefWidth( sal_uInt16 nXclColWidth ); }; - - /** Contains the column settings for a range of columns. After construction the record contains a temporary XF identifier returned @@ -790,8 +760,6 @@ private: sal_uInt16 mnLastXclCol; /// Index to last column. }; - - /** Contains COLINFO records for all columns of a Calc sheet. On construction one COLINFO record per column is created. After creating @@ -824,8 +792,6 @@ private: XclExpColOutlineBuffer maOutlineBfr; /// Buffer for column outline groups. }; - - class XclExpRow; /** Contains all possible default row settings. */ @@ -843,8 +809,6 @@ struct XclExpDefaultRowData inline bool IsUnsynced() const { return ::get_flag( mnFlags, EXC_DEFROW_UNSYNCED ); } }; - - /** Represents a DEFROWHEIGHT record containing default format for unused rows. */ class XclExpDefrowheight : public XclExpRecord { @@ -862,8 +826,6 @@ private: XclExpDefaultRowData maDefData; /// Record data. }; - - /** Represents a ROW record and additionally contains all cells records of a row. This class contains all cell records of a row in a spreadsheet. There are 2 @@ -953,8 +915,6 @@ private: bool mbEnabled; /// true = Write this ROW record. }; - - /** Collects all rows which contain all cells of a sheet. This row buffer automatically creates ROW records when cells are inserted diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index cbfb8395f3f3..9b0afde5656a 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -65,8 +65,6 @@ private: sal_uInt16 mnPageZoom; /// Zoom factor for pagebreak preview. }; - - /** Represents an SCL record for the zoom factor of the current view of a sheet. */ class XclExpScl : public XclExpRecord { @@ -84,8 +82,6 @@ private: sal_uInt16 mnDenom; /// Denominator of the zoom factor. }; - - /** Represents a PANE record containing settings for split/frozen windows. */ class XclExpPane : public XclExpRecord { @@ -106,8 +102,6 @@ private: bool mbFrozenPanes; /// true = "frozen" panes; false = "split" window. }; - - /** Represents a SELECTION record with selection data for a pane. */ class XclExpSelection : public XclExpRecord { @@ -167,8 +161,6 @@ private: sal_uInt32 mnGridColorId; /// Color identifier for grid color. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 3e8a346833af..986ca320b578 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -170,8 +170,6 @@ private: XclImpChRootDataRef mxChData; /// Reference to the root data object. }; - - /** Base class for chart record groups. Provides helper functions to read sub records. A chart record group consists of a header record, followed by a CHBEGIN @@ -215,8 +213,6 @@ private: typedef boost::shared_ptr< XclImpChFramePos > XclImpChFramePosRef; - - /** The CHLINEFORMAT record containing line formatting data. */ class XclImpChLineFormat { @@ -249,8 +245,6 @@ private: typedef boost::shared_ptr< XclImpChLineFormat > XclImpChLineFormatRef; - - /** The CHAREAFORMAT record containing simple area formatting data (solid or patterns). */ class XclImpChAreaFormat { @@ -279,8 +273,6 @@ private: typedef boost::shared_ptr< XclImpChAreaFormat > XclImpChAreaFormatRef; - - /** The CHESCHERFORMAT record containing complex area formatting data (bitmaps, hatches). */ class XclImpChEscherFormat : public XclImpChGroupBase { @@ -304,8 +296,6 @@ private: typedef boost::shared_ptr< XclImpChEscherFormat > XclImpChEscherFormatRef; - - /** Base class for record groups containing frame formatting. Frame formatting can be part of several record groups, e.g. CHFRAME, @@ -355,8 +345,6 @@ protected: XclImpChEscherFormatRef mxEscherFmt; /// Complex area format (CHESCHERFORMAT record). }; - - /** Represents the CHFRAME record group containing object frame properties. The CHFRAME group consists of: CHFRAME, CHBEGIN, CHLINEFORMAT, @@ -458,8 +446,6 @@ public: void ConvertRotationBase( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, bool bSupportsStacked ) const; }; - - /** The CHFONT record containing a font index for text objects. */ class XclImpChFont { @@ -477,8 +463,6 @@ private: typedef boost::shared_ptr< XclImpChFont > XclImpChFontRef; - - /** Represents the CHTEXT record group containing text object properties. The CHTEXT group consists of: CHTEXT, CHBEGIN, CHFRAMEPOS, CHFONT, @@ -581,8 +565,6 @@ private: typedef boost::shared_ptr< XclImpChMarkerFormat > XclImpChMarkerFormatRef; - - /** The CHPIEFORMAT record containing data point formatting data for pie segments. */ class XclImpChPieFormat { @@ -599,8 +581,6 @@ private: typedef boost::shared_ptr< XclImpChPieFormat > XclImpChPieFormatRef; - - /** The CHSERIESFORMAT record containing additional settings for a data series. */ class XclImpChSeriesFormat { @@ -617,8 +597,6 @@ private: typedef boost::shared_ptr< XclImpChSeriesFormat > XclImpChSeriesFormatRef; - - /** The CH3DDATAFORMAT record containing the bar type in 3D bar charts. */ class XclImpCh3dDataFormat { @@ -634,8 +612,6 @@ private: typedef boost::shared_ptr< XclImpCh3dDataFormat > XclImpCh3dDataFormatRef; - - /** The CHATTACHEDLABEL record that contains the type of a data point label. */ class XclImpChAttachedLabel : protected XclImpChRoot { @@ -652,8 +628,6 @@ private: typedef boost::shared_ptr< XclImpChAttachedLabel > XclImpChAttLabelRef; - - /** Represents the CHDATAFORMAT record group containing data point properties. The CHDATAFORMAT group consists of: CHDATAFORMAT, CHBEGIN, CHFRAME group, @@ -720,8 +694,6 @@ private: typedef boost::shared_ptr< XclImpChDataFormat > XclImpChDataFormatRef; - - /** Represents the CHSERTRENDLINE record containing settings for a trend line. */ class XclImpChSerTrendLine : protected XclImpChRoot { @@ -749,8 +721,6 @@ private: typedef boost::shared_ptr< XclImpChSerTrendLine > XclImpChSerTrendLineRef; - - /** Represents the CHSERERRORBAR record containing settings for error bars. */ class XclImpChSerErrorBar : protected XclImpChRoot { @@ -786,8 +756,6 @@ private: typedef boost::shared_ptr< XclImpChSerErrorBar > XclImpChSerErrorBarRef; - - /** Represents the CHSERIES record group describing a data series in a chart. The CHSERIES group consists of: CHSERIES, CHBEGIN, CHSOURCELINK groups, @@ -927,8 +895,6 @@ private: XclChTypeInfo maTypeInfo; /// Chart type info for the contained type. }; - - /** Represents the CHCHART3D record that contains 3D view settings. */ class XclImpChChart3d { @@ -946,8 +912,6 @@ private: typedef boost::shared_ptr< XclImpChChart3d > XclImpChChart3dRef; - - /** Represents the CHLEGEND record group describing the chart legend. The CHLEGEND group consists of: CHLEGEND, CHBEGIN, CHFRAMEPOS, CHFRAME @@ -980,8 +944,6 @@ private: typedef boost::shared_ptr< XclImpChLegend > XclImpChLegendRef; - - /** Represents the CHDROPBAR record group describing pos/neg bars in line charts. The CHDROPBAR group consists of: CHDROPBAR, CHBEGIN, CHLINEFORMAT, @@ -1005,8 +967,6 @@ private: typedef boost::shared_ptr< XclImpChDropBar > XclImpChDropBarRef; - - /** Represents the CHTYPEGROUP record group describing a group of series. The CHTYPEGROUP group consists of: CHTYPEGROUP, CHBEGIN, a chart type @@ -1147,8 +1107,6 @@ private: typedef boost::shared_ptr< XclImpChLabelRange > XclImpChLabelRangeRef; - - class XclImpChValueRange : protected XclImpChRoot { public: @@ -1169,8 +1127,6 @@ private: typedef boost::shared_ptr< XclImpChValueRange > XclImpChValueRangeRef; - - class XclImpChTick : protected XclImpChRoot { public: @@ -1194,8 +1150,6 @@ private: typedef boost::shared_ptr< XclImpChTick > XclImpChTickRef; - - /** Represents the CHAXIS record group describing an entire chart axis. The CHAXIS group consists of: CHAXIS, CHBEGIN, CHLABELRANGE, CHEXTRANGE, @@ -1265,8 +1219,6 @@ private: typedef boost::shared_ptr< XclImpChAxis > XclImpChAxisRef; - - /** Represents the CHAXESSET record group describing an axes set (X/Y/Z axes). The CHAXESSET group consists of: CHAXESSET, CHBEGIN, CHFRAMEPOS, CHAXIS @@ -1438,8 +1390,6 @@ private: typedef boost::shared_ptr< XclImpChChart > XclImpChChartRef; - - /** Drawing container of a chart. */ class XclImpChartDrawing : public XclImpDrawing { @@ -1463,8 +1413,6 @@ private: bool mbOwnTab; /// True = own sheet, false = embedded object. }; - - /** Represents the entire chart substream (all records in BOF/EOF block). */ class XclImpChart : protected XclImpRoot { @@ -1509,8 +1457,6 @@ private: bool mbIsPivotChart; /// true = chart is based on a pivot table. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index d3668d4e8e1a..1509733b2f00 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -142,8 +142,6 @@ private: sal_uInt16 mnCondIndex; /// Condition index to be inserted next. }; - - /** Imports and collects all conditional formatting of a sheet. */ class XclImpCondFormatManager : protected XclImpRoot { @@ -227,8 +225,6 @@ private: sal_uInt16 mnRefresh; /// Refresh time in minutes. }; - - class XclImpWebQueryBuffer : protected XclImpRoot { public: @@ -270,8 +266,6 @@ private: XclImpDecryptHelper(); }; - - // Document protection ======================================================== class XclImpDocProtectBuffer : protected XclImpRoot @@ -331,8 +325,6 @@ private: ProtectedSheetMap maProtectedSheets; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 4eaf60cd4568..ef99ab7f6519 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -202,8 +202,6 @@ private: bool mbCustomDff; /// true = Recreate SdrObject in DFF import. }; - - class XclImpDrawObjVector : public ::std::vector< XclImpDrawObjRef > { public: @@ -216,8 +214,6 @@ public: sal_Size GetProgressSize() const; }; - - /** A placeholder object for unknown object types. */ class XclImpPhObj : public XclImpDrawObjBase { @@ -225,8 +221,6 @@ public: explicit XclImpPhObj( const XclImpRoot& rRoot ); }; - - /** A group object. */ class XclImpGroupObj : public XclImpDrawObjBase { @@ -253,8 +247,6 @@ protected: sal_uInt16 mnFirstUngrouped; /// Object identfier of first object not grouped into this group. }; - - /** A line object. */ class XclImpLineObj : public XclImpDrawObjBase { @@ -277,8 +269,6 @@ protected: sal_uInt8 mnStartPoint; /// Starting point. }; - - /** A rectangle or oval object. */ class XclImpRectObj : public XclImpDrawObjBase { @@ -307,8 +297,6 @@ protected: sal_uInt16 mnFrameFlags; /// Additional flags. }; - - /** An oval object. */ class XclImpOvalObj : public XclImpRectObj { @@ -320,8 +308,6 @@ protected: virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; }; - - /** An arc object. */ class XclImpArcObj : public XclImpDrawObjBase { @@ -344,8 +330,6 @@ protected: sal_uInt8 mnQuadrant; /// Visible quadrant of the circle. }; - - /** A polygon object. */ class XclImpPolygonObj : public XclImpRectObj { @@ -370,8 +354,6 @@ protected: sal_uInt16 mnPointCount; /// Polygon point count. }; - - struct XclImpObjTextData { XclObjTextData maData; /// BIFF5 text data. @@ -383,8 +365,6 @@ struct XclImpObjTextData void ReadFormats( XclImpStream& rStrm ); }; - - /** A drawing object supporting text contents. Used for all simple objects in BIFF8. */ class XclImpTextObj : public XclImpRectObj { @@ -410,8 +390,6 @@ protected: XclImpObjTextData maTextData; /// Textbox data from BIFF5 OBJ or BIFF8 TXO record. }; - - /** A chart object. This is the drawing object wrapper for the chart data. */ class XclImpChartObj : public XclImpRectObj { @@ -449,8 +427,6 @@ private: bool mbOwnTab; /// true = own sheet; false = embedded object. }; - - /** A note object, which is a specialized text box objext. */ class XclImpNoteObj : public XclImpTextObj { @@ -469,8 +445,6 @@ private: sal_uInt16 mnNoteFlags; /// Flags from NOTE record. }; - - /** Helper base class for TBX and OCX form controls to manage spreadsheet links. */ class XclImpControlHelper { @@ -516,8 +490,6 @@ private: XclCtrlBindMode meBindMode; /// Value binding mode. }; - - /** Base class for textbox based form controls. */ class XclImpTbxObjBase : public XclImpTextObj, public XclImpControlHelper { @@ -550,8 +522,6 @@ protected: virtual XclTbxEventType DoGetEventType() const = 0; }; - - /** A button control. */ class XclImpButtonObj : public XclImpTbxObjBase { @@ -567,8 +537,6 @@ protected: virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; - - /** A checkbox control. */ class XclImpCheckBoxObj : public XclImpTbxObjBase { @@ -592,8 +560,6 @@ protected: sal_uInt16 mnCheckBoxFlags; }; - - /** An option button control. */ class XclImpOptionButtonObj : public XclImpCheckBoxObj { @@ -618,8 +584,6 @@ protected: sal_uInt16 mnFirstInGroup; /// 1 = Button is the first in a group. }; - - /** A label control. */ class XclImpLabelObj : public XclImpTbxObjBase { @@ -635,8 +599,6 @@ protected: virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; - - /** A groupbox control. */ class XclImpGroupBoxObj : public XclImpTbxObjBase { @@ -659,8 +621,6 @@ protected: sal_uInt16 mnGroupBoxFlags; }; - - /** A dialog control. */ class XclImpDialogObj : public XclImpTbxObjBase { @@ -676,8 +636,6 @@ protected: virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; - - /** An edit control. */ class XclImpEditObj : public XclImpTbxObjBase { @@ -706,8 +664,6 @@ protected: sal_uInt16 mnListBoxObjId; }; - - /** Base class of scrollable form controls (spin button, scrollbar, listbox, dropdown). */ class XclImpTbxObjScrollableBase : public XclImpTbxObjBase { @@ -732,8 +688,6 @@ protected: sal_uInt16 mnScrollFlags; }; - - /** A spinbutton control. */ class XclImpSpinButtonObj : public XclImpTbxObjScrollableBase { @@ -751,8 +705,6 @@ protected: virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; - - /** A scrollbar control. */ class XclImpScrollBarObj : public XclImpTbxObjScrollableBase { @@ -770,8 +722,6 @@ protected: virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; - - /** Base class for list controls (listbox, dropdown). */ class XclImpTbxObjListBase : public XclImpTbxObjScrollableBase { @@ -792,8 +742,6 @@ protected: bool mbHasDefFontIdx; }; - - /** A listbox control. */ class XclImpListBoxObj : public XclImpTbxObjListBase { @@ -819,8 +767,6 @@ protected: ScfUInt8Vec maSelection; }; - - /** A dropdown listbox control. */ class XclImpDropDownObj : public XclImpTbxObjListBase { @@ -855,8 +801,6 @@ protected: sal_uInt16 mnMinWidth; }; - - /** A picture, an embedded or linked OLE object, or an OCX form control. */ class XclImpPictureObj : public XclImpRectObj, public XclImpControlHelper { @@ -956,8 +900,6 @@ private: XclImpSdrObjMap maSdrObjMap; /// Maps SdrObjects to shape IDs. }; - - /** Simple implementation of the SVX DFF manager. Implements resolving palette colors. Used by XclImpDffPropSet (as is), extended by XclImpDffConverter. */ @@ -972,8 +914,6 @@ protected: virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const SAL_OVERRIDE; }; - - /** This is the central instance for converting binary DFF data into shape objects. Used for all sheet shapes and shapes embedded in chart objects. @@ -1166,8 +1106,6 @@ private: bool mbOleObjs; /// True = draw model supports OLE objects. }; - - /** Drawing manager of a single sheet. */ class XclImpSheetDrawing : public XclImpDrawing { @@ -1294,8 +1232,6 @@ private: XclImpStream& operator>>( XclImpStream& rStrm, XclImpDffPropSet& rPropSet ); - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxx index 51d2d2971a75..13ab2017872b 100644 --- a/sc/source/filter/inc/xiformula.hxx +++ b/sc/source/filter/inc/xiformula.hxx @@ -55,8 +55,6 @@ private: XclImpFmlaCompImplRef mxImpl; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xihelper.hxx b/sc/source/filter/inc/xihelper.hxx index ff1204bd3c42..bacfda0bee73 100644 --- a/sc/source/filter/inc/xihelper.hxx +++ b/sc/source/filter/inc/xihelper.hxx @@ -322,8 +322,6 @@ protected: sal_uInt8 mnType; /// The type of the cached value (EXC_CACHEDVAL_*). }; - - /** Contains cached values in a 2-dimensional array. */ class XclImpCachedMatrix { @@ -342,8 +340,6 @@ private: SCSIZE mnScRows; /// Number of cached rows. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index f0f6e224e7bf..19111544ca5e 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -101,8 +101,6 @@ enum XclImpExtNameType xlExtEuroConvert /// An external in Excel, but internal in OO function name. }; - - class XclImpCachedMatrix; class ScTokenArray; class XclImpSupbook; @@ -225,8 +223,6 @@ private: XclImpLinkMgrImplPtr mxImpl; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index 432220644f28..560d250de2b8 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -30,8 +30,6 @@ #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> - - class ScRangeData; class ScTokenArray; @@ -77,8 +75,6 @@ private: boost::scoped_ptr<TokenStrmData> mpTokensData; /// For later conversion of token array. }; - - /** This buffer contains all internal defined names of the document. @descr It manages the position of the names in the document, means if they are global or attached to a specific sheet. While inserting the names into the Calc @@ -110,8 +106,6 @@ private: XclImpNameList maNameList; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxx index 07ee76551f88..80b58e6090b4 100644 --- a/sc/source/filter/inc/xipage.hxx +++ b/sc/source/filter/inc/xipage.hxx @@ -68,8 +68,6 @@ private: bool mbValidPaper; /// true = Paper size and orientation valid. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 571fa75e6d12..eb57db902f33 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -60,8 +60,6 @@ private: typedef boost::shared_ptr< XclImpPCItem > XclImpPCItemRef; - - struct ScDPNumGroupInfo; class XclImpPivotCache; @@ -145,8 +143,6 @@ private: typedef boost::shared_ptr< XclImpPCField > XclImpPCFieldRef; - - class XclImpPivotCache : protected XclImpRoot { public: @@ -207,8 +203,6 @@ typedef boost::shared_ptr< XclImpPivotCache > XclImpPivotCacheRef; class XclImpPivotTable; - - class XclImpPTItem { public: @@ -230,8 +224,6 @@ private: typedef boost::shared_ptr< XclImpPTItem > XclImpPTItemRef; - - class XclImpPTField { public: @@ -307,8 +299,6 @@ private: typedef boost::shared_ptr< XclImpPTField > XclImpPTFieldRef; - - class XclImpPivotTable : protected XclImpRoot { public: @@ -350,8 +340,6 @@ public: * autoformat. */ void ReadSxViewEx9( XclImpStream& rStrm ); - - /** Inserts the pivot table into the Calc document. */ void Convert(); @@ -384,8 +372,6 @@ private: typedef boost::shared_ptr< XclImpPivotTable > XclImpPivotTableRef; - - /** The main class for pivot table import. This class contains functions to read all records related to pivot tables @@ -432,8 +418,6 @@ public: * autoformat. */ void ReadSxViewEx9( XclImpStream& rStrm ); - - /** Reads all used pivot caches and creates additional sheets for external data sources. */ void ReadPivotCaches( XclImpStream& rStrm ); /** Inserts all pivot tables into the Calc document. */ @@ -449,8 +433,6 @@ private: XclImpPivotTableVec maPTables; /// List of all pivot tables. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index 8e4673442cd5..4e0851058a79 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -122,8 +122,6 @@ struct XclImpRootData : public XclRootData virtual ~XclImpRootData(); }; - - /** Access to global data from other classes. */ class XclImpRoot : public XclRoot { @@ -218,8 +216,6 @@ private: XclImpRootData& mrImpData; /// Reference to the global import data struct. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index ec238da53bd8..b4aec80b48f6 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -90,8 +90,6 @@ private: sal_uInt16 mnRecSize; /// Current record size. }; - - /** Decrypts BIFF5 stream contents. */ class XclImpBiff5Decrypter : public XclImpDecrypter { @@ -120,8 +118,6 @@ private: sal_uInt16 mnHash; }; - - /** Decrypts BIFF8 stream contents using the given document identifier. */ class XclImpBiff8Decrypter : public XclImpDecrypter { @@ -193,8 +189,6 @@ private: bool mbValid; /// Read state: false = record overread. }; - - /** This class is used to import record oriented streams. @descr An instance is constructed with an SvStream. The SvStream stream is reset to its start while constructing this stream. @@ -528,8 +522,6 @@ private: bool mbValid; /// false = Record overread. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx index dfbdd5e6eba4..9e00da50c626 100644 --- a/sc/source/filter/inc/xistring.hxx +++ b/sc/source/filter/inc/xistring.hxx @@ -107,8 +107,6 @@ private: size_t mnFormatsEnd; /// Formatting run index for next portion. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xiview.hxx b/sc/source/filter/inc/xiview.hxx index ff3178a65fcc..c75045a66096 100644 --- a/sc/source/filter/inc/xiview.hxx +++ b/sc/source/filter/inc/xiview.hxx @@ -81,8 +81,6 @@ private: XclTabViewData maData; /// Sheet view settings data. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx index ef7d6d84b36b..e17696675ef2 100644 --- a/sc/source/filter/inc/xladdress.hxx +++ b/sc/source/filter/inc/xladdress.hxx @@ -26,8 +26,6 @@ class XclImpStream; class XclExpStream; - - /** A 2D cell address struct with Excel column and row indexes. */ struct XclAddress { @@ -66,8 +64,6 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const XclAddress& rXclPos return rStrm; } - - /** A 2D cell range address struct with Excel column and row indexes. */ struct XclRange { @@ -116,8 +112,6 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const XclRange& rXclRange return rStrm; } - - /** A 2D cell range address list with Excel column and row indexes. */ class XclRangeList : public ::std::vector< XclRange > { @@ -144,8 +138,6 @@ inline XclExpStream& operator<<( XclExpStream& rStrm, const XclRangeList& rXclRa return rStrm; } - - class XclTracer; /** Base class for import/export address converters. */ @@ -162,8 +154,6 @@ public: /** Returns whether the "some sheets have been cut" warning box should be shown. */ inline bool IsTabTruncated() const { return mbTabTrunc; } - - /** Checks if the passed sheet index is valid. @param nScTab The sheet index to check. @param bWarn true = Sets the internal flag that produces a warning box @@ -182,8 +172,6 @@ protected: bool mbTabTrunc; /// Flag for "tables truncated" warning box. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 3c18f5f437a0..eb1fd00bd616 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -753,8 +753,6 @@ struct XclChRectangle explicit XclChRectangle(); }; - - /** Specifies the position of a data series or data point. */ struct XclChDataPointPos { @@ -768,8 +766,6 @@ struct XclChDataPointPos bool operator<( const XclChDataPointPos& rL, const XclChDataPointPos& rR ); - - /** Contains the type and context of a block of future records which are guarded by CHFRBLOCKBEGIN and CHFRBLOCKEND records. */ struct XclChFrBlock @@ -793,8 +789,6 @@ struct XclChFramePos explicit XclChFramePos(); }; - - struct XclChLineFormat { Color maColor; /// Line color. @@ -805,8 +799,6 @@ struct XclChLineFormat explicit XclChLineFormat(); }; - - struct XclChAreaFormat { Color maPattColor; /// Pattern color. @@ -817,8 +809,6 @@ struct XclChAreaFormat explicit XclChAreaFormat(); }; - - class SfxItemSet; class EscherPropertyContainer; @@ -834,8 +824,6 @@ struct XclChEscherFormat ~XclChEscherFormat(); }; - - struct XclChPicFormat { sal_uInt16 mnBmpMode; /// Bitmap mode, e.g. stretched, stacked. @@ -845,8 +833,6 @@ struct XclChPicFormat explicit XclChPicFormat(); }; - - struct XclChFrame { sal_uInt16 mnFormat; /// Format type of the frame. @@ -877,8 +863,6 @@ struct XclChObjectLink explicit XclChObjectLink(); }; - - struct XclChFrLabelProps { OUString maSeparator; /// Separator between label values. @@ -887,8 +871,6 @@ struct XclChFrLabelProps explicit XclChFrLabelProps(); }; - - struct XclChText { XclChRectangle maRect; /// Position of the text object. @@ -916,8 +898,6 @@ struct XclChMarkerFormat explicit XclChMarkerFormat(); }; - - struct XclCh3dDataFormat { sal_uInt8 mnBase; /// Base form. @@ -926,8 +906,6 @@ struct XclCh3dDataFormat explicit XclCh3dDataFormat(); }; - - struct XclChDataFormat { XclChDataPointPos maPointPos; /// Position of the data point or series. @@ -937,8 +915,6 @@ struct XclChDataFormat explicit XclChDataFormat(); }; - - struct XclChSerTrendLine { double mfIntercept; /// Forced intercept. @@ -952,8 +928,6 @@ struct XclChSerTrendLine explicit XclChSerTrendLine(); }; - - struct XclChSerErrorBar { double mfValue; /// Fixed value for several source types. @@ -965,8 +939,6 @@ struct XclChSerErrorBar explicit XclChSerErrorBar(); }; - - struct XclChSeries { sal_uInt16 mnCategType; /// Data type for category entries. @@ -994,8 +966,6 @@ struct XclChType explicit XclChType(); }; - - struct XclChChart3d { sal_uInt16 mnRotation; /// Rotation (0...359deg). @@ -1009,8 +979,6 @@ struct XclChChart3d explicit XclChChart3d(); }; - - struct XclChLegend { XclChRectangle maRect; /// Position of the legend. @@ -1021,8 +989,6 @@ struct XclChLegend explicit XclChLegend(); }; - - struct XclChTypeGroup { sal_uInt16 mnFlags; /// Additional flags. @@ -1031,8 +997,6 @@ struct XclChTypeGroup explicit XclChTypeGroup(); }; - - struct XclChProperties { sal_uInt16 mnFlags; /// Additional flags. @@ -1053,8 +1017,6 @@ struct XclChLabelRange explicit XclChLabelRange(); }; - - struct XclChDateRange { sal_uInt16 mnMinDate; /// Minimum value on axis. @@ -1070,8 +1032,6 @@ struct XclChDateRange explicit XclChDateRange(); }; - - struct XclChValueRange { double mfMin; /// Minimum value on axis. @@ -1084,8 +1044,6 @@ struct XclChValueRange explicit XclChValueRange(); }; - - struct XclChTick { Color maTextColor; /// Tick labels color. @@ -1099,8 +1057,6 @@ struct XclChTick explicit XclChTick(); }; - - struct XclChAxis { sal_uInt16 mnType; /// Axis type. @@ -1111,8 +1067,6 @@ struct XclChAxis sal_Int32 GetApiAxisDimension() const; }; - - struct XclChAxesSet { XclChRectangle maRect; /// Position of the axes set (inner plot area). @@ -1198,8 +1152,6 @@ struct XclChFormatInfo bool mbIsFrame; /// true = Object is a frame, false = Object is a line. }; - - /** Provides access to chart auto formatting for all available object types. */ class XclChFormatInfoProvider { @@ -1294,8 +1246,6 @@ struct XclChExtTypeInfo : public XclChTypeInfo { return IsSeriesFrameFormat() ? EXC_CHOBJTYPE_FILLEDSERIES : EXC_CHOBJTYPE_LINEARSERIES; } }; - - /** Provides access to chart type info structs for all available chart types. */ class XclChTypeInfoProvider { @@ -1363,8 +1313,6 @@ private: sal_Int32 mnIndex; /// Index to create unique identifiers. }; - - struct XclFontData; /** Helper class for usage of property sets. */ @@ -1458,8 +1406,6 @@ private: ScfPropSetHelper maBitmapHlp; /// Properties for bitmaps. }; - - /** Base struct for internal root data structs for import and export. */ struct XclChRootData { @@ -1499,8 +1445,6 @@ struct XclChRootData GetTitleShape( const XclChTextKey& rTitleKey ) const; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index ab5d083b735f..512f8f24fb1b 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -341,8 +341,6 @@ inline SvStream& WriteXclObjAnchor( SvStream& rStrm, const XclObjAnchor& rAnchor .WriteUInt16( rAnchor.maLast.mnRow).WriteUInt16(rAnchor.mnBY); } - - struct XclObjLineData { sal_uInt8 mnColorIdx; @@ -358,8 +356,6 @@ struct XclObjLineData XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData ); - - struct XclObjFillData { sal_uInt8 mnBackColorIdx; @@ -375,8 +371,6 @@ struct XclObjFillData XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData ); - - struct XclObjTextData { sal_uInt16 mnTextLen; @@ -402,8 +396,6 @@ struct XclObjTextData inline sal_uInt8 GetVerAlign() const { return ::extract_value< sal_uInt8 >( mnFlags, 4, 3 ); } }; - - enum XclTbxEventType { EXC_TBX_EVENT_ACTION, /// XActionListener.actionPerformed @@ -413,8 +405,6 @@ enum XclTbxEventType EXC_TBX_EVENT_CHANGE /// XChangeListener.changed }; - - /** Provides static helper functions for form controls. */ class XclControlHelper { @@ -435,8 +425,6 @@ public: XclTbxEventType eEventType, SfxObjectShell* pShell = NULL ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index e09063912ab0..16c19b0a42c8 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -149,8 +149,6 @@ const sal_uInt16 EXC_TOK_NLR_REL = 0x8000; /// True = Natural langu const sal_uInt32 EXC_TOK_NLR_ADDREL = 0x80000000; /// NLR relative (in appended data). const sal_uInt32 EXC_TOK_NLR_ADDMASK = 0x3FFFFFFF; /// Mask for number of appended ranges. - - /** Type of a formula. */ enum XclFormulaType { @@ -334,8 +332,6 @@ struct XclFunctionInfo OUString GetAddInEquivalentFuncName() const; }; - - class XclRoot; /** Provides access to function info structs for all available functions. */ @@ -422,8 +418,6 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArray& rTokArr ); /** Calls the Write() function at the passed token array. */ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArrayRef& rxTokArr ); - - namespace formula { class FormulaToken; } class ScTokenArray; @@ -466,8 +460,6 @@ private: bool mbSkipSpaces; /// true = Skip whitespace tokens. }; - - /** Contains all cell references that can be extracted from a multiple operations formula. */ struct XclMultipleOpRefs { @@ -479,8 +471,6 @@ struct XclMultipleOpRefs bool mbDblRefMode; /// true = One formula with row and column values. }; - - /** A helper with Excel specific token array functions. The purpose to not add these functions to ScTokenArray is to prevent code @@ -541,8 +531,6 @@ public: static bool GetMultipleOpRefs( XclMultipleOpRefs& rRefs, const ScTokenArray& rScTokArr, const ScAddress& rScPos ); }; - - inline sal_uInt8 XclTokenArrayHelper::GetTokenId( sal_uInt8 nBaseId, sal_uInt8 nTokenClass ) { OSL_ENSURE( !::get_flag( nBaseId, static_cast< sal_uInt8 >( ~EXC_TOKID_MASK ) ), "XclTokenArrayHelper::GetTokenId - invalid token ID" ); @@ -557,8 +545,6 @@ inline void XclTokenArrayHelper::ChangeTokenClass( sal_uInt8& rnTokenId, sal_uIn ::set_flag( rnTokenId, nTokenClass ); } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xllink.hxx b/sc/source/filter/inc/xllink.hxx index 3ec2a99c55e5..238763b1014c 100644 --- a/sc/source/filter/inc/xllink.hxx +++ b/sc/source/filter/inc/xllink.hxx @@ -79,8 +79,6 @@ enum XclSupbookType EXC_SBTYPE_EUROTOOL /// SUPBOOK is uesd for EUROCONVERT. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlname.hxx b/sc/source/filter/inc/xlname.hxx index e5f4ae1340f0..9c8fc0783d68 100644 --- a/sc/source/filter/inc/xlname.hxx +++ b/sc/source/filter/inc/xlname.hxx @@ -61,8 +61,6 @@ const sal_Unicode EXC_BUILTIN_SHEETTITLE = '\x0C'; const sal_Unicode EXC_BUILTIN_FILTERDATABASE = '\x0D'; const sal_Unicode EXC_BUILTIN_UNKNOWN = '\x0E'; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx index f573a379f6f8..97fc09fe42fc 100644 --- a/sc/source/filter/inc/xlpage.hxx +++ b/sc/source/filter/inc/xlpage.hxx @@ -84,8 +84,6 @@ const sal_uInt16 EXC_SETUP_NOTES_END = 0x0200; const sal_uInt16 EXC_PAPERSIZE_DEFAULT = 0; const sal_uInt16 EXC_PAPERSIZE_USER = 0xFFFF; - - // Page settings ============================================================== class SvxBrushItem; @@ -146,8 +144,6 @@ struct XclPageData : private boost::noncopyable void SetScPaperSize( const Size& rSize, bool bPortrait, bool bStrict = false ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 56704d24338d..75a466bef052 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -556,8 +556,6 @@ struct XclPTCachedName XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedName ); - - /** Base struct for named info structs. Supports explicit naming and using the cache. */ struct XclPTVisNameInfo { @@ -748,8 +746,6 @@ struct XclPTExtInfo XclImpStream& operator>>( XclImpStream& rStrm, XclPTExtInfo& rInfo ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPTExtInfo& rInfo ); - - // Pivot table autoformat settings ============================================== /** Pivot table autoformat settings (SXVIEWEX9 record). */ diff --git a/sc/source/filter/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index 4f8263789aea..49902677cd48 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -49,8 +49,6 @@ struct XclDebugObjCounter }; #endif - - class SfxMedium; class ScEditEngineDefaulter; class ScHeaderEditEngine; @@ -118,8 +116,6 @@ struct XclRootData virtual ~XclRootData(); }; - - class SfxObjectShell; class ScModelObj; class OutputDevice; @@ -275,8 +271,6 @@ private: XclRootData& mrData; /// Reference to the global data struct. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx index b9b5057af618..9168c96dadac 100644 --- a/sc/source/filter/inc/xlstream.hxx +++ b/sc/source/filter/inc/xlstream.hxx @@ -39,8 +39,6 @@ const sal_uInt16 EXC_ENCR_BLOCKSIZE = 1024; const sal_uInt16 EXC_ID_UNKNOWN = SAL_MAX_UINT16; const sal_uInt16 EXC_ID_CONT = 0x003C; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx index 876ace0cc406..d8094996e6ed 100644 --- a/sc/source/filter/inc/xlstring.hxx +++ b/sc/source/filter/inc/xlstring.hxx @@ -34,8 +34,6 @@ const XclStrFlags EXC_STR_SMARTFLAGS = 0x0004; /// Omit flags on empty const XclStrFlags EXC_STR_SEPARATEFORMATS = 0x0008; /// Import: Keep old formats when reading unformatted string (default: clear formats); Export: Write unformatted string. const XclStrFlags EXC_STR_NOHEADER = 0x0010; /// Export: Don't write the length and flag fields. - - const sal_uInt16 EXC_STR_MAXLEN_8BIT = 0x00FF; const sal_uInt16 EXC_STR_MAXLEN = 0x7FFF; @@ -78,13 +76,9 @@ inline bool operator<( const XclFormatRun& rLeft, const XclFormatRun& rRight ) return (rLeft.mnChar < rRight.mnChar) || ((rLeft.mnChar == rRight.mnChar) && (rLeft.mnFontIdx < rRight.mnFontIdx)); } - - /** A vector with all formatting runs for a rich-string. */ typedef ::std::vector< XclFormatRun > XclFormatRunVec; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xltable.hxx b/sc/source/filter/inc/xltable.hxx index c325ab1d6803..8709c5f0eb25 100644 --- a/sc/source/filter/inc/xltable.hxx +++ b/sc/source/filter/inc/xltable.hxx @@ -164,8 +164,6 @@ const sal_uInt16 EXC_ID_RK = 0x027E; // (0x04BC) SHRFMLA ----------------------------------------------------------- const sal_uInt16 EXC_ID_SHRFMLA = 0x04BC; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 6cc7ed0374b0..06026e85fd14 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -258,8 +258,6 @@ XclImpStream& operator>>( XclImpStream& rStrm, Color& rColor ); @descr The color has the format (all values 8-bit): Red, Green, Blue, 0. */ XclExpStream& operator<<( XclExpStream& rStrm, const Color& rColor ); - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index b355c94dc9ec..a0e9c783841a 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef SC_XLTRACER_HXX #define SC_XLTRACER_HXX @@ -72,8 +70,6 @@ struct XclTracerDetails }; - - /** This class wraps an MSFilterTracer to create trace logs for import/export filters. */ class XclTracer { @@ -113,8 +109,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx index 6bc6e723bba8..b5501d588bfd 100644 --- a/sc/source/filter/inc/xlview.hxx +++ b/sc/source/filter/inc/xlview.hxx @@ -102,8 +102,6 @@ struct XclDocViewData explicit XclDocViewData(); }; - - /** Contains all settings for a selection in a single pane of a sheet. */ struct XclSelectionData { @@ -116,8 +114,6 @@ struct XclSelectionData typedef boost::shared_ptr< XclSelectionData > XclSelectionDataRef; - - /** Contains all view settings for a single sheet. */ struct XclTabViewData { @@ -165,8 +161,6 @@ struct XclTabViewData XclSelectionData& CreateSelectionData( sal_uInt8 nPane ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx index 496585561b3d..6ea74064f068 100644 --- a/sc/source/filter/lotus/filter.cxx +++ b/sc/source/filter/lotus/filter.cxx @@ -42,8 +42,6 @@ // Konstanten const sal_uInt16 nBOF = 0x0000; - - // externe Variablen extern WKTYP eTyp; // Typ der gerade in bearbeitung befindlichen Datei WKTYP eTyp; diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index ebb3eb2992ee..cc64b2e82cba 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -1689,8 +1689,6 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) } - - const sal_Char* GetAddInName( const sal_uInt8 n ) { static const sal_Char* pNames[ 256 ] = diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index ccbeb9bd4a9c..d38b0c0b1160 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -307,6 +307,4 @@ FltError ImportLotus::Read( SvStream& rIn ) return eRet; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx index 2514ede2c917..5316a7f9088d 100644 --- a/sc/source/filter/lotus/lotus.cxx +++ b/sc/source/filter/lotus/lotus.cxx @@ -27,8 +27,6 @@ #include "filtopt.hxx" #include "ftools.hxx" - - extern FltError ScImportLotus123old( SvStream&, ScDocument*, rtl_TextEncoding eSrc ); // alter Krempel in filter.cxx! diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx index 639e110b0eff..dc2cf168ef2b 100644 --- a/sc/source/filter/lotus/memory.cxx +++ b/sc/source/filter/lotus/memory.cxx @@ -21,8 +21,6 @@ // selbst per extern ihre Sachen besorgen! - - #include "scitems.hxx" #include <svx/algitem.hxx> #include <editeng/justifyitem.hxx> @@ -39,8 +37,6 @@ extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard; // -> tool.cxx, fuer GetFormAttr() extern ScProtectionAttr* pAttrUnprot; // -> tool.cxx, fuer PutFormString() - - sal_Bool MemNew( void ) { pValueFormCache = new FormCache( pDoc ); @@ -68,6 +64,4 @@ void MemDelete( void ) delete pAttrUnprot; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 7362c9050b8d..6f9208c37349 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -31,16 +31,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { //! TODO: this limit may change, is there a way to obtain it via API? @@ -73,8 +69,6 @@ const sal_Int16 BIFF8_MAXTAB = BIFF5_MAXTAB; } // namespace - - CellAddress ApiCellRangeList::getBaseAddress() const { if( empty() ) @@ -82,8 +76,6 @@ CellAddress ApiCellRangeList::getBaseAddress() const return CellAddress( front().Sheet, front().StartColumn, front().StartRow ); } - - void BinAddress::read( SequenceInputStream& rStrm ) { rStrm >> mnRow >> mnCol; @@ -95,8 +87,6 @@ void BinAddress::read( BiffInputStream& rStrm, bool bCol16Bit, bool bRow32Bit ) mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8(); } - - void BinRange::read( SequenceInputStream& rStrm ) { rStrm >> maFirst.mnRow >> maLast.mnRow >> maFirst.mnCol >> maLast.mnCol; @@ -110,8 +100,6 @@ void BinRange::read( BiffInputStream& rStrm, bool bCol16Bit, bool bRow32Bit ) maLast.mnCol = bCol16Bit ? rStrm.readuInt16() : rStrm.readuInt8(); } - - void BinRangeList::read( SequenceInputStream& rStrm ) { sal_Int32 nCount = rStrm.readInt32(); @@ -120,8 +108,6 @@ void BinRangeList::read( SequenceInputStream& rStrm ) aIt->read( rStrm ); } - - AddressConverter::AddressConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mbColOverflow( false ), @@ -163,8 +149,6 @@ AddressConverter::AddressConverter( const WorkbookHelper& rHelper ) : } } - - bool AddressConverter::parseOoxAddress2d( sal_Int32& ornColumn, sal_Int32& ornRow, const OUString& rString, sal_Int32 nStart, sal_Int32 nLength ) @@ -309,8 +293,6 @@ bool AddressConverter::parseOoxRange2d( return false; } - - bool AddressConverter::checkCol( sal_Int32 nCol, bool bTrackOverflow ) { bool bValid = (0 <= nCol) && (nCol <= maMaxPos.Column); @@ -335,8 +317,6 @@ bool AddressConverter::checkTab( sal_Int16 nSheet, bool bTrackOverflow ) return bValid; } - - bool AddressConverter::checkCellAddress( const CellAddress& rAddress, bool bTrackOverflow ) { return @@ -418,8 +398,6 @@ CellAddress AddressConverter::createValidCellAddress( return aAddress; } - - bool AddressConverter::checkCellRange( const CellRangeAddress& rRange, bool bAllowOverflow, bool bTrackOverflow ) { return @@ -477,8 +455,6 @@ bool AddressConverter::convertToCellRange( CellRangeAddress& orRange, return validateCellRange( orRange, bAllowOverflow, bTrackOverflow ); } - - void AddressConverter::validateCellRangeList( ApiCellRangeList& orRanges, bool bTrackOverflow ) { for( size_t nIndex = orRanges.size(); nIndex > 0; --nIndex ) @@ -544,8 +520,6 @@ void AddressConverter::initializeMaxPos( } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 148038d09a5c..40683a24d6b7 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -42,8 +42,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { const sal_uInt8 BIFF12_TOP10FILTER_TOP = 0x01; @@ -59,8 +57,6 @@ const sal_uInt8 BIFF_FILTER_DATATYPE_BOOLEAN = 8; const sal_uInt8 BIFF_FILTER_DATATYPE_EMPTY = 12; const sal_uInt8 BIFF_FILTER_DATATYPE_NOTEMPTY = 14; - - bool lclGetApiOperatorFromToken( sal_Int32& rnApiOperator, sal_Int32 nToken ) { switch( nToken ) @@ -145,8 +141,6 @@ bool lclConvertWildcardsToRegExp( OUString& rValue ) } // namespace - - ApiFilterSettings::ApiFilterSettings() { } @@ -188,8 +182,6 @@ void ApiFilterSettings::appendField( bool bAnd, const std::vector<OUString>& rVa } } - - FilterSettingsBase::FilterSettingsBase( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -208,8 +200,6 @@ ApiFilterSettings FilterSettingsBase::finalizeImport( sal_Int32 /*nMaxCount*/ ) return ApiFilterSettings(); } - - DiscreteFilter::DiscreteFilter( const WorkbookHelper& rHelper ) : FilterSettingsBase( rHelper ), mnCalendarType( XML_none ), @@ -285,8 +275,6 @@ ApiFilterSettings DiscreteFilter::finalizeImport( sal_Int32 nMaxCount ) return aSettings; } - - Top10Filter::Top10Filter( const WorkbookHelper& rHelper ) : FilterSettingsBase( rHelper ), mfValue( 0.0 ), @@ -326,8 +314,6 @@ ApiFilterSettings Top10Filter::finalizeImport( sal_Int32 /*nMaxCount*/ ) return aSettings; } - - FilterCriterionModel::FilterCriterionModel() : mnOperator( XML_equal ), mnDataType( BIFF_FILTER_DATATYPE_NONE ), @@ -381,8 +367,6 @@ void FilterCriterionModel::readBiffData( SequenceInputStream& rStrm ) } } - - CustomFilter::CustomFilter( const WorkbookHelper& rHelper ) : FilterSettingsBase( rHelper ), mbAnd( false ) @@ -501,8 +485,6 @@ void CustomFilter::appendCriterion( const FilterCriterionModel& rCriterion ) maCriteria.push_back( rCriterion ); } - - FilterColumn::FilterColumn( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnColId( -1 ), @@ -540,8 +522,6 @@ ApiFilterSettings FilterColumn::finalizeImport( sal_Int32 nMaxCount ) return aSettings; } - - AutoFilter::AutoFilter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -648,8 +628,6 @@ void AutoFilter::finalizeImport( const Reference<XSheetFilterDescriptor3>& rxFil } } - - AutoFilterBuffer::AutoFilterBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -745,8 +723,6 @@ AutoFilter* AutoFilterBuffer::getActiveAutoFilter() return maAutoFilters.empty() ? 0 : maAutoFilters.back().get(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/autofiltercontext.cxx b/sc/source/filter/oox/autofiltercontext.cxx index 4f98319bfc6b..d7ea3d95f762 100644 --- a/sc/source/filter/oox/autofiltercontext.cxx +++ b/sc/source/filter/oox/autofiltercontext.cxx @@ -27,8 +27,6 @@ namespace xls { using ::oox::core::ContextHandlerRef; - - FilterSettingsContext::FilterSettingsContext( WorksheetContextBase& rParent, FilterSettingsBase& rFilterSettings ) : WorksheetContextBase( rParent ), mrFilterSettings( rFilterSettings ) @@ -73,8 +71,6 @@ void FilterSettingsContext::onStartRecord( SequenceInputStream& rStrm ) mrFilterSettings.importRecord( getCurrentElement(), rStrm ); } - - FilterColumnContext::FilterColumnContext( WorksheetContextBase& rParent, FilterColumn& rFilterColumn ) : WorksheetContextBase( rParent ), mrFilterColumn( rFilterColumn ) @@ -119,8 +115,6 @@ void FilterColumnContext::onStartRecord( SequenceInputStream& rStrm ) mrFilterColumn.importFilterColumn( rStrm ); } - - AutoFilterContext::AutoFilterContext( WorksheetFragmentBase& rFragment, AutoFilter& rAutoFilter ) : WorksheetContextBase( rFragment ), mrAutoFilter( rAutoFilter ) @@ -151,8 +145,6 @@ void AutoFilterContext::onStartRecord( SequenceInputStream& rStrm ) mrAutoFilter.importAutoFilter( rStrm, getSheetIndex() ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx index 74c0072bff8c..fa7b55f00229 100644 --- a/sc/source/filter/oox/biffcodec.cxx +++ b/sc/source/filter/oox/biffcodec.cxx @@ -27,15 +27,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; - - BiffDecoderBase::BiffDecoderBase() : mbValid( false ) { @@ -69,8 +65,6 @@ void BiffDecoderBase::decode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, } } - - BiffDecoder_XOR::BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ) : BiffDecoderBase(), // must be called to prevent compiler warning maCodec( ::oox::core::BinaryCodec_XOR::CODEC_EXCEL ), @@ -130,8 +124,6 @@ void BiffDecoder_XOR::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcD maCodec.decode( pnDestData, pnSrcData, nBytes ); } - - namespace { /** Returns the block index of the passed stream position for RCF decryption. */ @@ -148,8 +140,6 @@ sal_Int32 lclGetRcfOffset( sal_Int64 nStreamPos ) } // namespace - - BiffDecoder_RCF::BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ) : BiffDecoderBase(), // must be called to prevent compiler warning maEncryptionData( rDecoder.maEncryptionData ), @@ -231,8 +221,6 @@ void BiffDecoder_RCF::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcD } } - - BiffCodecHelper::BiffCodecHelper( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -244,8 +232,6 @@ void BiffCodecHelper::cloneDecoder( BiffInputStream& rStrm ) rStrm.setDecoder( BiffDecoderRef( mxDecoder->clone() ) ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 3344304d084b..ae5fcd5ab442 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -31,8 +31,6 @@ namespace xls { - - namespace { const sal_Int32 BIFF_RK_100FLAG = 0x00000001; @@ -50,8 +48,6 @@ union DecodedDouble } // namespace - - // conversion ----------------------------------------------------------------- /*static*/ double BiffHelper::calcDoubleFromRk( sal_Int32 nRkValue ) diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index b64f50a97504..b4b5cb977def 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -28,8 +28,6 @@ namespace xls { - - namespace prv { BiffInputRecordBuffer::BiffInputRecordBuffer( BinaryInputStream& rInStrm ) : @@ -154,8 +152,6 @@ void BiffInputRecordBuffer::updateDecoded() } // namespace prv - - BiffInputStream::BiffInputStream( BinaryInputStream& rInStream, bool bContLookup ) : BinaryStreamBase( true ), maRecBuffer( rInStream ), @@ -489,8 +485,6 @@ void BiffInputStream::readUniStringHeader( bool& orb16BitChars, sal_Int32& ornAd ornAddSize = 4 * nFontCount + ::std::max< sal_Int32 >( 0, nPhoneticSize ); } - - BiffInputStreamPos::BiffInputStreamPos( BiffInputStream& rStrm ) : mrStrm( rStrm ), mnRecHandle( rStrm.getRecHandle() ), @@ -506,8 +500,6 @@ bool BiffInputStreamPos::restorePosition() return bValidRec && !mrStrm.isEof(); } - - BiffInputStreamPosGuard::BiffInputStreamPosGuard( BiffInputStream& rStrm ) : BiffInputStreamPos( rStrm ) { @@ -518,8 +510,6 @@ BiffInputStreamPosGuard::~BiffInputStreamPosGuard() restorePosition(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index 7c64569266a2..aae9266ccf4d 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -29,13 +29,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - ChartsheetFragment::ChartsheetFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) { diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index d3f0c661dcfe..b52a3769f02c 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -44,8 +44,6 @@ using ::com::sun::star::text::XTextRange; namespace oox { namespace xls { - - using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -83,8 +81,6 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign ) } } - - CommentModel::CommentModel() : mnAuthorId( -1 ), mnObjId( BIFF_OBJ_INVALID_ID ), @@ -92,8 +88,6 @@ CommentModel::CommentModel() : { } - - Comment::Comment( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { @@ -221,8 +215,6 @@ void CommentsBuffer::finalizeImport() maComments.forEachMem( &Comment::finalizeImport ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx index febdb14aea0a..2a8fa5159863 100644 --- a/sc/source/filter/oox/commentsfragment.cxx +++ b/sc/source/filter/oox/commentsfragment.cxx @@ -24,13 +24,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - CommentsFragment::CommentsFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) { @@ -143,8 +139,6 @@ void CommentsFragment::importComment( SequenceInputStream& rStrm ) mxComment->importComment( rStrm ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index c83b84b87df0..50c5b33b802e 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -55,8 +55,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; @@ -65,8 +63,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { const sal_Int32 BIFF12_CFRULE_TYPE_CELLIS = 1; @@ -120,8 +116,6 @@ const sal_uInt16 BIFF12_CFRULE_ABOVEAVERAGE = 0x0004; const sal_uInt16 BIFF12_CFRULE_BOTTOM = 0x0008; const sal_uInt16 BIFF12_CFRULE_PERCENT = 0x0010; - - template< typename Type > void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& rPropName, const Type& rValue ) { @@ -130,8 +124,6 @@ void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& orProps.back().Value <<= rValue; } - - void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttribs ) { OUString aType = rAttribs.getString( XML_type, OUString() ); @@ -256,8 +248,6 @@ void ColorScaleRule::AddEntries( ScColorScaleFormat* pFormat, ScDocument* pDoc, } } - - DataBarRule::DataBarRule( const CondFormat& rFormat ): WorksheetHelper( rFormat ), mpFormat(new ScDataBarFormatData) @@ -313,8 +303,6 @@ void DataBarRule::SetData( ScDataBarFormat* pFormat, ScDocument* pDoc, const ScA pFormat->SetDataBarData(mpFormat); } - - IconSetRule::IconSetRule( const CondFormat& rFormat ): WorksheetHelper( rFormat ), mpFormatData( new ScIconSetFormatData ) @@ -358,8 +346,6 @@ void IconSetRule::SetData( ScIconSetFormat* pFormat, ScDocument* pDoc, const ScA pFormat->SetIconSetData(mpFormatData); } - - CondFormatRuleModel::CondFormatRuleModel() : mnPriority( -1 ), mnType( XML_TOKEN_INVALID ), @@ -393,8 +379,6 @@ void CondFormatRuleModel::setBiff12TextType( sal_Int32 nOperator ) mnOperator = STATIC_ARRAY_SELECT( spnOperators, nOperator, XML_TOKEN_INVALID ); } - - CondFormatRule::CondFormatRule( const CondFormat& rCondFormat, ScConditionalFormat* pFormat ) : WorksheetHelper( rCondFormat ), mrCondFormat( rCondFormat ), @@ -956,15 +940,11 @@ IconSetRule* CondFormatRule::getIconSet() return mpIconSet.get(); } - - CondFormatModel::CondFormatModel() : mbPivot( false ) { } - - CondFormat::CondFormat( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), mpFormat(NULL), @@ -1038,8 +1018,6 @@ void CondFormat::insertRule( CondFormatRuleRef xRule ) } } - - CondFormatBuffer::CondFormatBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { diff --git a/sc/source/filter/oox/condformatcontext.cxx b/sc/source/filter/oox/condformatcontext.cxx index 4cfd409ba698..7153e1a6780b 100644 --- a/sc/source/filter/oox/condformatcontext.cxx +++ b/sc/source/filter/oox/condformatcontext.cxx @@ -23,12 +23,8 @@ namespace oox { namespace xls { - - using ::oox::core::ContextHandlerRef; - - ColorScaleContext::ColorScaleContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ) : WorksheetContextBase( rFragment ), mxRule( xRule ) @@ -65,8 +61,6 @@ void ColorScaleContext::onStartElement( const AttributeList& rAttribs ) } } - - DataBarContext::DataBarContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ) : WorksheetContextBase( rFragment ), mxRule( xRule ) @@ -106,8 +100,6 @@ void DataBarContext::onStartElement( const AttributeList& rAttribs ) } } - - IconSetContext::IconSetContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ) : WorksheetContextBase( rFragment ), mxRule( xRule ) @@ -142,8 +134,6 @@ void IconSetContext::onStartElement( const AttributeList& rAttribs ) } } - - CondFormatContext::CondFormatContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ) { @@ -236,8 +226,6 @@ void CondFormatContext::onEndRecord() } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index 6ee777e6f09c..49cbca9bbd7d 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -25,13 +25,9 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::uno; - - namespace { const sal_Int32 BIFF12_RECONNECT_AS_REQUIRED = 1; @@ -68,8 +64,6 @@ const sal_uInt8 BIFF12_WEBPR_HAS_URL = 0x04; } // namespace - - WebPrModel::WebPrModel() : mnHtmlFormat( XML_none ), mbXml( false ), @@ -84,8 +78,6 @@ WebPrModel::WebPrModel() : { } - - ConnectionModel::ConnectionModel() : mnId( -1 ), mnType( BIFF12_CONNECTION_UNKNOWN ), @@ -110,8 +102,6 @@ WebPrModel& ConnectionModel::createWebPr() return *mxWebPr; } - - Connection::Connection( const WorkbookHelper& rHelper, sal_Int32 nConnId ) : WorkbookHelper( rHelper ) { @@ -277,8 +267,6 @@ void Connection::importWebPrTable( SequenceInputStream& rStrm, sal_Int32 nRecId } } - - ConnectionsBuffer::ConnectionsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnUnusedId( 1 ) @@ -314,8 +302,6 @@ void ConnectionsBuffer::insertConnectionToMap( const ConnectionRef& rxConnection } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 4ad7d92220d1..4011197e4075 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -26,13 +26,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - ConnectionContext::ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection ) : WorkbookContextBase( rParent ), mrConnection( rConnection ) @@ -105,8 +101,6 @@ void ConnectionContext::onStartRecord( SequenceInputStream& rStrm ) mrConnection.importConnection( rStrm ); } - - ConnectionsFragment::ConnectionsFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) { @@ -164,8 +158,6 @@ void ConnectionsFragment::finalizeImport() getConnections().finalizeImport(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index fa462bfcf4ca..8aef91a13423 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -41,15 +41,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { const sal_uInt32 BIFF12_DEFNAME_HIDDEN = 0x00000001; @@ -63,8 +59,6 @@ const sal_uInt16 BIFF_REFFLAG_ROW1REL = 0x0002; const sal_uInt16 BIFF_REFFLAG_COL2REL = 0x0004; const sal_uInt16 BIFF_REFFLAG_ROW2REL = 0x0008; - - const sal_Char* const spcOoxPrefix = "_xlnm."; const sal_Char* const sppcBaseNames[] = @@ -183,8 +177,6 @@ Any lclConvertReference( const Any& rRefAny, const CellAddress& rBaseAddr, sal_u } // namespace - - DefinedNameModel::DefinedNameModel() : mnSheet( -1 ), mnFuncGroupId( -1 ), @@ -195,8 +187,6 @@ DefinedNameModel::DefinedNameModel() : { } - - DefinedNameBase::DefinedNameBase( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -256,8 +246,6 @@ ApiTokenSequence DefinedNameBase::importBiffFormula( sal_Int16 nBaseSheet, BiffI getFormulaParser().convertErrorToFormula( BIFF_ERR_NAME ); } - - DefinedName::DefinedName( const WorkbookHelper& rHelper ) : DefinedNameBase( rHelper ), mpScRangeData(NULL), @@ -463,8 +451,6 @@ bool DefinedName::getAbsoluteRange( CellRangeAddress& orRange ) const return getFormulaParser().extractCellRange( orRange, aFTokenSeq, false ); } - - DefinedNamesBuffer::DefinedNamesBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -538,8 +524,6 @@ DefinedNameRef DefinedNamesBuffer::createDefinedName() return xDefName; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index d830c9f30956..0b40518abacc 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -29,14 +29,10 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::table; using namespace ::oox::drawingml; - - namespace { /** Converts the passed 32-bit integer value from 1/100 mm to EMUs. */ @@ -53,8 +49,6 @@ inline sal_Int32 lclEmuToHmm( sal_Int64 nValue ) } // namespace - - CellAnchorModel::CellAnchorModel() : mnCol( -1 ), mnRow( -1 ), @@ -63,16 +57,12 @@ CellAnchorModel::CellAnchorModel() : { } - - AnchorClientDataModel::AnchorClientDataModel() : mbLocksWithSheet( true ), mbPrintsWithSheet( true ) { } - - ShapeAnchor::ShapeAnchor( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), meAnchorType( ANCHOR_INVALID ), @@ -301,8 +291,6 @@ EmuPoint ShapeAnchor::calcCellAnchorEmu( const CellAnchorModel& rModel ) const return aEmuPoint; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 0da5045e122d..0df6ab1bf3c5 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -61,8 +61,6 @@ using ::com::sun::star::awt::Rectangle; using ::com::sun::star::awt::XControlModel; // no using's for ::oox::vml, that may clash with ::oox::drawingml types - - ShapeMacroAttacher::ShapeMacroAttacher( const OUString& rMacroName, const Reference< XShape >& rxShape ) : VbaMacroAttacherBase( rMacroName ), mxShape( rxShape ) @@ -87,8 +85,6 @@ void ShapeMacroAttacher::attachMacro( const OUString& rMacroUrl ) } } - - Shape::Shape( const WorksheetHelper& rHelper, const AttributeList& rAttribs, const sal_Char* pcServiceName ) : ::oox::drawingml::Shape( pcServiceName ), WorksheetHelper( rHelper ) @@ -120,8 +116,6 @@ void Shape::finalizeXShape( XmlFilterBase& rFilter, const Reference< XShapes >& } } - - GroupShapeContext::GroupShapeContext( ContextHandler2Helper& rParent, const WorksheetHelper& rHelper, const ShapePtr& rxParentShape, const ShapePtr& rxShape ) : ShapeGroupContext( rParent, rxParentShape, rxShape ), @@ -176,8 +170,6 @@ ContextHandlerRef GroupShapeContext::onCreateContext( return xContext.get() ? xContext.get() : ShapeGroupContext::onCreateContext( nElement, rAttribs ); } - - DrawingFragment::DrawingFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mxDrawPage( rHelper.getDrawPage(), UNO_QUERY ) @@ -320,8 +312,6 @@ private: sal_Int32 mnRow; }; - - VmlFindNoteFunc::VmlFindNoteFunc( const CellAddress& rPos ) : mnCol( rPos.Column ), mnRow( rPos.Row ) @@ -336,8 +326,6 @@ bool VmlFindNoteFunc::operator()( const ::oox::vml::ShapeBase& rShape ) const } // namespace - - VmlControlMacroAttacher::VmlControlMacroAttacher( const OUString& rMacroName, const Reference< XIndexContainer >& rxCtrlFormIC, sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ) : VbaMacroAttacherBase( rMacroName ), @@ -401,8 +389,6 @@ void VmlControlMacroAttacher::attachMacro( const OUString& rMacroUrl ) } } - - VmlDrawing::VmlDrawing( const WorksheetHelper& rHelper ) : ::oox::vml::Drawing( rHelper.getOoxFilter(), rHelper.getDrawPage(), ::oox::vml::VMLDRAWING_EXCEL ), WorksheetHelper( rHelper ), @@ -764,8 +750,6 @@ void VmlDrawing::convertControlBackground( AxMorphDataModelBase& rAxModel, const } } - - VmlDrawingFragment::VmlDrawingFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : ::oox::vml::DrawingFragment( rHelper.getOoxFilter(), rFragmentPath, rHelper.getVmlDrawing() ), WorksheetHelper( rHelper ) @@ -778,8 +762,6 @@ void VmlDrawingFragment::finalizeImport() getVmlDrawing().convertAndInsert(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index 4644d934c786..6b7cef62ff35 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -36,8 +36,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::awt; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::lang; @@ -45,8 +43,6 @@ using namespace ::com::sun::star::uno; using namespace ::oox::drawingml; - - namespace { // OBJ record ----------------------------------------------------------------- @@ -114,8 +110,6 @@ BiffInputStream& operator>>( BiffInputStream& rStrm, BiffObjLineModel& rModel ) return rStrm; } - - BiffObjFillModel::BiffObjFillModel() : mnBackColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ), mnPattColorIdx( BIFF_OBJ_FILL_AUTOCOLOR ), @@ -145,8 +139,6 @@ void BiffDrawingObjectContainer::convertAndInsert( BiffDrawingBase& rDrawing, co maObjects.forEachMem( &BiffDrawingObjectBase::convertAndInsert, ::boost::ref( rDrawing ), ::boost::cref( rxShapes ), pParentRect ); } - - BiffDrawingObjectBase::BiffDrawingObjectBase( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), maAnchor( rHelper ), @@ -419,8 +411,6 @@ void BiffDrawingBase::finalizeImport() maRawObjs.convertAndInsert( *this, xShapes ); } - - BiffSheetDrawing::BiffSheetDrawing( const WorksheetHelper& rHelper ) : BiffDrawingBase( rHelper, rHelper.getDrawPage() ) { @@ -432,8 +422,6 @@ void BiffSheetDrawing::notifyShapeInserted( const Reference< XShape >& /*rxShape extendShapeBoundingBox( rShapeRect ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/excelchartconverter.cxx b/sc/source/filter/oox/excelchartconverter.cxx index 467db26feeef..38ffb791e49e 100644 --- a/sc/source/filter/oox/excelchartconverter.cxx +++ b/sc/source/filter/oox/excelchartconverter.cxx @@ -32,8 +32,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::chart2; using namespace ::com::sun::star::chart2::data; using namespace ::com::sun::star::lang; @@ -42,8 +40,6 @@ using namespace ::com::sun::star::uno; using ::oox::drawingml::chart::DataSequenceModel; - - ExcelChartConverter::ExcelChartConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -121,8 +117,6 @@ Reference< XDataSequence > ExcelChartConverter::createDataSequence( return xDataSeq; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 1cdd1036280e..c6bdbc67fb88 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -33,8 +33,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; @@ -43,8 +41,6 @@ using namespace ::oox::core; using ::oox::drawingml::table::TableStyleListPtr; - - OUString ExcelFilter_getImplementationName() { return OUString( "com.sun.star.comp.oox.xls.ExcelFilter" ); @@ -64,8 +60,6 @@ Reference< XInterface > ExcelFilter_create( return static_cast< ::cppu::OWeakObject* >( new ExcelFilter( rxContext ) ); } - - ExcelFilter::ExcelFilter( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : XmlFilterBase( rxContext ), mpBookGlob( 0 ) diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index 303b6cff59f4..afbb1412e7d2 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -25,14 +25,10 @@ namespace oox { namespace xls { - - using ::oox::core::FilterBase; using ::oox::core::FragmentHandler2; - - WorkbookFragmentBase::WorkbookFragmentBase( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : FragmentHandler2( rHelper.getOoxFilter(), rFragmentPath ), @@ -40,8 +36,6 @@ WorkbookFragmentBase::WorkbookFragmentBase( { } - - WorksheetFragmentBase::WorksheetFragmentBase( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : FragmentHandler2( rHelper.getOoxFilter(), rFragmentPath ), @@ -50,21 +44,15 @@ WorksheetFragmentBase::WorksheetFragmentBase( } - - BiffContextHandler::~BiffContextHandler() { } - - BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { } - - BiffFragmentHandler::BiffFragmentHandler( const FilterBase& rFilter, const OUString& rStrmName ) { // do not automatically close the root stream (indicated by empty stream name) @@ -85,8 +73,6 @@ bool BiffFragmentHandler::skipFragment() return !mxBiffStrm->isEof() && (mxBiffStrm->getRecId() == BIFF_ID_EOF); } - - BiffWorkbookFragmentBase::BiffWorkbookFragmentBase( const WorkbookHelper& rHelper, const OUString& rStrmName, bool bCloneDecoder ) : BiffFragmentHandler( rHelper.getBaseFilter(), rStrmName ), WorkbookHelper( rHelper ) @@ -95,8 +81,6 @@ BiffWorkbookFragmentBase::BiffWorkbookFragmentBase( const WorkbookHelper& rHelpe getCodecHelper().cloneDecoder( getInputStream() ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index 6d5c27f7b018..67bed9f58d84 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -35,8 +35,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; using namespace ::com::sun::star::frame; @@ -46,8 +44,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; - - ExcelVbaProject::ExcelVbaProject( const Reference< XComponentContext >& rxContext, const Reference< XSpreadsheetDocument >& rxDocument ) : ::oox::ole::VbaProject( rxContext, Reference< XModel >( rxDocument, UNO_QUERY ), "Calc" ), mxDocument( rxDocument ) @@ -132,8 +128,6 @@ void ExcelVbaProject::prepareImport() } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index dfe55b7af8f8..4b86f1c68826 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -43,8 +43,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; @@ -52,8 +50,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::Relation; using ::oox::core::Relations; - - namespace { const sal_uInt16 BIFF12_EXTERNALBOOK_BOOK = 0; @@ -68,8 +64,6 @@ const sal_uInt16 BIFF12_EXTNAME_ICONIFIED = 0x0020; } // namespace - - ExternalNameModel::ExternalNameModel() : mbBuiltIn( false ), mbNotify( false ), @@ -80,8 +74,6 @@ ExternalNameModel::ExternalNameModel() : { } - - ExternalName::ExternalName( const ExternalLink& rParentLink ) : DefinedNameBase( rParentLink ), mrParentLink( rParentLink ), @@ -271,8 +263,6 @@ void ExternalName::setResultSize( sal_Int32 nColumns, sal_Int32 nRows ) maCurrIt = maResults.begin(); } - - void LinkSheetRange::setDeleted() { meType = LINKSHEETRANGE_INTERNAL; @@ -309,8 +299,6 @@ void LinkSheetRange::setExternalRange( sal_Int32 nDocLink, sal_Int32 nFirst, sal } } - - ExternalLink::ExternalLink( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), meLinkType( LINKTYPE_UNKNOWN ), @@ -624,8 +612,6 @@ ExternalNameRef ExternalLink::createExternalName() return xExtName; } - - RefSheetsModel::RefSheetsModel() : mnExtRefId( -1 ), mnTabId1( -1 ), @@ -638,8 +624,6 @@ void RefSheetsModel::readBiff12Data( SequenceInputStream& rStrm ) rStrm >> mnExtRefId >> mnTabId1 >> mnTabId2; } - - ExternalLinkBuffer::ExternalLinkBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mxSelfRef( new ExternalLink( rHelper ) ), @@ -796,8 +780,6 @@ const RefSheetsModel* ExternalLinkBuffer::getRefSheets( sal_Int32 nRefId ) const &maRefSheets[ static_cast< size_t >( nRefId ) ] : 0; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index b9059973794a..6f487f8df1a5 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -29,8 +29,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; @@ -38,8 +36,6 @@ using namespace ::oox::core; - - ExternalSheetDataContext::ExternalSheetDataContext( WorkbookFragmentBase& rFragment, const Reference< XExternalSheetCache >& rxSheetCache ) : WorkbookContextBase(rFragment) @@ -160,8 +156,6 @@ void ExternalSheetDataContext::setCellValue( const Any& rValue ) } } - - ExternalLinkFragment::ExternalLinkFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath, ExternalLink& rExtLink ) : WorkbookFragmentBase( rHelper, rFragmentPath ), @@ -337,8 +331,6 @@ const RecordInfo* ExternalLinkFragment::getRecordInfos() const return spRecInfos; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 25021e880771..64270d226e99 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -42,8 +42,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -119,8 +117,6 @@ void BinSingleRef2d::readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffs setBiff8Data( nCol, nRow, bRelativeAsOffset ); } - - void BinComplexRef2d::readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset ) { sal_Int32 nRow1, nRow2; @@ -997,8 +993,6 @@ private: sal_uInt8 nMaxParam, bool bImportFilter, FilterType eFilter ); }; - - FunctionProviderImpl::FunctionProviderImpl( FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) { @@ -1110,8 +1104,6 @@ void FunctionProviderImpl::initFuncs( const FunctionData* pBeg, const FunctionDa initFunc( *pIt, nMaxParam ); } - - FunctionProvider::FunctionProvider( FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) : mxFuncImpl( new FunctionProviderImpl( eFilter, eBiff, bImportFilter, bCallerKnowsAboutMacroExport ) ) @@ -1194,8 +1186,6 @@ private: bool initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, const ApiTokenMap& rExtFuncTokenMap, const FunctionInfoVector& rFuncInfos ); }; - - OpCodeProviderImpl::OpCodeProviderImpl( const FunctionInfoVector& rFuncInfos, const Reference< XMultiServiceFactory >& rxModelFactory ) { @@ -1449,8 +1439,6 @@ bool OpCodeProviderImpl::initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, c return bIsValid; } - - OpCodeProvider::OpCodeProvider( const Reference< XMultiServiceFactory >& rxModelFactory, FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) : FunctionProvider( eFilter, eBiff, bImportFilter, bCallerKnowsAboutMacroExport ), @@ -1589,8 +1577,6 @@ TokenToRangeListState lclProcessClose( sal_Int32& ornParenLevel ) } // namespace - - FormulaProcessorBase::FormulaProcessorBase( const WorkbookHelper& rHelper ) : OpCodeProvider( rHelper.getBaseFilter().getModelFactory(), rHelper.getFilterType(), rHelper.getBiff(), rHelper.getBaseFilter().isImportFilter() ), ApiOpCodes( getOpCodes() ), @@ -1598,8 +1584,6 @@ FormulaProcessorBase::FormulaProcessorBase( const WorkbookHelper& rHelper ) : { } - - OUString FormulaProcessorBase::generateAddress2dString( const CellAddress& rAddress, bool bAbsolute ) { return generateAddress2dString( BinAddress( rAddress ), bAbsolute ); @@ -1620,8 +1604,6 @@ OUString FormulaProcessorBase::generateAddress2dString( const BinAddress& rAddre return aBuffer.makeStringAndClear(); } - - OUString FormulaProcessorBase::generateApiString( const OUString& rString ) { OUString aRetString = rString; @@ -1658,8 +1640,6 @@ OUString FormulaProcessorBase::generateApiArray( const Matrix< Any >& rMatrix ) return aBuffer.makeStringAndClear(); } - - Any FormulaProcessorBase::extractReference( const ApiTokenSequence& rTokens ) const { ApiTokenIterator aTokenIt( rTokens, OPCODE_SPACES, true ); @@ -1773,8 +1753,6 @@ void FormulaProcessorBase::convertStringToStringList( } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 731be0fcd5b2..9416b5c7cb37 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -38,16 +38,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::sheet::ReferenceFlags; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { sal_uInt16 lclReadFmlaSize( BiffInputStream& rStrm, BiffType eBiff, const sal_uInt16* pnFmlaSize ) @@ -573,8 +569,6 @@ private: WhiteSpaceVec maClosingSpaces; /// List of whitespaces before closing parenthesis. }; - - FormulaParserImpl::FormulaParserImpl( const FormulaParser& rParent ) : FormulaFinalizer( rParent ), WorkbookHelper( rParent ), @@ -1290,8 +1284,6 @@ private: bool mbNeedExtRefs; /// True = parser needs initialization of external reference info. }; - - OoxFormulaParserImpl::OoxFormulaParserImpl( const FormulaParser& rParent ) : FormulaParserImpl( rParent ), maApiParser( rParent.getBaseFilter().getModelFactory(), rParent ), @@ -1842,8 +1834,6 @@ bool lclIsValidNlrRange( const BiffNlr& rNlr, const BinRange& rRange, bool bRow } // namespace - - class BiffFormulaParserImpl : public FormulaParserImpl { public: @@ -1947,8 +1937,6 @@ private: sal_uInt16 mnRefIdSize; /// Size of unused data following a reference identifier. }; - - BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) : FormulaParserImpl( rParent ), mnAddDataPos( 0 ), @@ -2741,8 +2729,6 @@ bool BiffFormulaParserImpl::pushBiffFunction( sal_uInt16 nFuncId, sal_uInt8 nPar return pushFunctionOperator( OPCODE_NONAME, nParamCount ); } - - namespace { /** Extracts the reference identifier and the remaining data from a formula in @@ -2764,8 +2750,6 @@ bool lclExtractRefId( sal_Int32& rnRefId, OUString& rRemainder, const OUString& } - - FormulaParser::FormulaParser( const WorkbookHelper& rHelper ) : FormulaProcessorBase( rHelper ) { @@ -2902,8 +2886,6 @@ OUString FormulaParser::importMacroName( const OUString& rFormulaString ) return OUString(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index a7709b3d28f5..340d15c8b1b1 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -43,16 +43,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - - namespace { /** Stores the number format used in Calc for an Excel built-in number format. */ @@ -435,8 +431,6 @@ struct BuiltinFormat #define UTF8_KO_MIN "\353\266\204" #define UTF8_KO_SEC "\354\264\210" - - /** Default number format table. Last parent of all other tables, used for unknown locales. */ static const BuiltinFormat spBuiltinFormats_BASE[] = { @@ -533,8 +527,6 @@ static const BuiltinFormat spBuiltinFormats_BASE[] = NUMFMT_ENDTABLE() }; - - /** Arabic, U.A.E. */ static const BuiltinFormat spBuiltinFormats_ar_AE[] = { @@ -1634,8 +1626,6 @@ static const BuiltinFormat spBuiltinFormats_zh_TW[] = NUMFMT_ENDTABLE() }; - - /** Specifies a built-in number format table for a specific locale. */ struct BuiltinFormatTable { @@ -1795,22 +1785,16 @@ static const BuiltinFormatTable spBuiltinFormatTables[] = } // namespace - - NumFmtModel::NumFmtModel() : mnPredefId( -1 ) { } - - ApiNumFmtData::ApiNumFmtData() : mnIndex( 0 ) { } - - namespace { sal_Int32 lclCreatePredefinedFormat( const Reference< XNumberFormats >& rxNumFmts, @@ -1861,8 +1845,6 @@ sal_Int32 lclCreateFormat( const Reference< XNumberFormats >& rxNumFmts, return nIndex; } - - /** Functor for converting an XML number format to an API number format index. */ class NumberFormatFinalizer { @@ -1893,8 +1875,6 @@ NumberFormatFinalizer::NumberFormatFinalizer( const WorkbookHelper& rHelper ) : } // namespace - - NumberFormat::NumberFormat( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -1949,8 +1929,6 @@ void NumberFormat::writeToPropertyMap( PropertyMap& rPropMap ) const rPropMap.setProperty( PROP_NumberFormat, maApiData.mnIndex); } - - NumberFormatsBuffer::NumberFormatsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper(rHelper) , mnHighestId(0) @@ -2077,8 +2055,6 @@ void NumberFormatsBuffer::insertBuiltinFormats() } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index eeb0e06d027d..a95c05c2e7ac 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -26,8 +26,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -35,8 +33,6 @@ using namespace ::com::sun::star::uno; using ::rtl::OUString; - - class OOXMLFormulaParserImpl : private FormulaFinalizer { public: @@ -51,8 +47,6 @@ private: ApiParserWrapper maApiParser; }; - - OOXMLFormulaParserImpl::OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxModelFactory ) : FormulaFinalizer( OpCodeProvider( rxModelFactory, FILTER_OOXML, BIFF_UNKNOWN, true ) ), maApiParser( rxModelFactory, *this ) @@ -103,8 +97,6 @@ const FunctionInfo* OOXMLFormulaParserImpl::resolveBadFuncName( const OUString& return 0; } - - Sequence< OUString > OOXMLFormulaParser_getSupportedServiceNames() { Sequence< OUString > aServiceNames( 1 ); @@ -122,8 +114,6 @@ Reference< XInterface > OOXMLFormulaParser_create( const Reference< XComponentCo return static_cast< ::cppu::OWeakObject* >( new OOXMLFormulaParser ); } - - OOXMLFormulaParser::OOXMLFormulaParser() { } @@ -185,8 +175,6 @@ OUString SAL_CALL OOXMLFormulaParser::printFormula( throw RuntimeException(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 81fc024c238d..fdaed2281738 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -47,16 +47,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using ::oox::core::Relations; - - namespace { const double OOX_MARGIN_DEFAULT_LR = 0.748; /// Left/right default margin in inches. @@ -90,8 +86,6 @@ const sal_uInt16 BIFF12_CHARTPAGESETUP_DRAFTQUALITY = 0x0020; } // namespace - - PageSettingsModel::PageSettingsModel() : mfLeftMargin( OOX_MARGIN_DEFAULT_LR ), mfRightMargin( OOX_MARGIN_DEFAULT_LR ), @@ -133,8 +127,6 @@ void PageSettingsModel::setBiffPrintErrors( sal_uInt8 nPrintErrors ) mnPrintErrors = STATIC_ARRAY_SELECT( spnErrorIds, nPrintErrors, XML_none ); } - - PageSettings::PageSettings( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { @@ -332,8 +324,6 @@ void PageSettings::importPictureData( const Relations& rRelations, const OUStrin } - - enum HFPortionId { HF_LEFT, @@ -342,8 +332,6 @@ enum HFPortionId HF_COUNT }; - - struct HFPortionInfo { Reference<text::XText> mxText; /// XText interface of this portion. @@ -369,8 +357,6 @@ bool HFPortionInfo::initialize( const Reference<text::XText>& rxText ) return bRet; } - - class HeaderFooterParser : public WorkbookHelper { public: @@ -441,8 +427,6 @@ private: FontModel maFontModel; /// Font attributes of current text range. }; - - namespace { // different names for bold font style (lowercase) @@ -468,8 +452,6 @@ static const sal_Char* const sppcItalicNames[] = } // namespace - - HeaderFooterParser::HeaderFooterParser( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maPageNumberService( "com.sun.star.text.TextField.PageNumber" ), @@ -881,8 +863,6 @@ void HeaderFooterParser::setNewPortion( HFPortionId ePortion ) - - PageSettingsConverter::HFHelperData::HFHelperData( sal_Int32 nLeftPropId, sal_Int32 nRightPropId ) : mnLeftPropId( nLeftPropId ), mnRightPropId( nRightPropId ), @@ -894,8 +874,6 @@ PageSettingsConverter::HFHelperData::HFHelperData( sal_Int32 nLeftPropId, sal_In { } - - PageSettingsConverter::PageSettingsConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mxHFParser( new HeaderFooterParser( rHelper ) ), @@ -1063,8 +1041,6 @@ sal_Int32 PageSettingsConverter::writeHeaderFooter( return nHeight; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 3cd2d9036082..454a1acf1299 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -44,8 +44,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -54,8 +52,6 @@ using namespace ::com::sun::star::util; using ::oox::core::Relations; - - namespace { const sal_uInt16 BIFF12_PCDFIELD_SERVERFIELD = 0x0001; @@ -102,8 +98,6 @@ const sal_uInt8 BIFF12_PCDEFINITION_SUPPORTDRILL = 0x08; const sal_uInt8 BIFF12_PCDWBSOURCE_HASRELID = 0x01; const sal_uInt8 BIFF12_PCDWBSOURCE_HASSHEET = 0x02; - - const sal_uInt16 BIFF_PC_NOSTRING = 0xFFFF; const sal_uInt16 BIFF_PCDFIELD_HASITEMS = 0x0001; @@ -127,8 +121,6 @@ const sal_uInt16 BIFF_PCDEFINITION_OPTIMIZEMEMORY = 0x0008; const sal_uInt16 BIFF_PCDEFINITION_BACKGROUNDQUERY = 0x0010; const sal_uInt16 BIFF_PCDEFINITION_ENABLEREFRESH = 0x0020; - - /** Adjusts the weird date format read from binary streams. Dates before 1900-Mar-01 are stored including the non-existing leap day @@ -151,8 +143,6 @@ void lclAdjustBinDateTime( css::util::DateTime& orDateTime ) } // namespace - - PivotCacheItem::PivotCacheItem() : mnType( XML_m ), mbUnused( false ) { @@ -305,8 +295,6 @@ OUString PivotCacheItem::getName() const return OUString(); } - - PivotCacheItemList::PivotCacheItemList( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -424,8 +412,6 @@ void PivotCacheItemList::importArray( SequenceInputStream& rStrm ) } } - - PCFieldModel::PCFieldModel() : mnNumFmtId( 0 ), mnSqlType( 0 ), @@ -439,8 +425,6 @@ PCFieldModel::PCFieldModel() : { } - - PCSharedItemsModel::PCSharedItemsModel() : mbHasSemiMixed( true ), mbHasNonDate( true ), @@ -455,8 +439,6 @@ PCSharedItemsModel::PCSharedItemsModel() : { } - - PCFieldGroupModel::PCFieldGroupModel() : mfStartValue( 0.0 ), mfEndValue( 0.0 ), @@ -478,8 +460,6 @@ void PCFieldGroupModel::setBiffGroupBy( sal_uInt8 nGroupBy ) mnGroupBy = STATIC_ARRAY_SELECT( spnGroupBy, nGroupBy, XML_range ); } - - PivotCacheField::PivotCacheField( const WorkbookHelper& rHelper, bool bIsDatabaseField ) : WorkbookHelper( rHelper ), maSharedItems( rHelper ), @@ -1033,8 +1013,6 @@ void PivotCacheField::writeSharedItemToSourceDataCell( writeItemToSourceDataCell( rSheetHelper, nCol, nRow, *pCacheItem ); } - - PCDefinitionModel::PCDefinitionModel() : mfRefreshedDate( 0.0 ), mnRecords( 0 ), @@ -1053,23 +1031,17 @@ PCDefinitionModel::PCDefinitionModel() : { } - - PCSourceModel::PCSourceModel() : mnSourceType( XML_TOKEN_INVALID ), mnConnectionId( 0 ) { } - - PCWorksheetSourceModel::PCWorksheetSourceModel() { maRange.StartColumn = maRange.StartRow = maRange.EndColumn = maRange.EndRow = -1; } - - PivotCache::PivotCache( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnCurrRow( -1 ), @@ -1396,8 +1368,6 @@ void PivotCache::updateSourceDataRow( WorksheetHelper& rSheetHelper, sal_Int32 n } } - - PivotCacheBuffer::PivotCacheBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -1484,8 +1454,6 @@ PivotCache& PivotCacheBuffer::createPivotCache( sal_Int32 nCacheId ) return *rxCache; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index f9d860d64d13..008a190efd98 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -27,14 +27,10 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::uno; using namespace ::oox::core; - - PivotCacheFieldContext::PivotCacheFieldContext( WorkbookFragmentBase& rFragment, PivotCacheField& rCacheField ) : WorkbookContextBase( rFragment ), mrCacheField( rCacheField ) @@ -106,8 +102,6 @@ void PivotCacheFieldContext::onStartRecord( SequenceInputStream& rStrm ) mrCacheField.importPCDField( rStrm ); } - - PivotCacheDefinitionFragment::PivotCacheDefinitionFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath, PivotCache& rPivotCache ) : WorkbookFragmentBase( rHelper, rFragmentPath ), @@ -208,8 +202,6 @@ void PivotCacheDefinitionFragment::finalizeImport() } } - - PivotCacheRecordsFragment::PivotCacheRecordsFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath, const PivotCache& rPivotCache ) : WorksheetFragmentBase( rHelper, rFragmentPath ), @@ -324,8 +316,6 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn } - - namespace { bool lclSeekToPCDField( BiffInputStream& rStrm ) @@ -340,8 +330,6 @@ bool lclSeekToPCDField( BiffInputStream& rStrm ) } // namespace - - BiffPivotCacheFragment::BiffPivotCacheFragment( const WorkbookHelper& rHelper, const OUString& rStrmName, PivotCache& rPivotCache ) : BiffWorkbookFragmentBase( rHelper, rStrmName, true ), @@ -383,8 +371,6 @@ bool BiffPivotCacheFragment::importFragment() return rStrm.getRecId() == BIFF_ID_EOF; } - - BiffPivotCacheRecordsContext::BiffPivotCacheRecordsContext( const WorksheetHelper& rHelper, const PivotCache& rPivotCache ) : BiffWorksheetContextBase( rHelper ), mrPivotCache( rPivotCache ), @@ -460,8 +446,6 @@ void BiffPivotCacheRecordsContext::startNextRow() mbInRow = true; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index 72a7c06b6661..7b18a69ec564 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -52,8 +52,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -61,8 +59,6 @@ using namespace ::com::sun::star::uno; using namespace com::sun::star; - - namespace { const sal_Int32 OOX_PT_DATALAYOUTFIELD = -2; /// Placeholder index of data layout field. @@ -70,8 +66,6 @@ const sal_Int32 OOX_PT_DATALAYOUTFIELD = -2; /// Placehol const sal_Int32 OOX_PT_PREVIOUS_ITEM = 0x001000FC; /// Calculation of data item result is based on previous item. const sal_Int32 OOX_PT_NEXT_ITEM = 0x001000FD; /// Calculation of data item result is based on next item. - - const sal_uInt32 BIFF12_PTFIELD_DATAFIELD = 0x00000008; const sal_uInt32 BIFF12_PTFIELD_DEFAULT = 0x00000100; const sal_uInt32 BIFF12_PTFIELD_SUM = 0x00000200; @@ -158,8 +152,6 @@ const sal_uInt8 BIFF12_PTDEF_COLAXIS = 2; } // namespace - - PTFieldItemModel::PTFieldItemModel() : mnCacheItem( -1 ), mnType( XML_data ), @@ -176,8 +168,6 @@ void PTFieldItemModel::setBiffType( sal_uInt16 nType ) mnType = STATIC_ARRAY_SELECT( spnTypes, nType, XML_data ); } - - PTFieldModel::PTFieldModel() : mnAxis( XML_TOKEN_INVALID ), mnNumFmtId( 0 ), @@ -224,16 +214,12 @@ void PTFieldModel::setBiffAxis( sal_uInt8 nAxis ) mnAxis = STATIC_ARRAY_SELECT( spnAxisIds, nAxis, XML_TOKEN_INVALID ); } - - PTPageFieldModel::PTPageFieldModel() : mnField( -1 ), mnItem( BIFF12_PTPAGEFIELD_MULTIITEMS ) { } - - PTDataFieldModel::PTDataFieldModel() : mnField( -1 ), mnSubtotal( XML_sum ), @@ -256,8 +242,6 @@ void PTDataFieldModel::setBiffShowDataAs( sal_Int32 nShowDataAs ) mnShowDataAs = STATIC_ARRAY_SELECT( spnShowDataAs, nShowDataAs, XML_TOKEN_INVALID ); } - - PivotTableField::PivotTableField( PivotTable& rPivotTable, sal_Int32 nFieldIndex ) : WorkbookHelper( rPivotTable ), mrPivotTable( rPivotTable ), @@ -747,8 +731,6 @@ Reference< XDataPilotField > PivotTableField::convertRowColPageField( sal_Int32 return xDPField; } - - PTFilterModel::PTFilterModel() : mfValue( 0.0 ), mnField( -1 ), @@ -762,8 +744,6 @@ PTFilterModel::PTFilterModel() : { } - - PivotTableFilter::PivotTableFilter( const PivotTable& rPivotTable ) : WorkbookHelper( rPivotTable ), mrPivotTable( rPivotTable ) @@ -865,8 +845,6 @@ void PivotTableFilter::finalizeImport() } } - - PTDefinitionModel::PTDefinitionModel() : mnCacheId( -1 ), mnDataPosition( 0 ), @@ -902,8 +880,6 @@ PTDefinitionModel::PTDefinitionModel() : { } - - PTLocationModel::PTLocationModel() : mnFirstHeaderRow( 0 ), mnFirstDataRow( 0 ), @@ -913,8 +889,6 @@ PTLocationModel::PTLocationModel() : { } - - PivotTable::PivotTable( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mpDPObject(NULL), @@ -1345,8 +1319,6 @@ void PivotTable::importFields( IndexVector& orFields, SequenceInputStream& rStrm orFields.push_back( rStrm.readInt32() ); } - - PivotTableBuffer::PivotTableBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -1364,8 +1336,6 @@ void PivotTableBuffer::finalizeImport() maTables.forEachMem( &PivotTable::finalizeImport ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index c211b870bea1..cbbeaecce827 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -25,13 +25,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - PivotTableFieldContext::PivotTableFieldContext( WorksheetFragmentBase& rFragment, PivotTableField& rTableField ) : WorksheetContextBase( rFragment ), mrTableField( rTableField ) @@ -110,8 +106,6 @@ void PivotTableFieldContext::onStartRecord( SequenceInputStream& rStrm ) mrTableField.importPTField( rStrm ); } - - PivotTableFilterContext::PivotTableFilterContext( WorksheetFragmentBase& rFragment, PivotTableFilter& rTableFilter ) : WorksheetContextBase( rFragment ), mrTableFilter( rTableFilter ) @@ -164,8 +158,6 @@ void PivotTableFilterContext::onStartRecord( SequenceInputStream& rStrm ) mrTableFilter.importPTFilter( rStrm ); } - - PivotTableFragment::PivotTableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mrPivotTable( getPivotTables().createPivotTable() ) @@ -282,8 +274,6 @@ const RecordInfo* PivotTableFragment::getRecordInfos() const return spRecInfos; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 362308cf095d..9952d4de879d 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -33,16 +33,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - namespace { const sal_uInt32 BIFF12_QUERYTABLE_HEADERS = 0x00000001; @@ -64,8 +60,6 @@ const sal_uInt32 BIFF12_QUERYTABLE_APPLYBORDER = 0x00020000; const sal_uInt32 BIFF12_QUERYTABLE_APPLYFILL = 0x00040000; const sal_uInt32 BIFF12_QUERYTABLE_APPLYPROTECTION = 0x00080000; - - void lclAppendWebQueryTableName( OUStringBuffer& rTables, const OUString& rTableName ) { if( !rTableName.isEmpty() ) @@ -132,8 +126,6 @@ Reference< XAreaLink > lclFindAreaLink( } // namespace - - QueryTableModel::QueryTableModel() : mnConnId( -1 ), mnGrowShrinkType( XML_insertDelete ), @@ -152,8 +144,6 @@ QueryTableModel::QueryTableModel() : { } - - QueryTable::QueryTable( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { @@ -268,8 +258,6 @@ void QueryTable::finalizeImport() } } - - QueryTableBuffer::QueryTableBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { @@ -287,8 +275,6 @@ void QueryTableBuffer::finalizeImport() maQueryTables.forEachMem( &QueryTable::finalizeImport ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx index dbd51f41a748..b7d6ac66f92b 100644 --- a/sc/source/filter/oox/querytablefragment.cxx +++ b/sc/source/filter/oox/querytablefragment.cxx @@ -25,13 +25,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - QueryTableFragment::QueryTableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mrQueryTable( getQueryTables().createQueryTable() ) @@ -74,8 +70,6 @@ const RecordInfo* QueryTableFragment::getRecordInfos() const } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index d95da34b2ccf..2fb062ab2eb8 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -30,14 +30,10 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; - - namespace { const sal_uInt8 BIFF12_STRINGFLAG_FONTS = 0x01; @@ -50,8 +46,6 @@ inline bool lclNeedsRichTextFormat( const Font* pFont ) } // namespace - - RichStringPortion::RichStringPortion( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnFontId( -1 ) @@ -157,16 +151,12 @@ void RichStringPortion::writeFontProperties( const Reference<XText>& rxText, con pFont->writeToPropertySet(aPropSet, FONT_PROPTYPE_TEXT); } - - void FontPortionModel::read( SequenceInputStream& rStrm ) { mnPos = rStrm.readuInt16(); mnFontId = rStrm.readuInt16(); } - - void FontPortionModelList::appendPortion( const FontPortionModel& rPortion ) { // #i33341# real life -- same character index may occur several times @@ -195,8 +185,6 @@ void FontPortionModelList::importPortions( SequenceInputStream& rStrm ) } } - - PhoneticDataModel::PhoneticDataModel() : mnFontId( -1 ), mnType( XML_fullwidthKatakana ), @@ -213,8 +201,6 @@ void PhoneticDataModel::setBiffData( sal_Int32 nType, sal_Int32 nAlignment ) mnAlignment = STATIC_ARRAY_SELECT( spnAlignments, nAlignment, XML_left ); } - - PhoneticSettings::PhoneticSettings( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -244,8 +230,6 @@ void PhoneticSettings::importStringData( SequenceInputStream& rStrm ) maModel.setBiffData( extractValue< sal_Int32 >( nFlags, 0, 2 ), extractValue< sal_Int32 >( nFlags, 2, 2 ) ); } - - RichStringPhonetic::RichStringPhonetic( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mnBasePos( -1 ), @@ -270,8 +254,6 @@ void RichStringPhonetic::setBaseRange( sal_Int32 nBasePos, sal_Int32 nBaseEnd ) mnBaseEnd = nBaseEnd; } - - void PhoneticPortionModel::read( SequenceInputStream& rStrm ) { mnPos = rStrm.readuInt16(); @@ -279,8 +261,6 @@ void PhoneticPortionModel::read( SequenceInputStream& rStrm ) mnBaseLen = rStrm.readuInt16(); } - - void PhoneticPortionModelList::appendPortion( const PhoneticPortionModel& rPortion ) { // same character index may occur several times @@ -314,8 +294,6 @@ void PhoneticPortionModelList::importPortions( SequenceInputStream& rStrm ) } } - - RichString::RichString( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maPhonSettings( rHelper ) @@ -500,8 +478,6 @@ void RichString::createPhoneticPortions( const OUString& rText, PhoneticPortionM } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/richstringcontext.cxx b/sc/source/filter/oox/richstringcontext.cxx index ad8ebf32dbaf..1bb6c96491d9 100644 --- a/sc/source/filter/oox/richstringcontext.cxx +++ b/sc/source/filter/oox/richstringcontext.cxx @@ -24,12 +24,8 @@ namespace oox { namespace xls { - - using ::oox::core::ContextHandlerRef; - - ContextHandlerRef RichStringContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { if( isRootElement() ) @@ -90,8 +86,6 @@ void RichStringContext::onCharacters( const OUString& rChars ) } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index 62004a87ae77..a2f4a7f29a97 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -35,31 +35,23 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - - ScenarioCellModel::ScenarioCellModel() : mnNumFmtId( 0 ), mbDeleted( false ) { } - - ScenarioModel::ScenarioModel() : mbLocked( false ), mbHidden( false ) { } - - Scenario::Scenario( const WorkbookHelper& rHelper, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), mnSheet( nSheet ) @@ -158,16 +150,12 @@ void Scenario::finalizeImport() } } - - SheetScenariosModel::SheetScenariosModel() : mnCurrent( 0 ), mnShown( 0 ) { } - - SheetScenarios::SheetScenarios( const WorkbookHelper& rHelper, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), mnSheet( nSheet ) @@ -210,8 +198,6 @@ void SheetScenarios::finalizeImport() } } - - ScenarioBuffer::ScenarioBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -230,8 +216,6 @@ void ScenarioBuffer::finalizeImport() maSheetScenarios.forEachMem( &SheetScenarios::finalizeImport ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/scenariocontext.cxx b/sc/source/filter/oox/scenariocontext.cxx index db921cc9ec0d..8535b89a67b0 100644 --- a/sc/source/filter/oox/scenariocontext.cxx +++ b/sc/source/filter/oox/scenariocontext.cxx @@ -24,12 +24,8 @@ namespace oox { namespace xls { - - using ::oox::core::ContextHandlerRef; - - ScenarioContext::ScenarioContext( WorksheetContextBase& rParent, SheetScenarios& rSheetScenarios ) : WorksheetContextBase( rParent ), mrScenario( rSheetScenarios.createScenario() ) @@ -70,8 +66,6 @@ void ScenarioContext::onStartRecord( SequenceInputStream& rStrm ) mrScenario.importScenario( rStrm ); } - - ScenariosContext::ScenariosContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ), mrSheetScenarios( getScenarios().createSheetScenarios( getSheetIndex() ) ) @@ -112,8 +106,6 @@ void ScenariosContext::onStartRecord( SequenceInputStream& rStrm ) mrSheetScenarios.importScenarios( rStrm ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/sharedstringsbuffer.cxx b/sc/source/filter/oox/sharedstringsbuffer.cxx index 59951c3bc522..3d90c5a6208a 100644 --- a/sc/source/filter/oox/sharedstringsbuffer.cxx +++ b/sc/source/filter/oox/sharedstringsbuffer.cxx @@ -24,13 +24,9 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; - - SharedStringsBuffer::SharedStringsBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -53,8 +49,6 @@ RichStringRef SharedStringsBuffer::getString( sal_Int32 nStringId ) const return maStrings.get( nStringId ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx index 19fdf3c551c8..9d9b848ed84e 100644 --- a/sc/source/filter/oox/sharedstringsfragment.cxx +++ b/sc/source/filter/oox/sharedstringsfragment.cxx @@ -25,13 +25,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - SharedStringsFragment::SharedStringsFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) @@ -87,8 +83,6 @@ void SharedStringsFragment::finalizeImport() getSharedStrings().finalizeImport(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 7422e1ad70e9..67018af69489 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -58,8 +58,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; @@ -68,8 +66,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - - CellModel::CellModel() : mnCellType( XML_TOKEN_INVALID ), mnXfId( -1 ), @@ -77,8 +73,6 @@ CellModel::CellModel() : { } - - CellFormulaModel::CellFormulaModel() : mnFormulaType( XML_TOKEN_INVALID ), mnSharedId( -1 ) @@ -101,8 +95,6 @@ bool CellFormulaModel::isValidSharedRef( const CellAddress& rCellAddr ) (maFormulaRef.StartRow <= rCellAddr.Row) && (rCellAddr.Row <= maFormulaRef.EndRow); } - - DataTableModel::DataTableModel() : mb2dTable( false ), mbRowTable( false ), @@ -111,8 +103,6 @@ DataTableModel::DataTableModel() : { } - - CellBlockBuffer::CellBlockBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), mnCurrRow( -1 ) @@ -131,8 +121,6 @@ void CellBlockBuffer::finalizeImport() { } - - SheetDataBuffer::SheetDataBuffer( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), maCellBlocks( rHelper ), @@ -564,8 +552,6 @@ bool SheetDataBuffer::MergedRange::tryExpand( const CellAddress& rAddress, sal_I return false; } - - void SheetDataBuffer::setCellFormula( const CellAddress& rCellAddr, const ApiTokenSequence& rTokens ) { if( rTokens.hasElements() ) diff --git a/sc/source/filter/oox/sheetdatacontext.cxx b/sc/source/filter/oox/sheetdatacontext.cxx index 4d2c57a568c1..9fe0331e3b0e 100644 --- a/sc/source/filter/oox/sheetdatacontext.cxx +++ b/sc/source/filter/oox/sheetdatacontext.cxx @@ -34,8 +34,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; @@ -43,8 +41,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::ContextHandlerRef; - - namespace { // record constants ----------------------------------------------------------- @@ -66,8 +62,6 @@ const sal_uInt8 BIFF12_ROW_SHOWPHONETIC = 0x01; } // namespace - - SheetDataContextBase::SheetDataContextBase( const WorksheetHelper& rHelper ) : mrAddressConv( rHelper.getAddressConverter() ), mrFormulaParser( rHelper.getFormulaParser() ), @@ -80,8 +74,6 @@ SheetDataContextBase::~SheetDataContextBase() { } - - SheetDataContext::SheetDataContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ), SheetDataContextBase( rFragment ), diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 28d32c00954e..dc2f589cc6f9 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -82,8 +82,6 @@ using ::com::sun::star::table::BorderLine2; namespace oox { namespace xls { - - using namespace com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; @@ -94,8 +92,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; - - namespace { // OOXML constants ------------------------------------------------------------ @@ -206,8 +202,6 @@ const sal_uInt8 BIFF_FONTUNDERL_DOUBLE = 2; const sal_uInt8 BIFF_FONTUNDERL_SINGLE_ACC = 33; const sal_uInt8 BIFF_FONTUNDERL_DOUBLE_ACC = 34; - - sal_Int32 lclReadRgbColor( BinaryInputStream& rStrm ) { sal_uInt8 nR, nG, nB, nA; @@ -224,8 +218,6 @@ sal_Int32 lclReadRgbColor( BinaryInputStream& rStrm ) } // namespace - - ExcelGraphicHelper::ExcelGraphicHelper( const WorkbookHelper& rHelper ) : GraphicHelper( rHelper.getBaseFilter().getComponentContext(), rHelper.getBaseFilter().getTargetFrame(), rHelper.getBaseFilter().getStorage() ), WorkbookHelper( rHelper ) @@ -244,8 +236,6 @@ sal_Int32 ExcelGraphicHelper::getPaletteColor( sal_Int32 nPaletteIdx ) const return getStyles().getPaletteColor( nPaletteIdx ); } - - void Color::setAuto() { clearTransformations(); @@ -341,8 +331,6 @@ SequenceInputStream& operator>>( SequenceInputStream& rStrm, Color& orColor ) return rStrm; } - - namespace { /** Standard EGA colors, bright. */ @@ -397,8 +385,6 @@ static const sal_Int32 spnDefColors8[] = } // namespace - - ColorPalette::ColorPalette( const WorkbookHelper& rHelper ) : WorkbookHelper(rHelper) , mnAppendIndex(0) @@ -471,8 +457,6 @@ void ColorPalette::appendColor( sal_Int32 nRGBValue ) ++mnAppendIndex; } - - namespace { void lclSetFontName( ApiScriptFontName& rFontName, const FontDescriptor& rFontDesc, bool bHasGlyphs ) @@ -492,8 +476,6 @@ void lclSetFontName( ApiScriptFontName& rFontName, const FontDescriptor& rFontDe } // namespace - - FontModel::FontModel() : mnScheme( XML_none ), mnFamily( OOX_FONTFAMILY_NONE ), @@ -544,8 +526,6 @@ void FontModel::setBiffEscapement( sal_uInt16 nEscapement ) mnEscapement = STATIC_ARRAY_SELECT( spnEscapes, nEscapement, XML_baseline ); } - - ApiFontUsedFlags::ApiFontUsedFlags( bool bAllUsed ) : mbNameUsed( bAllUsed ), mbColorUsed( bAllUsed ), @@ -561,16 +541,12 @@ ApiFontUsedFlags::ApiFontUsedFlags( bool bAllUsed ) : { } - - ApiScriptFontName::ApiScriptFontName() : mnFamily( ::com::sun::star::awt::FontFamily::DONTKNOW ), mnTextEnc( RTL_TEXTENCODING_DONTKNOW ) { } - - ApiFontData::ApiFontData() : maDesc( "Calibri", @@ -598,8 +574,6 @@ ApiFontData::ApiFontData() : maLatinFont.maName = maDesc.Name; } - - Font::Font( const WorkbookHelper& rHelper, bool bDxf ) : WorkbookHelper( rHelper ), maModel( rHelper.getTheme().getDefaultFontModel() ), @@ -1118,8 +1092,6 @@ void Font::writeToPropertySet( PropertySet& rPropSet, FontPropertyType ePropType rPropSet.setProperties( aPropMap ); } - - AlignmentModel::AlignmentModel() : mnHorAlign( XML_general ), mnVerAlign( XML_bottom ), @@ -1147,8 +1119,6 @@ void AlignmentModel::setBiffVerAlign( sal_uInt8 nVerAlign ) mnVerAlign = STATIC_ARRAY_SELECT( spnVerAligns, nVerAlign, XML_bottom ); } - - ApiAlignmentData::ApiAlignmentData() : meHorJustify( ::com::sun::star::table::CellHoriJustify_STANDARD ), mnHorJustifyMethod( ::com::sun::star::table::CellJustifyMethod::AUTO ), @@ -1178,8 +1148,6 @@ bool operator==( const ApiAlignmentData& rLeft, const ApiAlignmentData& rRight ) (rLeft.mbShrink == rRight.mbShrink); } - - Alignment::Alignment( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -1392,16 +1360,12 @@ void Alignment::writeToPropertyMap( PropertyMap& rPropMap ) const rPropMap.setProperty( PROP_ShrinkToFit, maApiData.mbShrink); } - - ProtectionModel::ProtectionModel() : mbLocked( true ), // default in Excel and Calc mbHidden( false ) { } - - ApiProtectionData::ApiProtectionData() : maCellProt( sal_True, sal_False, sal_False, sal_False ) { @@ -1416,8 +1380,6 @@ bool operator==( const ApiProtectionData& rLeft, const ApiProtectionData& rRight (rLeft.maCellProt.IsPrintHidden == rRight.maCellProt.IsPrintHidden); } - - Protection::Protection( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -1451,8 +1413,6 @@ void Protection::fillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) const ScfTools::PutItem( rItemSet, ScProtectionAttr( maApiData.maCellProt.IsLocked, maApiData.maCellProt.IsFormulaHidden ), bSkipPoolDefs ); } - - namespace { bool lcl_isBorder(const ::com::sun::star::table::BorderLine& rBorder) @@ -1479,8 +1439,6 @@ void BorderLineModel::setBiffStyle( sal_Int32 nLineStyle ) mnStyle = STATIC_ARRAY_SELECT( spnStyleIds, nLineStyle, XML_none ); } - - BorderModel::BorderModel( bool bDxf ) : maLeft( bDxf ), maRight( bDxf ), @@ -1492,8 +1450,6 @@ BorderModel::BorderModel( bool bDxf ) : { } - - ApiBorderData::ApiBorderData() : mbBorderUsed( false ), mbDiagUsed( false ) @@ -1535,8 +1491,6 @@ bool operator==( const ApiBorderData& rLeft, const ApiBorderData& rRight ) (rLeft.mbDiagUsed == rRight.mbDiagUsed); } - - namespace { inline void lclSetBorderLineWidth( BorderLine& rBorderLine, @@ -1549,8 +1503,6 @@ inline void lclSetBorderLineWidth( BorderLine& rBorderLine, } // namespace - - Border::Border( const WorkbookHelper& rHelper, bool bDxf ) : WorkbookHelper( rHelper ), maModel( bDxf ), @@ -1773,8 +1725,6 @@ bool Border::convertBorderLine( BorderLine2& rBorderLine, const BorderLineModel& } - - PatternFillModel::PatternFillModel( bool bDxf ) : mnPattern( XML_none ), mbPattColorUsed( !bDxf ), @@ -1796,8 +1746,6 @@ void PatternFillModel::setBiffPattern( sal_Int32 nPattern ) mnPattern = STATIC_ARRAY_SELECT( spnPatternIds, nPattern, XML_none ); } - - GradientFillModel::GradientFillModel() : mnType( XML_linear ), mfAngle( 0.0 ), @@ -1833,8 +1781,6 @@ void GradientFillModel::readGradientStop( SequenceInputStream& rStrm, bool bDxf maColors[ fPosition ] = aColor; } - - ApiSolidFillData::ApiSolidFillData() : mnColor( API_RGB_TRANSPARENT ), mbTransparent( true ), @@ -1850,8 +1796,6 @@ bool operator==( const ApiSolidFillData& rLeft, const ApiSolidFillData& rRight ) (rLeft.mbUsed == rRight.mbUsed); } - - namespace { inline sal_Int32 lclGetMixedColorComp( sal_Int32 nPatt, sal_Int32 nFill, sal_Int32 nAlpha ) @@ -1869,8 +1813,6 @@ sal_Int32 lclGetMixedColor( sal_Int32 nPattColor, sal_Int32 nFillColor, sal_Int3 } // namespace - - Fill::Fill( const WorkbookHelper& rHelper, bool bDxf ) : WorkbookHelper( rHelper ), mbDxf( bDxf ) @@ -2100,8 +2042,6 @@ void Fill::writeToPropertyMap( PropertyMap& rPropMap ) const } } - - XfModel::XfModel() : mnStyleXfId( -1 ), mnFontId( -1 ), @@ -2118,8 +2058,6 @@ XfModel::XfModel() : { } - - Xf::Xf( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maAlignment( rHelper ), @@ -2383,8 +2321,6 @@ Xf::createPattern( bool bSkipPoolDefs ) return *mpPattern; } - - Dxf::Dxf( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -2507,8 +2443,6 @@ void Dxf::fillToItemSet( SfxItemSet& rSet ) const mxFill->fillToItemSet(rSet); } - - namespace { const sal_Char* const spcStyleNamePrefix = "Excel Built-in "; @@ -2594,8 +2528,6 @@ OUString lclCreateStyleName( const CellStyleModel& rModel ) } // namespace - - CellStyleModel::CellStyleModel() : mnXfId( -1 ), mnBuiltinId( -1 ), @@ -2616,8 +2548,6 @@ bool CellStyleModel::isDefaultStyle() const return mbBuiltin && (mnBuiltinId == OOX_STYLE_NORMAL); } - - CellStyle::CellStyle( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mbCreated( false ), @@ -2697,8 +2627,6 @@ void CellStyle::finalizeImport( const OUString& rFinalName ) createCellStyle(); } - - CellStyleBuffer::CellStyleBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -2868,8 +2796,6 @@ OUString CellStyleBuffer::createCellStyle( const CellStyleRef& rxCellStyle ) con return lclGetBuiltinStyleName( OOX_STYLE_NORMAL, OUString() ); } - - AutoFormatModel::AutoFormatModel() : mnAutoFormatId( 0 ), mbApplyNumFmt( false ), @@ -2881,8 +2807,6 @@ AutoFormatModel::AutoFormatModel() : { } - - StylesBuffer::StylesBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maPalette( rHelper ), diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index bc06d4fb9db7..979d5f868dca 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -24,13 +24,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - IndexedColorsContext::IndexedColorsContext( WorkbookFragmentBase& rFragment ) : WorkbookContextBase( rFragment ) { @@ -58,8 +54,6 @@ ContextHandlerRef IndexedColorsContext::onCreateRecordContext( sal_Int32 nRecId, return 0; } - - ContextHandlerRef FontContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { if( mxFont.get() ) @@ -67,8 +61,6 @@ ContextHandlerRef FontContext::onCreateContext( sal_Int32 nElement, const Attrib return 0; } - - void BorderContext::onStartElement( const AttributeList& rAttribs ) { if( mxBorder.get() && (getCurrentElement() == XLS_TOKEN( border )) ) @@ -90,8 +82,6 @@ ContextHandlerRef BorderContext::onCreateContext( sal_Int32 nElement, const Attr return 0; } - - ContextHandlerRef FillContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { if( mxFill.get() ) switch( getCurrentElement() ) @@ -125,8 +115,6 @@ ContextHandlerRef FillContext::onCreateContext( sal_Int32 nElement, const Attrib return 0; } - - void XfContext::onStartElement( const AttributeList& rAttribs ) { if( mxXf.get() && (getCurrentElement() == XLS_TOKEN( xf )) ) @@ -148,8 +136,6 @@ ContextHandlerRef XfContext::onCreateContext( sal_Int32 nElement, const Attribut return 0; } - - ContextHandlerRef DxfContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) { if( mxDxf.get() ) switch( getCurrentElement() ) @@ -172,8 +158,6 @@ ContextHandlerRef DxfContext::onCreateContext( sal_Int32 nElement, const Attribu return 0; } - - StylesFragment::StylesFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) { @@ -314,8 +298,6 @@ void StylesFragment::finalizeImport() getStyles().finalizeImport(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index ee1a0fe46c60..ebd10dd5a4cf 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -30,15 +30,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; - - TableModel::TableModel() : mnId( -1 ), mnType( XML_worksheet ), @@ -47,8 +43,6 @@ TableModel::TableModel() : { } - - Table::Table( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maAutoFilters( rHelper ), @@ -123,8 +117,6 @@ void Table::applyAutoFilters() } } - - TableBuffer::TableBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -176,8 +168,6 @@ void TableBuffer::insertTableToMaps( const TableRef& rxTable ) } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx index 0e4148294a2d..92cf34aeff38 100644 --- a/sc/source/filter/oox/tablefragment.cxx +++ b/sc/source/filter/oox/tablefragment.cxx @@ -26,13 +26,9 @@ namespace oox { namespace xls { - - using namespace ::oox::core; - - TableFragment::TableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mrTable( getTables().createTable() ) @@ -91,8 +87,6 @@ const RecordInfo* TableFragment::getRecordInfos() const return spRecInfos; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/themebuffer.cxx b/sc/source/filter/oox/themebuffer.cxx index cc80aa0e41eb..58ed24219cfc 100644 --- a/sc/source/filter/oox/themebuffer.cxx +++ b/sc/source/filter/oox/themebuffer.cxx @@ -24,12 +24,8 @@ namespace oox { namespace xls { - - using ::oox::drawingml::ClrScheme; - - ThemeBuffer::ThemeBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mxDefFontModel( new FontModel ) @@ -60,8 +56,6 @@ sal_Int32 ThemeBuffer::getColorByToken( sal_Int32 nToken ) const return getClrScheme().getColor( nToken, nColor ) ? nColor : API_RGB_TRANSPARENT; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index 30b4c9e8ea4c..12e164b1a1d2 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -34,15 +34,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::uno; - - namespace { const double MM100_PER_INCH = 2540.0; @@ -50,8 +46,6 @@ const double MM100_PER_POINT = MM100_PER_INCH / 72.0; const double MM100_PER_TWIP = MM100_PER_POINT / 20.0; const double MM100_PER_EMU = 1.0 / 360.0; - - /** Returns true, if the passed year is a leap year. */ inline bool lclIsLeapYear( sal_Int32 nYear ) { @@ -93,8 +87,6 @@ sal_Int32 lclGetDays( const util::Date& rDate ) } // namespace - - UnitConverter::UnitConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), maCoeffs( UNIT_ENUM_SIZE, 1.0 ), @@ -237,8 +229,6 @@ double UnitConverter::getCoefficient( Unit eUnit ) const return maCoeffs[ static_cast< size_t >( eUnit ) ]; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index de36ecf6dd02..3cd23b33ea4a 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -42,8 +42,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; @@ -52,8 +50,6 @@ using namespace ::com::sun::star::uno; using ::oox::core::FilterBase; - - namespace { const sal_Int32 OOX_BOOKVIEW_TABBARRATIO_DEF = 600; /// Default tabbar ratio. @@ -98,8 +94,6 @@ const sal_Int16 API_SPLITPANE_TOPRIGHT = 1; /// Top-right pa const sal_Int16 API_SPLITPANE_BOTTOMLEFT = 2; /// Bottom-left, bottom, left, or single pane. const sal_Int16 API_SPLITPANE_BOTTOMRIGHT = 3; /// Bottom-right, or right pane. - - /** Returns the OOXML pane identifier from the passed BIFF pane id. */ sal_Int32 lclGetOoxPaneId( sal_Int32 nBiffPaneId, sal_Int32 nDefaultPaneId ) { @@ -109,15 +103,11 @@ sal_Int32 lclGetOoxPaneId( sal_Int32 nBiffPaneId, sal_Int32 nDefaultPaneId ) } // namespace - - PaneSelectionModel::PaneSelectionModel() : mnActiveCellId( 0 ) { } - - SheetViewModel::SheetViewModel() : mnWorkbookViewId( 0 ), mnViewType( XML_normal ), @@ -184,8 +174,6 @@ PaneSelectionModel& SheetViewModel::createPaneSelection( sal_Int32 nPaneId ) return *rxPaneSel; } - - SheetViewSettings::SheetViewSettings( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) { @@ -460,8 +448,6 @@ SheetViewModelRef SheetViewSettings::createSheetView() return xModel; } - - WorkbookViewModel::WorkbookViewModel() : mnWinX( 0 ), mnWinY( 0 ), @@ -478,8 +464,6 @@ WorkbookViewModel::WorkbookViewModel() : { } - - ViewSettings::ViewSettings( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), mbValidOleSize( false ) @@ -633,8 +617,6 @@ WorkbookViewModel& ViewSettings::createWorkbookView() return *xModel; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 69a9c90c513b..776c3d957d5e 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -67,8 +67,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::io; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; @@ -77,16 +75,12 @@ using namespace ::oox::core; using ::oox::drawingml::ThemeFragmentHandler; - - namespace { const double PROGRESS_LENGTH_GLOBALS = 0.1; /// 10% of progress bar for globals import. } // namespace - - WorkbookFragment::WorkbookFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) { diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 8039f7bcbac7..9bb9f3ce3b8c 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -90,8 +90,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::awt; using namespace ::com::sun::star::container; using namespace ::com::sun::star::document; @@ -106,8 +104,6 @@ using ::oox::core::FragmentHandler; using ::oox::core::XmlFilterBase; using ::oox::drawingml::Theme; - - bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rName2 ) const { // there is no wrapper in OUString, TODO: compare with collator @@ -115,8 +111,6 @@ bool IgnoreCaseCompare::operator()( const OUString& rName1, const OUString& rNam rName1.getStr(), rName1.getLength(), rName2.getStr(), rName2.getLength() ) < 0; } - - class WorkbookGlobals : boost::noncopyable { public: @@ -318,8 +312,6 @@ private: boost::scoped_ptr<ScDocumentImport> mxDocImport; }; - - WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) : mrBaseFilter( rFilter ), mrExcelFilter( rFilter ), @@ -707,8 +699,6 @@ void WorkbookGlobals::recalcFormulaCells() rDoc.CalcFormulaTree(false, true, false); } - - WorkbookHelper::~WorkbookHelper() { } @@ -1034,8 +1024,6 @@ BiffCodecHelper& WorkbookHelper::getCodecHelper() const return mrBookGlob.getCodecHelper(); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index 53cedc8d354a..8be9165a73c2 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -34,8 +34,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; @@ -43,8 +41,6 @@ using namespace ::com::sun::star::util; using ::oox::core::CodecHelper; - - namespace { const sal_uInt32 BIFF12_WORKBOOKPR_DATE1904 = 0x00000001; @@ -65,16 +61,12 @@ const sal_Int16 API_SHOWMODE_PLACEHOLDER = 2; /// Show placeholder } // namespace - - FileSharingModel::FileSharingModel() : mnPasswordHash( 0 ), mbRecommendReadOnly( false ) { } - - WorkbookSettingsModel::WorkbookSettingsModel() : mnShowObjectMode( XML_all ), mnUpdateLinksMode( XML_userSet ), @@ -91,8 +83,6 @@ void WorkbookSettingsModel::setBiffObjectMode( sal_uInt16 nObjMode ) mnShowObjectMode = STATIC_ARRAY_SELECT( spnObjModes, nObjMode, XML_all ); } - - CalcSettingsModel::CalcSettingsModel() : mfIterateDelta( 0.001 ), mnCalcId( -1 ), @@ -109,8 +99,6 @@ CalcSettingsModel::CalcSettingsModel() : { } - - WorkbookSettings::WorkbookSettings( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -276,8 +264,6 @@ void WorkbookSettings::setDateMode( bool bDateMode1904, bool bDateCompatibility getUnitConverter().finalizeNullDate( getNullDate() ); } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index a0f0cafafba3..c2dce216435d 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -37,15 +37,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; - - SheetInfoModel::SheetInfoModel() : mnBiffHandle( -1 ), mnSheetId( -1 ), @@ -53,8 +49,6 @@ SheetInfoModel::SheetInfoModel() : { } - - WorksheetBuffer::WorksheetBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) { @@ -221,8 +215,6 @@ void WorksheetBuffer::insertSheet( const SheetInfoModel& rModel ) maSheetInfosByName[ lclQuoteName( rModel.maName ) ] = xSheetInfo; } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index cd46a2aabae8..05f8b8cfcb27 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -47,15 +47,11 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; - - namespace { const sal_uInt16 BIFF_COLINFO_HIDDEN = 0x0001; @@ -80,8 +76,6 @@ const sal_uInt16 BIFF12_OLEOBJECT_AUTOLOAD = 0x0002; } // namespace - - DataValidationsContext::DataValidationsContext( WorksheetFragmentBase& rFragment ) : WorksheetContextBase( rFragment ) { @@ -197,8 +191,6 @@ void DataValidationsContext::importDataValidation( SequenceInputStream& rStrm ) setValidation( aModel ); } - - WorksheetFragment::WorksheetFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) { diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 9a1533b92cec..02df50057a22 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -81,8 +81,6 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; @@ -94,8 +92,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - - namespace { void lclUpdateProgressBar( const ISegmentProgressBarRef& rxProgressBar, double fPosition ) @@ -107,8 +103,6 @@ void lclUpdateProgressBar( const ISegmentProgressBarRef& rxProgressBar, double f } // namespace - - ColumnModel::ColumnModel() : maRange( -1 ), mfWidth( 0.0 ), @@ -132,8 +126,6 @@ bool ColumnModel::isMergeable( const ColumnModel& rModel ) const (mbCollapsed == rModel.mbCollapsed); } - - RowModel::RowModel() : mnRow( -1 ), mfHeight( 0.0 ), @@ -179,8 +171,6 @@ HyperlinkModel::HyperlinkModel() { } - - ValidationModel::ValidationModel() : mnType( XML_none ), mnOperator( XML_between ), @@ -214,8 +204,6 @@ void ValidationModel::setBiffErrorStyle( sal_uInt8 nErrorStyle ) } - - class WorksheetGlobals : public WorkbookHelper, public IWorksheetProgress { public: @@ -423,8 +411,6 @@ private: bool mbHasDefWidth; /// True = default column width is set from defaultColWidth attribute. }; - - WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), maSheetCellRanges( "com.sun.star.sheet.SheetCellRanges" ), @@ -1376,8 +1362,6 @@ void WorksheetGlobals::finalizeDrawings() } - - WorksheetHelper::WorksheetHelper( WorksheetGlobals& rSheetGlob ) : WorkbookHelper( rSheetGlob ), mrSheetGlob( rSheetGlob ) @@ -1638,8 +1622,6 @@ void WorksheetHelper::createSharedFormulaMapEntry( } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/worksheetsettings.cxx b/sc/source/filter/oox/worksheetsettings.cxx index 906df7b47a69..e58b41d6d346 100644 --- a/sc/source/filter/oox/worksheetsettings.cxx +++ b/sc/source/filter/oox/worksheetsettings.cxx @@ -32,16 +32,12 @@ namespace oox { namespace xls { - - using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using ::oox::core::CodecHelper; - - namespace { const sal_uInt8 BIFF12_SHEETPR_FILTERMODE = 0x01; @@ -53,8 +49,6 @@ const sal_uInt16 BIFF_SHEETPR_FITTOPAGES = 0x0100; } // namespace - - SheetSettingsModel::SheetSettingsModel() : mbFilterMode( false ), mbApplyStyles( false ), @@ -63,8 +57,6 @@ SheetSettingsModel::SheetSettingsModel() : { } - - SheetProtectionModel::SheetProtectionModel() : mnPasswordHash( 0 ), mbSheet( false ), @@ -86,8 +78,6 @@ SheetProtectionModel::SheetProtectionModel() : { } - - WorksheetSettings::WorksheetSettings( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ), maPhoneticSett( rHelper ) @@ -254,8 +244,6 @@ void WorksheetSettings::finalizeImport() } } - - } // namespace xls } // namespace oox diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx index 8e8240214031..a9ae7b3ab4f6 100644 --- a/sc/source/filter/rtf/expbase.cxx +++ b/sc/source/filter/rtf/expbase.cxx @@ -22,8 +22,6 @@ #include "editutil.hxx" - - ScExportBase::ScExportBase( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rRangeP ) : diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx index 268f8f184e74..ec97bf84b404 100644 --- a/sc/source/filter/rtf/rtfimp.cxx +++ b/sc/source/filter/rtf/rtfimp.cxx @@ -56,6 +56,4 @@ ScRTFImport::~ScRTFImport() delete (ScRTFParser*) mpParser; // vor EditEngine! } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index ea281c699c0a..3280eb55833a 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -36,8 +36,6 @@ #define SC_RTFTWIPTOL 10 // 10 Twips tolerance when determining columns - - ScRTFParser::ScRTFParser( EditEngine* pEditP ) : ScEEParser( pEditP ), mnCurPos(0), diff --git a/sc/source/filter/starcalc/collect.cxx b/sc/source/filter/starcalc/collect.cxx index e64e0962573e..19e5be3285d7 100644 --- a/sc/source/filter/starcalc/collect.cxx +++ b/sc/source/filter/starcalc/collect.cxx @@ -24,8 +24,6 @@ #define MAXCOLLECTIONSIZE 16384 #define MAXDELTA 1024 - - ScDataObject::~ScDataObject() { } @@ -71,8 +69,6 @@ ScCollection::ScCollection(const ScCollection& rCollection) *this = rCollection; } - - ScCollection::~ScCollection() { lcl_DeleteScDataObjects( pItems, nCount ); @@ -81,8 +77,6 @@ ScCollection::~ScCollection() sal_uInt16 ScCollection::GetCount() const { return nCount; } - - bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject) { if ((nCount < MAXCOLLECTIONSIZE) && (nIndex <= nCount) && pItems) @@ -106,15 +100,11 @@ bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject) return false; } - - bool ScCollection::Insert(ScDataObject* pScDataObject) { return AtInsert(nCount, pScDataObject); } - - ScDataObject* ScCollection::At(sal_uInt16 nIndex) const { if (nIndex < nCount) @@ -142,8 +132,6 @@ ScCollection& ScCollection::operator=( const ScCollection& r ) return *this; } - - ScDataObject* ScCollection::Clone() const { return new ScCollection(*this); diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index da1043e3e6e2..37fe8dd74571 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -953,12 +953,8 @@ ScDataObject* Sc10PageData::Clone() const return new Sc10PageData(aPageFormat); } - - // Import - - Sc10Import::Sc10Import(SvStream& rStr, ScDocument* pDocument ) : rStream (rStr), pDoc (pDocument), @@ -1060,8 +1056,6 @@ void Sc10Import::LoadFileInfo() // Achtung Info Uebertragen } - - void Sc10Import::LoadEditStateInfo() { Sc10EditStateInfo EditStateInfo; @@ -2424,8 +2418,6 @@ void Sc10Import::LoadObjects() } } - - FltError ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocument* pDocument ) { rStream.Seek( 0UL ); @@ -2433,6 +2425,4 @@ FltError ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocu return ( FltError ) aImport.Import(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index 82282f7fa6c3..d086d727e5c3 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -43,8 +43,6 @@ using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- - - void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rectangle& rRect, SCTAB nSrcTab, sal_uInt16 nX1, sal_uInt16 nY1, sal_uInt16 nX2, sal_uInt16 nY2 ) { @@ -91,6 +89,4 @@ void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rect } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 2fb1bc4d10bd..250a548d9090 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -19,8 +19,6 @@ - - #include <stdio.h> #include <sot/storage.hxx> #include "XclExpChangeTrack.hxx" @@ -98,8 +96,6 @@ static inline void lcl_WriteGUID( XclExpStream& rStrm, const sal_uInt8* pGUID ) rStrm.SetSliceSize( 0 ); } - - XclExpUserBView::XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID ) : sUsername( rUsername ) { @@ -133,8 +129,6 @@ sal_Size XclExpUserBView::GetLen() const return 50 + ((sUsername.Len() > 0) ? sUsername.GetSize() : 0); } - - XclExpUserBViewList::XclExpUserBViewList( const ScChangeTrack& rChangeTrack ) { sal_uInt8 aGUID[ 16 ]; @@ -161,8 +155,6 @@ void XclExpUserBViewList::Save( XclExpStream& rStrm ) (*iter)->Save( rStrm ); } - - XclExpUsersViewBegin::XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ) : nCurrTab( nTab ) { @@ -197,8 +189,6 @@ sal_Size XclExpUsersViewBegin::GetLen() const return 64; } - - void XclExpUsersViewEnd::SaveCont( XclExpStream& rStrm ) { rStrm << (sal_uInt16) 0x0001; @@ -214,8 +204,6 @@ sal_Size XclExpUsersViewEnd::GetLen() const return 2; } - - void XclExpChTr0x0191::SaveCont( XclExpStream& rStrm ) { rStrm << (sal_uInt16) 0x0000; @@ -231,8 +219,6 @@ sal_Size XclExpChTr0x0191::GetLen() const return 2; } - - void XclExpChTr0x0198::SaveCont( XclExpStream& rStrm ) { rStrm << (sal_uInt16) 0x0006 @@ -249,8 +235,6 @@ sal_Size XclExpChTr0x0198::GetLen() const return 4; } - - void XclExpChTr0x0192::SaveCont( XclExpStream& rStrm ) { rStrm << sal_uInt16( 0x0022 ); @@ -267,8 +251,6 @@ sal_Size XclExpChTr0x0192::GetLen() const return 512; } - - void XclExpChTr0x0197::SaveCont( XclExpStream& rStrm ) { rStrm << (sal_uInt16) 0x0000; @@ -284,8 +266,6 @@ sal_Size XclExpChTr0x0197::GetLen() const return 2; } - - XclExpChTrEmpty::~XclExpChTrEmpty() { } @@ -300,8 +280,6 @@ sal_Size XclExpChTrEmpty::GetLen() const return 0; } - - XclExpChTr0x0195::~XclExpChTr0x0195() { } @@ -321,8 +299,6 @@ sal_Size XclExpChTr0x0195::GetLen() const return 162; } - - XclExpChTr0x0194::~XclExpChTr0x0194() { } @@ -345,8 +321,6 @@ sal_Size XclExpChTr0x0194::GetLen() const return 162; } - - XclExpChTrHeader::~XclExpChTrHeader() { } @@ -394,8 +368,6 @@ void XclExpChTrHeader::SaveXml( XclExpXmlStream& rRevisionHeadersStrm ) pHeaders->write( ">" ); } - - XclExpChTrInfo::~XclExpChTrInfo() { } @@ -451,8 +423,6 @@ void XclExpChTrInfo::SaveXml( XclExpXmlStream& rRevisionHeadersStrm ) rRevisionHeadersStrm.PushStream( pRevisionLog ); } - - XclExpChTrTabIdBuffer::XclExpChTrTabIdBuffer( sal_uInt16 nCount ) : nBufSize( nCount ), nLastId( nCount ) @@ -523,8 +493,6 @@ void XclExpChTrTabIdBuffer::Remove() nLastId--; } - - XclExpChTrTabId::XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer, bool bInRevisionHeaders ) : nTabCount( rBuffer.GetBufferCount() ) , mbInRevisionHeaders( bInRevisionHeaders ) @@ -590,8 +558,6 @@ void XclExpChTrTabId::SaveXml( XclExpXmlStream& rRevisionLogStrm ) rRevisionLogStrm.PushStream( pRevisionLog ); } - - // ! does not copy additional actions XclExpChTrAction::XclExpChTrAction( const XclExpChTrAction& rCopy ) : ExcRecord( rCopy ), @@ -694,8 +660,6 @@ sal_Size XclExpChTrAction::GetLen() const return GetHeaderByteCount() + GetActionByteCount(); } - - XclExpChTrData::XclExpChTrData() : pString( NULL ), mpFormulaCell( NULL ), @@ -770,8 +734,6 @@ void XclExpChTrData::Write( XclExpStream& rStrm, const XclExpChTrTabIdBuffer& rT } } - - XclExpChTrCellContent::XclExpChTrCellContent( const ScChangeActionContent& rAction, const XclExpRoot& rRoot, @@ -1033,8 +995,6 @@ void XclExpChTrCellContent::SaveXml( XclExpXmlStream& rRevisionLogStrm ) pStream->endElement( XML_rcc ); } - - XclExpChTrInsert::XclExpChTrInsert( const ScChangeAction& rAction, const XclExpRoot& rRoot, @@ -1141,8 +1101,6 @@ void XclExpChTrInsert::SaveXml( XclExpXmlStream& rRevisionLogStrm ) pStream->endElement( XML_rrc ); } - - XclExpChTrInsertTab::XclExpChTrInsertTab( const ScChangeAction& rAction, const XclExpRoot& rRoot, @@ -1191,8 +1149,6 @@ void XclExpChTrInsertTab::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - XclExpChTrMoveRange::XclExpChTrMoveRange( const ScChangeActionMove& rAction, const XclExpRoot& rRoot, @@ -1270,8 +1226,6 @@ void XclExpChTrMoveRange::SaveXml( XclExpXmlStream& rRevisionLogStrm ) pStream->endElement( XML_rm ); } - - XclExpChTr0x014A::XclExpChTr0x014A( const XclExpChTrInsert& rAction ) : XclExpChTrInsert( rAction ) { @@ -1318,8 +1272,6 @@ void XclExpChTr0x014A::SaveXml( XclExpXmlStream& rStrm ) pStream->endElement( XML_rfmt ); } - - class ExcXmlRecord : public ExcRecord { public: diff --git a/sc/source/filter/xcl97/xcl97dum.cxx b/sc/source/filter/xcl97/xcl97dum.cxx index 0882a8bc808f..e476bcef3d83 100644 --- a/sc/source/filter/xcl97/xcl97dum.cxx +++ b/sc/source/filter/xcl97/xcl97dum.cxx @@ -74,8 +74,6 @@ const sal_uInt8 ExcDummy8_041::pMyData[] = { }; const sal_Size ExcDummy8_041::nMyLen = sizeof(ExcDummy8_041::pMyData); - - const sal_uInt8 ExcDummy8_02::pMyData[] = { 0x5f, 0x00, 0x02, 0x00, 0x01, 0x00 // SAVERECALC }; @@ -95,8 +93,6 @@ const sal_uInt8* ExcDummy8_00a::GetData() const return pMyData; } - - sal_Size ExcDummy8_00b::GetLen() const { return nMyLen; @@ -108,8 +104,6 @@ const sal_uInt8* ExcDummy8_00b::GetData() const return pMyData; } - - sal_Size ExcDummy8_040::GetLen() const { return nMyLen; @@ -121,8 +115,6 @@ const sal_uInt8* ExcDummy8_040::GetData() const return pMyData; } - - sal_Size ExcDummy8_041::GetLen() const { return nMyLen; @@ -134,8 +126,6 @@ const sal_uInt8* ExcDummy8_041::GetData() const return pMyData; } - - sal_Size ExcDummy8_02::GetLen() const { return nMyLen; diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 6fbc7bc16160..5c673627294d 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -75,8 +75,6 @@ using ::com::sun::star::io::XOutputStream; using ::com::sun::star::script::ScriptEventDescriptor; using ::com::sun::star::script::XEventAttacherManager; - - XclEscherExGlobal::XclEscherExGlobal( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) { @@ -95,8 +93,6 @@ SvStream* XclEscherExGlobal::ImplQueryPictureStream() return mxPicStrm.get(); } - - XclEscherEx::XclEscherEx( const XclExpRoot& rRoot, XclExpObjectManager& rObjMgr, SvStream& rStrm, const XclEscherEx* pParent ) : EscherEx( pParent ? pParent->mxGlobal : EscherExGlobalRef( new XclEscherExGlobal( rRoot ) ), &rStrm ), XclExpRoot( rRoot ), @@ -527,8 +523,6 @@ void XclEscherEx::DeleteCurrAppData() } } - - // --- class XclEscherClientData ------------------------------------- void XclEscherClientData::WriteData( EscherEx& rEx ) const diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 34237b48c11f..d6c39cead5f0 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -90,8 +90,6 @@ using ::oox::drawingml::ShapeExport; using ::oox::vml::VMLExport; using namespace oox; - - sal_Int32 XclExpObjList::mnDrawingMLCount; sal_Int32 XclExpObjList::mnVmlCount; @@ -1036,8 +1034,6 @@ void XclObjAny::SaveXml( XclExpXmlStream& rStrm ) pDrawing->endElement( FSNS( XML_xdr, XML_twoCellAnchor ) ); } - - void ExcBof8_Base::SaveCont( XclExpStream& rStrm ) { rStrm.DisableEncryption(); @@ -1132,8 +1128,6 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - // --- class XclObproj ----------------------------------------------- sal_uInt16 XclObproj::GetNum() const @@ -1172,8 +1166,6 @@ sal_Size XclCodename::GetLen() const return aName.GetSize(); } - - // ---- Scenarios ---------------------------------------------------- ExcEScenarioCell::ExcEScenarioCell( sal_uInt16 nC, sal_uInt16 nR, const OUString& rTxt ) : @@ -1205,8 +1197,6 @@ void ExcEScenarioCell::SaveXml( XclExpXmlStream& rStrm ) const } - - ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) { OUString sTmpName; @@ -1336,8 +1326,6 @@ void ExcEScenario::SaveXml( XclExpXmlStream& rStrm ) } - - ExcEScenarioManager::ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ) : nActive( 0 ) { @@ -1412,8 +1400,6 @@ sal_Size ExcEScenarioManager::GetLen() const return 8; } - - struct XclExpTabProtectOption { ScTableProtection::Option eOption; @@ -1478,8 +1464,6 @@ void XclExpSheetProtectOptions::WriteBody( XclExpStream& rStrm ) rStrm << nBytes; } - - XclExpSheetEnhancedProtection::XclExpSheetEnhancedProtection( const XclExpRoot& rRoot, const ScEnhancedProtection & rProt ) : XclExpRecord( 0x0868 ), @@ -1521,8 +1505,6 @@ void XclExpSheetEnhancedProtection::WriteBody( XclExpStream& rStrm ) } } - - void XclCalccount::SaveCont( XclExpStream& rStrm ) { rStrm << nCount; @@ -1555,8 +1537,6 @@ void XclCalccount::SaveXml( XclExpXmlStream& rStrm ) } - - void XclIteration::SaveCont( XclExpStream& rStrm ) { rStrm << nIter; @@ -1589,15 +1569,11 @@ void XclIteration::SaveXml( XclExpXmlStream& rStrm ) } - - void XclDelta::SaveCont( XclExpStream& rStrm ) { rStrm << fDelta; } - - XclDelta::XclDelta( const ScDocument& rDoc ) { fDelta = rDoc.GetDocOptions().GetIterEps(); @@ -1623,8 +1599,6 @@ void XclDelta::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - - XclExpFileEncryption::XclExpFileEncryption( const XclExpRoot& rRoot ) : XclExpRecord(0x002F, 54), mrRoot(rRoot) @@ -1661,8 +1635,6 @@ void XclExpFileEncryption::WriteBody( XclExpStream& rStrm ) rStrm.SetEncrypter(xEnc); } - - XclExpInterfaceHdr::XclExpInterfaceHdr( sal_uInt16 nCodePage ) : XclExpUInt16Record( EXC_ID_INTERFACEHDR, nCodePage ) { @@ -1674,8 +1646,6 @@ void XclExpInterfaceHdr::WriteBody( XclExpStream& rStrm ) rStrm << GetValue(); } - - XclExpInterfaceEnd::XclExpInterfaceEnd() : XclExpRecord(0x00E2, 0) {} @@ -1687,8 +1657,6 @@ void XclExpInterfaceEnd::WriteBody( XclExpStream& rStrm ) rStrm.EnableEncryption(); } - - XclExpWriteAccess::XclExpWriteAccess() : XclExpRecord(0x005C, 112) { @@ -1721,8 +1689,6 @@ void XclExpWriteAccess::WriteBody( XclExpStream& rStrm ) rStrm << aData[i]; } - - XclExpFileSharing::XclExpFileSharing( const XclExpRoot& rRoot, sal_uInt16 nPasswordHash, bool bRecommendReadOnly ) : XclExpRecord( EXC_ID_FILESHARING ), mnPasswordHash( nPasswordHash ), @@ -1745,8 +1711,6 @@ void XclExpFileSharing::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt16( mbRecommendReadOnly ? 1 : 0 ) << mnPasswordHash << maUserName; } - - XclExpProt4Rev::XclExpProt4Rev() : XclExpRecord(0x01AF, 2) { @@ -1761,8 +1725,6 @@ void XclExpProt4Rev::WriteBody( XclExpStream& rStrm ) rStrm << static_cast<sal_uInt16>(0x0000); } - - XclExpProt4RevPass::XclExpProt4RevPass() : XclExpRecord(0x01BC, 2) { @@ -1777,8 +1739,6 @@ void XclExpProt4RevPass::WriteBody( XclExpStream& rStrm ) rStrm << static_cast<sal_uInt16>(0x0000); } - - static const sal_uInt8 nDataRecalcId[] = { 0xC1, 0x01, 0x00, 0x00, 0x54, 0x8D, 0x01, 0x00 }; @@ -1788,8 +1748,6 @@ XclExpRecalcId::XclExpRecalcId() : { } - - static const sal_uInt8 nDataBookExt[] = { 0x63, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1801,8 +1759,6 @@ XclExpBookExt::XclExpBookExt() : { } - - XclRefmode::XclRefmode( const ScDocument& rDoc ) : XclExpBoolRecord( 0x000F, rDoc.GetAddressConvention() != formula::FormulaGrammar::CONV_XL_R1C1 ) { diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index fda87c52b59a..7f350bca78fd 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -32,8 +32,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index 510b8dbe0e2a..5a2d35f089a7 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx @@ -19,8 +19,6 @@ - - #include "XMLCellRangeSourceContext.hxx" #include <sax/tools/converter.hxx> @@ -31,8 +29,6 @@ using namespace ::com::sun::star; - - ScMyImpCellRangeSource::ScMyImpCellRangeSource() : nColumns( 0 ), nRows( 0 ), @@ -41,8 +37,6 @@ ScMyImpCellRangeSource::ScMyImpCellRangeSource() : } - - ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index cceaaa5e0af1..ce896ca6e970 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -25,8 +25,6 @@ class ScXMLImport; - - struct ScMyImpCellRangeSource { OUString sSourceStr; @@ -41,8 +39,6 @@ struct ScMyImpCellRangeSource }; - - class ScXMLCellRangeSourceContext : public SvXMLImportContext { private: diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index a6b7b66f0c68..5c53643a6abc 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -19,8 +19,6 @@ - - #include "XMLConsolidationContext.hxx" #include "document.hxx" #include "rangeutl.hxx" @@ -33,8 +31,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - - ScXMLConsolidationContext::ScXMLConsolidationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index 01480b506a93..459a87c03840 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -27,8 +27,6 @@ class ScXMLImport; - - class ScXMLConsolidationContext : public SvXMLImportContext { private: diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 2c4a62b1e78a..b2ff92a0c1fa 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -34,8 +34,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - - ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel ) { if (xModel.is()) @@ -46,8 +44,6 @@ ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xMode return NULL; } - - sheet::GeneralFunction ScXMLConverter::GetFunctionFromString( const OUString& sFunction ) { if( IsXMLToken(sFunction, XML_SUM ) ) @@ -105,8 +101,6 @@ ScSubTotalFunc ScXMLConverter::GetSubTotalFuncFromString( const OUString& sFunct } - - void ScXMLConverter::GetStringFromFunction( OUString& rString, const sheet::GeneralFunction eFunction, @@ -164,8 +158,6 @@ void ScXMLConverter::GetStringFromFunction( } - - sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString( const OUString& rString ) { @@ -181,8 +173,6 @@ sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString( } - - void ScXMLConverter::GetStringFromOrientation( OUString& rString, const sheet::DataPilotFieldOrientation eOrientation, @@ -215,8 +205,6 @@ void ScXMLConverter::GetStringFromOrientation( } - - ScDetectiveObjType ScXMLConverter::GetDetObjTypeFromString( const OUString& rString ) { if( IsXMLToken(rString, XML_FROM_SAME_TABLE ) ) @@ -246,8 +234,6 @@ bool ScXMLConverter::GetDetOpTypeFromString( ScDetOpType& rDetOpType, const OUSt } - - void ScXMLConverter::GetStringFromDetObjType( OUString& rString, const ScDetectiveObjType eObjType, @@ -301,8 +287,6 @@ void ScXMLConverter::GetStringFromDetOpType( } - - void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) { OUStringBuffer sBuffer(sFormula.getLength()); @@ -335,8 +319,6 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) } - - void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate) { util::DateTime aAPIDateTime; @@ -363,8 +345,6 @@ void ScXMLConverter::ConvertAPIToCoreDateTime(const util::DateTime& aDateTime, D rDateTime = aTempDateTime; } - - namespace { /** Enumerates different types of condition tokens. */ @@ -560,8 +540,6 @@ bool lclSkipEmptyParentheses( const sal_Unicode*& rpcString, const sal_Unicode* } // namespace - - void ScXMLConditionHelper::parseCondition( ScXMLConditionParseResult& rParseResult, const OUString& rAttribute, sal_Int32 nStartIndex ) { @@ -650,6 +628,4 @@ OUString ScXMLConditionHelper::getExpression( const sal_Unicode*& rpcString, con return aExp; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index 325f7a5cf6c8..8beb11ef8a61 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -35,8 +35,6 @@ class ScDocument; class DateTime; - - class ScXMLConverter { public: @@ -104,8 +102,6 @@ public: static void ConvertAPIToCoreDateTime(const com::sun::star::util::DateTime& aDateTime, DateTime& rDateTime); }; - - enum ScXMLConditionToken { XML_COND_INVALID, /// Token not recognized. @@ -124,8 +120,6 @@ enum ScXMLConditionToken XML_COND_ISTRUEFORMULA /// The 'is-true-formula' token. }; - - /** Result of an attempt to parse a single condition in a 'condition' attribute value of e.g. conditional formatting or data validation. */ @@ -141,8 +135,6 @@ struct ScXMLConditionParseResult sal_Int32 mnEndIndex; /// Index of first character following the condition. }; - - class ScXMLConditionHelper { public: @@ -161,8 +153,6 @@ private: ~ScXMLConditionHelper(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 4d69a920596f..68444ddd1760 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -31,8 +31,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index fd7e78eea2a2..6db5bc1f10a2 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.cxx @@ -19,8 +19,6 @@ - - #include "XMLDetectiveContext.hxx" #include <sax/tools/converter.hxx> @@ -37,8 +35,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - - ScMyImpDetectiveObj::ScMyImpDetectiveObj() : aSourceRange(), eObjType( SC_DETOBJ_NONE ), @@ -46,8 +42,6 @@ ScMyImpDetectiveObj::ScMyImpDetectiveObj() : { } - - bool ScMyImpDetectiveOp::operator<(const ScMyImpDetectiveOp& rDetOp) const { return (nIndex < rDetOp.nIndex); @@ -69,8 +63,6 @@ bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp ) } - - ScXMLDetectiveContext::ScXMLDetectiveContext( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -113,8 +105,6 @@ void ScXMLDetectiveContext::EndElement() } - - ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -194,8 +184,6 @@ void ScXMLDetectiveHighlightedContext::EndElement() } - - ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 8bea285e37ab..088ba7e3cbc3 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -30,8 +30,6 @@ class ScXMLImport; - - struct ScMyImpDetectiveObj { ScRange aSourceRange; @@ -44,8 +42,6 @@ struct ScMyImpDetectiveObj typedef ::std::vector< ScMyImpDetectiveObj > ScMyImpDetectiveObjVec; - - struct ScMyImpDetectiveOp { ScAddress aPosition; @@ -75,8 +71,6 @@ public: }; - - class ScXMLDetectiveContext : public SvXMLImportContext { private: @@ -103,8 +97,6 @@ public: }; - - class ScXMLDetectiveHighlightedContext : public SvXMLImportContext { private: @@ -134,8 +126,6 @@ public: }; - - class ScXMLDetectiveOperationContext : public SvXMLImportContext { private: diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index ad4d08a228b1..05032da72793 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.cxx @@ -20,8 +20,6 @@ #include "XMLEmptyContext.hxx" #include "xmlimprt.hxx" - - ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName) : diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 329ee7871002..4ec1be58a976 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star; - - ScMyIteratorBase::ScMyIteratorBase() { } @@ -58,8 +56,6 @@ void ScMyIteratorBase::UpdateAddress( table::CellAddress& rCellAddress ) } - - bool ScMyShape::operator<(const ScMyShape& aShape) const { if( aAddress.Tab() != aShape.aAddress.Tab() ) @@ -182,8 +178,6 @@ void ScMyNoteShapesContainer::Sort() aNoteShapeList.sort(); } - - bool ScMyMergedRange::operator<(const ScMyMergedRange& aRange) const { if( aCellRange.Sheet != aRange.aCellRange.Sheet ) @@ -274,8 +268,6 @@ void ScMyMergedRangesContainer::Sort() aRangeList.sort(); } - - bool ScMyAreaLink::Compare( const ScMyAreaLink& rAreaLink ) const { return (GetRowCount() == rAreaLink.GetRowCount()) && @@ -356,8 +348,6 @@ void ScMyAreaLinksContainer::Sort() aAreaLinkList.sort(); } - - ScMyCellRangeAddress::ScMyCellRangeAddress(const table::CellRangeAddress& rRange) : table::CellRangeAddress(rRange) { @@ -436,8 +426,6 @@ void ScMyEmptyDatabaseRangesContainer::Sort() aDatabaseList.sort(); } - - bool ScMyDetectiveObj::operator<( const ScMyDetectiveObj& rDetObj) const { if( aPosition.Sheet != rDetObj.aPosition.Sheet ) @@ -524,8 +512,6 @@ void ScMyDetectiveObjContainer::Sort() aDetectiveObjList.sort(); } - - bool ScMyDetectiveOp::operator<( const ScMyDetectiveOp& rDetOp) const { if( aPosition.Sheet != rDetOp.aPosition.Sheet ) @@ -590,8 +576,6 @@ void ScMyDetectiveOpContainer::Sort() aDetectiveOpList.sort(); } - - ScMyCell::ScMyCell() : aShapeList(), aDetectiveObjVec(), @@ -617,8 +601,6 @@ ScMyCell::~ScMyCell() { } - - ScMyNotEmptyCellsIterator::ScMyNotEmptyCellsIterator(ScXMLExport& rTempXMLExport) : pShapes(NULL), pNoteShapes(NULL), diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 95c837ddd662..0275dd37f7fa 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -44,8 +44,6 @@ struct ScMyCell; class ScXMLExport; class ScFormatRangeStyles; - - class ScMyIteratorBase { protected: @@ -61,8 +59,6 @@ public: virtual void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); }; - - struct ScMyShape { ScAddress aAddress; @@ -124,8 +120,6 @@ public: void SkipTable(SCTAB nSkip); }; - - struct ScMyMergedRange { com::sun::star::table::CellRangeAddress aCellRange; @@ -153,8 +147,6 @@ public: void SkipTable(SCTAB nSkip); }; - - struct ScMyAreaLink { OUString sFilter; @@ -194,8 +186,6 @@ public: void SkipTable(SCTAB nSkip); }; - - struct ScMyCellRangeAddress : com::sun::star::table::CellRangeAddress { ScMyCellRangeAddress(const com::sun::star::table::CellRangeAddress& rRange); @@ -221,8 +211,6 @@ public: void SkipTable(SCTAB nSkip); }; - - struct ScMyDetectiveObj { ::com::sun::star::table::CellAddress aPosition; @@ -258,8 +246,6 @@ public: void SkipTable(SCTAB nSkip); }; - - struct ScMyDetectiveOp { ::com::sun::star::table::CellAddress aPosition; @@ -289,8 +275,6 @@ public: void SkipTable(SCTAB nSkip); }; - - // contains data to export for the current cell position struct ScMyCell { @@ -330,8 +314,6 @@ struct ScMyCell ~ScMyCell(); }; - - class ScMyNotEmptyCellsIterator : boost::noncopyable { com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet> xTable; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index decd8e9f294c..6ed4addcdc5f 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -450,8 +450,6 @@ const OUString& ScMyValidationsContainer::GetValidationName(const sal_Int32 nInd return aValidationVec[nIndex].sName; } - - sal_Int32 ScMyDefaultStyles::GetStyleNameIndex(const ScFormatRangeStyles* pCellStyles, const sal_Int32 nTable, const sal_Int32 nPos, const sal_Int32 i, bool& bIsAutoStyle) @@ -990,8 +988,6 @@ void ScFormatRangeStyles::Sort() aTables[i]->sort(); } - - ScColumnRowStylesBase::ScColumnRowStylesBase() : aStyleNames() { @@ -1051,8 +1047,6 @@ OUString* ScColumnRowStylesBase::GetStyleNameByIndex(const sal_Int32 nIndex) return aStyleNames[nIndex]; } - - ScColumnStyles::ScColumnStyles() : ScColumnRowStylesBase(), aTables() @@ -1109,8 +1103,6 @@ OUString* ScColumnStyles::GetStyleName(const sal_Int32 nTable, const sal_Int32 n return GetStyleNameByIndex(GetStyleNameIndex(nTable, nField, bTemp)); } - - ScRowStyles::Cache::Cache() : mnTable(-1), mnStart(-1), mnEnd(-1), mnStyle(-1) {} diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index c835f2ad1355..c05f1134f85d 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -97,8 +97,6 @@ public: const OUString& GetValidationName(const sal_Int32 nIndex); }; - - struct ScMyDefaultStyle { sal_Int32 nIndex; diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 31b82b694636..a8c0831c3452 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -234,8 +234,6 @@ void ScMyStyleRanges::SetStylesToRanges(const OUString* pStyleName, ScXMLImport& } } - - ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport& rTempImport) : aRowDefaultStyle(aCellStyles.end()), diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 382347ac47b2..f1eb4a860b24 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -25,8 +25,6 @@ using namespace com::sun::star; - - ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index 0131c53455d3..1051977371f7 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -31,8 +31,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index e80cb8d7d130..5830b1db96e2 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -40,8 +40,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - class ScXMLChangeInfoContext : public SvXMLImportContext { ScMyActionInfo aInfo; @@ -69,8 +67,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLBigRangeContext : public SvXMLImportContext { ScBigRange& rBigRange; @@ -93,8 +89,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLCellContentDeletionContext : public SvXMLImportContext { OUString sFormulaAddress; @@ -132,8 +126,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLDependenceContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -156,8 +148,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLDependingsContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -180,8 +170,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLChangeDeletionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -204,8 +192,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLDeletionsContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -228,8 +214,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLChangeCellContext; class ScXMLChangeTextPContext : public SvXMLImportContext @@ -264,8 +248,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLChangeCellContext : public SvXMLImportContext { ScCellValue& mrOldCell; @@ -307,8 +289,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLPreviousContext : public SvXMLImportContext { OUString sFormulaAddress; @@ -343,8 +323,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLContentChangeContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -367,8 +345,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLInsertionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -390,8 +366,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLInsertionCutOffContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -413,8 +387,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLMovementCutOffContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -436,8 +408,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLCutOffsContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -459,8 +429,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLDeletionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -482,8 +450,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLMovementContext : public SvXMLImportContext { ScBigRange aSourceRange; @@ -507,8 +473,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLRejectionContext : public SvXMLImportContext { ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; @@ -530,8 +494,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -2003,6 +1965,4 @@ void ScXMLRejectionContext::EndElement() pChangeTrackingImportHelper->EndChangeAction(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index deee3871f8b3..8f394d2f7308 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -24,8 +24,6 @@ #include "sheetdata.hxx" - - ScSheetSaveData::ScSheetSaveData() : mnStartTab( -1 ), mnStartOffset( -1 ), diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index 51843bcd74e0..963cd15b9790 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -30,8 +30,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - ScXMLAnnotationData::ScXMLAnnotationData() : mbUseShapePos( false ), mbShown( false ) @@ -42,8 +40,6 @@ ScXMLAnnotationData::~ScXMLAnnotationData() { } - - ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index b9f114455822..1298a2abef41 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -56,8 +56,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index dc80fa338f26..b85d9eacd8f1 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -40,8 +40,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index 3c73191d6312..7f5ba32ff476 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -29,8 +29,6 @@ using namespace xmloff::token; - - ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 37f6bf621447..1f306c5a9411 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -168,8 +168,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 72cefa2096d2..15cab9128845 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -55,8 +55,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; - - ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 7cb8a551c671..60ef6c766b53 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -59,8 +59,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 775f86beb67f..bce3c190d1ed 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -184,8 +184,6 @@ using ::std::vector; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; - - namespace { OUString lcl_RangeSequenceToString( @@ -238,8 +236,6 @@ OUString lcl_GetFormattedString( ScDocument* pDoc, const ScAddress& rPos ) } // anonymous namespace - - OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw() { return OUString( "com.sun.star.comp.Calc.XMLExporter" ); @@ -453,8 +449,6 @@ void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShap } } - - sal_Int16 ScXMLExport::GetFieldUnit() { css::uno::Reference<css::sheet::XGlobalSheetSettings> xProperties = @@ -4852,8 +4846,6 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) } - - void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& rProps) { if (GetModel().is()) diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 0f80a8c56d5e..fc90e5d28f2c 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.cxx @@ -41,8 +41,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; - - ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, const Reference<XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ) : @@ -124,8 +122,6 @@ void ScXMLExternalRefTabSourceContext::EndElement() pRefMgr->setFilterData(mrExternalRefInfo.mnFileId, maFilterName, maFilterOptions); } - - ScXMLExternalRefRowsContext::ScXMLExternalRefRowsContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, const Reference<XAttributeList>& /* xAttrList */, ScXMLExternalTabData& rRefInfo ) : @@ -167,8 +163,6 @@ void ScXMLExternalRefRowsContext::EndElement() { } - - ScXMLExternalRefRowContext::ScXMLExternalRefRowContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, const Reference<XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ) : @@ -244,8 +238,6 @@ void ScXMLExternalRefRowContext::EndElement() mrExternalRefInfo.mnRow += mnRepeatRowCount; } - - ScXMLExternalRefCellContext::ScXMLExternalRefCellContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, const Reference<XAttributeList>& xAttrList, ScXMLExternalTabData& rRefInfo ) : @@ -397,8 +389,6 @@ void ScXMLExternalRefCellContext::SetCellString(const OUString& rStr) maCellString = rStr; } - - ScXMLExternalRefCellTextContext::ScXMLExternalRefCellTextContext( ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, const Reference<XAttributeList>& /*xAttrList*/, diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index d5b8698d80ac..3e627f736f18 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -53,8 +53,6 @@ private: OUString maFilterOptions; }; - - class ScXMLExternalRefRowsContext : public SvXMLImportContext { public: @@ -77,8 +75,6 @@ private: ScXMLExternalTabData& mrExternalRefInfo; }; - - class ScXMLExternalRefRowContext : public SvXMLImportContext { public: @@ -102,8 +98,6 @@ private: sal_Int32 mnRepeatRowCount; }; - - class ScXMLExternalRefCellContext : public SvXMLImportContext { public: @@ -136,8 +130,6 @@ private: bool mbIsEmpty; }; - - class ScXMLExternalRefCellTextContext : public SvXMLImportContext { public: diff --git a/sc/source/filter/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index 2929b6802923..35569d322989 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.cxx @@ -521,8 +521,6 @@ void ScXMLSetItemContext::EndElement() { } - - ScXMLDPFilterContext::ScXMLDPFilterContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -887,6 +885,4 @@ void ScXMLDPConditionContext::EndElement() pFilterContext->AddFilterField(aFilterField); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index b9c5acebdc37..10e9bcec5a44 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -238,18 +238,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap() - - - - - - - - - - - - // NB: virtually inherit so we can multiply inherit properly // in ScXMLFlatDocContext_Impl class ScXMLDocContext_Impl : public virtual SvXMLImportContext @@ -2254,8 +2242,6 @@ ScXMLImport::~ScXMLImport() throw() delete pDetectiveOpArray; } - - SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) { diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 33cb0f7bd22f..4b53ea791549 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.cxx @@ -18,8 +18,6 @@ */ - - #include "xmllabri.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> @@ -29,8 +27,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - - ScXMLLabelRangesContext::ScXMLLabelRangesContext( ScXMLImport& rImport, sal_uInt16 nPrefix, @@ -71,8 +67,6 @@ void ScXMLLabelRangesContext::EndElement() } - - ScXMLLabelRangeContext::ScXMLLabelRangeContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index d176ba067d77..c14cb1c6f0c8 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -24,8 +24,6 @@ class ScXMLImport; - - class ScXMLLabelRangesContext : public SvXMLImportContext { private: @@ -50,8 +48,6 @@ public: }; - - class ScXMLLabelRangeContext : public SvXMLImportContext { private: diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index b936d4dfa3c3..7ad71c53fb5b 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -30,8 +30,6 @@ using namespace com::sun::star; - - ScXMLNamedExpressionsContext::GlobalInserter::GlobalInserter(ScXMLImport& rImport) : mrImport(rImport) {} void ScXMLNamedExpressionsContext::GlobalInserter::insert(ScMyNamedExpression* pExp) diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 7f966cc8c610..887504c84d26 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -45,8 +45,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index 684b45dc1d62..02d30df74d28 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.cxx @@ -35,8 +35,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - ScXMLTableScenarioContext::ScXMLTableScenarioContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index 8df12719df3b..85163e674579 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -34,8 +34,6 @@ using namespace com::sun::star; using namespace xmloff::token; - - ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index acf043d0cb24..4cb52cc86005 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -646,8 +646,6 @@ sal_Int32 XMLTableStyleContext::GetNumberFormat() return nNumberFormat; } - - SvXMLStyleContext *XMLTableStylesContext::CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) @@ -1057,8 +1055,6 @@ void ScMasterPageContext::Finish( bool bOverwrite ) ClearContent(OUString(SC_UNO_PAGE_RIGHTHDRCON)); } - - ScCellTextStyleContext::ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList> & xAttrList, SvXMLStylesContext& rStyles, sal_uInt16 nFamily, bool bDefaultStyle ) : diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index df8164d76a96..c2a7c8d8ea9c 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -135,8 +135,6 @@ ScXMLExternalTabData::ScXMLExternalTabData() : { } - - ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -425,8 +423,6 @@ void ScXMLTableContext::EndElement() } } - - ScXMLImport& ScXMLTableProtectionContext::GetScImport() { return static_cast<ScXMLImport&>(GetImport()); diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index 53430add3dbf..975e4ec89d5b 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -65,8 +65,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - - class ScXMLTableProtectionContext : public SvXMLImportContext { ScXMLImport& GetScImport(); diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index 5b3528b6ed9f..866f53d18bb4 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -74,8 +74,6 @@ using namespace com::sun::star; - - ScXMLImportWrapper::ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const uno::Reference < embed::XStorage >& xStor ) : rDoc(rD), pMedium(pM), @@ -367,8 +365,6 @@ bool ScXMLImportWrapper::Import(bool bStylesOnly, ErrCode& nError) } } - - uno::Reference<task::XStatusIndicator> xStatusIndicator(GetStatusIndicator()); if (xStatusIndicator.is()) { diff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxx index 1b72fe1220af..e20d234819a7 100644 --- a/sc/source/ui/Accessibility/AccessibilityHints.cxx +++ b/sc/source/ui/Accessibility/AccessibilityHints.cxx @@ -21,8 +21,6 @@ using namespace ::com::sun::star; - - TYPEINIT1(ScAccWinFocusLostHint, SfxHint); @@ -40,8 +38,6 @@ ScAccWinFocusLostHint::~ScAccWinFocusLostHint() { } - - TYPEINIT1(ScAccWinFocusGotHint, SfxHint); @@ -78,8 +74,6 @@ ScAccGridWinFocusLostHint::~ScAccGridWinFocusLostHint() { } - - TYPEINIT1(ScAccGridWinFocusGotHint, SfxHint); diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 728f8709e5d6..698b86518b8a 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -64,8 +64,6 @@ using ::com::sun::star::beans::PropertyValue; using namespace ::com::sun::star::accessibility; - - const sal_uInt16 nRulerRole = AccessibleRole::TEXT; const sal_uInt16 nGridRole = AccessibleRole::TABLE; const sal_uInt16 nCellRole = AccessibleRole::TEXT; @@ -1605,6 +1603,4 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 1ac5dfc244cb..734d4e3fa3a0 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1403,8 +1403,6 @@ void ScChildrenShapes::VisAreaChanged() const std::for_each(maZOrderedShapes.begin(), maZOrderedShapes.end(), aVisAreaChanged); } - - ScAccessibleDocument::ScAccessibleDocument( const uno::Reference<XAccessible>& rxParent, ScTabViewShell* pViewShell, diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 6d473b61999e..6c2a66f7f3d2 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -62,8 +62,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; - - typedef std::list< uno::Reference< XAccessible > > ScXAccList; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index fdd8d547f246..f35e70f9f9f2 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -51,8 +51,6 @@ using ::com::sun::star::uno::RuntimeException; using ::std::for_each; using ::std::vector; - - namespace { class AddRemoveEventListener : public ::std::unary_function<void, Reference<XAccessible> > @@ -82,8 +80,6 @@ private: } - - ScAccessibleFilterMenu::ScAccessibleFilterMenu(const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) : ScAccessibleContextBase(rxParent, AccessibleRole::MENU), mnMenuPos(nMenuPos), diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 3a6f2c18fac0..f6be4b81d227 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -45,8 +45,6 @@ #include <vcl/svapp.hxx> - - class ScViewForwarder : public SvxViewForwarder { ScTabViewShell* mpViewShell; @@ -144,8 +142,6 @@ void ScViewForwarder::SetInvalid() mpViewShell = NULL; } - - class ScEditObjectViewForwarder : public SvxViewForwarder { Window* mpWindow; diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 15364d81c102..2c69a7e3afca 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -38,8 +38,6 @@ using namespace com::sun::star; - - ScClient::ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ) : SfxInPlaceClient( pViewShell, pDraw, pObj->GetAspect() ), pModel( pSdrModel ), diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 319c88b056f5..52e21e1ea2f4 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -74,16 +74,12 @@ using namespace com::sun::star; - - #define SCDRAWTRANS_TYPE_EMBOBJ 1 #define SCDRAWTRANS_TYPE_DRAWMODEL 2 #define SCDRAWTRANS_TYPE_DOCUMENT 3 - - ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContainerShell, const TransferableObjectDescriptor& rDesc ) : pModel( pClipModel ), diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 6a1eae25dad7..700f2b399c31 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -382,8 +382,6 @@ void ScInputHandler::DeleteRangeFinder() } } - - inline OUString GetEditText(EditEngine* pEng) { return ScEditUtil::GetSpaceDelimitedString(*pEng); @@ -492,8 +490,6 @@ static sal_Int32 lcl_MatchParenthesis( const OUString& rStr, sal_Int32 nPos ) return (sal_Int32) (p - p0); } - - ScInputHandler::ScInputHandler() : pInputWin( NULL ), pEngine( NULL ), @@ -2460,8 +2456,6 @@ void ScInputHandler::SetMode( ScInputMode eNewMode ) bInOwnChange = false; } - - // lcl_IsNumber - true, wenn nur Ziffern (dann keine Autokorrektur) static bool lcl_IsNumber(const OUString& rString) @@ -3822,8 +3816,6 @@ void ScInputHandler::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd ) rEnd = nFormSelEnd; } - - EditView* ScInputHandler::GetFuncEditView() { UpdateActiveView(); // wegen pTableView @@ -3850,8 +3842,6 @@ EditView* ScInputHandler::GetFuncEditView() return pView; } - - void ScInputHandler::InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd ) { if ( nStart <= nEnd ) @@ -3872,8 +3862,6 @@ void ScInputHandler::InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd ) bModified = true; } - - void ScInputHandler::InputReplaceSelection( const OUString& rStr ) { if (!pRefViewSh) @@ -3936,23 +3924,17 @@ ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos, { } - - ScInputHdlState::ScInputHdlState( const ScInputHdlState& rCpy ) : pEditData ( NULL ) { *this = rCpy; } - - ScInputHdlState::~ScInputHdlState() { delete pEditData; } - - bool ScInputHdlState::operator==( const ScInputHdlState& r ) const { return ( (aStartPos == r.aStartPos) @@ -3962,8 +3944,6 @@ bool ScInputHdlState::operator==( const ScInputHdlState& r ) const && ScGlobal::EETextObjEqual( pEditData, r.pEditData ) ); } - - ScInputHdlState& ScInputHdlState::operator=( const ScInputHdlState& r ) { delete pEditData; diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index f448a9aa0bb6..3b91d53b1567 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -148,8 +148,6 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const return aInfo; } - - #define IMAGE(id) pImgMgr->SeekImage(id) static bool lcl_isExperimentalMode() { @@ -907,8 +905,6 @@ void ScInputWindow::MouseButtonUp( const MouseEvent& rMEvt ) ToolBox::MouseButtonUp( rMEvt ); } - - // ScInputBarGroup @@ -2062,8 +2058,6 @@ void ScTextWnd::RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextDat maAccTextDatas.erase( aIt ); } - - void ScTextWnd::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -2567,6 +2561,4 @@ void ScPosWnd::ReleaseFocus_Impl() - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index 0640de5fdc58..734d9b718a5c 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.cxx @@ -24,8 +24,6 @@ using namespace com::sun::star; - - ScLinkTransferObj::ScLinkTransferObj() { } diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index d52be0e37f7d..aa83fd577656 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -24,8 +24,6 @@ #include "docpool.hxx" #include "msgpool.hxx" - - static SfxItemInfo const aMsgItemInfos[] = { { 0, SFX_ITEM_POOLABLE }, // SCITEM_STRING @@ -40,8 +38,6 @@ static SfxItemInfo const aMsgItemInfos[] = { SID_PRINTER_NOTFOUND_WARN, SFX_ITEM_POOLABLE } // SCITEM_PRINTWARN }; - - ScMessagePool::ScMessagePool() : SfxItemPool ( OUString("ScMessagePool"), MSGPOOL_START, MSGPOOL_END, @@ -106,6 +102,4 @@ SfxMapUnit ScMessagePool::GetMetric( sal_uInt16 nWhich ) const - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx index febc7e23c55c..90c426ed0336 100644 --- a/sc/source/ui/app/rfindlst.cxx +++ b/sc/source/ui/app/rfindlst.cxx @@ -27,8 +27,6 @@ static const ColorData aColNames[SC_RANGECOLORS] = { COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN, COL_BLUE, COL_RED, COL_MAGENTA, COL_BROWN }; - - ScRangeFindList::ScRangeFindList(const OUString& rName) : aDocName( rName ), bHidden( false ) @@ -55,6 +53,4 @@ ColorData ScRangeFindList::GetColorName( const size_t nIndex ) return aColNames[nIndex % SC_RANGECOLORS]; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 4a7f1828e195..6d97e2f2863e 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -119,15 +119,11 @@ - - ScResId::ScResId( sal_uInt16 nId ) : ResId( nId, *SC_MOD()->GetResMgr() ) { } - - void ScDLL::Init() { ScModule **ppShlPtr = (ScModule**) GetAppData(SHL_CALC); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index b32a280b3862..87174c10e1e8 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -119,8 +119,6 @@ static sal_uInt16 nIdleCount = 0; - - SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) ) { SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, @@ -128,8 +126,6 @@ SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) ) SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) ); // nur ID wichtig } - - ScModule::ScModule( SfxObjectFactory* pFact ) : SfxModule( SfxApplication::CreateResManager( "sc" ), false, pFact, NULL ), mpDragData(new ScDragData), @@ -335,8 +331,6 @@ void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - - void ScModule::DeleteCfg() { DELETEZ( pViewCfg ); // Speichern passiert vor Exit() automatisch @@ -370,12 +364,8 @@ void ScModule::DeleteCfg() } } - - // von der Applikation verschoben: - - void ScModule::Execute( SfxRequest& rReq ) { SfxViewFrame* pViewFrm = SfxViewFrame::Current(); @@ -644,8 +634,6 @@ void ScModule::HideDisabledSlots( SfxItemSet& rSet ) } - - void ScModule::ResetDragObject() { mpDragData->pCellTransfer = NULL; @@ -713,15 +701,11 @@ ScDocument* ScModule::GetClipDoc() return NULL; } - - void ScModule::SetSelectionTransfer( ScSelectionTransferObj* pNew ) { pSelTransfer = pNew; } - - void ScModule::InitFormEditData() { pFormEditData = new ScFormEditData; @@ -732,8 +716,6 @@ void ScModule::ClearFormEditData() DELETEZ( pFormEditData ); } - - void ScModule::SetViewOptions( const ScViewOptions& rOpt ) { if ( !pViewCfg ) @@ -972,13 +954,9 @@ sal_uInt16 ScModule::GetOptDigitLanguage() LANGUAGE_SYSTEM; } - - // Optionen - - // ModifyOptions - Items aus Calc-Options-Dialog // und SID_AUTOSPELL_CHECK @@ -997,8 +975,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) GetInputOptions(); OSL_ENSURE( pInputCfg, "InputOptions not initialised :-(" ); - - SfxViewFrame* pViewFrm = SfxViewFrame::Current(); SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL; @@ -1014,8 +990,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) bool bSaveInputOptions = false; bool bCompileErrorCells = false; - - // SFX_APP()->SetOptions( rOptSet ); // Linguistik nicht mehr @@ -1162,8 +1136,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - - // DocOptions @@ -1324,8 +1296,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) SFX_APP()->Broadcast( SfxSimpleHint( SID_SCPRINTOPTIONS ) ); } - - if ( bSaveAppOptions ) pAppCfg->OptionsChanged(); @@ -1420,12 +1390,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - - // Input-Handler - - ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, bool bUseRef ) { if ( pRefInputHandler && bUseRef ) @@ -1605,12 +1571,8 @@ void ScModule::ActivateInputWindow( const OUString* pStrFormula, bool bMatrix ) } } - - // Referenz - Dialoge - - void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm ) { //! move reference dialog handling to view @@ -1933,12 +1895,8 @@ void ScModule::EndReference() } } - - // Idle / Online-Spelling - - void ScModule::AnythingChanged() { sal_uLong nOldTime = aIdleTimer.GetTimeout(); diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index fd90579d352e..f7e5b73704ed 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -39,8 +39,6 @@ using namespace com::sun::star; - - static sal_Bool lcl_IsURLButton( SdrObject* pObject ) { sal_Bool bRet = false; diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 95f7e9056ea8..6d265df27410 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -66,15 +66,11 @@ using namespace com::sun::star; - - #define SCTRANS_TYPE_IMPEX 1 #define SCTRANS_TYPE_EDIT_RTF 2 #define SCTRANS_TYPE_EDIT_BIN 3 #define SCTRANS_TYPE_EMBOBJ 4 - - void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol ) { SCCOL nMaxCol = 0; @@ -115,8 +111,6 @@ void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPr ScPrintFunc::DrawToDev( pDoc, pDev, nPrintFactor, aBound, &aViewData, bMetaFile ); } - - ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDescriptor& rDesc ) : pDoc( pClipDoc ), nNonFiltered(0), diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index fca4f6262935..0c87ab51bf68 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -108,8 +108,6 @@ const std::vector<editeng::MisspellRanges>* ScInputStatusItem::GetMisspellRanges // ScPaintHint ist nach schints.cxx verschoben - - // ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht @@ -124,8 +122,6 @@ ScTablesHint::~ScTablesHint() { } - - // ScIndexHint @@ -139,8 +135,6 @@ ScIndexHint::~ScIndexHint() { } - - // ScEditViewHint - neue EditView fuer Cursorposition anlegen @@ -167,8 +161,6 @@ ScSortItem::ScSortItem( sal_uInt16 nWhichP, if ( pSortData ) theSortData = *pSortData; } - - ScSortItem::ScSortItem( sal_uInt16 nWhichP, const ScSortParam* pSortData ) : SfxPoolItem ( nWhichP ), @@ -177,8 +169,6 @@ ScSortItem::ScSortItem( sal_uInt16 nWhichP, if ( pSortData ) theSortData = *pSortData; } - - ScSortItem::ScSortItem( const ScSortItem& rItem ) : SfxPoolItem ( rItem ), pViewData ( rItem.pViewData ), @@ -190,15 +180,11 @@ ScSortItem::~ScSortItem() { } - - OUString ScSortItem::GetValueText() const { return OUString("SortItem"); } - - bool ScSortItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -209,15 +195,11 @@ bool ScSortItem::operator==( const SfxPoolItem& rItem ) const && (theSortData == rOther.theSortData) ); } - - SfxPoolItem* ScSortItem::Clone( SfxItemPool * ) const { return new ScSortItem( *this ); } - - bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const { // Return empty value as there is no useful conversion @@ -243,8 +225,6 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, mpQueryData.reset(new ScQueryParam); } - - ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, const ScQueryParam* pQueryData ) : SfxPoolItem ( nWhichP ), @@ -258,8 +238,6 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, mpQueryData.reset(new ScQueryParam); } - - ScQueryItem::ScQueryItem( const ScQueryItem& rItem ) : SfxPoolItem ( rItem ), mpQueryData(new ScQueryParam(*rItem.mpQueryData)), @@ -273,8 +251,6 @@ ScQueryItem::~ScQueryItem() { } - - void ScQueryItem::SetAdvancedQuerySource(const ScRange* pSource) { if (pSource) @@ -297,15 +273,11 @@ bool ScQueryItem::GetAdvancedQuerySource(ScRange& rSource) const return bIsAdvanced; } - - OUString ScQueryItem::GetValueText() const { return OUString("QueryItem"); } - - bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -318,8 +290,6 @@ bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const && (*mpQueryData == *rQueryItem.mpQueryData) ); } - - SfxPoolItem* ScQueryItem::Clone( SfxItemPool * ) const { return new ScQueryItem( *this ); @@ -338,8 +308,6 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, if ( pSubTotalData ) theSubTotalData = *pSubTotalData; } - - ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, const ScSubTotalParam* pSubTotalData ) : SfxPoolItem ( nWhichP ), @@ -348,8 +316,6 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, if ( pSubTotalData ) theSubTotalData = *pSubTotalData; } - - ScSubTotalItem::ScSubTotalItem( const ScSubTotalItem& rItem ) : SfxPoolItem ( rItem ), pViewData ( rItem.pViewData ), @@ -361,15 +327,11 @@ ScSubTotalItem::~ScSubTotalItem() { } - - OUString ScSubTotalItem::GetValueText() const { return OUString("SubTotalItem"); } - - bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -380,15 +342,11 @@ bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const && (theSubTotalData == rSTItem.theSubTotalData) ); } - - SfxPoolItem* ScSubTotalItem::Clone( SfxItemPool * ) const { return new ScSubTotalItem( *this ); } - - bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const { // Return empty value as there is no useful conversion @@ -406,8 +364,6 @@ ScUserListItem::ScUserListItem( sal_uInt16 nWhichP ) { } - - ScUserListItem::ScUserListItem( const ScUserListItem& rItem ) : SfxPoolItem ( rItem ) { @@ -422,15 +378,11 @@ ScUserListItem::~ScUserListItem() delete pUserList; } - - OUString ScUserListItem::GetValueText() const { return OUString("ScUserListItem"); } - - bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -447,15 +399,11 @@ bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const } - - SfxPoolItem* ScUserListItem::Clone( SfxItemPool * ) const { return new ScUserListItem( *this ); } - - void ScUserListItem::SetUserList( const ScUserList& rUserList ) { delete pUserList; @@ -474,29 +422,21 @@ ScConsolidateItem::ScConsolidateItem( if ( pConsolidateData ) theConsData = *pConsolidateData; } - - ScConsolidateItem::ScConsolidateItem( const ScConsolidateItem& rItem ) : SfxPoolItem ( rItem ), theConsData ( rItem.theConsData ) { } - - ScConsolidateItem::~ScConsolidateItem() { } - - OUString ScConsolidateItem::GetValueText() const { return OUString("ScConsolidateItem"); } - - bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -506,15 +446,11 @@ bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const return ( theConsData == rCItem.theConsData); } - - SfxPoolItem* ScConsolidateItem::Clone( SfxItemPool * ) const { return new ScConsolidateItem( *this ); } - - // ScPivotItem - Daten fuer den Pivot-Dialog @@ -531,8 +467,6 @@ ScPivotItem::ScPivotItem( sal_uInt16 nWhichP, const ScDPSaveData* pData, bNewSheet = bNew; } - - ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) : SfxPoolItem ( rItem ), aDestRange ( rItem.aDestRange ), @@ -542,22 +476,16 @@ ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) : pSaveData = new ScDPSaveData(*rItem.pSaveData); } - - ScPivotItem::~ScPivotItem() { delete pSaveData; } - - OUString ScPivotItem::GetValueText() const { return OUString("ScPivotItem"); } - - bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -569,15 +497,11 @@ bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const bNewSheet == rPItem.bNewSheet ); } - - SfxPoolItem* ScPivotItem::Clone( SfxItemPool * ) const { return new ScPivotItem( *this ); } - - // ScSolveItem - Daten fuer den Solver-Dialog @@ -588,29 +512,21 @@ ScSolveItem::ScSolveItem( sal_uInt16 nWhichP, if ( pSolveData ) theSolveData = *pSolveData; } - - ScSolveItem::ScSolveItem( const ScSolveItem& rItem ) : SfxPoolItem ( rItem ), theSolveData ( rItem.theSolveData ) { } - - ScSolveItem::~ScSolveItem() { } - - OUString ScSolveItem::GetValueText() const { return OUString("ScSolveItem"); } - - bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -620,8 +536,6 @@ bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const return ( theSolveData == rPItem.theSolveData ); } - - SfxPoolItem* ScSolveItem::Clone( SfxItemPool * ) const { return new ScSolveItem( *this ); @@ -638,29 +552,21 @@ ScTabOpItem::ScTabOpItem( sal_uInt16 nWhichP, if ( pTabOpData ) theTabOpData = *pTabOpData; } - - ScTabOpItem::ScTabOpItem( const ScTabOpItem& rItem ) : SfxPoolItem ( rItem ), theTabOpData ( rItem.theTabOpData ) { } - - ScTabOpItem::~ScTabOpItem() { } - - OUString ScTabOpItem::GetValueText() const { return OUString("ScTabOpItem"); } - - bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -670,8 +576,6 @@ bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const return ( theTabOpData == rPItem.theTabOpData ); } - - SfxPoolItem* ScTabOpItem::Clone( SfxItemPool * ) const { return new ScTabOpItem( *this ); diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index e86b9d884955..6dbe9a593f33 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <sfx2/objsh.hxx> @@ -37,8 +35,6 @@ #include <editeng/flstitem.hxx> #include <sfx2/app.hxx> - - ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* pCellAttrs) : SfxTabDialog(pFrameP, pParent, "FormatCellsDialog", "modules/scalc/ui/formatcellsdialog.ui", pCellAttrs) { @@ -69,14 +65,10 @@ ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* p AddTabPage( "cellprotection" , ScTabPageProtection::Create, 0 ); } - - ScAttrDlg::~ScAttrDlg() { } - - void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) { SfxObjectShell* pDocSh = SfxObjectShell::Current(); @@ -97,8 +89,6 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } } - - IMPL_LINK_NOARG(ScAttrDlg, OkHandler) { ((Link&)GetOKButton().GetClickHdl()).Call( NULL ); diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 9931208e1943..0b20eee29e08 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -68,15 +68,11 @@ sal_uInt16* ScTabPageProtection::GetRanges() return pProtectionRanges; } - - SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTabPageProtection( pParent, rAttrSet ) ); } - - void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) { // Initialize variables @@ -120,8 +116,6 @@ void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) UpdateButtons(); } - - bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) { sal_Bool bAttrsChanged = false; @@ -144,8 +138,6 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) bAttrsChanged = !pOldItem || !( aProtAttr == *(const ScProtectionAttr*)pOldItem ); } - - if ( bAttrsChanged ) rCoreAttrs.Put( aProtAttr ); else if ( eItemState == SFX_ITEM_DEFAULT ) @@ -154,8 +146,6 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) return bAttrsChanged; } - - int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) @@ -164,8 +154,6 @@ int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } - - IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) { TriState eState = pBox->GetState(); @@ -195,8 +183,6 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) return 0; } - - void ScTabPageProtection::UpdateButtons() { if ( bDontCare ) diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx index 9dddba67b4db..d73d64aeaa8d 100644 --- a/sc/source/ui/cctrl/cbuttonw.cxx +++ b/sc/source/ui/cctrl/cbuttonw.cxx @@ -35,21 +35,15 @@ ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice ) SetOptSizePixel(); } - - ScDDComboBoxButton::~ScDDComboBoxButton() { } - - void ScDDComboBoxButton::SetOutputDevice( OutputDevice* pOutputDevice ) { pOut = pOutputDevice; } - - void ScDDComboBoxButton::SetOptSizePixel() { aBtnSize = pOut->LogicToPixel( Size(0,11), MAP_APPFONT ); @@ -57,8 +51,6 @@ void ScDDComboBoxButton::SetOptSizePixel() aBtnSize.Width() = pOut->GetSettings().GetStyleSettings().GetScrollBarSize(); } - - void ScDDComboBoxButton::Draw( const Point& rAt, const Size& rSize, bool bState, @@ -116,8 +108,6 @@ void ScDDComboBoxButton::Draw( const Point& rAt, pOut->SetFillColor(); } - - void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect, bool bState ) { @@ -164,6 +154,4 @@ void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect, - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index a418e4850de9..59cf40fd02c2 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -47,8 +47,6 @@ ScMenuFloatingWindow::MenuItemData::MenuItemData() : { } - - ScMenuFloatingWindow::SubMenuItemData::SubMenuItemData(ScMenuFloatingWindow* pParent) : mpSubMenu(NULL), mnMenuPos(MENU_NOT_SELECTED), @@ -71,8 +69,6 @@ IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) return 0; } - - size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999; ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel) : @@ -859,8 +855,6 @@ ScDocument* ScMenuFloatingWindow::getDoc() return mpDoc; } - - ScCheckListMenuWindow::Config::Config() : mbAllowEmptySet(true), mbRTL(false) { @@ -871,8 +865,6 @@ ScCheckListMenuWindow::Member::Member() : { } - - ScCheckListMenuWindow::CancelButton::CancelButton(ScCheckListMenuWindow* pParent) : ::CancelButton(pParent), mpParent(pParent) {} @@ -882,8 +874,6 @@ void ScCheckListMenuWindow::CancelButton::Click() ::CancelButton::Click(); } - - ScCheckListMenuWindow::ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc) : ScMenuFloatingWindow(pParent, pDoc), maChecks(this, WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ), diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index 3156ab9a5779..d784d51d85d8 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -28,8 +28,6 @@ #include <vcl/builder.hxx> #include "global.hxx" - - namespace { sal_Unicode lclGetDecSep() @@ -75,6 +73,4 @@ void ScDoubleField::SetValue( double fValue, sal_Int32 nDecPlaces, bool bEraseTr nDecPlaces, lclGetDecSep(), bEraseTrailingDecZeros ) ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxx index e6fb1dcce058..47b2b88f8334 100644 --- a/sc/source/ui/cctrl/popmenu.cxx +++ b/sc/source/ui/cctrl/popmenu.cxx @@ -19,14 +19,10 @@ #include "popmenu.hxx" - - void ScPopupMenu::Select() { nSel = GetCurItemId(); bHit = true; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 6ec692a02415..a4250caed0a2 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -34,16 +34,10 @@ #include "scresid.hxx" #include "sc.hrc" - - SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item); - - // ToolBox - Controller - - ScTbxInsertCtrl::ScTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), nLastSlotId(0) diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 6ad81991568e..260edebbc265 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -39,12 +39,8 @@ // class ScZoomSliderControl --------------------------------------- - - SFX_IMPL_TOOLBOX_CONTROL( ScZoomSliderControl, SvxZoomSliderItem ); - - ScZoomSliderControl::ScZoomSliderControl( sal_uInt16 nSlotId, sal_uInt16 nId, @@ -54,15 +50,11 @@ ScZoomSliderControl::ScZoomSliderControl( rTbx.Invalidate(); } - - ScZoomSliderControl::~ScZoomSliderControl() { } - - void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { @@ -89,8 +81,6 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState } } - - Window* ScZoomSliderControl::CreateItemWindow( Window *pParent ) { // #i98000# Don't try to get a value via SfxViewFrame::Current here. @@ -101,8 +91,6 @@ Window* ScZoomSliderControl::CreateItemWindow( Window *pParent ) return pSlider; } - - struct ScZoomSliderWnd::ScZoomSliderWnd_Impl { sal_uInt16 mnCurrentZoom; @@ -134,8 +122,6 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl } }; - - const long nButtonWidth = 10; const long nButtonHeight = 10; const long nIncDecWidth = 11; @@ -148,8 +134,6 @@ const long nSnappingEpsilon = 5; // snapping epsilon in pixels const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two adjacent snapping points - - sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const { Size aSliderWindowSize = GetOutputSizePixel(); @@ -209,8 +193,6 @@ sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const return nRet; } - - long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const { Size aSliderWindowSize = GetOutputSizePixel(); @@ -238,8 +220,6 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const } - - ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , sal_uInt16 nCurrentZoom ): Window( pParent ), @@ -255,15 +235,11 @@ ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno:: SetSizePixel( Size( aSliderSize.Width() * nSliderWidth-1, aSliderSize.Height() + nSliderHeight ) ); } - - ScZoomSliderWnd::~ScZoomSliderWnd() { delete mpImpl; } - - void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) { if ( !mpImpl->mbValuesSet ) @@ -320,8 +296,6 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) mpImpl->mbOmitPaint = false; } - - void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) { if ( !mpImpl->mbValuesSet ) @@ -362,8 +336,6 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) } } - - void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) { if( pZoomSliderItem ) @@ -414,15 +386,11 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) Paint(aRect); } - - void ScZoomSliderWnd::Paint( const Rectangle& rRect ) { DoPaint( rRect ); } - - void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ ) { if( mpImpl->mbOmitPaint ) @@ -519,6 +487,4 @@ void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index cdfe83a26dd0..7c44b239638c 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -29,14 +29,10 @@ // ause #include "editutil.hxx" - - static const sal_Char pStrFix[] = "FIX"; static const sal_Char pStrMrg[] = "MRG"; - - ScAsciiOptions::ScAsciiOptions() : bFixedLen ( false ), aFieldSeps ( OUString(';') ), diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 8277afc4b63e..2df46a9e00cb 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -23,8 +23,6 @@ #include "AccessibleCsvControl.hxx" - - ScCsvLayoutData::ScCsvLayoutData() : mnPosCount( 1 ), mnPosOffset( 0 ), @@ -60,8 +58,6 @@ ScCsvDiff ScCsvLayoutData::GetDiff( const ScCsvLayoutData& rData ) const } - - ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : Control( &rParent, WB_TABSTOP | WB_NODIALOGCONTROL ), mrData( rParent.GetLayoutData() ), @@ -312,6 +308,4 @@ ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index d0ee530ab6a7..3a1b2cdf85b8 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -45,8 +45,6 @@ // *** edit engine *** - - struct Func_SetType { sal_Int32 mnType; @@ -64,8 +62,6 @@ struct Func_Select }; - - ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : ScCsvControl( rParent ), mpColorConfig( 0 ), @@ -1365,6 +1361,4 @@ ScAccessibleCsvControl* ScCsvGrid::ImplCreateAccessible() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index e5a08fa6a479..bf0b6d7fcb0f 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -32,14 +32,10 @@ using namespace com::sun::star::uno; - - #define SEP_PATH "Office.Calc/Dialogs/CSVImport" #define FIXED_WIDTH_LIST "FixedWidthList" - - static void load_FixedWidthList(ScCsvSplits &aSplits) { OUString sSplits; @@ -667,6 +663,4 @@ ScAccessibleCsvControl* ScCsvRuler::ImplCreateAccessible() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx index 49c60d3ec8ad..eb8a348c3fca 100644 --- a/sc/source/ui/dbgui/csvsplits.cxx +++ b/sc/source/ui/dbgui/csvsplits.cxx @@ -22,8 +22,6 @@ #include <algorithm> - - bool ScCsvSplits::Insert( sal_Int32 nPos ) { bool bValid = (nPos >= 0); @@ -65,8 +63,6 @@ bool ScCsvSplits::HasSplit( sal_Int32 nPos ) const } - - sal_uInt32 ScCsvSplits::GetIndex( sal_Int32 nPos ) const { const_iterator aIter = ::std::lower_bound( maVec.begin(), maVec.end(), nPos ); @@ -94,14 +90,10 @@ sal_Int32 ScCsvSplits::GetPos( sal_uInt32 nIndex ) const } - - sal_uInt32 ScCsvSplits::GetIterIndex( const_iterator aIter ) const { return (aIter == maVec.end()) ? CSV_VEC_NOTFOUND : (aIter - maVec.begin()); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 5cd4a45caaa8..8600dec42a06 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -25,8 +25,6 @@ // ause #include "editutil.hxx" - - ScCsvTableBox::ScCsvTableBox( Window* pParent, WinBits nBits ) : ScCsvControl( pParent, maData, nBits ), maRuler( *this ), @@ -428,6 +426,4 @@ ScAccessibleCsvControl* ScCsvTableBox::ImplCreateAccessible() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 09af5929ba41..0bf9ae87f2a1 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -22,8 +22,6 @@ - - #include <vcl/waitobj.hxx> #include <comphelper/processfactory.hxx> @@ -45,15 +43,11 @@ using namespace com::sun::star; #include "dpsdbtab.hxx" - - // entries in the "type" ListBox #define DP_TYPELIST_TABLE 0 #define DP_TYPELIST_QUERY 1 #define DP_TYPELIST_SQLNAT 3 - - ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : ModalDialog(pParent, "SelectDataSourceDialog", "modules/scalc/ui/selectdatasource.ui") @@ -192,6 +186,4 @@ void ScDataPilotDatabaseDlg::FillObjects() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 80306d7dfdd0..894a56d54945 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -22,8 +22,6 @@ - - #include "dapitype.hxx" #include "scresid.hxx" #include "sc.hrc" @@ -31,8 +29,6 @@ using namespace com::sun::star; - - ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal) : ModalDialog( pParent, "SelectSourceDialog", "modules/scalc/ui/selectsource.ui" ) { @@ -101,8 +97,6 @@ IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn ) return 0; } - - ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, const uno::Sequence<OUString>& rServices ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DAPISERVICE ) ), @@ -163,6 +157,4 @@ OUString ScDataPilotServiceDlg::GetParPass() const return aEdPasswd.GetText(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index ba4e781af7e1..c8b43853da29 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -33,16 +33,12 @@ #include "dbnamdlg.hxx" - - #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D - - class DBSaveData; static DBSaveData* pSaveObj = NULL; @@ -91,8 +87,6 @@ private: - - void DBSaveData::Save() { aArea = rCurArea; @@ -105,8 +99,6 @@ void DBSaveData::Save() } - - void DBSaveData::Restore() { if ( bDirty ) @@ -121,12 +113,8 @@ void DBSaveData::Restore() } } - - // class ScDbNameDlg - - ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, @@ -177,16 +165,12 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, } - - ScDbNameDlg::~ScDbNameDlg() { DELETEZ( pSaveObj ); } - - void ScDbNameDlg::Init() { m_pBtnHeader->Check( true ); // Default: mit Spaltenkoepfen @@ -308,15 +292,11 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } - - bool ScDbNameDlg::Close() { return DoClose( ScDbNameDlgWrapper::GetChildWindowId() ); } - - void ScDbNameDlg::SetActive() { m_pEdAssign->GrabFocus(); @@ -328,8 +308,6 @@ void ScDbNameDlg::SetActive() RefInputDone(); } - - void ScDbNameDlg::UpdateNames() { typedef ScDBCollection::NamedDBs DBsType; @@ -358,8 +336,6 @@ void ScDbNameDlg::UpdateNames() m_pEdName->Invalidate(); } - - void ScDbNameDlg::UpdateDBData( const OUString& rStrName ) { @@ -393,8 +369,6 @@ void ScDbNameDlg::UpdateDBData( const OUString& rStrName ) } - - bool ScDbNameDlg::IsRefInputMode() const { return bRefInputMode; @@ -419,8 +393,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) return 0; } - - IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl) { Close(); @@ -428,8 +400,6 @@ IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl) } IMPL_LINK_NOARG_INLINE_END(ScDbNameDlg, CancelBtnHdl) - - IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) { OUString aNewName = comphelper::string::strip(m_pEdName->GetText(), ' '); @@ -578,8 +548,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) return 0; } - - IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) { OUString theName = m_pEdName->GetText(); @@ -644,8 +612,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) return 0; } - - IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl) { // hier parsen fuer Save() etc. diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 03a9c631acd6..9d82cd9ca963 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -30,8 +30,6 @@ #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> - - namespace { /** Date part flags in order of the list box entries. */ @@ -59,8 +57,6 @@ static const sal_uInt16 nDatePartResIds[] = } // namespace - - ScDPGroupEditHelper::ScDPGroupEditHelper( RadioButton* pRbAuto, RadioButton* pRbMan, Edit* pEdValue ) : mpRbAuto( pRbAuto ), mpRbMan( pRbMan ), @@ -114,8 +110,6 @@ IMPL_LINK( ScDPGroupEditHelper, ClickHdl, RadioButton*, pButton ) return 0; } - - ScDPNumGroupEditHelper::ScDPNumGroupEditHelper( RadioButton* pRbAuto, RadioButton* pRbMan, ScDoubleField* pEdValue ) : ScDPGroupEditHelper( pRbAuto, pRbMan, pEdValue ), @@ -133,8 +127,6 @@ void ScDPNumGroupEditHelper::ImplSetValue( double fValue ) mpEdValue->SetValue( fValue ); } - - ScDPDateGroupEditHelper::ScDPDateGroupEditHelper( RadioButton* pRbAuto, RadioButton* pRbMan, DateField* pEdValue, const Date& rNullDate ) : ScDPGroupEditHelper( pRbAuto, pRbMan, pEdValue ), @@ -157,8 +149,6 @@ void ScDPDateGroupEditHelper::ImplSetValue( double fValue ) } - - ScDPNumGroupDlg::ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ) : ModalDialog ( pParent, "PivotTableGroupByNumber", "modules/scalc/ui/groupbynumber.ui" ), mpRbAutoStart ( get<RadioButton>("auto_start") ), @@ -207,8 +197,6 @@ ScDPNumGroupInfo ScDPNumGroupDlg::GetGroupInfo() const return aInfo; } - - ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) : ModalDialog( pParent, "PivotTableGroupByDate", "modules/scalc/ui/groupbydate.ui" ), @@ -339,6 +327,4 @@ IMPL_LINK( ScDPDateGroupDlg, CheckHdl, SvxCheckListBox*, pListBox ) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 3581c09c8eac..3b9e968387d4 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -161,8 +161,6 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, } - - ScFilterDlg::~ScFilterDlg() { delete pOptionsMgr; @@ -174,8 +172,6 @@ ScFilterDlg::~ScFilterDlg() } - - void ScFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryItem& rQueryItem = (const ScQueryItem&) @@ -204,8 +200,6 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) pDoc = pViewData ? pViewData->GetDocument() : NULL; nSrcTab = pViewData ? pViewData->GetTabNo() : static_cast<SCTAB>(0); - - // for easier access: maFieldLbArr.reserve(QUERY_ENTRY_COUNT); maFieldLbArr.push_back(pLbField1); @@ -389,8 +383,6 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) } - - bool ScFilterDlg::Close() { if (pViewData) @@ -399,8 +391,6 @@ bool ScFilterDlg::Close() return DoClose( ScFilterDlgWrapper::GetChildWindowId() ); } - - // Mouse-selected cell area becomes the new selection and is shown in the // reference text box @@ -416,8 +406,6 @@ void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } - - void ScFilterDlg::SetActive() { if ( bRefInputMode ) @@ -432,8 +420,6 @@ void ScFilterDlg::SetActive() RefInputDone(); } - - void ScFilterDlg::FillFieldLists() { pLbField1->Clear(); @@ -611,8 +597,6 @@ void ScFilterDlg::UpdateHdrInValueList( size_t nList ) } } - - void ScFilterDlg::ClearValueList( size_t nList ) { if (nList > 0 && nList <= QUERY_ENTRY_COUNT) @@ -626,8 +610,6 @@ void ScFilterDlg::ClearValueList( size_t nList ) } - - size_t ScFilterDlg::GetFieldSelPos( SCCOL nField ) { if ( nField >= theQueryData.nCol1 && nField <= theQueryData.nCol2 ) @@ -636,8 +618,6 @@ size_t ScFilterDlg::GetFieldSelPos( SCCOL nField ) return 0; } - - ScQueryItem* ScFilterDlg::GetOutputItem() { ScAddress theCopyPos; @@ -682,15 +662,11 @@ ScQueryItem* ScFilterDlg::GetOutputItem() } - - bool ScFilterDlg::IsRefInputMode() const { return bRefInputMode; } - - // Handler: @@ -731,8 +707,6 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) return 0; } - - IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) { if ( pExpander->get_expanded() ) @@ -747,8 +721,6 @@ IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) return 0; } - - IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) { // Check if RefInputMode is still true every 50ms @@ -763,8 +735,6 @@ IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) } - - IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { /* @@ -1020,8 +990,6 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) } - - IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { // Column headers: @@ -1061,8 +1029,6 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) } - - IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) { size_t nOffset = GetSliderPos(); diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 58d540974438..e17538145153 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -69,8 +69,6 @@ ScFilterOptionsMgr::ScFilterOptionsMgr( } - - ScFilterOptionsMgr::~ScFilterOptionsMgr() { sal_uInt16 nEntries = pLbCopyArea->GetEntryCount(); @@ -81,8 +79,6 @@ ScFilterOptionsMgr::~ScFilterOptionsMgr() } - - void ScFilterOptionsMgr::Init() { //moggi:TODO @@ -204,8 +200,6 @@ void ScFilterOptionsMgr::Init() pEdCopyArea->SetText( EMPTY_OUSTRING ); } - - bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const { OUString aPosStr( rPosStr ); @@ -222,8 +216,6 @@ bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const // Handler: - - IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) { if ( pLb == pLbCopyArea ) @@ -241,8 +233,6 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) } - - IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) { if ( pEd == pEdCopyArea ) @@ -276,8 +266,6 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) } - - IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox ) { if ( pBox == pBtnCopyResult ) diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx index 778d018f6899..4dbc1d45b5d4 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -76,8 +76,6 @@ ScImportOptions::ScImportOptions( const OUString& rStr ) } } - - OUString ScImportOptions::BuildString() const { OUString aResult; @@ -98,8 +96,6 @@ OUString ScImportOptions::BuildString() const return aResult; } - - void ScImportOptions::SetTextEncoding( rtl_TextEncoding nEnc ) { eCharSet = (nEnc == RTL_TEXTENCODING_DONTKNOW ? diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 43d9e871d0f9..04680f162804 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include <vcl/waitobj.hxx> #include "viewdata.hxx" @@ -240,8 +238,6 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) } } - - void ScPivotFilterDlg::FillFieldLists() { m_pLbField1->Clear(); @@ -277,8 +273,6 @@ void ScPivotFilterDlg::FillFieldLists() } } - - void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList ) { if ( pDoc && nList>0 && nList<=3 ) @@ -323,8 +317,6 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList ) } } - - void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList ) { if ( nList>0 && nList<=3 ) @@ -337,8 +329,6 @@ void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList ) } } - - sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField ) { if ( nField >= theQueryData.nCol1 && nField <= theQueryData.nCol2 ) @@ -347,8 +337,6 @@ sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField ) return 0; } - - const ScQueryItem& ScPivotFilterDlg::GetOutputItem() { ScQueryParam theParam( theQueryData ); @@ -517,8 +505,6 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb ) return 0; } - - IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { // bei Gross-/Kleinschreibung die Werte-Listen aktualisieren @@ -542,8 +528,6 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) return 0; } - - IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) { if ( pEd ) diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 9bc0b1ce8e9e..59cf31e53d47 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -40,15 +40,11 @@ #include <vector> - - using namespace ::com::sun::star::sheet; using ::com::sun::star::uno::Sequence; using ::std::vector; - - namespace { /** Appends all strings from the Sequence to the list box. @@ -154,8 +150,6 @@ static const ScDPListBoxWrapper::MapEntryType spShowFromMap[] = } // namespace - - ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) { @@ -197,8 +191,6 @@ void ScDPFunctionListBox::FillFunctionNames() InsertEntry( aArr.GetString( nIndex ) ); } - - ScDPFunctionDlg::ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData) @@ -413,8 +405,6 @@ IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl) return 0; } - - ScDPSubtotalDlg::ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, bool bEnableLayout ) @@ -493,8 +483,6 @@ void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa mpBtnOptions->SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) ); } - - IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, RadioButton*, pBtn ) { mpLbFunc->Enable( pBtn == mpRbUser ); @@ -519,8 +507,6 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn ) return 0; } - - ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, bool bEnableLayout ) @@ -771,8 +757,6 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox ) return 0; } - - ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DPSHOWDETAIL ) ), maFtDims ( this, ScResId( FT_DIMS ) ), @@ -841,6 +825,4 @@ IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox*, pLBox ) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index e6cbda50c621..60dd912d4eb5 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <comphelper/string.hxx> #include <svx/drawitem.hxx> @@ -39,8 +37,6 @@ #include "scresid.hxx" #include "scendlg.hxx" - - ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected) : ModalDialog(pParent, "ScenarioDialog", @@ -113,8 +109,6 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const OUString& rName, bool m_pCbProtect->Enable(false); } - - void ScNewScenarioDlg::GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const { @@ -151,8 +145,6 @@ void ScNewScenarioDlg::SetScenarioData( const OUString& rName, const OUString& r m_pCbProtect->Check ( (nFlags & SC_SCENARIO_PROTECT) != 0 ); } - - IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl) { OUString aName = comphelper::string::strip(m_pEdName->GetText(), ' '); @@ -177,8 +169,6 @@ IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl) //! beim Editieren testen, ob eine andere Tabelle den Namen hat! } - - IMPL_LINK( ScNewScenarioDlg, EnableHdl, CheckBox *, pBox ) { if (pBox == m_pCbShowFrame) diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 5de5e123e37a..95355a15c5b2 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -58,8 +58,6 @@ using namespace com::sun::star::uno; #define SEP_PATH_CLPBRD "Office.Calc/Dialogs/ClipboardTextImport" #define SEP_PATH_TEXT2COL "Office.Calc/Dialogs/TextToColumnsImport" - - static void lcl_FillCombo( ComboBox& rCombo, const OUString& rList, sal_Unicode cSelect ) { sal_Int32 i; @@ -233,8 +231,6 @@ static void save_Separators( aItem.PutProperties(aNames, aValues); } - - ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) : ModalDialog (pParent, "TextImportCsvDialog", @@ -463,8 +459,6 @@ ScImportAsciiDlg::~ScImportAsciiDlg() } - - bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) { if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream) @@ -630,8 +624,6 @@ void ScImportAsciiDlg::UpdateVertical() } - - IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, RadioButton*, pButton ) { OSL_ENSURE( pButton, "ScImportAsciiDlg::RbSepFixHdl - missing sender" ); diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 133834bf64e2..6b0d32278741 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "scuiimoptdlg.hxx" #include "tabvwsh.hxx" #include "scresid.hxx" @@ -57,8 +55,6 @@ private: sal_Int32 nIter; }; - - sal_uInt16 ScDelimiterTable::GetCode( const OUString& rDel ) const { sal_Unicode nCode = 0; @@ -81,8 +77,6 @@ sal_uInt16 ScDelimiterTable::GetCode( const OUString& rDel ) const return nCode; } - - OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const { OUString aStrDel; @@ -249,16 +243,12 @@ ScImportOptionsDlg::ScImportOptionsDlg( SetText( *pStrTitle ); } - - ScImportOptionsDlg::~ScImportOptionsDlg() { delete pFieldSepTab; delete pTextSepTab; } - - void ScImportOptionsDlg::GetImportOptions( ScImportOptions& rOptions ) const { rOptions.SetTextEncoding( m_pLbCharset->GetSelectTextEncoding() ); @@ -274,8 +264,6 @@ void ScImportOptionsDlg::GetImportOptions( ScImportOptions& rOptions ) const } } - - sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const { ScDelimiterTable* pTab; @@ -302,8 +290,6 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const return nCode; } - - IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, CheckBox*, pCheckBox ) { if (pCheckBox == m_pCbFixed) diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 0367f38122d9..e217a4cebfb7 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -41,12 +41,8 @@ #define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK),\ ScGlobal::GetRscString(rid) ).Execute() - - // class ScSpecialFilterDialog - - ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, const SfxItemSet& rArgSet ) @@ -101,8 +97,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi } - - ScSpecialFilterDlg::~ScSpecialFilterDlg() { sal_uInt16 nEntries = pLbFilterArea->GetEntryCount(); @@ -122,8 +116,6 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg() } - - void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryItem& rQueryItem = (const ScQueryItem&) @@ -204,8 +196,6 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) } - - bool ScSpecialFilterDlg::Close() { if (pViewData) @@ -214,8 +204,6 @@ bool ScSpecialFilterDlg::Close() return DoClose( ScSpecialFilterDlgWrapper::GetChildWindowId() ); } - - // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Edit angezeigt wird. @@ -239,8 +227,6 @@ void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } - - void ScSpecialFilterDlg::SetActive() { if ( bRefInputMode ) @@ -264,8 +250,6 @@ void ScSpecialFilterDlg::SetActive() } - - ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, const ScRange& rSource ) { @@ -277,15 +261,11 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, } - - bool ScSpecialFilterDlg::IsRefInputMode() const { return bRefInputMode; } - - // Handler: @@ -406,8 +386,6 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) } - - IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) { // alle 50ms nachschauen, ob RefInputMode noch stimmt @@ -437,8 +415,6 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) } - - IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) { if ( pLb == pLbFilterArea ) @@ -456,8 +432,6 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) } - - IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) { if ( pEd == pEdFilterArea ) diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 39eaa7773c63..f82f72ae6045 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -11,8 +11,6 @@ #include "sortdlg.hxx" #include <vcl/layout.hxx> - - ScSortKeyItem::ScSortKeyItem(Window* pParent) { m_pUIBuilder = new VclBuilder(pParent, getUIRootDir(), "modules/scalc/ui/sortkey.ui"); @@ -34,15 +32,11 @@ void ScSortKeyItem::DisableField() m_pFrame->Disable(); } - - void ScSortKeyItem::EnableField() { m_pFrame->Enable(); } - - ScSortKeyWindow::ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& rSortKeyItems) : mrSortKeyItems(rSortKeyItems) { @@ -56,15 +50,11 @@ ScSortKeyWindow::ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& rSortKeyIt } } - - ScSortKeyWindow::~ScSortKeyWindow() { mrSortKeyItems.clear(); } - - void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber ) { ScSortKeyItem* pSortKeyItem = new ScSortKeyItem(m_pBox); @@ -77,15 +67,11 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber ) mrSortKeyItems.push_back(pSortKeyItem); } - - void ScSortKeyWindow::DoScroll(sal_Int32 nNewPos) { m_pBox->SetPosPixel(Point(0, nNewPos)); } - - ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& rItems) : m_aSortWin(pParent, rItems) , m_rScrolledWindow(*pParent->get<VclScrolledWindow>("SortCriteriaPage")) @@ -126,8 +112,6 @@ void ScSortKeyCtrl::setScrollRange() checkAutoVScroll(); } - - IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar ) { sal_Int32 nOffset = m_aSortWin.GetItemHeight(); @@ -136,8 +120,6 @@ IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar ) return 0; } - - void ScSortKeyCtrl::AddSortKey( sal_uInt16 nItem ) { m_rVertScroll.SetRangeMax( nItem ); diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index 56c99d66e19e..b5c9900930c2 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -20,15 +20,11 @@ #undef SC_DLLIMPLEMENTATION - - #include "tpsubt.hxx" #include "scresid.hxx" #include "subtdlg.hxx" - - ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) : SfxTabDialog(pParent, "SubTotalDialog", "modules/scalc/ui/subtotaldialog.ui", pArgSet) @@ -42,8 +38,6 @@ ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) m_pBtnRemove->SetClickHdl( LINK( this, ScSubTotalDlg, RemoveHdl ) ); } - - IMPL_LINK_INLINE_START( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn ) { if (pBtn == m_pBtnRemove) diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index f6c4e75c712e..fc4190a9efe0 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "textimportoptions.hxx" #include "vcl/svapp.hxx" #include "vcl/msgbox.hxx" diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 20c4609a3948..63eff99e4da3 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -48,8 +48,6 @@ using namespace com::sun::star; - - /* * Since the settings on the second Tab Page (Options) effects * the first Tab Page, there must be a way for it to communicate with the @@ -68,8 +66,6 @@ using namespace com::sun::star; * This still needs to be changed! */ - - // Sort Criteria Tab page ScTabPageSortFields::ScTabPageSortFields(Window* pParent, @@ -116,14 +112,10 @@ void ScTabPageSortFields::SetPosPixel(const Point& rAllocPos) maSortKeyCtrl.setScrollRange(); } - - ScTabPageSortFields::~ScTabPageSortFields() { } - - void ScTabPageSortFields::Init() { const ScSortItem& rSortItem = (const ScSortItem&) @@ -144,16 +136,12 @@ void ScTabPageSortFields::Init() } } - - SfxTabPage* ScTabPageSortFields::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTabPageSortFields( pParent, rArgSet ) ); } - - void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) { bSortByRows = aSortData.bByRow; @@ -236,8 +224,6 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) SetLastSortKey( nSortKeyCount ); } - - bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) { ScSortParam aNewSortData = aSortData; @@ -302,8 +288,6 @@ bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) return true; } - - // for data exchange without dialogue detour: void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet ) { @@ -328,8 +312,6 @@ void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet ) } } - - int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) { if ( pDlg ) @@ -347,8 +329,6 @@ int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) return SfxTabPage::LEAVE_PAGE; } - - void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) { if ( pViewData ) @@ -417,8 +397,6 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) } } - - sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField ) { sal_uInt16 nFieldPos = 0; @@ -542,8 +520,6 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, m_pLbSortUser->SetAccessibleName(m_pBtnSortUser->GetText()); } - - ScTabPageSortOptions::~ScTabPageSortOptions() { sal_uInt16 nEntries = m_pLbOutPos->GetEntryCount(); @@ -555,8 +531,6 @@ ScTabPageSortOptions::~ScTabPageSortOptions() delete pColWrap; //! not if from document } - - void ScTabPageSortOptions::Init() { // CollatorResource has user-visible names for sort algorithms @@ -640,8 +614,6 @@ void ScTabPageSortOptions::Init() m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM ); } - - SfxTabPage* ScTabPageSortOptions::Create( Window* pParent, const SfxItemSet& rArgSet ) @@ -649,8 +621,6 @@ SfxTabPage* ScTabPageSortOptions::Create( return ( new ScTabPageSortOptions( pParent, rArgSet ) ); } - - void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) { if ( aSortData.bUserDef ) @@ -718,8 +688,6 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) } } - - bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) { // Create local copy of ScParam @@ -767,8 +735,6 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) return true; } - - // for data exchange without dialogue detour: void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet ) { @@ -793,8 +759,6 @@ void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet ) } } - - int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) { sal_Bool bPosInputOk = sal_True; @@ -847,8 +811,6 @@ int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) return bPosInputOk ? SfxTabPage::LEAVE_PAGE : SfxTabPage::KEEP_PAGE; } - - void ScTabPageSortOptions::FillUserSortListBox() { ScUserList* pUserLists = ScGlobal::GetUserList(); @@ -895,8 +857,6 @@ IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox ) return 0; } - - IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) { if (pLb == m_pLbOutPos) @@ -912,8 +872,6 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) return 0; } - - IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn ) { if (pBtn == m_pBtnTopDown) @@ -927,8 +885,6 @@ IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn ) return 0; } - - void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) { if (pEd == m_pEdOutPos) @@ -957,8 +913,6 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) } } - - IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) { m_pLbAlgorithm->SetUpdateMode( false ); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 3958ee6e287f..d2c53569f760 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -65,8 +65,6 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, Init (); } - - ScTpSubTotalGroup::~ScTpSubTotalGroup() { sal_uLong nCount = mpLbColumns->GetEntryCount(); @@ -85,8 +83,6 @@ ScTpSubTotalGroup::~ScTpSubTotalGroup() } } - - void ScTpSubTotalGroup::Init() { const ScSubTotalItem& rSubTotalItem = (const ScSubTotalItem&) @@ -106,8 +102,6 @@ void ScTpSubTotalGroup::Init() FillListBoxes(); } - - bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo, const SfxItemSet& rArgSet ) { @@ -120,8 +114,6 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo, else nGroupIdx = nGroupNo-1; - - // first we have to clear the listboxes... for ( sal_uLong nLbEntry = 0; nLbEntry < mpLbColumns->GetEntryCount(); ++nLbEntry ) { @@ -168,8 +160,6 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo, return true; } - - bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, SfxItemSet& rArgSet ) { @@ -191,8 +181,6 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, else nGroupIdx = nGroupNo-1; - - ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); if ( pDlg ) @@ -249,8 +237,6 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, return true; } - - void ScTpSubTotalGroup::FillListBoxes() { OSL_ENSURE( pViewData && pDoc, "ViewData or Document not found :-/" ); @@ -287,8 +273,6 @@ void ScTpSubTotalGroup::FillListBoxes() } } - - sal_uInt16 ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField ) { sal_uInt16 nFieldPos = 0; @@ -306,8 +290,6 @@ sal_uInt16 ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField ) return nFieldPos; } - - ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( sal_uInt16 nPos ) { switch ( nPos ) @@ -330,8 +312,6 @@ ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( sal_uInt16 nPos ) } } - - sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) { switch ( eFunc ) @@ -384,8 +364,6 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) return 0; } - - IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) { if ( ((SvxCheckListBox*)pLb) == mpLbColumns ) @@ -408,20 +386,14 @@ SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup1( pParent, rArgSet ) ); } - - SfxTabPage* ScTpSubTotalGroup2::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup2( pParent, rArgSet ) ); } - - SfxTabPage* ScTpSubTotalGroup3::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup3( pParent, rArgSet ) ); } - - ScTpSubTotalGroup1::ScTpSubTotalGroup1( Window* pParent, const SfxItemSet& rArgSet ) : ScTpSubTotalGroup( pParent, rArgSet ) {} @@ -435,16 +407,12 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS {} - - #define RESET(i) (ScTpSubTotalGroup::DoReset( (i), rArgSet )) void ScTpSubTotalGroup1::Reset( const SfxItemSet& rArgSet ) { RESET(1); } void ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); } void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); } #undef RESET - - #define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), rArgSet )) bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); } bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); } @@ -480,14 +448,10 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, Init(); } - - ScTpSubTotalOptions::~ScTpSubTotalOptions() { } - - void ScTpSubTotalOptions::Init() { const ScSubTotalItem& rSubTotalItem = (const ScSubTotalItem&) @@ -504,16 +468,12 @@ void ScTpSubTotalOptions::Init() FillUserSortListBox(); } - - SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalOptions( pParent, rArgSet ) ); } - - void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) { pBtnPagebreak->Check ( rSubTotalData.bPagebreak ); @@ -539,8 +499,6 @@ void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) CheckHdl( pBtnSort ); } - - bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) { ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt @@ -569,8 +527,6 @@ bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) return true; } - - void ScTpSubTotalOptions::FillUserSortListBox() { ScUserList* pUserLists = ScGlobal::GetUserList(); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index bcac2499a434..b53301e1d81d 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -49,8 +49,6 @@ #include <sfx2/childwin.hxx> #include "reffact.hxx" - - static sal_uInt16 pValueRanges[] = { FID_VALID_MODE, FID_VALID_ERRTEXT, @@ -59,8 +57,6 @@ static sal_uInt16 pValueRanges[] = }; - - ScValidationDlg::ScValidationDlg(Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/) : ScValidationDlgBase(pParent ? pParent : SFX_APP()->GetTopWindow(), @@ -166,8 +162,6 @@ ScValidationDlg::~ScValidationDlg() RemoveRefDlg( false ); } - - namespace { /** Converts the passed ScValidationMode to the position in the list box. */ @@ -301,8 +295,6 @@ bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaSt } // namespace - - ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage( pParent, ScResId( TP_VALIDATION_VALUES ), rArgSet ), maFtAllow ( this, ScResId( FT_ALLOW ) ), @@ -611,8 +603,6 @@ IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd ) return 0; } - - IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl) { sal_uInt16 nLbPos = maLbAllow.GetSelectEntryPos(); @@ -674,8 +664,6 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) } - - // Input Help Page ScTPValidationHelp::ScTPValidationHelp( Window* pParent, @@ -693,36 +681,26 @@ ScTPValidationHelp::ScTPValidationHelp( Window* pParent, Init(); } - - ScTPValidationHelp::~ScTPValidationHelp() { } - - void ScTPValidationHelp::Init() { pTsbHelp->EnableTriState( false ); } - - sal_uInt16* ScTPValidationHelp::GetRanges() { return pValueRanges; } - - SfxTabPage* ScTPValidationHelp::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTPValidationHelp( pParent, rArgSet ) ); } - - void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) { const SfxPoolItem* pItem; @@ -743,8 +721,6 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) pEdInputHelp->SetText( EMPTY_OUSTRING ); } - - bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) { rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() == TRISTATE_TRUE ) ); @@ -754,8 +730,6 @@ bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) return true; } - - // Error Alert Page ScTPValidationError::ScTPValidationError( Window* pParent, @@ -776,14 +750,10 @@ ScTPValidationError::ScTPValidationError( Window* pParent, Init(); } - - ScTPValidationError::~ScTPValidationError() { } - - void ScTPValidationError::Init() { m_pLbAction->SetSelectHdl( LINK( this, ScTPValidationError, SelectActionHdl ) ); @@ -795,23 +765,17 @@ void ScTPValidationError::Init() SelectActionHdl( NULL ); } - - sal_uInt16* ScTPValidationError::GetRanges() { return pValueRanges; } - - SfxTabPage* ScTPValidationError::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTPValidationError( pParent, rArgSet ) ); } - - void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) { const SfxPoolItem* pItem; @@ -839,8 +803,6 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) SelectActionHdl( NULL ); } - - bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) { rArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) ); @@ -851,8 +813,6 @@ bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) return true; } - - IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) { ScValidErrorStyle eStyle = (ScValidErrorStyle) m_pLbAction->GetSelectEntryPos(); @@ -865,8 +825,6 @@ IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) return( 0L ); } - - IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) { Window* pOld = Application::GetDefDialogParent(); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index bfda73213579..d74983558519 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -56,8 +56,6 @@ struct AreaLink_Impl TYPEINIT1(ScAreaLink,::sfx2::SvBaseLink); - - ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, const OUString& rArea, const ScRange& rDest, diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 5e031faec11e..5c9bdd8b2672 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -217,6 +217,4 @@ IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 1698b621a1c5..364f9bb2aae5 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star; - - bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange, bool /* bApi */ ) { @@ -242,8 +240,6 @@ bool ScDBDocFunc::ModifyDBData( const ScDBData& rNewData ) return bDone; } - - bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed, SCTAB aTab ) { //! auch fuer ScDBFunc::RepeatDB benutzen! @@ -426,8 +422,6 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo return bDone; } - - bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, bool bRecord, bool bPaint, bool bApi ) { @@ -669,8 +663,6 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, return true; } - - bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, const ScRange* pAdvSource, bool bRecord, bool bApi ) { @@ -1010,8 +1002,6 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, return true; } - - bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, const ScSortParam* pForceNewSort, bool bRecord, bool bApi ) { @@ -1670,8 +1660,6 @@ void ScDBDocFunc::RefreshPivotTableGroups(ScDPObject* pDPObj) } } - - // database import void ScDBDocFunc::UpdateImport( const OUString& rTarget, const svx::ODataAccessDescriptor& rDescriptor ) @@ -1737,6 +1725,4 @@ void ScDBDocFunc::UpdateImport( const OUString& rTarget, const svx::ODataAccessD } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 62e4e51e1f53..270cad2bdf8e 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -101,8 +101,6 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram } } - - bool ScDBDocFunc::DoImportUno( const ScAddress& rPos, const uno::Sequence<beans::PropertyValue>& aArgs ) { @@ -118,8 +116,6 @@ bool ScDBDocFunc::DoImportUno( const ScAddress& rPos, return true; } - - bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, const svx::ODataAccessDescriptor* pDescriptor, bool bRecord, bool bAddrInsert ) { @@ -665,6 +661,4 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index e4b080b317ca..74c34673531f 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -99,8 +99,6 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- - - IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) { // #i101118# if drawing layer collects the undo actions, add it there @@ -121,8 +119,6 @@ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) return 0; } - - // Zeile ueber dem Range painten (fuer Linien nach AdjustRowHeight) static void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange ) @@ -136,8 +132,6 @@ static void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange ) } } - - bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, bool bPaint ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -169,8 +163,6 @@ bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, bool bPaint ) } - - bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos) { ScDocShellModificator aModificator( rDocShell ); @@ -565,8 +557,6 @@ void ScDocFunc::DetectiveCollectAllSuccs(const ScRangeList& rSrcRanges, vector<S lcl_collectAllPredOrSuccRanges(rSrcRanges, rRefTokens, rDocShell, false); } - - bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags, bool bRecord, bool bApi ) { @@ -678,8 +668,6 @@ bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags, return true; } - - bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType, bool bRecord, bool bApi ) { @@ -734,8 +722,6 @@ bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType, return true; } - - bool ScDocFunc::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -1185,8 +1171,6 @@ bool ScDocFunc::SetCellText( return bSet; } - - bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow ) { ScDocument& rDoc = *rDocShell.GetDocument(); @@ -1206,8 +1190,6 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow ) return true; } - - bool ScDocFunc::SetNoteText( const ScAddress& rPos, const OUString& rText, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -1237,8 +1219,6 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const OUString& rText, bool return true; } - - bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate, bool bApi ) { bool bDone = false; @@ -1299,8 +1279,6 @@ bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, c return bDone; } - - bool ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern, bool bRecord, bool bApi ) { @@ -3347,8 +3325,6 @@ bool ScDocFunc::SetTabBgColor( return bSuccess; } - - //! SetWidthOrHeight - noch doppelt zu ViewFunc !!!!!! //! Probleme: //! - Optimale Hoehe fuer Edit-Zellen ist unterschiedlich zwischen Drucker und Bildschirm @@ -3667,8 +3643,6 @@ bool ScDocFunc::RemovePageBreak( bool bColumn, const ScAddress& rPos, return true; } - - void ScDocFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -3831,8 +3805,6 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, bool bApi ) return true; } - - bool ScDocFunc::ClearItems( const ScMarkData& rMark, const sal_uInt16* pWhich, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -4050,8 +4022,6 @@ bool ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark, return bSuccess; } - - bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, const ScTokenArray* pTokenArray, const OUString& rString, bool bApi, bool bEnglish, const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) @@ -4139,8 +4109,6 @@ bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, return bSuccess; } - - bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, const ScTabOpParam& rParam, bool bRecord, bool bApi ) { @@ -4200,8 +4168,6 @@ bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, return bSuccess; } - - inline ScDirection DirFromFillDir( FillDir eDir ) { if (eDir==FILL_TO_BOTTOM) @@ -4655,8 +4621,6 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e return true; } - - bool ScDocFunc::MergeCells( const ScCellMergeOption& rOption, bool bContents, bool bRecord, bool bApi ) { using ::std::set; @@ -4846,8 +4810,6 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, bool bRecord ) return true; } - - bool ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges, SCTAB nTab ) { return SetNewRangeNames( new ScRangeName(rNewRanges), true, nTab ); @@ -4925,8 +4887,6 @@ void ScDocFunc::ModifyAllRangeNames( const boost::ptr_map<OUString, ScRangeName> SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED)); } - - void ScDocFunc::CreateOneName( ScRangeName& rList, SCCOL nPosX, SCROW nPosY, SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, @@ -5081,8 +5041,6 @@ bool ScDocFunc::CreateNames( const ScRange& rRange, sal_uInt16 nFlags, bool bApi return bDone; } - - bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -5193,8 +5151,6 @@ bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, bool bApi ) return bDone; } - - bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, bool bApi ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -5239,8 +5195,6 @@ bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd return bRet; } - - bool ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, const ScRange& rDestRange, sal_uLong nRefresh, diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 329e38e9634f..0c2b700a8f57 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -166,8 +166,6 @@ static const sal_Char pFilterHtml[] = "HTML (StarCalc)"; static const sal_Char pFilterHtmlWebQ[] = "calc_HTML_WebQuery"; static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)"; - - #define ScDocShell #include "scslots.hxx" @@ -181,8 +179,6 @@ SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), SFXOBJECTSHELL TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: No TypeInfo? - - void ScDocShell::FillClass( SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* /* pAppName */, @@ -211,8 +207,6 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, } } - - void ScDocShell::DoEnterHandler() { ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); @@ -221,8 +215,6 @@ void ScDocShell::DoEnterHandler() SC_MOD()->InputEnterHandler(); } - - SCTAB ScDocShell::GetSaveTab() { SCTAB nTab = 0; @@ -2683,8 +2675,6 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : // InitItems and CalcOutputFactor are called now in Load/ConvertFrom/InitNew } - - ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : SfxObjectShell( i_nSfxCreationFlags ), aDocument ( SCDOCMODE_DOCUMENT, this ), @@ -2732,8 +2722,6 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : // InitItems and CalcOutputFactor are called now in Load/ConvertFrom/InitNew } - - ScDocShell::~ScDocShell() { ResetDrawObjectShell(); // If the Drawing Layer still tries to access it, access it @@ -2770,8 +2758,6 @@ ScDocShell::~ScDocShell() #endif } - - ::svl::IUndoManager* ScDocShell::GetUndoManager() { return aDocument.GetUndoManager(); diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index bbda71a56c23..cbf967aaf74c 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -32,8 +32,6 @@ using namespace com::sun::star; - - bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) { bool bRet = SfxObjectShell::InitNew( xStor ); @@ -62,8 +60,6 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) return bRet; } - - bool ScDocShell::IsEmpty() const { return bIsEmpty; @@ -75,8 +71,6 @@ void ScDocShell::SetEmpty(bool bSet) bIsEmpty = bSet; } - - void ScDocShell::InitItems() { // Fill AllItemSet for Controller with needed Items: @@ -145,8 +139,6 @@ void ScDocShell::InitItems() } } - - void ScDocShell::ResetDrawObjectShell() { ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer(); @@ -154,8 +146,6 @@ void ScDocShell::ResetDrawObjectShell() pDrawLayer->SetObjectShell( NULL ); } - - void ScDocShell::Activate() { } @@ -166,8 +156,6 @@ void ScDocShell::Deactivate() } - - ScDrawLayer* ScDocShell::MakeDrawLayer() { ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer(); diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 5de3b11dcf53..4d9580dea59e 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -63,12 +63,8 @@ #include "markdata.hxx" - - // Redraw - Benachrichtigungen - - void ScDocShell::PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ) { // Broadcast( ScEditViewHint( pEditEngine, rCursorPos ) ); @@ -216,8 +212,6 @@ void ScDocShell::UpdatePaintExt( sal_uInt16& rExtFlags, SCCOL nStartCol, SCROW n UpdatePaintExt( rExtFlags, ScRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ) ); } - - void ScDocShell::LockPaint_Impl(bool bDoc) { if ( !pPaintLockData ) @@ -337,8 +331,6 @@ void ScDocShell::UnlockDocument() } } - - void ScDocShell::SetInplace( bool bInplace ) { if (bIsInplace != bInplace) @@ -403,8 +395,6 @@ double ScDocShell::GetOutputFactor() const return nPrtToScreenFactor; } - - void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and Load { // Einstellungen aus dem SpellCheckCfg kommen in Doc- und ViewOptions @@ -439,8 +429,6 @@ void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and L aDocument.SetLanguage( (LanguageType) nDefLang, (LanguageType) nCjkLang, (LanguageType) nCtlLang ); } - - Printer* ScDocShell::GetDocumentPrinter() // fuer OLE { return aDocument.GetPrinter(); @@ -568,8 +556,6 @@ sal_uInt16 ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlag return 0; } - - ScChangeAction* ScDocShell::GetChangeAction( const ScAddress& rPos ) { ScChangeTrack* pTrack = GetDocument()->GetChangeTrack(); @@ -668,8 +654,6 @@ void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pP delete pDlg; } - - void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) { ScChangeTrack* pTrack = aDocument.GetChangeTrack(); @@ -731,12 +715,8 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) SetDocumentModified(); } - - // Merge (Aenderungen zusammenfuehren) - - static inline sal_Bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, sal_Bool bIgnore100Sec ) { return pA && pB && diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index c0941fece774..c993c1127d1e 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -98,8 +98,6 @@ using namespace ::com::sun::star; #include "sheetevents.hxx" #include <documentlinkmgr.hxx> - - #define IS_SHARE_HEADER(set) \ ((SfxBoolItem&) \ ((SvxSetItem&)(set).Get(ATTR_PAGE_HEADERSET)).GetItemSet(). \ @@ -114,8 +112,6 @@ using namespace ::com::sun::star; #define SC_PREVIEW_SIZE_Y 12400 - - void ScDocShell::Execute( SfxRequest& rReq ) { // SID_SC_RANGE (Range), @@ -1114,8 +1110,6 @@ void ScDocShell::Execute( SfxRequest& rReq ) } - - void UpdateAcceptChangesDialog() { // update "accept changes" dialog @@ -1129,8 +1123,6 @@ void UpdateAcceptChangesDialog() } } - - bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQueryIfProtected ) { bool bDone = false; @@ -1195,8 +1187,6 @@ bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQuer } - - void ScDocShell::DoRecalc( bool bApi ) { bool bDone = false; @@ -1272,8 +1262,6 @@ void ScDocShell::DoHardRecalc( bool /* bApi */ ) PostPaintGridAll(); } - - void ScDocShell::DoAutoStyle( const ScRange& rRange, const OUString& rStyle ) { ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool(); @@ -1297,8 +1285,6 @@ void ScDocShell::DoAutoStyle( const ScRange& rRange, const OUString& rStyle ) } } - - void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) { sal_uInt16 nId = rHint.GetHint(); @@ -2198,8 +2184,6 @@ bool ScDocShell::DdeSetData( const OUString& rItem, return pObj; } - - ScViewData* ScDocShell::GetViewData() { SfxViewShell* pCur = SfxViewShell::Current(); @@ -2207,8 +2191,6 @@ ScViewData* ScDocShell::GetViewData() return pViewSh ? pViewSh->GetViewData() : NULL; } - - SCTAB ScDocShell::GetCurTab() { //! this must be made non-static and use a ViewShell from this document! @@ -2248,8 +2230,6 @@ SfxBindings* ScDocShell::GetViewBindings() return NULL; } - - ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo ) // static { ScDocShell* pFound = NULL; @@ -2271,8 +2251,6 @@ ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo ) // static return pFound; } - - IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ) { OSL_ENSURE( _pFileDlg, "ScDocShell::DialogClosedHdl(): no file dialog" ); diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 5ad9284e79d9..a743c3def4ad 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -67,8 +67,6 @@ using ::std::auto_ptr; using ::std::vector; - - // former viewfunc/dbfunc methods @@ -291,8 +289,6 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe aDocument.SetAnonymousDBData(nTab, pNoNameData); } - - if ( pUndoColl ) { aDocument.CompileDBFormula( false ); // CompileFormulaString diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 4c573f4cfe7e..6853ff2ea99e 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -66,8 +66,6 @@ struct ScStylePair // STATIC DATA ----------------------------------------------------------- - - // Ole diff --git a/sc/source/ui/docshell/docsh7.cxx b/sc/source/ui/docshell/docsh7.cxx index 2c21ac0b9206..3400001d3561 100644 --- a/sc/source/ui/docshell/docsh7.cxx +++ b/sc/source/ui/docshell/docsh7.cxx @@ -19,13 +19,9 @@ #include "docsh.hxx" - - void ScDocShell::GetDrawObjState( SfxItemSet & /* rSet */ ) { // SID_SC_ACTIVEOBJECT (SelectedObject) - removed (old Basic) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index e35989354207..28bbecac3eeb 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -79,8 +79,6 @@ using namespace com::sun::star; using ::std::vector; - - #define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" //! move to a header file? @@ -239,8 +237,6 @@ bool ScDocShell::IsDocument( const INetURLObject& rURL ) return bRet; } - - #ifndef DISABLE_DBCONNECTIVITY static void lcl_setScalesToColumns(ScDocument& rDoc, const vector<long>& rScales) diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx index 2a575aa02611..aab817d0d04e 100644 --- a/sc/source/ui/docshell/editable.cxx +++ b/sc/source/ui/docshell/editable.cxx @@ -67,8 +67,6 @@ ScEditableTester::ScEditableTester( ScViewFunc* pView ) : TestView( pView ); } - - void ScEditableTester::TestBlock( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { @@ -134,8 +132,6 @@ void ScEditableTester::TestView( ScViewFunc* pView ) } } - - sal_uInt16 ScEditableTester::GetMessageId() const { if (mbIsEditable) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 76b394939bfa..257291248d18 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -243,8 +243,6 @@ void removeRangeNamesBySrcDoc(ScRangeName& rRanges, sal_uInt16 nFileId) } - - ScExternalRefCache::Table::Table() : meReferenced( REFERENCED_MARKED ) // Prevent accidental data loss due to lack of knowledge. @@ -472,22 +470,16 @@ ScExternalRefCache::TokenRef ScExternalRefCache::Table::getEmptyOrNullToken( return TokenRef(); } - - ScExternalRefCache::TableName::TableName(const OUString& rUpper, const OUString& rReal) : maUpperName(rUpper), maRealName(rReal) { } - - ScExternalRefCache::CellFormat::CellFormat() : mbIsSet(false), mnType(NUMBERFORMAT_ALL), mnIndex(0) { } - - ScExternalRefCache::ScExternalRefCache() {} ScExternalRefCache::~ScExternalRefCache() {} @@ -1228,8 +1220,6 @@ ScExternalRefCache::DocItem* ScExternalRefCache::getDocItem(sal_uInt16 nFileId) return &itrDoc->second; } - - ScExternalRefLink::ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId, const OUString& rFilter) : ::sfx2::SvBaseLink(::sfx2::LINKUPDATE_ONCALL, FORMAT_FILE), mnFileId(nFileId), @@ -1298,8 +1288,6 @@ IMPL_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl) return 0; } - - static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument* pSrcDoc, ScRefCellValue& rCell ) { if (rCell.hasEmptyValue()) @@ -1574,8 +1562,6 @@ ScExternalRefCache::TableTypeRef ScExternalRefManager::getCacheTable( return maRefCache.getCacheTable(nFileId, rTabName, bCreateNew, pnIndex); } - - ScExternalRefManager::LinkListener::LinkListener() { } @@ -1584,8 +1570,6 @@ ScExternalRefManager::LinkListener::~LinkListener() { } - - ScExternalRefManager::ApiGuard::ApiGuard(ScDocument* pDoc) : mpMgr(pDoc->GetExternalRefManager()), mbOldInteractionEnabled(mpMgr->mbUserInteractionEnabled) @@ -1600,8 +1584,6 @@ ScExternalRefManager::ApiGuard::~ApiGuard() mpMgr->mbUserInteractionEnabled = mbOldInteractionEnabled; } - - void ScExternalRefManager::getAllCachedTableNames(sal_uInt16 nFileId, vector<OUString>& rTabNames) const { maRefCache.getAllTableNames(nFileId, rTabNames); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 6fa8b4fac2a5..e048ffef0f9a 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -56,8 +56,6 @@ #include <boost/scoped_ptr.hpp> - - // We don't want to end up with 2GB read in one line just because of malformed // multiline fields, so chop it _somewhere_, which is twice supported columns // times maximum cell content length, 2*1024*64K=128M, and because it's @@ -206,8 +204,6 @@ bool ScImportExport::IsFormatSupported( sal_uLong nFormat ) } - - // Vorbereitung fuer Undo: Undo-Dokument erzeugen @@ -264,8 +260,6 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) } - - bool ScImportExport::ImportData( const OUString& /* rMimeType */, const ::com::sun::star::uno::Any & /* rValue */ ) { @@ -863,8 +857,6 @@ static inline void lcl_WriteSimpleString( SvStream& rStrm, const OUString& rStri } - - bool ScImportExport::Text2Doc( SvStream& rStrm ) { bool bOk = true; @@ -960,8 +952,6 @@ bool ScImportExport::Text2Doc( SvStream& rStrm ) // erweiterter Ascii-Import - - static bool lcl_PutString( ScDocumentImport& rDocImport, SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rStr, sal_uInt8 nColFormat, SvNumberFormatter* pFormatter, bool bDetectNumFormat, diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 9d31d398c850..6de5358fd9f2 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -36,8 +36,6 @@ using ::std::list; using ::std::for_each; using ::std::pair; - - /** * A simple container to keep track of cells that depend on basic modules * changes. We don't check for duplicates at insertion time; instead, we @@ -92,8 +90,6 @@ private: }; - - ScMacroManager::ScMacroManager(ScDocument* pDoc) : mpDepTracker(new ScUserMacroDepTracker), mpDoc(pDoc) diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index 5759666d14da..240b1ad7b71c 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -28,8 +28,6 @@ #include "sc.hrc" - - static void lcl_InvalidateOutliner( SfxBindings* pBindings ) { if ( pBindings ) @@ -43,8 +41,6 @@ static void lcl_InvalidateOutliner( SfxBindings* pBindings ) } } - - //! PaintWidthHeight zur DocShell verschieben? static void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab, @@ -78,8 +74,6 @@ static void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab, rDocShell.PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts ); } - - bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, bool bColumns, bool bRecord, bool bApi ) { bool bSuccess = false; @@ -265,8 +259,6 @@ bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, bool bRecord ) return bSuccess; } - - bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, bool bRecord ) { SCCOL nStartCol = rRange.aStart.Col(); @@ -331,8 +323,6 @@ bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, bool bRecord ) return true; } - - bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, bool bRecord, bool bPaint ) { @@ -426,8 +416,6 @@ bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool bColumns, sal_uInt16 nLevel return true; } - - bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, bool bRecord ) { bool bDone = false; @@ -624,8 +612,6 @@ bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, bool bRecord ) return bDone; } - - bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, bool bRecord, bool bPaint ) { @@ -771,6 +757,4 @@ bool ScOutlineDocFunc::HideOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx index cad02c397574..b0c6110490db 100644 --- a/sc/source/ui/docshell/pagedata.cxx +++ b/sc/source/ui/docshell/pagedata.cxx @@ -21,8 +21,6 @@ #include "pagedata.hxx" - - ScPrintRangeData::ScPrintRangeData() { nPagesX = nPagesY = 0; @@ -64,8 +62,6 @@ void ScPrintRangeData::SetPagesY( size_t nCount, const SCROW* pData ) nPagesY = nCount; } - - ScPageBreakData::ScPageBreakData(size_t nMax) { nUsed = 0; @@ -121,6 +117,4 @@ void ScPageBreakData::AddPages() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx index 9db2dfe7a594..58a31495fbfa 100644 --- a/sc/source/ui/docshell/pntlock.cxx +++ b/sc/source/ui/docshell/pntlock.cxx @@ -19,8 +19,6 @@ #include "pntlock.hxx" - - ScPaintLockData::ScPaintLockData() : nLevel( 0 ), nDocLevel( 0 ), @@ -43,6 +41,4 @@ void ScPaintLockData::AddRange( const ScRange& rRange, sal_uInt16 nP ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 5f1d8d18d8e9..71d1368c3872 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -29,8 +29,6 @@ using namespace formula; - - static bool lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const OUString& rName ) { if (pDocSh) @@ -258,6 +256,4 @@ void ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxx index 3b73fc9e41d2..1a9da440b651 100644 --- a/sc/source/ui/docshell/sizedev.cxx +++ b/sc/source/ui/docshell/sizedev.cxx @@ -25,8 +25,6 @@ #include "scmod.hxx" #include "inputopt.hxx" - - ScSizeDeviceProvider::ScSizeDeviceProvider( ScDocShell* pDocSh ) { sal_Bool bTextWysiwyg = SC_MOD()->GetInputOptions().GetTextWysiwyg(); diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index c67fada503dd..cf28198beffb 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -56,8 +56,6 @@ struct TableLink_Impl TYPEINIT1(ScTableLink, ::sfx2::SvBaseLink); - - ScTableLink::ScTableLink(ScDocShell* pDocSh, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, sal_uLong nRefresh ): diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index de9afa62bd45..d1dbac731dc3 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -20,16 +20,12 @@ #undef SC_DLLIMPLEMENTATION - - #include "document.hxx" #include "docsh.hxx" #include "scresid.hxx" #include "tpstat.hxx" - - // Dokumentinfo-Tabpage: @@ -38,8 +34,6 @@ SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet ) return new ScDocStatPage( pParent, rSet ); } - - ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "StatisticsInfoPage", "modules/scalc/ui/statisticsinfopage.ui", rSet ) { @@ -62,26 +56,18 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) } - - ScDocStatPage::~ScDocStatPage() { } - - bool ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ ) { return false; } - - void ScDocStatPage::Reset( const SfxItemSet& /* rSet */ ) { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index e908d75dae95..faa86dd3fc4f 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -59,8 +59,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/frame/XFrame.hpp> - - TYPEINIT1( ScDrawShell, SfxShell ); SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) ) diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 99beae50b91c..29872c588e37 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -56,8 +56,6 @@ sal_uInt16 ScGetFontWorkId(); // in drtxtob using namespace com::sun::star; - - ScDrawShell::ScDrawShell( ScViewData* pData ) : SfxShell(pData->GetViewShell()), pViewData( pData ), @@ -398,8 +396,6 @@ void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet ) } - - void ScDrawShell::Activate (const bool bMDI) { (void)bMDI; @@ -411,8 +407,6 @@ void ScDrawShell::Activate (const bool bMDI) } - - ::rtl::OUString ScDrawShell::GetSidebarContextName (void) { return sfx2::sidebar::EnumContext::GetContextName( diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx index 85f481984244..16976c0b2489 100644 --- a/sc/source/ui/drawfunc/drawsh4.cxx +++ b/sc/source/ui/drawfunc/drawsh4.cxx @@ -32,8 +32,6 @@ #include "sc.hrc" - - void ScDrawShell::GetFormTextState(SfxItemSet& rSet) { const SdrObject* pObj = NULL; @@ -99,6 +97,4 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 52e524dcf3a6..d6e0366a2305 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -60,8 +60,6 @@ using namespace com::sun::star; - - void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink { ScDrawView* pView = pViewData->GetScDrawView(); @@ -243,8 +241,6 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) sal_uInt16 ScGetFontWorkId(); - - // Funktionen auf Drawing-Objekten @@ -649,8 +645,6 @@ IMPL_LINK( ScDrawShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog ) return 1; // name is valid } - - void ScDrawShell::ExecFormText(SfxRequest& rReq) { ScDrawView* pDrView = pViewData->GetScDrawView(); @@ -667,8 +661,6 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq) } } - - void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq ) { ScViewFunc* pView = pViewData->GetView(); @@ -712,6 +704,4 @@ ScDrawView* ScDrawShell::GetDrawView() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 6085d42134ac..28028af7f1f7 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -90,8 +90,6 @@ SFX_IMPL_INTERFACE( ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL) TYPEINIT1( ScDrawTextObjectBar, SfxShell ); - - // abschalten der nicht erwuenschten Acceleratoren: void ScDrawTextObjectBar::StateDisableItems( SfxItemSet &rSet ) @@ -141,12 +139,8 @@ ScDrawTextObjectBar::~ScDrawTextObjectBar() } } - - // Funktionen - - void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) { ScDrawView* pView = pViewData->GetScDrawView(); @@ -544,12 +538,8 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) } } - - // Attribute - - void ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq ) { // Unterstreichung diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 24b6d15ce46b..9e5dbb736a0d 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -45,8 +45,6 @@ #include "drwtrans.hxx" #include "drwlayer.hxx" - - sal_uInt16 ScGetFontWorkId() { return SvxFontWorkChildWindow::GetChildWindowId(); @@ -268,6 +266,4 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 369aa8cc9393..ab6ca7ea287b 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -36,8 +36,6 @@ #include <math.h> - - FuConstCustomShape::FuConstCustomShape( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq ) { diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 4b8bfcbd6a7f..23591c7b74d0 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -33,8 +33,6 @@ #include "scresid.hxx" - - /************************************************************************* |* |* Konstruktor diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 407b39a0bd75..09c368ef6a42 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -37,8 +37,6 @@ //! fusel,fuconstr,futext - zusammenfassen! #define SC_MAXDRAGMOVE 3 - - /************************************************************************* |* |* Konstruktor @@ -367,6 +365,4 @@ void FuConstruct::Deactivate() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index ab88c9df3ff5..57c75dfd8890 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star; - - void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage ) { if ( !rPage.Width() || !rPage.Height() ) @@ -92,8 +90,6 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r rPos.X() = -rPos.X() - rSize.Width(); // back to real position } - - static void lcl_InsertGraphic( const Graphic& rGraphic, const OUString& rFileName, const OUString& rFilterName, sal_Bool bAsLink, sal_Bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView ) @@ -180,8 +176,6 @@ static void lcl_InsertGraphic( const Graphic& rGraphic, pObj->SetGraphicLink( rFileName, ""/*TODO?*/, rFilterName ); } - - static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView, const Size& rPrefSize, bool const bLink ) diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 6de0e8ab62e8..a369d39affc8 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -21,8 +21,6 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/beans/XPropertySet.hpp> - - #include <toolkit/helper/vclunohelper.hxx> #include <sot/exchange.hxx> #include <svl/globalnameitem.hxx> diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx index e620d98b1b07..19313d8ebc96 100644 --- a/sc/source/ui/drawfunc/fumark.cxx +++ b/sc/source/ui/drawfunc/fumark.cxx @@ -31,8 +31,6 @@ #include "drawview.hxx" #include "markdata.hxx" - - /************************************************************************* |* |* Funktion zum Aufziehen eines Rechtecks @@ -257,6 +255,4 @@ void FuMarkRect::ForcePointer(const MouseEvent* /* pMEvt */) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index feedc55d5f3f..85fae0274822 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -48,16 +48,12 @@ #include "docuno.hxx" #include "docsh.hxx" - - // Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten //! fusel,fuconstr,futext - zusammenfassen! #define SC_MAXDRAGMOVE 3 // Min necessary mouse motion for normal dragging #define SC_MINDRAGMOVE 2 - - using namespace com::sun::star; /************************************************************************* diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index d19236b9991f..8f753aae6d3d 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -37,8 +37,6 @@ #include "drawview.hxx" #include <svx/sdrhittesthelper.hxx> - - inline long Diff( const Point& rP1, const Point& rP2 ) { long nX = rP1.X() - rP2.X(); @@ -166,6 +164,4 @@ void FuSelection::ActivateNoteHandles(SdrObject* pObject) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index fed6aa1b2324..c3409a4daef9 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -46,8 +46,6 @@ //! fusel,fuconstr,futext - zusammenfassen! #define SC_MAXDRAGMOVE 3 - - static void lcl_InvalidateAttribs( SfxBindings& rBindings ) { rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT ); @@ -567,8 +565,6 @@ void FuText::ForcePointer(const MouseEvent* /* pMEvt */) pViewShell->SetActivePointer( aNewPointer ); } - - /************************************************************************* |* |* Tastaturereignisse bearbeiten @@ -595,8 +591,6 @@ bool FuText::KeyInput(const KeyEvent& rKEvt) return bReturn; } - - /************************************************************************* |* |* Function aktivieren diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index e043ec1a8374..86e5c515f8e6 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.cxx @@ -24,8 +24,6 @@ #include "futext.hxx" #include "tabvwsh.hxx" - - SdrOutliner* FuText::MakeOutliner() { ScViewData* pViewData = pViewShell->GetViewData(); @@ -45,6 +43,4 @@ SdrOutliner* FuText::MakeOutliner() return pOutl; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index fcbeada6a061..c59927b80223 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -40,8 +40,6 @@ #include "dwfunctr.hrc" #include "dwfunctr.hxx" - - SFX_IMPL_DOCKINGWINDOW_WITHID( ScFunctionChildWindow, FID_FUNCTION_BOX ) /************************************************************************* @@ -801,8 +799,6 @@ void ScFunctionDockWin::UpdateFunctionList() } } - - pAllFuncList->SetUpdateMode( true ); if ( pAllFuncList->GetEntryCount() > 0 ) @@ -935,8 +931,6 @@ void ScFunctionDockWin::DoEnter() } - - /************************************************************************* #* Handle: SelHdl #*------------------------------------------------------------------------ @@ -1100,8 +1094,6 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo) } } - - void ScFunctionDockWin::FillInfo(SfxChildWinInfo& rInfo) const { SfxDockingWindow::FillInfo(rInfo); diff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx index 4ed9680305dc..c97fa2bf2def 100644 --- a/sc/source/ui/formdlg/formdata.cxx +++ b/sc/source/ui/formdlg/formdata.cxx @@ -19,8 +19,6 @@ #include "formdata.hxx" - - ScFormEditData::ScFormEditData() : formula::FormEditData() , pInputHandler(NULL) @@ -46,6 +44,4 @@ void ScFormEditData::SaveValues() pParent = pTemp; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 7c3c58ae1531..f8bd44e21607 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -63,8 +63,6 @@ ScDocument* ScFormulaDlg::pDoc = NULL; ScAddress ScFormulaDlg::aCursorPos; - - // Initialisierung / gemeinsame Funktionen fuer Dialog @@ -365,8 +363,6 @@ bool ScFormulaDlg::calculateValue( const OUString& rStrExp, OUString& rStrResult return true; } - - // virtuelle Methoden von ScAnyRefDlg: void ScFormulaDlg::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) { diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index 8ed0dce25906..2b8e5ab61d2f 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -236,8 +236,6 @@ void ScPrivatSplit::SetYRange(Range cRgeY) aYMovingRange=cRgeY; } - - /************************************************************************* #* Member: GetDeltaY #*------------------------------------------------------------------------ @@ -371,8 +369,6 @@ void ScPrivatSplit::ImplInitSettings( bool bFont, bool bForeground, bool bBackgr Invalidate(); } - - void ScPrivatSplit::StateChanged( StateChangedType nType ) { if ( (nType == STATE_CHANGE_ZOOM) || @@ -395,8 +391,6 @@ void ScPrivatSplit::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); } - - void ScPrivatSplit::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 2780f3571d3f..0afd3fd4c31c 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -152,8 +152,6 @@ public: bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 153f3c1b9d94..bd061e4a8f0b 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_ACCESSIBLECSVCONTROL_HXX #define _SC_ACCESSIBLECSVCONTROL_HXX @@ -34,8 +32,6 @@ #include "AccessibleContextBase.hxx" - - class ScCsvControl; namespace utl { class AccessibleStateSetHelper; } @@ -126,8 +122,6 @@ protected: }; - - class ScCsvRuler; typedef ::cppu::ImplHelper1< @@ -299,8 +293,6 @@ private: }; - - class ScCsvGrid; typedef ::cppu::ImplHelper2< @@ -544,8 +536,6 @@ private: }; - - /** Accessible class representing a cell of the CSV grid control. */ class ScAccessibleCsvCell : public ScAccessibleCsvControl, public accessibility::AccessibleStaticTextBase { @@ -648,8 +638,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index cac2365084a8..e01ee9d0a2ff 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -38,8 +38,6 @@ class ScCsvViewForwarder; class ScAccessibleCell; - - class ScAccessibleTextData : public SfxListener { public: @@ -67,8 +65,6 @@ private: }; - - class ScAccessibleCellBaseTextData : public ScAccessibleTextData, public ScCellTextData { @@ -85,8 +81,6 @@ public: }; - - // ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object class ScAccessibleCellTextData : public ScAccessibleCellBaseTextData @@ -122,8 +116,6 @@ private: }; - - class ScAccessibleEditObjectTextData : public ScAccessibleTextData { public: @@ -155,8 +147,6 @@ protected: }; - - class ScAccessibleEditLineTextData : public ScAccessibleEditObjectTextData { public: @@ -179,8 +169,6 @@ private: }; - - class ScAccessiblePreviewCellTextData : public ScAccessibleCellBaseTextData { public: @@ -208,8 +196,6 @@ private: }; - - class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextData { public: @@ -240,8 +226,6 @@ private: }; - - class ScAccessibleHeaderTextData : public ScAccessibleTextData { public: @@ -273,8 +257,6 @@ private: }; - - class ScAccessibleNoteTextData : public ScAccessibleTextData { public: @@ -306,8 +288,6 @@ private: }; - - class ScAccessibleCsvTextData : public ScAccessibleTextData { private: @@ -345,8 +325,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index d590cf5e4cb6..ba0621630b31 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -156,8 +156,6 @@ private: DECL_LINK( ReOpenTimerHdl, void*); DECL_LINK( ColCompareHdl, SvSortData*); - - protected: void RejectFiltered(); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index e272aefa09df..af1a3aa71048 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -103,8 +103,6 @@ public: bool CanInputDone( bool bForced ){ return pRefEdit && (bForced || !pRefBtn); } }; - - class SC_DLLPUBLIC ScRefHandler : public IAnyRefDialog { @@ -174,8 +172,6 @@ public: }; - - class ScRefHdlModalImpl : public ModalDialog, public ScRefHandler { public: diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index e0bf70b956fe..1c2c681075f4 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -30,8 +30,6 @@ class ScDocument; class ScViewData; - - class ScPrintAreasDlg : public ScAnyRefDlg { public: @@ -84,8 +82,6 @@ private: #endif }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx index 8630a4e50b88..8e7c6a2e9218 100644 --- a/sc/source/ui/inc/asciiopt.hxx +++ b/sc/source/ui/inc/asciiopt.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef SC_ASCIIOPT_HXX #define SC_ASCIIOPT_HXX @@ -33,8 +31,6 @@ #include "csvtablebox.hxx" #include "i18nlangtag/lang.h" - - class ScAsciiOptions { private: diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 6d4854d40e8c..3023be44eac2 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -26,8 +26,6 @@ class Window; class SfxViewFrame; class SfxItemSet; - - class ScAttrDlg : public SfxTabDialog { public: diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx index a553941121f3..3efcc6b2f110 100644 --- a/sc/source/ui/inc/auditsh.hxx +++ b/sc/source/ui/inc/auditsh.hxx @@ -44,8 +44,6 @@ public: void GetState(SfxItemSet& rSet); }; - - #endif diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index aa96dbcf29e8..f75480ce3ec9 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -38,12 +38,8 @@ class ScAutoFmtPreview; // s.u. class SvNumberFormatter; class ScDocument; - - enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; - - class SC_DLLPUBLIC ScAutoFmtPreview : public Window { public: diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index d6db458abdfb..34651cbb2b9e 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -57,8 +57,6 @@ public: void ExecuteAllNow(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx index 54f7f07d55f1..5222ab42b8f8 100644 --- a/sc/source/ui/inc/cbutton.hxx +++ b/sc/source/ui/inc/cbutton.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef SC_CBUTTON_HXX #define SC_CBUTTON_HXX @@ -28,8 +26,6 @@ class OutputDevice; - - class ScDDComboBoxButton { public: diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index 879c6feac487..fd723aae4107 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -47,8 +47,6 @@ public: SdrOle2Obj* GetDrawObj(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 7cc7628e3be2..f0e3513523b4 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -32,8 +32,6 @@ class ScViewData; - - enum ScConflictAction { SC_CONFLICT_ACTION_NONE, @@ -43,8 +41,6 @@ enum ScConflictAction typedef ::std::vector< sal_uLong > ScChangeActionList; - - // struct ScConflictsListEntry @@ -59,12 +55,8 @@ struct ScConflictsListEntry }; - - typedef ::std::vector< ScConflictsListEntry > ScConflictsList; - - // class ScConflictsListHelper @@ -83,8 +75,6 @@ public: ScChangeActionMergeMap* pSharedMap, ScChangeActionMergeMap* pOwnMap ); }; - - // class ScConflictsFinder @@ -110,8 +100,6 @@ public: bool Find(); }; - - // class ScConflictsResolver @@ -129,8 +117,6 @@ public: bool bHandleContentAction, bool bHandleNonContentAction ); }; - - // class ScConflictsDlg diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 38571b998cd7..9066c4ddb37a 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -34,8 +34,6 @@ class ScRangeUtil; class ScAreaData; - - class ScConsolidateDlg : public ScAnyRefDlg { public: @@ -106,8 +104,6 @@ private: #endif // _CONSDLG_CXX }; - - #endif // SC_CONSDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 4c91760e8fc5..2bca85f758eb 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -159,8 +159,6 @@ public: }; - - #endif // SC_NAVIPI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index cd3adc52b097..3acd915a88c2 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -31,8 +31,6 @@ class ScViewData; class ScDocument; - - class ScColRowNameRangesDlg : public ScAnyRefDlg { public: @@ -95,8 +93,6 @@ private: #endif }; - - #endif // SC_CRNRDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 3537f629920c..9f5ab5c33587 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_CSVCONTROL_HXX #define _SC_CSVCONTROL_HXX @@ -36,8 +34,6 @@ namespace com { namespace sun { namespace star { namespace accessibility { } } } } - - /** Minimum character count for a column in separators mode. */ const sal_Int32 CSV_MINCOLWIDTH = 8; /** Maximum length of a cell string. */ @@ -69,8 +65,6 @@ const sal_uInt8 SC_COL_SKIP = 9; const sal_uInt8 SC_COL_ENGLISH = 10; - - /** Exported data of a column (data used in the dialog). */ struct ScCsvExpData { @@ -85,8 +79,6 @@ struct ScCsvExpData typedef ::std::vector< ScCsvExpData > ScCsvExpDataVec; - - /** Specifies which element should be used to perform an action. */ enum ScMoveMode { @@ -100,8 +92,6 @@ enum ScMoveMode }; - - /** Flags for comparison of old and new control layout data. */ typedef sal_uInt32 ScCsvDiff; @@ -122,8 +112,6 @@ const ScCsvDiff CSV_DIFF_VERTICAL = CSV_DIFF_LINECOUNT | CSV_DIFF_LINEOFFS const ScCsvDiff CSV_DIFF_CURSOR = CSV_DIFF_RULERCURSOR | CSV_DIFF_GRIDCURSOR; - - /** A structure containing all layout data valid for both ruler and data grid (i.e. scroll position or column width). */ struct ScCsvLayoutData @@ -169,8 +157,6 @@ inline bool operator!=( const ScCsvLayoutData& rData1, const ScCsvLayoutData& rD } - - /** Enumeration of possible commands to change any settings of the CSV controls. @descr Controls have to send commands instead of changing their settings directly. This helps to keep the different controls consistent to each other. @@ -215,8 +201,6 @@ enum ScCsvCmdType }; - - /** Data for a CSV control command. The stored position data is aways character based, it's never a column index (required for internal consistency). */ class ScCsvCmd @@ -243,8 +227,6 @@ inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPar } - - /** Base class for the CSV ruler and the data grid control. Implements command handling. */ class SC_DLLPUBLIC ScCsvControl : public Control { @@ -417,8 +399,6 @@ protected: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 55a374ff6ea6..c8a6b0553dcd 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_CSVGRID_HXX #define _SC_CSVGRID_HXX @@ -33,8 +31,6 @@ #include "csvsplits.hxx" - - namespace svtools { class ColorConfig; } class EditEngine; class ScEditEngineDefaulter; @@ -42,16 +38,12 @@ class ScAsciiOptions; class ScAccessibleCsvControl; - - const sal_uInt8 CSV_COLFLAG_NONE = 0x00; /// Nothing set. const sal_uInt8 CSV_COLFLAG_SELECT = 0x01; /// Column is selected. const sal_uInt32 CSV_COLUMN_INVALID = CSV_VEC_NOTFOUND; - - /** This struct contains the state of one table column. */ struct ScCsvColState { @@ -78,13 +70,9 @@ inline void ScCsvColState::Select( bool bSel ) } - - typedef ::std::vector< ScCsvColState > ScCsvColStateVec; - - /** A data grid control for the CSV import dialog. The design of this control simulates a Calc spreadsheet with row and column headers. */ class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener @@ -347,8 +335,6 @@ protected: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index be81d3db8a54..e3cfd831d888 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_CSVRULER_HXX #define _SC_CSVRULER_HXX @@ -30,8 +28,6 @@ class ScAccessibleCsvControl; - - /** A ruler control for the CSV import dialog. Supports setting and moving splits (which divide lines of data into several columns). */ class SC_DLLPUBLIC ScCsvRuler : public ScCsvControl @@ -185,8 +181,6 @@ protected: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvsplits.hxx b/sc/source/ui/inc/csvsplits.hxx index 18b8888f4adf..662082d5370a 100644 --- a/sc/source/ui/inc/csvsplits.hxx +++ b/sc/source/ui/inc/csvsplits.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_CSVSPLITS_HXX #define _SC_CSVSPLITS_HXX @@ -27,16 +25,12 @@ #include <vector> - - /** Constant for an invalid vector index. */ const sal_uInt32 CSV_VEC_NOTFOUND = SAL_MAX_UINT32; /** Constant for an invalid ruler position. */ const sal_Int32 CSV_POS_INVALID = -1; - - /** A vector of column splits that supports inserting, removing and moving splits. */ class ScCsvSplits { @@ -89,8 +83,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index c5e33311887c..27b1d8099330 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_CSVTABLEBOX_HXX #define _SC_CSVTABLEBOX_HXX @@ -144,8 +142,6 @@ protected: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index c4aa3ca6a97a..2992ab38ab59 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -27,8 +27,6 @@ #include <vcl/lstbox.hxx> #include <com/sun/star/uno/Sequence.hxx> - - class ScDataPilotSourceTypeDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index a0b39fc6f58b..98385b147f03 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -107,8 +107,6 @@ public: void RefreshPivotTableGroups(ScDPObject* pDPObj); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 704fee82d2a4..5d4b8f0572d2 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -36,8 +36,6 @@ class ScDPSaveData; struct ScDPNumGroupInfo; struct ScSubTotalParam; - - class ScDBFunc : public ScViewFunc { private: @@ -122,8 +120,6 @@ public: static sal_uInt16 DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 85b66f6a1b23..7900f8cb183b 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -33,8 +33,6 @@ class ScViewData; class ScDocument; - - class ScDbNameDlg : public ScAnyRefDlg { public: @@ -102,8 +100,6 @@ private: DECL_LINK( AssModifyHdl, void * ); }; - - #endif // SC_DBNAMDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index 59eaf1dce39d..f39913c2b7a1 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.hxx @@ -28,8 +28,6 @@ #include "global.hxx" - - class ScDeleteCellDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index 1833a10117a5..4831a3eb910d 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -24,8 +24,6 @@ #include <vcl/button.hxx> #include "global.hxx" - - class ScDeleteContentsDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 9da6caf6b715..623a507ad432 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -76,8 +76,6 @@ struct DocShell_Impl; typedef ::boost::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap; - - //enum ScDBFormat { SC_FORMAT_SDF, SC_FORMAT_DBF }; // Extra flags for Repaint diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index dfdca9c8f03f..e0ee7348016d 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -28,8 +28,6 @@ #include "editfield.hxx" #include "dpgroup.hxx" - - class ScDPGroupEditHelper { public: @@ -57,8 +55,6 @@ private: Edit* mpEdValue; }; - - class ScDPNumGroupEditHelper : public ScDPGroupEditHelper { public: @@ -76,8 +72,6 @@ private: ScDoubleField* mpEdValue; }; - - class ScDPDateGroupEditHelper : public ScDPGroupEditHelper { public: @@ -97,8 +91,6 @@ private: }; - - class ScDPNumGroupDlg : public ModalDialog { public: @@ -119,8 +111,6 @@ private: ScDPNumGroupEditHelper maEndHelper; }; - - class ScDPDateGroupDlg : public ModalDialog { public: @@ -150,8 +140,6 @@ private: ScDPDateGroupEditHelper maEndHelper; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 8b9ad3dcf48d..166a40f6b3c3 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -86,8 +86,6 @@ public: ::rtl::OUString GetSidebarContextName (void); }; - - #endif diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index a2acb1b69690..717a32f80318 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -165,8 +165,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index 97f916ea0659..1930a23bc774 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -73,8 +73,6 @@ private: bool IsNoteEdit(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index 7f7534c735d7..62ac77705fff 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -22,8 +22,6 @@ #include <vcl/field.hxx> - - /** An edit control that contains a double precision floating-point value. */ class ScDoubleField : public Edit { @@ -36,8 +34,6 @@ public: bool bEraseTrailingDecZeros = true ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx index 154babd12315..d77d991d50c4 100644 --- a/sc/source/ui/inc/editsh.hxx +++ b/sc/source/ui/inc/editsh.hxx @@ -72,8 +72,6 @@ public: OUString GetSelectionText( bool bWholeWord ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 3604f467dff3..dde1c3826599 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -28,8 +28,6 @@ class ScDocument; - - #include "scui_def.hxx" @@ -88,8 +86,6 @@ private: const OUString aErrMsgInvalidVal; - - ScDocument& rDoc; FillDir theFillDir; FillCmd theFillCmd; @@ -112,8 +108,6 @@ private: #endif }; - - #endif // SC_FILLDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 7e1c1f57b4fd..8e5455d58249 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -38,8 +38,6 @@ #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> - - class ScFilterOptionsMgr; class ScViewData; class ScDocument; @@ -227,8 +225,6 @@ private: DECL_LINK( TimeOutHdl, Timer* ); }; - - #endif // SC_FILTDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 6cfa1cb9fd21..21f8fd818a99 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -25,8 +25,6 @@ #include <vcl/lstbox.hxx> #include <vcl/button.hxx> - - namespace formula { class RefButton; @@ -35,8 +33,6 @@ struct ScQueryParam; class ScDocument; class ScViewData; - - class ScFilterOptionsMgr { public: diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index 9606b7237400..5c8fb87ef90e 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.hxx @@ -24,8 +24,6 @@ class ScInputHandler; class ScDocShell; - - class ScFormEditData : public formula::FormEditData { public: @@ -50,8 +48,6 @@ private: ScDocShell* pScDocShell; }; - - #endif // SC_CRNRDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 8a18ba8fa9a8..8109f1f0ff78 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -109,8 +109,6 @@ protected: ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); }; - - #endif // SC_CRNRDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index bc1bdb2a7599..bb2bd35b0fca 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -43,8 +43,6 @@ class FuConstArc : public FuConstruct virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; - - #endif // _SD_FUCONARC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index ba87384056fd..c4ba01050c35 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -43,8 +43,6 @@ class FuConstRectangle : public FuConstruct virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; - - #endif // _SD_FUCONREC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 1ef2c8c2c228..c92dc192ab79 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -48,8 +48,6 @@ class FuConstruct : public FuDraw Point CurrentGridSyncOffsetAndPos( Point& rInOutPos); }; - - #endif // _SD_FUCONSTR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 643346952154..1e29a62e07c2 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -48,8 +48,6 @@ public: virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; - - #endif // _SD_FUCONCTL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 03cc69342024..8effb122fd2c 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -57,8 +57,6 @@ class FuDraw : public FuPoor void ResetModifiers(); }; - - #endif // _SD_FUDRAW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx index b92d49f8c045..947891bfce8a 100644 --- a/sc/source/ui/inc/fumark.hxx +++ b/sc/source/ui/inc/fumark.hxx @@ -52,8 +52,6 @@ class FuMarkRect : public FuPoor virtual sal_uInt8 Command(const CommandEvent& rCEvt) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 04580c9998aa..d37123f6e66a 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -35,8 +35,6 @@ class ScFuncDesc; - - #define LRU_MAX 10 @@ -53,8 +51,6 @@ public: - - class ScFuncPage : public TabPage { private: diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 3315da55340b..3f87873d826b 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -114,8 +114,6 @@ public: virtual bool doConstructOrthogonal() const; }; - - #endif // _SD_FUPOOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index dbfd90c0ba03..58da6f2d9214 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -54,8 +54,6 @@ private: bool IsNoteCaptionClicked( const Point& rPos ) const; }; - - #endif // _SD_FUSEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index 3475f54b3ce4..bf72c5866e3d 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -26,8 +26,6 @@ class SdrObject; class SdrTextObj; class SdrOutliner; - - /** Base class for Text functions */ class FuText : public FuConstruct { @@ -64,8 +62,6 @@ private: SdrOutliner* MakeOutliner(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 6fa24d70ae20..92743039a1e4 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -79,8 +79,6 @@ struct SpellCallbackInfo; #define SC_PD_BREAK_H 16 #define SC_PD_BREAK_V 32 - - // predefines namespace sdr { namespace overlay { class OverlayObjectList; }} @@ -416,8 +414,6 @@ protected: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 4038b4d9a641..122ae01d76d0 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.hxx @@ -25,8 +25,6 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> - - class ScGroupDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index ea5ec9e42dc3..0ee89c46e64b 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -27,8 +27,6 @@ #include "sc.hrc" - - class ScHFEditDlg : public SfxTabDialog { SvxNumType eNumType; diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index ea6b85e9c08e..5c76c0e34454 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -48,8 +48,6 @@ class ScDocument; #define FLT_DATE_SAVE 5 #endif - - class ScHighlightChgDlg : public ScAnyRefDlg { private: diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx index 5c0640377ccb..c5908cae8d11 100644 --- a/sc/source/ui/inc/hintwin.hxx +++ b/sc/source/ui/inc/hintwin.hxx @@ -40,8 +40,6 @@ public: virtual ~ScHintWindow(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx index 40775b9b7fd2..e1ed0824faca 100644 --- a/sc/source/ui/inc/hiranges.hxx +++ b/sc/source/ui/inc/hiranges.hxx @@ -24,8 +24,6 @@ #include "global.hxx" #include "address.hxx" - - struct ScHighlightEntry { ScRange aRef; diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx index 883dd0078682..612da9d44d6d 100644 --- a/sc/source/ui/inc/imoptdlg.hxx +++ b/sc/source/ui/inc/imoptdlg.hxx @@ -29,8 +29,6 @@ #include "scdllapi.h" #include "global.hxx" - - class SC_DLLPUBLIC ScImportOptions { public: @@ -104,6 +102,4 @@ public: #endif // SC_IMOPTDLG_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index c10fdb4da73b..36b5d803c950 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -40,8 +40,6 @@ class ScRangeList; class ScTabViewShell; class Accelerator; - - class ScTextWndBase : public Window { public: @@ -130,8 +128,6 @@ private: ScTabViewShell* mpViewShell; }; - - class ScPosWnd : public ComboBox, public SfxListener // Display position { private: @@ -304,8 +300,6 @@ private: bool mbIsMultiLine; }; - - class ScInputWindowWrapper : public SfxChildWindow { public: diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index 3e4d2bcc1c93..314d9faacd33 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -27,8 +27,6 @@ #include "global.hxx" - - class ScInsertCellDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 17cfedc43a87..0067cb02bd54 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -39,8 +39,6 @@ class ScDocShell; namespace sfx2 { class DocumentInserter; } namespace sfx2 { class FileDialogHelper; } - - class ScInsertTableDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/invmerge.hxx b/sc/source/ui/inc/invmerge.hxx index f3fd2c34bed6..e54b3ffad55f 100644 --- a/sc/source/ui/inc/invmerge.hxx +++ b/sc/source/ui/inc/invmerge.hxx @@ -42,8 +42,6 @@ public: void Flush(); }; - - #endif diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index 260ff9fbbe31..bc51e98c499e 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -29,8 +29,6 @@ #include <vcl/dialog.hxx> - - class ScSelEntryDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 45f53c41f7e0..5932ea4cdabe 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -34,8 +34,6 @@ namespace sfx2 { class FileDialogHelper; } class ScDocShell; - - class ScLinkedAreaDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 504e53af47d4..976a067971b8 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -31,12 +31,8 @@ #include "uiitems.hxx" - - class ScDocumentPool; - - class ScMessagePool: public SfxItemPool { SfxStringItem aGlobalStringItem; @@ -63,8 +59,6 @@ public: virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 4c845afe1dea..6e087c15fa5b 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -26,8 +26,6 @@ #include <vcl/fixed.hxx> - - class ScMetricInputDlg : public ModalDialog { public: @@ -58,6 +56,4 @@ private: - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 8906d0a250e5..093a7590fe06 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -28,8 +28,6 @@ #include <vcl/fixed.hxx> #include <vcl/edit.hxx> - - class ScMoveTableDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 12597276fe0f..8c9cb91df19d 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -40,8 +40,6 @@ class ScViewData; class ScDocument; - - //logic behind the manage names dialog class ScNameDlg : public ScAnyRefDlg { @@ -138,8 +136,6 @@ public: }; - - #endif // SC_NAMEDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx index d07b0ba6a51e..147b00ea40ce 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.hxx @@ -24,8 +24,6 @@ #include <sfx2/ctrlitem.hxx> - - class ScNavigatorDlg; class ScNavigatorControllerItem : public SfxControllerItem diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 736da5b47dee..dfe0eb9cf092 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -41,8 +41,6 @@ class ScNavigatorDialogWrapper; class ScNavigatorDlg; class ScNavigatorSettings; - - #define SC_DROPMODE_URL 0 #define SC_DROPMODE_LINK 1 #define SC_DROPMODE_COPY 2 @@ -150,8 +148,6 @@ private: SCCOL NumToAlpha ( SCCOL nColNo, OUString& rStr ); }; - - // class RowEdit class RowEdit : public NumericField @@ -173,8 +169,6 @@ private: void ExecuteRow(); }; - - // class ScDocListBox class ScDocListBox : public ListBox @@ -190,8 +184,6 @@ private: ScNavigatorDlg& rDlg; }; - - // class CommandToolBox class CommandToolBox : public ToolBox @@ -334,8 +326,6 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; - - class ScNavigatorDialogWrapper: public SfxChildWindowContext { public: @@ -352,8 +342,6 @@ private: ScNavigatorDlg* pNavigator; }; - - #endif // SC_NAVIPI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index ed459cb47a33..245ad62acdc3 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -65,8 +65,6 @@ public: void SetGridOff( const Point& rOff ) { aGridOff = rOff; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx index fd66ba03966a..85e617c2bf3a 100644 --- a/sc/source/ui/inc/olinefun.hxx +++ b/sc/source/ui/inc/olinefun.hxx @@ -26,8 +26,6 @@ class ScDocShell; class ScRange; - - class ScOutlineDocFunc { private: @@ -54,8 +52,6 @@ public: bool bRecord, bool bPaint ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index e8069a1bf76f..7d5a1ac2c30a 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -26,13 +26,9 @@ class ScOutlineEntry; class ScOutlineArray; - - enum ScOutlineMode { SC_OUTLINE_HOR, SC_OUTLINE_VER }; - - /** The window left of or above the spreadsheet containing the outline groups and controls to expand/collapse them. */ class ScOutlineWindow : public Window @@ -229,8 +225,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index cb7ba6ee34b6..11793ce338c1 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -34,8 +34,6 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } - - class ScCursorRefEdit : public formula::RefEdit { Link maCursorUpLink; diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 915f23a74900..0aee29fdc55f 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -50,13 +50,9 @@ class FmFormView; class ScFieldEditEngine; class SdrPaintWindow; - - #define SC_SCENARIO_HSPACE 60 #define SC_SCENARIO_VSPACE 50 - - enum ScOutputType { OUTTYPE_WINDOW, OUTTYPE_PRINTER }; class ScFieldEditEngine; @@ -341,8 +337,6 @@ public: void AddPDFNotes(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxx index 8ed128d1baf8..3f3f01481c17 100644 --- a/sc/source/ui/inc/pagedata.hxx +++ b/sc/source/ui/inc/pagedata.hxx @@ -23,8 +23,6 @@ #include "global.hxx" #include "address.hxx" - - class ScPrintRangeData { private: @@ -79,8 +77,6 @@ public: void AddPages(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 8d7c701a418a..2c7d29be95e7 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -30,15 +30,11 @@ #include "address.hxx" #include "queryparam.hxx" - - class ScViewData; class ScDocument; class ScQueryItem; class ScTypedStrData; - - class ScPivotFilterDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx index 79ac5e9257e4..3718cbcfe614 100644 --- a/sc/source/ui/inc/pgbrksh.hxx +++ b/sc/source/ui/inc/pgbrksh.hxx @@ -38,8 +38,6 @@ public: }; - - #endif diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx index cfc708c50696..d52259f95254 100644 --- a/sc/source/ui/inc/pivotsh.hxx +++ b/sc/source/ui/inc/pivotsh.hxx @@ -46,8 +46,6 @@ private: ScDPObject* GetCurrDPObject(); }; - - #endif diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx index a37ad3c38e37..2d237c0ddc2b 100644 --- a/sc/source/ui/inc/popmenu.hxx +++ b/sc/source/ui/inc/popmenu.hxx @@ -39,8 +39,6 @@ public: bool WasHit() const { return bHit; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 00787a050eed..a8826933c727 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -166,8 +166,6 @@ public: SC_DLLPUBLIC const ScMarkData::MarkedTabsType& GetSelectedTabs() const; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index a980a0412710..851824d15289 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -37,8 +37,6 @@ class ScPreviewLocationData; class CommandEvent; - - class ScPreviewShell: public SfxViewShell { ScDocShell* pDocShell; @@ -122,8 +120,6 @@ public: SC_DLLPUBLIC ScPreview* GetPreview() { return pPreview; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index 47a2a4e0a29b..fc8eb6403997 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -331,8 +331,6 @@ private: void FillPageData(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index 153eed4ca1e5..88b7f50c7531 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -44,8 +44,6 @@ class ScPrivatSplit : public Control using Control::ImplInitSettings; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); - - protected: virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 451a75818520..03feaa6ced33 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -40,14 +40,10 @@ #include <boost/scoped_ptr.hpp> #include <boost/unordered_map.hpp> - - typedef sfx::ListBoxWrapper< sal_Int32 > ScDPListBoxWrapper; class ScDPObject; - - class ScDPFunctionListBox : public ListBox { public: @@ -60,8 +56,6 @@ private: void FillFunctionNames(); }; - - class ScDPFunctionDlg : public ModalDialog { typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; @@ -103,8 +97,6 @@ private: bool mbEmptyItem; /// true = Empty base item in listbox. }; - - class ScDPSubtotalDlg : public ModalDialog { public: @@ -140,8 +132,6 @@ private: bool mbEnableLayout; /// true = Enable Layout mode controls. }; - - class ScDPSubtotalOptDlg : public ModalDialog { public: @@ -194,8 +184,6 @@ private: NameMapType maDataFieldNameMap; /// Cache for displayed name to field name mapping. }; - - class ScDPShowDetailDlg : public ModalDialog { public: @@ -225,8 +213,6 @@ private: ScDPObject& mrDPObj; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index f0e697ae10f0..7fed20a2c615 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -35,8 +35,6 @@ SFX_DECL_CHILDWINDOW_WITHID(Class); \ }; - - DECL_WRAPPER_WITHID(ScNameDlgWrapper) DECL_WRAPPER_WITHID(ScNameDefDlgWrapper) DECL_WRAPPER_WITHID(ScSolverDlgWrapper) @@ -166,8 +164,6 @@ public: }; - - #endif // SC_REFFACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 3b0d2c99573d..41c0843b1a43 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -121,8 +121,6 @@ private: ScPasswordHash meDesiredHash; }; - - class ScRetypePassInputDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx index 066daa363985..eaf9da07219e 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.hxx @@ -24,8 +24,6 @@ #include "global.hxx" #include "address.hxx" - - struct ScRangeFindData { ScRange aRef; @@ -60,8 +58,6 @@ public: static ColorData GetColorName(const size_t nIndex); }; - - #endif diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 4d7f63e4b541..8768350a1dfe 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -28,8 +28,6 @@ #include <svtools/svmedit.hxx> #include <svtools/ctrlbox.hxx> - - class ScNewScenarioDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 796348f9d600..60a51efc233e 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef SCUI_ASCIIOPT_HXX #define SCUI_ASCIIOPT_HXX @@ -26,8 +24,6 @@ #include "asciiopt.hxx" #include "svx/langbox.hxx" - - class ScImportAsciiDlg : public ModalDialog { SvStream* mpDatStream; diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index a6c7dbd94d89..193a2a855e85 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -24,8 +24,6 @@ #include "imoptdlg.hxx" - - class ScDelimiterTable; class ScImportOptionsDlg : public ModalDialog diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index f2a07c12dcbc..6cb77c0b478b 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -103,8 +103,6 @@ private: DECL_LINK( MenuHdl, ScExtIButton* ); }; - - class ScRightHeaderEditPage : public ScHFEditPage { public: @@ -114,8 +112,6 @@ private: ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); }; - - class ScLeftHeaderEditPage : public ScHFEditPage { public: @@ -125,8 +121,6 @@ private: ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); }; - - class ScRightFooterEditPage : public ScHFEditPage { public: @@ -136,8 +130,6 @@ private: ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); }; - - class ScLeftFooterEditPage : public ScHFEditPage { public: diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index ec9818801e26..9f8fc1b43d19 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -24,8 +24,6 @@ #include "viewdata.hxx" - - class ScTabView; class ScViewData; @@ -79,8 +77,6 @@ public: - - class ScHeaderFunctionSet : public FunctionSet // Column / row headers { private: @@ -115,8 +111,6 @@ public: ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx index 25a2fe0abdc8..92147c8ef96b 100644 --- a/sc/source/ui/inc/selectionstate.hxx +++ b/sc/source/ui/inc/selectionstate.hxx @@ -23,8 +23,6 @@ #include <editeng/editdata.hxx> #include "rangelst.hxx" - - /** Enumerates all possible types of selections in a Calc document. */ enum ScSelectionType { @@ -35,8 +33,6 @@ enum ScSelectionType SC_SELECTTYPE_EDITDRAW /// Edit mode in drawing object (with or without selection). }; - - class ScViewData; /** Contains all available data about any possible selection in a Calc document. */ @@ -65,8 +61,6 @@ private: bool operator==( const ScSelectionState& rL, const ScSelectionState& rR ); inline bool operator!=( const ScSelectionState& rL, const ScSelectionState& rR ) { return !(rL == rR); } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index 35b66bdf3b0b..304634d1a749 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -28,8 +28,6 @@ class ScViewData; class ScDocShell; - - // class ScShareDocumentDlg diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index db8fe9a3baae..3a765b68b177 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -25,8 +25,6 @@ #include <vcl/layout.hxx> #include <vcl/lstbox.hxx> - - class ScShowTabDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 6d20fe916f83..e33dd6dddae5 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -34,8 +34,6 @@ class ScViewData; class ScDocument; - - class ScSimpleRefDlg: public ScAnyRefDlg { private: @@ -95,8 +93,6 @@ public: void SetAutoReOpen(bool bFlag) {bAutoReOpen=bFlag;} }; - - #endif // SC_DBNAMDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 39a92d864258..e5d1989181f9 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -33,8 +33,6 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } - - class ScSolverOptionsDialog : public ModalDialog { ListBox* m_pLbEngine; diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 69fdfe5f576d..33d7f9cfa843 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -28,8 +28,6 @@ #include <vcl/fixed.hxx> #include <vcl/group.hxx> - - enum ScSolverErr { SOLVERR_NOFORMULA, @@ -39,8 +37,6 @@ enum ScSolverErr }; - - class ScSolverDlg : public ScAnyRefDlg { public: diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index a775b791c4d4..5a9f39699f1e 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -23,8 +23,6 @@ #include <svtools/stdctrl.hxx> #include <svx/langbox.hxx> - - struct ScSortKeyItem : public VclBuilderContainer { VclFrame* m_pFrame; @@ -43,8 +41,6 @@ struct ScSortKeyItem : public VclBuilderContainer typedef boost::ptr_vector<ScSortKeyItem> ScSortKeyItems; - - class ScSortKeyWindow { private: @@ -63,8 +59,6 @@ public: sal_Int32 GetTotalHeight() const { return m_pBox->GetSizePixel().Height(); } }; - - class ScSortKeyCtrl { private: diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index 17bb964e21b6..a60e2151b952 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -23,8 +23,6 @@ #include <memory> #include <svx/SpellDialogChildWindow.hxx> - - class ScConversionEngineBase; class ScSelectionState; class ScTabViewShell; @@ -92,8 +90,6 @@ private: bool mbOldIdleEnabled; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index f90fce409eaa..a69a5f9bbd35 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -28,8 +28,6 @@ class ScDocShell; class ScDocument; class SfxItemPool; - - /** Base class for special type of edit engines, i.e. for spell checker and text conversion. */ class ScConversionEngineBase : public ScEditEngineDefaulter { @@ -92,8 +90,6 @@ private: bool mbFinished; /// true = Entire document/selection finished. }; - - /** Edit engine for spell checking. */ class ScSpellingEngine : public ScConversionEngineBase { @@ -128,8 +124,6 @@ private: Window* GetDialogParent(); }; - - /** Edit engine for text conversion. */ class ScTextConversionEngine : public ScConversionEngineBase { @@ -155,8 +149,6 @@ private: ScConversionParam maConvParam; /// Conversion parameters. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index 3a11bfac1374..2a38f367259f 100644 --- a/sc/source/ui/inc/spellparam.hxx +++ b/sc/source/ui/inc/spellparam.hxx @@ -21,8 +21,6 @@ #include <vcl/font.hxx> - - /** Specifiers for sheet conversion (functions iterating over the sheet and modifying cells). */ enum ScConversionType { @@ -31,8 +29,6 @@ enum ScConversionType SC_CONVERSION_CHINESE_TRANSL /// Chinese simplified/traditional converter. }; - - /** Parameters for conversion. */ class ScConversionParam { @@ -73,8 +69,6 @@ private: bool mbIsInteractive; /// True = Text conversion has (specific) dialog that may be raised. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index 8294cec46c30..134cf5483bb6 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -22,8 +22,6 @@ #include <sfx2/styledlg.hxx> - - class SfxStyleSheetBase; class ScStyleDlg : public SfxStyleDialog diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 61efeddfc702..f28b203c85f9 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -24,8 +24,6 @@ #include "scui_def.hxx" - - class ScSubTotalDlg : public SfxTabDialog { public: diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 6bf180393fef..ff5b44278e33 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -25,8 +25,6 @@ #include <vcl/button.hxx> #include <svx/SvxColorValueSet.hxx> - - class ScTabBgColorDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index 87cbd2f44fe5..e19cc574172b 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -27,8 +27,6 @@ class ScViewData; - - // initial size #define SC_TABBAR_DEFWIDTH 270 @@ -77,8 +75,6 @@ public: void SetSheetLayoutRTL( bool bSheetRTL ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 14126effd5ea..7de0c5753ea5 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -27,8 +27,6 @@ #include "anyrefdg.hxx" - - enum ScTabOpErr { TABOPERR_NOFORMULA = 1, @@ -40,8 +38,6 @@ enum ScTabOpErr TABOPERR_NOROWFORMULA }; - - class ScTabOpDlg : public ScAnyRefDlg { public: @@ -98,6 +94,4 @@ private: #endif // SC_TABOPDLG_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index ecdcbb545cc2..cc548d588b57 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -24,8 +24,6 @@ #include <svtools/stdctrl.hxx> #include <sfx2/tabdlg.hxx> - - class ScTabPageProtection : public SfxTabPage { public: @@ -60,8 +58,6 @@ private: void UpdateButtons(); }; - - #endif // SC_TABPAGES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index 045dfa2bb43e..0fde64c08fb3 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -46,8 +46,6 @@ public: virtual void Paint( const Rectangle& rPaintRect ) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index b4fb5b350564..ce968e5330e5 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -82,8 +82,6 @@ public: }; - - class ScTabView : boost::noncopyable { private: @@ -537,8 +535,6 @@ public: void SetAutoSpellData( SCCOL nPosX, SCROW nPosY, const std::vector<editeng::MisspellRanges>* pRanges ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index fea48f5c3f78..bd5f0a20b1f7 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -90,8 +90,6 @@ enum ObjectSelectionType }; - - class ScTabViewShell: public SfxViewShell, public ScDBFunc { private: @@ -422,8 +420,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx index 7d128d07fd99..a3a76158a5ef 100644 --- a/sc/source/ui/inc/target.hxx +++ b/sc/source/ui/inc/target.hxx @@ -38,8 +38,6 @@ public: ScTabViewShell* GetViewShell() const { return pViewShell; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 135b1c3254f5..628c10bcd347 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -28,8 +28,6 @@ #include <svtools/stdctrl.hxx> #include "editfield.hxx" - - class ScDocOptions; class ScTpCalcOptions : public SfxTabPage diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 0dc893890571..eb4688c3b6b7 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -24,8 +24,6 @@ class ScStyleDlg; - - class ScHFPage : public SvxHFPage { public: @@ -62,8 +60,6 @@ private: #endif }; - - class ScHeaderPage : public ScHFPage { public: @@ -74,8 +70,6 @@ private: ScHeaderPage( Window* pParent, const SfxItemSet& rSet ); }; - - class ScFooterPage : public ScHFPage { public: diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 51ee0e72ad05..c85141e7d323 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -33,8 +33,6 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <cppuhelper/weakref.hxx> - - class ScHeaderEditEngine; class ScPatternAttr; class EditView; diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 9d9f3bfb1624..743b1a5be16a 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -23,8 +23,6 @@ #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> - - class ScTpPrintOptions : public SfxTabPage { CheckBox* m_pSkipEmptyPagesCB; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 5284b6534aae..96f21b49633b 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -35,8 +35,6 @@ #include "address.hxx" #include "sortparam.hxx" - - // +1 because one field is reserved for the "- undefined -" entry #define SC_MAXFIELDS MAXCOLCOUNT+1 diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 452237d2a010..4029d65347c4 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -27,8 +27,6 @@ - - class ScDocStatPage: public SfxTabPage { public: @@ -48,8 +46,6 @@ private: FixedText* m_pFtPages; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index e2bda75455f1..99174bb57479 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -26,8 +26,6 @@ #include <vcl/lstbox.hxx> #include "global.hxx" - - // +1 because one field is reserved for the "- none -" entry #define SC_MAXFIELDS MAXCOLCOUNT+1 @@ -35,8 +33,6 @@ class ScViewData; class ScDocument; struct ScSubTotalParam; - - class ScTpSubTotalGroup : public SfxTabPage { protected: @@ -77,8 +73,6 @@ private: DECL_LINK( CheckHdl, ListBox * ); }; - - class ScTpSubTotalGroup1 : public ScTpSubTotalGroup { protected: @@ -94,8 +88,6 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; - - class ScTpSubTotalGroup2 : public ScTpSubTotalGroup { protected: @@ -111,8 +103,6 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; - - class ScTpSubTotalGroup3 : public ScTpSubTotalGroup { protected: @@ -128,8 +118,6 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; - - class ScTpSubTotalOptions : public SfxTabPage { protected: @@ -168,8 +156,6 @@ private: DECL_LINK( CheckHdl, CheckBox * ); }; - - #endif // SC_TPSORT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 4b9b20c4366d..c2fbe3af2338 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -25,8 +25,6 @@ #include <vcl/lstbox.hxx> #include <vcl/vclmedit.hxx> - - class ScUserList; class ScDocument; class ScViewData; @@ -103,8 +101,6 @@ private: #endif }; - - #endif // SC_TPUSRLST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 0861c17e18e4..c935b7d96e88 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -27,12 +27,8 @@ #include <svtools/ctrlbox.hxx> #include <svx/strarray.hxx> - - class ScViewOptions; - - class ScTpContentOptions : public SfxTabPage { ListBox* pGridLB; @@ -85,8 +81,6 @@ public: }; - - class ScDocument; class ScTpLayoutOptions : public SfxTabPage { diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 6124de524fa4..5baf06a8d207 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -40,8 +40,6 @@ class ScViewData; class ScDPSaveData; struct ScQueryParam; - - // Items class ScInputStatusItem : public SfxPoolItem @@ -174,8 +172,6 @@ private: ScSortParam theSortData; }; - - class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem { public: @@ -205,8 +201,6 @@ private: bool bIsAdvanced; }; - - class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem { public: @@ -232,8 +226,6 @@ private: ScSubTotalParam theSubTotalData; }; - - class SC_DLLPUBLIC ScUserListItem : public SfxPoolItem { public: @@ -253,8 +245,6 @@ private: ScUserList* pUserList; }; - - class ScConsolidateItem : public SfxPoolItem { public: @@ -274,8 +264,6 @@ private: ScConsolidateParam theConsData; }; - - class ScPivotItem : public SfxPoolItem { public: @@ -299,8 +287,6 @@ private: bool bNewSheet; }; - - class ScSolveItem : public SfxPoolItem { public: @@ -320,8 +306,6 @@ private: ScSolveParam theSolveData; }; - - class ScTabOpItem : public SfxPoolItem { public: diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 766bc808511e..d3ab144e9e1a 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -31,8 +31,6 @@ class SdrUndoAction; class ScRefUndoData; class ScDBData; - - class ScSimpleUndo: public SfxUndoAction { ScSimpleUndo(const ScSimpleUndo&); // disabled @@ -63,8 +61,6 @@ protected: static void ShowTable( const ScRange& rRange ); }; - - enum ScBlockUndoMode { SC_UNDO_SIMPLE, SC_UNDO_MANUALHEIGHT, SC_UNDO_AUTOHEIGHT }; class ScBlockUndo: public ScSimpleUndo @@ -110,8 +106,6 @@ protected: void ShowBlock(); }; - - // for functions that act on a database range - takes care of the unnamed database range // (collected separately, before the undo action, for showing dialogs etc.) @@ -135,8 +129,6 @@ public: void EndRedo(); }; - - enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST }; class ScMoveUndo: public ScSimpleUndo // mit Referenzen @@ -163,8 +155,6 @@ private: void UndoRef(); }; - - class ScUndoWrapper: public SfxUndoAction // for manual merging of actions { SfxUndoAction* pWrappedUndo; diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index c67affc28210..5eef2fe4105e 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -41,8 +41,6 @@ class SvxSearchItem; class SdrUndoAction; class ScEditDataArray; - - class ScUndoInsertCells: public ScMoveUndo { public: @@ -979,8 +977,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 2ace5366e306..6ab912528c5b 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -254,8 +254,6 @@ private: void SetChangeTrack( const ScCellValue& rOldCell ); }; - - /** Undo action for inserting, removing, and replacing a cell note. */ class ScUndoReplaceNote : public ScSimpleUndo { @@ -298,8 +296,6 @@ private: SdrUndoAction* mpDrawUndo; }; - - /** Undo action for showing or hiding a cell note caption. */ class ScUndoShowHideNote : public ScSimpleUndo { @@ -320,8 +316,6 @@ private: bool mbShown; }; - - class ScUndoDetective: public ScSimpleUndo { public: diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 9b9d4ad7dfdd..c5678e9e0eca 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -40,8 +40,6 @@ class ScDPObject; class SdrUndoAction; class ScMarkData; - - class ScUndoDoOutline: public ScSimpleUndo { public: diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index 3c28fa9a9508..beb76b0d217c 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.hxx @@ -51,8 +51,6 @@ public: virtual sal_uInt16 GetId() const SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index b2adb32f79fb..13042eafae50 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -26,8 +26,6 @@ class ScDocShell; class SfxStyleSheetBase; - - class ScStyleSaveData { private: diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 60161d037672..ea0932c9919f 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -42,8 +42,6 @@ class ScDocProtection; class ScTableProtection; class ScMarkData; - - class ScUndoInsertTab : public ScSimpleUndo { public: @@ -351,8 +349,6 @@ private: void DoChange( bool bShow ) const; }; - - /** This class implements undo & redo of document protect & unprotect operations. */ class ScUndoDocProtect : public ScSimpleUndo @@ -378,8 +374,6 @@ private: void DoProtect(bool bProtect); }; - - /** This class implements undo & redo of both protect and unprotect of sheet. */ class ScUndoTabProtect : public ScSimpleUndo diff --git a/sc/source/ui/inc/undoutil.hxx b/sc/source/ui/inc/undoutil.hxx index 532fe66c23d2..d6edb17d99b8 100644 --- a/sc/source/ui/inc/undoutil.hxx +++ b/sc/source/ui/inc/undoutil.hxx @@ -49,8 +49,6 @@ public: SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index e7f8e52da356..c33a890a13f5 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -30,8 +30,6 @@ #include "anyrefdg.hxx" - - struct ScRefHandlerCaller{ virtual ~ScRefHandlerCaller(){} }; @@ -176,8 +174,6 @@ public: }; - - /** The tab page "Criteria" from the Validation dialog. */ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage { @@ -259,8 +255,6 @@ public: }; - - class ScTPValidationHelp : public SfxTabPage { private: @@ -283,8 +277,6 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; - - class ScTPValidationError : public SfxTabPage { private: diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index d8eb8a2188b2..0ec932d6b602 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -25,8 +25,6 @@ #include <boost/scoped_ptr.hpp> - - #define SC_SMALL3DSHADOW COL_BLACK #define SC_SIZE_NONE 65535 const SCCOL SC_TABSTART_NONE = SCCOL_MAX; @@ -104,8 +102,6 @@ class ScExtDocOptions; class ScViewData; class ScMarkData; - - class ScViewDataTable // per-sheet data { friend class ScViewData; @@ -154,8 +150,6 @@ public: ~ScViewDataTable(); }; - - class SC_DLLPUBLIC ScViewData { private: @@ -501,8 +495,6 @@ public: }; - - inline long ScViewData::ToPixel( sal_uInt16 nTwips, double nFactor ) { long nRet = (long)( nTwips * nFactor ); @@ -549,8 +541,6 @@ inline ScSplitPos Which( ScVSplitPos eVPos ) SC_SPLIT_TOPLEFT : SC_SPLIT_BOTTOMLEFT; } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index bc9408bc7070..f53495e8dc67 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -60,8 +60,6 @@ struct ColRowSpan; namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } } - - class ScViewFunc : public ScTabView { private: @@ -373,8 +371,6 @@ private: void MarkAndJumpToRanges(const ScRangeList& rRanges); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index 62981f4296aa..4c025c8041bf 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -23,8 +23,6 @@ #include <vcl/msgbox.hxx> - - /** Message box with warning image and "Do not show again" checkbox. */ class ScCbWarningBox : public WarningBox { @@ -45,8 +43,6 @@ public: }; - - /** Warning box for "Replace cell contents?". */ class ScReplaceWarnBox : public ScCbWarningBox { @@ -60,8 +56,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index fa7660706d24..c98935af4ac4 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -1827,8 +1827,6 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo) } } - - void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const { SfxModelessDialog::FillInfo(rInfo); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 2e29bea0002b..5b435f0f8f57 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -717,8 +717,6 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren) - - static void lcl_InvalidateWindows() { TypeId aType(TYPE(ScDocShell)); @@ -833,8 +831,6 @@ bool ScRefHandler::EnterRefMode() return m_bInRefMode = true; } - - ScRefHandler::~ScRefHandler() { LeaveRefMode(); @@ -860,8 +856,6 @@ bool ScRefHandler::LeaveRefMode() return true; } - - void ScRefHandler::SwitchToDocument() { ScTabViewShell* pCurrent = ScTabViewShell::GetActiveViewShell(); @@ -890,8 +884,6 @@ void ScRefHandler::SwitchToDocument() } } - - bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 { // default: allow only same document (overridden in function dialog) @@ -903,15 +895,11 @@ bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be return ( aDocName.isEmpty() || aDocName == aCmpName ); } - - bool ScRefHandler::IsRefInputMode() const { return m_rWindow.IsVisible(); // nur wer sichtbar ist kann auch Referenzen bekommen } - - bool ScRefHandler::DoClose( sal_uInt16 nId ) { m_aHelper.DoClose(nId); @@ -923,22 +911,16 @@ void ScRefHandler::SetDispatcherLock( bool bLock ) m_aHelper.SetDispatcherLock( bLock ); } - - void ScRefHandler::ViewShellChanged() { m_aHelper.ViewShellChanged(); } - - void ScRefHandler::AddRefEntry() { // wenn nicht ueberladen, gibt es keine Mehrfach-Referenzen } - - bool ScRefHandler::IsTableLocked() const { // per Default kann bei Referenzeingabe auch die Tabelle umgeschaltet werden @@ -946,13 +928,9 @@ bool ScRefHandler::IsTableLocked() const return false; } - - // RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld // (per Button oder Bewegung) - - void ScRefHandler::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) { m_aHelper.RefInputStart( pEdit, pButton ); @@ -1031,8 +1009,6 @@ void ScRefHandler::RefInputDone( bool bForced ) m_aHelper.RefInputDone( bForced ); } - - ScRefHdlModalImpl::ScRefHdlModalImpl(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : ModalDialog( pParent, rID, rUIXMLDescription) diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 281acd237a58..67920b735475 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -52,8 +52,6 @@ #define FRAME_OFFSET 4 - - // ScAutoFmtPreview ScAutoFmtPreview::ScAutoFmtPreview(Window* pParent) @@ -157,8 +155,6 @@ rFont.MethodName( Value ); rCJKFont.MethodName( Value ); rCTLFont.MethodName( Va } } - - sal_uInt16 ScAutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const { static const sal_uInt16 pnFmtMap[] = @@ -184,8 +180,6 @@ const SvxLineItem& ScAutoFmtPreview::GetDiagItem( size_t nCol, size_t nRow, bool return *static_cast< const SvxLineItem* >( pCurData->GetItem( GetFormatIndex( nCol, nRow ), bTLBR ? ATTR_BORDER_TLBR : ATTR_BORDER_BLTR ) ); } - - void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) { if ( pCurData ) @@ -369,8 +363,6 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) #undef FRAME_OFFSET - - void ScAutoFmtPreview::DrawStrings() { for( size_t nRow = 0; nRow < 5; ++nRow ) @@ -378,8 +370,6 @@ void ScAutoFmtPreview::DrawStrings() DrawString( nCol, nRow ); } - - void ScAutoFmtPreview::DrawBackground() { if( pCurData ) @@ -401,8 +391,6 @@ void ScAutoFmtPreview::DrawBackground() } } - - void ScAutoFmtPreview::PaintCells() { if ( pCurData ) @@ -451,8 +439,6 @@ void ScAutoFmtPreview::CalcCellArray( bool bFitWidthP ) aPrvSize.Height() = maArray.GetHeight() + 4; } - - inline void lclSetStyleFromBorder( svx::frame::Style& rStyle, const ::editeng::SvxBorderLine* pBorder ) { rStyle.Set( pBorder, 1.0 / TWIPS_PER_POINT, 5 ); @@ -531,8 +517,6 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) aVD.SetDrawMode( nOldDrawMode ); } - - void ScAutoFmtPreview::Paint( const Rectangle& rRect ) { DoPaint( rRect ); diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 732caafeaa8e..3d0024219fda 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -26,8 +26,6 @@ #include "viewdata.hxx" #include "dbfunc.hxx" - - // struct ScConflictsListEntry @@ -59,8 +57,6 @@ bool ScConflictsListEntry::HasOwnAction( sal_uLong nOwnAction ) const return false; } - - // class ScConflictsListHelper @@ -147,8 +143,6 @@ void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsL } } - - // class ScConflictsFinder diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 93538409e5b6..aea36217f07f 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -29,8 +29,6 @@ #include <vcl/msgbox.hxx> #include <boost/scoped_array.hpp> - - #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() @@ -38,8 +36,6 @@ const sal_uLong nEntryDataCol = 0; const sal_uLong nEntryDataRow = 1; const sal_uLong nEntryDataDelim = 2; - - // class ScColRowNameRangesDlg diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 94ea4e734932..f9e4639b89d6 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -9,8 +9,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "datafdlg.hxx" #include "scresid.hxx" #include "viewdata.hxx" diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index b26a0f87bcfe..1bcc3532b31a 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -22,8 +22,6 @@ - - #include "delcldlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" @@ -31,8 +29,6 @@ static sal_uInt8 nDelItemChecked=0; - - ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) : ModalDialog(pParent, "DeleteCellsDialog", "modules/scalc/ui/deletecells.ui") { @@ -65,8 +61,6 @@ ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) } } - - DelCellCmd ScDeleteCellDlg::GetDelCellCmd() const { DelCellCmd nReturn = DEL_NONE; diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 98ea97518511..dd1d0cdc38ce 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -19,22 +19,16 @@ #undef SC_DLLIMPLEMENTATION - - #include "delcodlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - - bool ScDeleteContentsDlg::bPreviousAllCheck = false; sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | IDF_VALUE); - - ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, sal_uInt16 nCheckDefaults ) : ModalDialog ( pParent, "DeleteContentsDialog", "modules/scalc/ui/deletecontents.ui" ), @@ -78,8 +72,6 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, aBtnDelAll->SetClickHdl( LINK( this, ScDeleteContentsDlg, DelAllHdl ) ); } - - sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const { ScDeleteContentsDlg::nPreviousChecks = 0; @@ -106,8 +98,6 @@ sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const : ScDeleteContentsDlg::nPreviousChecks ); } - - void ScDeleteContentsDlg::DisableChecks( bool bDelAllChecked ) { if ( bDelAllChecked ) @@ -135,8 +125,6 @@ void ScDeleteContentsDlg::DisableChecks( bool bDelAllChecked ) } } - - void ScDeleteContentsDlg::DisableObjects() { bObjectsDisabled = true; @@ -144,8 +132,6 @@ void ScDeleteContentsDlg::DisableObjects() aBtnDelObjects->Disable(); } - - IMPL_LINK_NOARG_INLINE_START(ScDeleteContentsDlg, DelAllHdl) { DisableChecks( aBtnDelAll->IsChecked() ); diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 72cf476ab215..92240884d089 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -22,8 +22,6 @@ - - #include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <limits.h> @@ -38,12 +36,8 @@ #undef _FILLDLG_CXX - - // class ScFillSeriesDlg - - ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, ScDocument& rDocument, FillDir eFillDir, @@ -88,14 +82,10 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, } - - ScFillSeriesDlg::~ScFillSeriesDlg() { } - - void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag) { bStartValFlag=bFlag; @@ -111,8 +101,6 @@ void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag) } } - - void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) { m_pBtnOk->SetClickHdl ( LINK( this, ScFillSeriesDlg, OKHdl ) ); @@ -200,8 +188,6 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) } - - bool ScFillSeriesDlg::CheckStartVal() { bool bValOk = false; @@ -221,8 +207,6 @@ bool ScFillSeriesDlg::CheckStartVal() } - - bool ScFillSeriesDlg::CheckIncrementVal() { sal_uInt32 nKey = 0; @@ -232,8 +216,6 @@ bool ScFillSeriesDlg::CheckIncrementVal() } - - bool ScFillSeriesDlg::CheckEndVal() { bool bValOk = false; @@ -252,8 +234,6 @@ bool ScFillSeriesDlg::CheckEndVal() return bValOk; } - - // Handler: @@ -294,8 +274,6 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) } - - IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) { if ( m_pBtnLeft->IsChecked() ) theFillDir = FILL_TO_LEFT; @@ -345,6 +323,4 @@ IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 2a1388b235cf..43ddb4e9f7b9 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -22,14 +22,10 @@ - - #include "groupdlg.hxx" #include "scresid.hxx" - - ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) : ModalDialog(pParent, bUngroup ? @@ -50,19 +46,13 @@ ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) m_pBtnRows->GrabFocus(); } - - bool ScGroupDlg::GetColsChecked() const { return m_pBtnCols->IsChecked(); } - - ScGroupDlg::~ScGroupDlg() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 29ba0666356f..6cd7829128e1 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -242,6 +242,4 @@ IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn ) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index b5b59a5f2fd9..37e864c38ab1 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -22,8 +22,6 @@ - - #include "inscldlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" @@ -31,8 +29,6 @@ static sal_uInt8 nInsItemChecked=0; - - ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) : ModalDialog ( pParent, "InsertCellsDialog", "modules/scalc/ui/insertcells.ui") { @@ -66,8 +62,6 @@ ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) : } } - - InsCellCmd ScInsertCellDlg::GetInsCellCmd() const { InsCellCmd nReturn = INS_NONE; @@ -100,6 +94,4 @@ ScInsertCellDlg::~ScInsertCellDlg() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 08b1a163f6e4..0e967b4b5ccb 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -22,23 +22,17 @@ - - #include "inscodlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - - bool ScInsertContentsDlg::bPreviousAllCheck = false; sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_VALUE | IDF_DATETIME | IDF_STRING); sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0; sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd - - ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, sal_uInt16 nCheckDefaults, const OUString* pStrTitle ) @@ -124,8 +118,6 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, } - - sal_uInt16 ScInsertContentsDlg::GetInsContentsCmdBits() const { ScInsertContentsDlg::nPreviousChecks = 0; @@ -152,8 +144,6 @@ sal_uInt16 ScInsertContentsDlg::GetInsContentsCmdBits() const : ScInsertContentsDlg::nPreviousChecks ); } - - InsCellCmd ScInsertContentsDlg::GetMoveMode() { if ( mpRbMoveDown->IsChecked() ) @@ -164,8 +154,6 @@ InsCellCmd ScInsertContentsDlg::GetMoveMode() return INS_NONE; } - - void ScInsertContentsDlg::DisableChecks( bool bInsAllChecked ) { if ( bInsAllChecked ) @@ -285,8 +273,6 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) } - - IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl) { DisableChecks( mpBtnInsAll->IsChecked() ); @@ -337,6 +323,4 @@ sal_uInt16 ScInsertContentsDlg::GetFormulaCmdBits() const return ScInsertContentsDlg::nPreviousFormulaChecks; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 970165618224..7b6571a13b12 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -22,8 +22,6 @@ - - #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docinsert.hxx> @@ -41,8 +39,6 @@ #define SC_INSTBDLG_CXX #include "instbdlg.hxx" - - ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) : ModalDialog(pParent, "InsertSheetDialog", "modules/scalc/ui/insertsheet.ui") , rViewData(rData) @@ -71,8 +67,6 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT Init_Impl( bFromFile ); } - - ScInsertTableDlg::~ScInsertTableDlg() { if (pDocShTables) @@ -80,8 +74,6 @@ ScInsertTableDlg::~ScInsertTableDlg() delete pDocInserter; } - - void ScInsertTableDlg::Init_Impl( bool bFromFile ) { m_pLbTables->EnableMultiSelection(true); @@ -130,8 +122,6 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) } } - - short ScInsertTableDlg::Execute() { // set Parent of DocumentInserter and Doc-Manager @@ -146,8 +136,6 @@ short ScInsertTableDlg::Execute() return nRet; } - - void ScInsertTableDlg::SetNewTable_Impl() { if (m_pBtnNew->IsChecked() ) @@ -167,8 +155,6 @@ void ScInsertTableDlg::SetNewTable_Impl() } } - - void ScInsertTableDlg::SetFromTo_Impl() { if (m_pBtnFromFile->IsChecked() ) @@ -184,8 +170,6 @@ void ScInsertTableDlg::SetFromTo_Impl() } } - - void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) { m_pLbTables->SetUpdateMode( false ); @@ -209,8 +193,6 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) m_pLbTables->SelectEntryPos(0); } - - const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN ) { const OUString* pStr = NULL; @@ -232,8 +214,6 @@ const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN ) return pStr; } - - const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) { const OUString* pStr = NULL; @@ -250,8 +230,6 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) return pStr; } - - // Handler: @@ -289,8 +267,6 @@ IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) return 0; } - - IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) { if ( pDocInserter ) @@ -301,16 +277,12 @@ IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) return 0; } - - IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl) { DoEnable_Impl(); return 0; } - - void ScInsertTableDlg::DoEnable_Impl() { if ( m_pBtnNew->IsChecked() || ( pDocShTables && m_pLbTables->GetSelectEntryCount() ) ) diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 6e38b9d547ba..88be94c04b74 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -22,16 +22,12 @@ - - #include <vcl/msgbox.hxx> #include "lbseldlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - - ScSelEntryDlg::ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEntryList) : ModalDialog(pParent, "SelectRangeDialog", "modules/scalc/ui/selectrange.ui") { @@ -48,15 +44,11 @@ ScSelEntryDlg::ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEnt m_pLb->SelectEntryPos( 0 ); } - - OUString ScSelEntryDlg::GetSelectEntry() const { return m_pLb->GetSelectEntry(); } - - IMPL_LINK_NOARG_INLINE_START(ScSelEntryDlg, DblClkHdl) { EndDialog( RET_OK ); diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 01a4b5fa79a0..2fb4a91ab9f4 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include <comphelper/string.hxx> #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> @@ -40,8 +38,6 @@ #include "docsh.hxx" #include "tablink.hxx" - - ScLinkedAreaDlg::ScLinkedAreaDlg(Window* pParent) : ModalDialog(pParent, "ExternalDataDialog", "modules/scalc/ui/externaldata.ui") , pSourceShell(NULL) diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 1626febd0888..359230d5cc64 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -22,15 +22,11 @@ - - #include "mtrindlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - - ScMetricInputDlg::ScMetricInputDlg( Window* pParent, const OString& sDialogName, long nCurrent, @@ -66,8 +62,6 @@ ScMetricInputDlg::ScMetricInputDlg( Window* pParent, m_pBtnDefVal->Check( nCurrentValue == nDefaultValue ); } - - long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const { /* @@ -107,8 +101,6 @@ IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) return 0; } - - IMPL_LINK_NOARG_INLINE_START(ScMetricInputDlg, ModifyHdl) { m_pBtnDefVal->Check( nDefaultValue == m_pEdValue->GetValue() ); @@ -116,6 +108,4 @@ IMPL_LINK_NOARG_INLINE_START(ScMetricInputDlg, ModifyHdl) } IMPL_LINK_NOARG_INLINE_END(ScMetricInputDlg, ModifyHdl) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 1e6a40eaa838..ecf5b609bf9f 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -22,8 +22,6 @@ - - #include <vcl/msgbox.hxx> #include "mvtabdlg.hxx" @@ -34,8 +32,6 @@ #include "scresid.hxx" #include "globstr.hrc" - - ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault) : ModalDialog ( pParent, "MoveCopySheetDialog", "modules/scalc/ui/movecopysheet.ui" ), @@ -70,14 +66,10 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault) Init(); } - - ScMoveTableDlg::~ScMoveTableDlg() { } - - sal_uInt16 ScMoveTableDlg::GetSelectedDocument () const { return nDocument; } SCTAB ScMoveTableDlg::GetSelectedTable () const { return nTable; } @@ -214,8 +206,6 @@ bool ScMoveTableDlg::IsCurrentDocSelected() const return pLbDoc->GetSelectEntryPos() == mnCurrentDocPos; } - - void ScMoveTableDlg::Init() { pBtnOk->SetClickHdl ( LINK( this, ScMoveTableDlg, OkHdl ) ); @@ -230,8 +220,6 @@ void ScMoveTableDlg::Init() SelHdl( pLbDoc ); } - - void ScMoveTableDlg::InitDocListBox() { SfxObjectShell* pSh = SfxObjectShell::GetFirst(); @@ -355,6 +343,4 @@ IMPL_LINK( ScMoveTableDlg, CheckNameHdl, Edit *, pEdt ) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index b771e8f67eaf..3423988e890c 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -65,8 +65,6 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 nSeconds ) m_pFtTime->SetText( aNew ); } - - ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const OUString& rErrorText ) : ModalDialog(pParent, "NoSolutionDialog", "modules/scalc/ui/nosolutiondialog.ui") { @@ -74,8 +72,6 @@ ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const OUStr m_pFtErrorText->SetText(rErrorText); } - - ScSolverSuccessDialog::ScSolverSuccessDialog( Window* pParent, const OUString& rSolution ) : ModalDialog(pParent, "SolverSuccessDialog", "modules/scalc/ui/solversuccessdialog.ui") { @@ -97,8 +93,6 @@ IMPL_LINK( ScSolverSuccessDialog, ClickHdl, PushButton*, pBtn ) return 0; } - - ScCursorRefEdit::ScCursorRefEdit( Window* pParent, Window *pLabel ) : formula::RefEdit( pParent, pLabel ) { @@ -132,8 +126,6 @@ void ScCursorRefEdit::KeyInput( const KeyEvent& rKEvt ) formula::RefEdit::KeyInput( rKEvt ); } - - ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bMin, bool bValue, const OUString& rTarget, const OUString& rVariable, const std::vector<ScOptConditionRow>& rConditions, @@ -275,14 +267,10 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP Init( aCursorPos ); } - - ScOptSolverDlg::~ScOptSolverDlg() { } - - void ScOptSolverDlg::Init(const ScAddress& rCursorPos) { // Get the "Delete Rows" commandimagelist images from sfx instead of @@ -390,8 +378,6 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) mpEdActive = m_pEdObjectiveCell; } - - void ScOptSolverDlg::ReadConditions() { for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) @@ -449,15 +435,11 @@ void ScOptSolverDlg::EnableButtons() } } - - bool ScOptSolverDlg::Close() { return DoClose( ScOptSolverDlgWrapper::GetChildWindowId() ); } - - void ScOptSolverDlg::SetActive() { if ( mbDlgLostFocus ) @@ -473,8 +455,6 @@ void ScOptSolverDlg::SetActive() RefInputDone(); } - - void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if( mpEdActive ) @@ -526,8 +506,6 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - - bool ScOptSolverDlg::IsRefInputMode() const { return mpEdActive != NULL; @@ -581,8 +559,6 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) return 0; } - - IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl ) { Edit* pEdit = NULL; @@ -612,16 +588,12 @@ IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl ) return 0; } - - IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl) { mbDlgLostFocus = !IsActive(); return 0; } - - IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) { for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) @@ -650,8 +622,6 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) return 0; } - - IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl) { // modify handler for the target edit: @@ -751,8 +721,6 @@ IMPL_LINK( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit*, pEdit ) return 0; } - - void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus ) { OUString aMessage = bCondition ? maConditionError : maInputError; @@ -764,8 +732,6 @@ void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus ) } } - - bool ScOptSolverDlg::ParseRef( ScRange& rRange, const OUString& rInput, bool bAllowRange ) { ScRangeUtil aRangeUtil; diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 6f1e6b376757..f2d16f32c478 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -392,8 +392,6 @@ IMPL_LINK_NOARG(ScRetypePassDlg, ScrollHdl) return 0; } - - ScRetypePassInputDlg::ScRetypePassInputDlg(Window* pParent, ScPassHashProtectable* pProtected) : ModalDialog(pParent, "RetypePasswordDialog", "modules/scalc/ui/retypepassworddialog.ui") diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 6a53ff903459..83c97b4c3d05 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -22,8 +22,6 @@ - - #include "scitems.hxx" #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> @@ -160,8 +158,6 @@ IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) return 0; } - - IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl) { if ( bCoreDataChanged ) @@ -172,8 +168,6 @@ IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl) } IMPL_LINK_NOARG_INLINE_END(ScAutoFormatDlg, DblClkHdl) - - IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) { ScAutoFormatData* pData = pFormat->findByIndex(nIndex); @@ -203,8 +197,6 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) return 0; } - - IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) { if ( !bFmtInserted && pSelFmtData ) @@ -277,8 +269,6 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) return 0; } - - IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) { if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) ) @@ -402,8 +392,6 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) return 0; } - - IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) { nIndex = m_pLbFormat->GetSelectEntryPos(); @@ -426,8 +414,6 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) return 0; } - - OUString ScAutoFormatDlg::GetCurrFormatName() { const ScAutoFormatData* p = pFormat->findByIndex(nIndex); diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 1f04f4f30649..e144a7ae3263 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -22,8 +22,6 @@ - - #include <vcl/msgbox.hxx> #include "shtabdlg.hxx" @@ -31,8 +29,6 @@ #include "miscdlgs.hrc" - - ScShowTabDlg::ScShowTabDlg(Window* pParent) : ModalDialog(pParent, "ShowSheetDialog", "modules/scalc/ui/showsheetdialog.ui") { @@ -45,8 +41,6 @@ ScShowTabDlg::ScShowTabDlg(Window* pParent) m_pLb->SetDoubleClickHdl( LINK( this, ScShowTabDlg, DblClkHdl ) ); } - - void ScShowTabDlg::SetDescription( const OUString& rTitle, const OUString& rFixedText, const OString& rDlgHelpId, const OString& sLbHelpId ) diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 384d22e34c20..b99ba1d67c67 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -28,8 +28,6 @@ #include "simpref.hxx" #include "scmod.hxx" - - #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ @@ -125,8 +123,6 @@ void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - - bool ScSimpleRefDlg::Close() { CancelBtnHdl(m_pBtnCancel); @@ -216,6 +212,4 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 9d8af3909f21..cabc77454d9c 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -39,8 +39,6 @@ using namespace com::sun::star; - - /// Helper for sorting properties struct ScSolverOptionsEntry { @@ -55,8 +53,6 @@ struct ScSolverOptionsEntry } }; - - class ScSolverOptionsString : public SvLBoxString { bool mbIsDouble; @@ -106,8 +102,6 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const rDev.SetFont( aOldFont ); } - - ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, const uno::Sequence<OUString>& rImplNames, const uno::Sequence<OUString>& rDescriptions, @@ -392,8 +386,6 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) return 0; } - - ScSolverIntegerDialog::ScSolverIntegerDialog(Window * pParent) : ModalDialog( pParent, "IntegerDialog", "modules/scalc/ui/integerdialog.ui" ) @@ -422,8 +414,6 @@ sal_Int32 ScSolverIntegerDialog::GetValue() const return (sal_Int32) nValue; } - - ScSolverValueDialog::ScSolverValueDialog( Window * pParent ) : ModalDialog( pParent, "DoubleDialog", "modules/scalc/ui/doubledialog.ui" ) diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index bf9859269962..1f18e178897f 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -31,8 +31,6 @@ using namespace com::sun::star; - - #define SCSOLVER_SERVICE "com.sun.star.sheet.Solver" void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames, diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 718e22517696..c1cb88a94a1e 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -74,14 +74,10 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, Init(); } - - ScSolverDlg::~ScSolverDlg() { } - - void ScSolverDlg::Init() { m_pBtnOk->SetClickHdl( LINK( this, ScSolverDlg, BtnHdl ) ); @@ -107,15 +103,11 @@ void ScSolverDlg::Init() pEdActive = m_pEdFormulaCell; } - - bool ScSolverDlg::Close() { return DoClose( ScSolverDlgWrapper::GetChildWindowId() ); } - - void ScSolverDlg::SetActive() { if ( bDlgLostFocus ) @@ -131,8 +123,6 @@ void ScSolverDlg::SetActive() RefInputDone(); } - - void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if( pEdActive ) @@ -155,8 +145,6 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - - void ScSolverDlg::RaiseError( ScSolverErr eError ) { switch ( eError ) @@ -183,15 +171,11 @@ void ScSolverDlg::RaiseError( ScSolverErr eError ) } } - - bool ScSolverDlg::IsRefInputMode() const { return pEdActive != NULL; } - - bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal ) { sal_uInt32 n1 = 0; @@ -261,8 +245,6 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) return 0; } - - IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) { Edit* pEdit = NULL; @@ -281,8 +263,6 @@ IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) return 0; } - - IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index a03a2839fe5a..d3214ce7ec5d 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "tabbgcolordlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" @@ -38,8 +36,6 @@ #include <boost/scoped_ptr.hpp> - - #define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl) ScTabBgColorDlg::ScTabBgColorDlg(Window* pParent, const OUString& rTitle, @@ -65,8 +61,6 @@ ScTabBgColorDlg::ScTabBgColorDlg(Window* pParent, const OUString& rTitle, m_pBtnOk->SetClickHdl( HDL(TabBgColorOKHdl_Impl) ); } - - void ScTabBgColorDlg::GetSelectedColor( Color& rColor ) const { rColor = this->m_aTabBgColor; diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index adbfbc8b1c59..5d6c82ad1986 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -30,8 +30,6 @@ #include "tabopdlg.hxx" - - // class ScTabOpDlg @@ -77,15 +75,11 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, Init(); } - - ScTabOpDlg::~ScTabOpDlg() { Hide(); } - - void ScTabOpDlg::Init() { m_pBtnOk->SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); @@ -114,15 +108,11 @@ void ScTabOpDlg::Init() //SFX_APPWINDOW->Enable(); } - - bool ScTabOpDlg::Close() { return DoClose( ScTabOpDlgWrapper::GetChildWindowId() ); } - - void ScTabOpDlg::SetActive() { if ( bDlgLostFocus ) @@ -137,8 +127,6 @@ void ScTabOpDlg::SetActive() RefInputDone(); } - - void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if ( pEdActive ) @@ -174,8 +162,6 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - - void ScTabOpDlg::RaiseError( ScTabOpErr eError ) { const OUString* pMsg = &errMsgNoFormula; @@ -223,8 +209,6 @@ void ScTabOpDlg::RaiseError( ScTabOpErr eError ) pEd->GrabFocus(); } - - static sal_Bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab, ScRefAddress& rStart, ScRefAddress& rEnd ) { @@ -323,8 +307,6 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) return 0; } - - IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) { if( (pCtrl == (Control*)m_pEdFormulaRange) || (pCtrl == (Control*)m_pRBFormulaRange) ) @@ -342,8 +324,6 @@ IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) return 0; } - - IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); @@ -352,6 +332,4 @@ IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 27f505a9ac7e..a6f301f38803 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -45,8 +45,6 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, AddTabPage("position", RID_SVXPAGE_CHAR_POSITION); } - - void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); @@ -65,8 +63,6 @@ void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } - - ScParagraphDlg::ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr) : SfxTabDialog(pParent, "ParagraphDialog", "modules/scalc/ui/paradialog.ui", pAttr) @@ -82,8 +78,6 @@ ScParagraphDlg::ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr) m_nTabPageId = AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); } - - void ScParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { if (nId == m_nTabPageId) @@ -95,6 +89,4 @@ void ScParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index acb908faacce..41e75b7c87c4 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -25,8 +25,6 @@ #include "sc.hrc" - - ScCbWarningBox::ScCbWarningBox( Window* pParent, const OUString& rMsgStr, bool bDefYes ) : WarningBox( pParent, WB_YES_NO | (bDefYes ? WB_DEF_YES : WB_DEF_NO), rMsgStr ) { @@ -58,8 +56,6 @@ void ScCbWarningBox::DisableDialog() } - - ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : ScCbWarningBox( pParent, OUString( ScResId( STR_REPLCELLSWARN ) ), true ) { @@ -80,6 +76,4 @@ void ScReplaceWarnBox::DisableDialog() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 550ed6b11dae..89ab3196985e 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -145,8 +145,6 @@ void ScNameDlg::Init() m_pLbScope->InsertEntry(aTabName); } - - if (m_pRangeManagerTable->GetSelectionCount()) { SelectionChanged(); diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 6654205ce9ca..f4a0a7a68edc 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -160,8 +160,6 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLi return pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(rLine.aName)); } - - void ScRangeManagerTable::CheckForFormulaString() { for (SvTreeListEntry* pEntry = GetFirstEntryInView(); pEntry ; pEntry = GetNextEntryInView(pEntry)) diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 3f188c3efe3b..8d8e4d841ce3 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -22,8 +22,6 @@ - - #include "namepast.hxx" #include "scresid.hxx" #include "docsh.hxx" @@ -32,8 +30,6 @@ #include "viewdata.hxx" - - ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) : ModalDialog( pParent, "InsertNameDialog", "modules/scalc/ui/insertname.ui" ) { @@ -76,8 +72,6 @@ ScNamePasteDlg::~ScNamePasteDlg() delete mpTable; } - - IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) { if( pButton == m_pBtnPasteAll ) @@ -101,8 +95,6 @@ IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) return 0; } - - std::vector<OUString> ScNamePasteDlg::GetSelectedNames() const { return maSelectedNames; diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index 2f89813ded20..9481a26ac91a 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -28,8 +28,6 @@ // STATIC DATA ----------------------------------------------------------- - - ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16 nIdP, ScNavigatorDlg& rDlg, SfxBindings& rBindings ) @@ -38,8 +36,6 @@ ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16 nIdP, { } - - void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemState /* eState */, const SfxPoolItem* pItem ) { @@ -104,6 +100,4 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 58aedee2ccec..20b88d024166 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -64,8 +64,6 @@ static const sal_Int32 SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).getLength #define SCNAV_MAXROW (MAXROWCOUNT) - - void ScNavigatorDlg::ReleaseFocus() { SfxViewShell* pCurSh = SfxViewShell::Current(); @@ -91,14 +89,10 @@ ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ) SetMaxTextLen( SCNAV_COLDIGITS ); // 1...256...18278 or A...IV...ZZZ } - - ColumnEdit::~ColumnEdit() { } - - bool ColumnEdit::Notify( NotifyEvent& rNEvt ) { bool nHandled = SpinField::Notify( rNEvt ); @@ -129,16 +123,12 @@ bool ColumnEdit::Notify( NotifyEvent& rNEvt ) return nHandled; } - - void ColumnEdit::LoseFocus() { EvalText(); } - - void ColumnEdit::Up() { nCol++; @@ -149,24 +139,18 @@ void ColumnEdit::Up() nCol--; } - - void ColumnEdit::Down() { if ( nCol>1 ) SetCol( nCol-1 ); } - - void ColumnEdit::First() { nCol = 1; SetText(OUString('A')); } - - void ColumnEdit::Last() { OUString aStr; @@ -175,8 +159,6 @@ void ColumnEdit::Last() } - - void ColumnEdit::EvalText() { OUString aStrCol = GetText(); @@ -197,8 +179,6 @@ void ColumnEdit::EvalText() nKeyGroup = KEYGROUP_ALPHA; } - - void ColumnEdit::ExecuteCol() { SCROW nRow = rDlg.aEdRow.GetRow(); @@ -209,8 +189,6 @@ void ColumnEdit::ExecuteCol() rDlg.SetCurrentCell( nCol-1, nRow-1 ); } - - void ColumnEdit::SetCol( SCCOL nColNo ) { OUString aStr; @@ -228,8 +206,6 @@ void ColumnEdit::SetCol( SCCOL nColNo ) } } - - SCCOL ColumnEdit::AlphaToNum( OUString& rStr ) { SCCOL nColumn = 0; @@ -253,8 +229,6 @@ SCCOL ColumnEdit::AlphaToNum( OUString& rStr ) return nColumn; } - - SCCOL ColumnEdit::NumStrToAlpha( OUString& rStr ) { SCCOL nColumn = 0; @@ -267,8 +241,6 @@ SCCOL ColumnEdit::NumStrToAlpha( OUString& rStr ) return nColumn; } - - SCCOL ColumnEdit::NumToAlpha( SCCOL nColNo, OUString& rStr ) { if ( nColNo > SCNAV_MAXCOL ) @@ -293,14 +265,10 @@ RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ) SetLast( SCNAV_MAXROW); } - - RowEdit::~RowEdit() { } - - bool RowEdit::Notify( NotifyEvent& rNEvt ) { bool nHandled = NumericField::Notify( rNEvt ); @@ -320,14 +288,10 @@ bool RowEdit::Notify( NotifyEvent& rNEvt ) return nHandled; } - - void RowEdit::LoseFocus() { } - - void RowEdit::ExecuteRow() { SCCOL nCol = rDlg.aEdCol.GetCol(); @@ -347,14 +311,10 @@ ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId ) { } - - ScDocListBox::~ScDocListBox() { } - - void ScDocListBox::Select() { ScNavigatorDlg::ReleaseFocus(); @@ -378,14 +338,10 @@ CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId ) SetItemBits( IID_DROPMODE, GetItemBits( IID_DROPMODE ) | TIB_DROPDOWNONLY ); } - - CommandToolBox::~CommandToolBox() { } - - void CommandToolBox::Select( sal_uInt16 nSelId ) { // Modus umschalten ? @@ -436,14 +392,10 @@ void CommandToolBox::Select() Select( GetCurItemId() ); } - - void CommandToolBox::Click() { } - - IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl) { // Das Popupmenue fuer den Dropmodus muss im Click (Button Down) @@ -470,8 +422,6 @@ IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl) return 1; } - - void CommandToolBox::UpdateButtons() { NavListMode eMode = rDlg.eListMode; @@ -745,8 +695,6 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win aLbEntries.SetNavigatorDlgFlag(true); } - - ScNavigatorDlg::~ScNavigatorDlg() { aContentTimer.Stop(); @@ -762,8 +710,6 @@ ScNavigatorDlg::~ScNavigatorDlg() EndListening( rBindings ); } - - void ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize? { FloatingWindow* pFloat = pContextWin!=NULL ? pContextWin->GetFloatingWindow() : NULL; @@ -784,8 +730,6 @@ void ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize? } } - - void ScNavigatorDlg::Paint( const Rectangle& rRect ) { if (mbUseStyleSettingsBackground) @@ -818,15 +762,11 @@ void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } - - void ScNavigatorDlg::Resize() { DoResize(); } - - void ScNavigatorDlg::DoResize() { Size aNewSize = GetOutputSizePixel(); @@ -884,8 +824,6 @@ void ScNavigatorDlg::DoResize() } } - - void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.ISA(SfxSimpleHint) ) @@ -957,8 +895,6 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - - IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pTimer ) { if ( pTimer != &aContentTimer ) @@ -968,8 +904,6 @@ IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pTimer ) return 0; } - - void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew) { nDropMode = nNew; @@ -979,8 +913,6 @@ void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew) rCfg.SetDragMode(nDropMode); } - - void ScNavigatorDlg::CursorPosChanged() { //! Eintraege selektieren ??? @@ -989,8 +921,6 @@ void ScNavigatorDlg::CursorPosChanged() // if ( GetAreaAtCursor( aStrAreaName ) ) } - - void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo ) { if ( (nColNo+1 != nCurCol) || (nRowNo+1 != nCurRow) ) @@ -1025,8 +955,6 @@ void ScNavigatorDlg::SetCurrentCellStr( const OUString& rName ) &aNameItem, 0L ); } - - void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo ) { if ( nTabNo != nCurTab ) @@ -1058,8 +986,6 @@ void ScNavigatorDlg::SetCurrentTableStr( const OUString& rName ) } } - - void ScNavigatorDlg::SetCurrentObject( const OUString& rName ) { SfxStringItem aNameItem( SID_CURRENTOBJECT, rName ); @@ -1068,8 +994,6 @@ void ScNavigatorDlg::SetCurrentObject( const OUString& rName ) &aNameItem, 0L ); } - - void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName ) // aktivieren { SfxStringItem aDocItem( SID_CURRENTDOC, rDocName ); @@ -1078,15 +1002,11 @@ void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName ) // aktivie &aDocItem, 0L ); } - - ScTabViewShell* ScNavigatorDlg::GetTabViewShell() const { return PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); } - - ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings() { // Don't store the settings pointer here, because the settings belong to @@ -1098,8 +1018,6 @@ ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings() return pViewSh ? pViewSh->GetNavigatorSettings() : NULL; } - - bool ScNavigatorDlg::GetViewData() { ScTabViewShell* pViewSh = GetTabViewShell(); @@ -1108,8 +1026,6 @@ bool ScNavigatorDlg::GetViewData() return ( pViewData != NULL ); } - - void ScNavigatorDlg::UpdateColumn( const SCCOL* pCol ) { if ( pCol ) @@ -1121,8 +1037,6 @@ void ScNavigatorDlg::UpdateColumn( const SCCOL* pCol ) CheckDataArea(); } - - void ScNavigatorDlg::UpdateRow( const SCROW* pRow ) { if ( pRow ) @@ -1134,8 +1048,6 @@ void ScNavigatorDlg::UpdateRow( const SCROW* pRow ) CheckDataArea(); } - - void ScNavigatorDlg::UpdateTable( const SCTAB* pTab ) { if ( pTab ) @@ -1146,8 +1058,6 @@ void ScNavigatorDlg::UpdateTable( const SCTAB* pTab ) CheckDataArea(); } - - void ScNavigatorDlg::UpdateAll() { switch ( eListMode ) @@ -1169,8 +1079,6 @@ void ScNavigatorDlg::UpdateAll() aContentTimer.Stop(); // dann nicht nochmal } - - void ScNavigatorDlg::SetListMode( NavListMode eMode, bool bSetSize ) { if ( eMode != eListMode ) @@ -1211,8 +1119,6 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, bool bSetSize ) UnmarkDataArea(); } - - void ScNavigatorDlg::ShowList( bool bShow, bool bSetSize ) { FloatingWindow* pFloat = pContextWin!=NULL ? pContextWin->GetFloatingWindow() : NULL; @@ -1259,8 +1165,6 @@ void ScNavigatorDlg::ShowList( bool bShow, bool bSetSize ) } } - - void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize ) { FloatingWindow* pFloat = pContextWin!=NULL ? pContextWin->GetFloatingWindow() : NULL; @@ -1308,12 +1212,8 @@ void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize ) } - - // Dokumente fuer Dropdown-Listbox - - void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) { aLbDocuments.Clear(); @@ -1361,8 +1261,6 @@ void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) aLbDocuments.SelectEntry( aSelEntry ); } - - void ScNavigatorDlg::MarkDataArea() { ScTabViewShell* pViewSh = GetTabViewShell(); @@ -1383,8 +1281,6 @@ void ScNavigatorDlg::MarkDataArea() } } - - void ScNavigatorDlg::UnmarkDataArea() { ScTabViewShell* pViewSh = GetTabViewShell(); @@ -1396,8 +1292,6 @@ void ScNavigatorDlg::UnmarkDataArea() } } - - void ScNavigatorDlg::CheckDataArea() { if ( aTbxCmd.IsItemChecked( IID_DATA ) && pMarkArea ) @@ -1414,8 +1308,6 @@ void ScNavigatorDlg::CheckDataArea() } } - - void ScNavigatorDlg::StartOfDataArea() { // pMarkArea auswerten ??? @@ -1434,8 +1326,6 @@ void ScNavigatorDlg::StartOfDataArea() } } - - void ScNavigatorDlg::EndOfDataArea() { // pMarkArea auswerten ??? @@ -1454,8 +1344,6 @@ void ScNavigatorDlg::EndOfDataArea() } } - - SfxChildAlignment ScNavigatorDlg::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) { diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 5b578f0ecffe..c8a6b02395b7 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -228,8 +228,6 @@ ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List, } } - - ScScenarioWindow::~ScScenarioWindow() { } @@ -244,8 +242,6 @@ void ScScenarioWindow::Paint( const Rectangle& rRect ) Window::Paint( rRect ); } - - void ScScenarioWindow::NotifyState( const SfxPoolItem* pState ) { if( pState ) @@ -273,8 +269,6 @@ void ScScenarioWindow::NotifyState( const SfxPoolItem* pState ) } } - - void ScScenarioWindow::SetSizePixel( const Size& rNewSize ) { Size aSize( rNewSize ); @@ -290,6 +284,4 @@ void ScScenarioWindow::SetSizePixel( const Size& rNewSize ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 8e7459cac8a3..c9988b8f91be 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -22,8 +22,6 @@ - - #include <svx/dlgutil.hxx> #include <svx/drawitem.hxx> #include <svx/xtable.hxx> @@ -44,8 +42,6 @@ #include "opredlin.hxx" - - ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent,"OptChangesPage", "modules/scalc/ui/optchangespage.ui", rSet), diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 55db49230b47..71401ed06741 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -19,8 +19,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <vcl/msgbox.hxx> @@ -38,8 +36,6 @@ #include <math.h> - - ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "OptCalculatePage", "modules/scalc/ui/optcalculatepage.ui", rCoreAttrs) @@ -69,16 +65,12 @@ ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs) SetExchangeSupport(); } - - ScTpCalcOptions::~ScTpCalcOptions() { delete pOldOptions; delete pLocalOptions; } - - void ScTpCalcOptions::Init() { m_pBtnIterate->SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) ); @@ -88,15 +80,11 @@ void ScTpCalcOptions::Init() m_pBtnDate1904->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) ); } - - SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTpCalcOptions( pParent, rAttrSet ) ); } - - void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) { sal_uInt16 d,m,y; @@ -146,8 +134,6 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) } - - bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { // alle weiteren Optionen werden in den Handlern aktualisiert @@ -173,8 +159,6 @@ bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) return false; } - - int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) { int nReturn = KEEP_PAGE; @@ -222,8 +206,6 @@ IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn ) return 0; } - - IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) { if (pBtn == m_pBtnGeneralPrec) @@ -259,6 +241,4 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 9c7f8dc552b5..2b79c99f370b 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -19,8 +19,6 @@ #undef SC_DLLIMPLEMENTATION - - #include <scmod.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index c2108ab6cd2f..27c70d4ad663 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -29,8 +29,6 @@ #include "sc.hrc" #include "optdlg.hrc" - - ScTpPrintOptions::ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage ( pParent, @@ -60,8 +58,6 @@ int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } - - void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) { ScPrintOptions aOptions; @@ -92,8 +88,6 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) m_pForceBreaksCB->SaveValue(); } - - bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET ); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 5eab46a9811b..da438c025a91 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -89,16 +89,12 @@ ScTpUserLists::ScTpUserLists( Window* pParent, Reset(rCoreAttrs); } - - ScTpUserLists::~ScTpUserLists() { delete pUserLists; delete pRangeUtil; } - - void ScTpUserLists::Init() { SfxViewShell* pSh = SfxViewShell::Current(); @@ -146,15 +142,11 @@ void ScTpUserLists::Init() } - - SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTpUserLists( pParent, rAttrSet ) ); } - - void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) { const ScUserListItem& rUserListItem = (const ScUserListItem&) @@ -205,8 +197,6 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) } } - - bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) { // Modifikationen noch nicht uebernommen? @@ -246,8 +236,6 @@ bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) return bDataModified; } - - int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) @@ -256,16 +244,12 @@ int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } - - size_t ScTpUserLists::UpdateUserListBox() { mpLbLists->Clear(); if ( !pUserLists ) return 0; - - size_t nCount = pUserLists->size(); OUString aEntry; @@ -279,14 +263,10 @@ size_t ScTpUserLists::UpdateUserListBox() return nCount; } - - void ScTpUserLists::UpdateEntries( size_t nList ) { if ( !pUserLists ) return; - - if ( nList < pUserLists->size() ) { const ScUserListData* pList = (*pUserLists)[nList]; @@ -308,8 +288,6 @@ void ScTpUserLists::UpdateEntries( size_t nList ) } } - - void ScTpUserLists::MakeListStr( OUString& rListStr ) { OUString aStr; @@ -346,8 +324,6 @@ void ScTpUserLists::MakeListStr( OUString& rListStr ) } - - void ScTpUserLists::AddNewList( const OUString& rEntriesStr ) { OUString theEntriesStr( rEntriesStr ); @@ -360,15 +336,11 @@ void ScTpUserLists::AddNewList( const OUString& rEntriesStr ) pUserLists->push_back(new ScUserListData(theEntriesStr)); } - - void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, const ScRefAddress& rEndPos ) { if ( bCopyDone ) return; - - SCTAB nTab = rStartPos.Tab(); SCCOL nStartCol = rStartPos.Col(); SCROW nStartRow = rStartPos.Row(); @@ -446,21 +418,15 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, } } - - bCopyDone = true; } - - void ScTpUserLists::ModifyList( size_t nSelList, const OUString& rEntriesStr ) { if ( !pUserLists ) return; - - OUString theEntriesStr( rEntriesStr ); MakeListStr( theEntriesStr ); @@ -468,8 +434,6 @@ void ScTpUserLists::ModifyList( size_t nSelList, (*pUserLists)[nSelList]->SetString( theEntriesStr ); } - - void ScTpUserLists::RemoveList( size_t nList ) { if (pUserLists && nList < pUserLists->size()) @@ -507,8 +471,6 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb ) return 0; } - - IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) { if ( pBtn == mpBtnNew || pBtn == mpBtnDiscard ) @@ -692,8 +654,6 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) if ( bCopyDone ) return 0; - - ScRefAddress theStartPos; ScRefAddress theEndPos; OUString theAreaStr( mpEdCopyFrom->GetText() ); @@ -744,15 +704,11 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) return 0; } - - IMPL_LINK( ScTpUserLists, EdEntriesModHdl, VclMultiLineEdit*, pEd ) { if ( pEd != mpEdEntries ) return 0; - - if ( mpBtnCopy->IsEnabled() ) { mpBtnCopy->Disable(); @@ -797,6 +753,4 @@ IMPL_LINK( ScTpUserLists, EdEntriesModHdl, VclMultiLineEdit*, pEd ) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index a1edc469210e..d7132592867b 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -22,8 +22,6 @@ - - #include "scitems.hxx" #include "tpview.hxx" #include "global.hxx" @@ -44,8 +42,6 @@ // STATIC DATA ----------------------------------------------------------- - - ScTpContentOptions::ScTpContentOptions( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", rArgSet), @@ -309,8 +305,6 @@ void ScTpContentOptions::InitGridOpt() if ( !pColorList.is() ) return; - - pColorLB->SetUpdateMode( false ); // items from ColorTable diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index da72cedbd1f1..f53d2a3a3ffe 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -53,8 +53,6 @@ const sal_uInt16 SC_AREASDLG_RR_USER = 1; const sal_uInt16 SC_AREASDLG_RR_OFFSET = 2; - - #define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl ) #define ERRORBOX(nId) ErrorBox( this, WinBits(WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString( nId ) ).Execute() @@ -94,8 +92,6 @@ static void printAddressFlags(sal_uInt16 nFlag) // class ScPrintAreasDlg - - ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ) : ScAnyRefDlg(pB, pCW, pParent, "PrintAreasDialog", "modules/scalc/ui/printareasdialog.ui") , bDlgLostFocus(false) @@ -145,8 +141,6 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* } - - ScPrintAreasDlg::~ScPrintAreasDlg() { // Extra-Data an ListBox-Entries abraeumen @@ -161,16 +155,12 @@ ScPrintAreasDlg::~ScPrintAreasDlg() } - - bool ScPrintAreasDlg::Close() { return DoClose( ScPrintAreasDlgWrapper::GetChildWindowId() ); } - - bool ScPrintAreasDlg::IsTableLocked() const { // Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn, @@ -180,8 +170,6 @@ bool ScPrintAreasDlg::IsTableLocked() const } - - void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ ) { if ( pRefInputEdit ) @@ -214,8 +202,6 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ } - - void ScPrintAreasDlg::AddRefEntry() { if ( pRefInputEdit == pEdPrintArea ) @@ -233,16 +219,12 @@ void ScPrintAreasDlg::AddRefEntry() } - - void ScPrintAreasDlg::Deactivate() { bDlgLostFocus = true; } - - void ScPrintAreasDlg::SetActive() { if ( bDlgLostFocus ) @@ -262,8 +244,6 @@ void ScPrintAreasDlg::SetActive() } - - void ScPrintAreasDlg::Impl_Reset() { OUString aStrRange; @@ -332,8 +312,6 @@ void ScPrintAreasDlg::Impl_Reset() } - - bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) { OUString aRangeStr = pEd->GetText(); @@ -353,8 +331,6 @@ bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) } - - bool ScPrintAreasDlg::Impl_CheckRefStrings() { bool bOk = false; @@ -418,8 +394,6 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings() } - - void ScPrintAreasDlg::Impl_FillLists() { @@ -492,8 +466,6 @@ void ScPrintAreasDlg::Impl_FillLists() } } - - // Handler: @@ -553,8 +525,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) } - - IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) { if ( pCtr ==(Control *) pEdPrintArea || @@ -580,8 +550,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) } - - IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) { sal_uInt16 nSelPos = pLb->GetSelectEntryPos(); @@ -619,8 +587,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) } - - IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) { ListBox* pLb = NULL; @@ -667,12 +633,8 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) return 0; } - - // globale Funktionen: - - // TODO: It might make sense to move these functions to address.?xx. -kohei static bool lcl_CheckOne_OOO( const OUString& rStr, bool bIsRow, SCCOLROW& rVal ) @@ -854,8 +816,6 @@ static bool lcl_CheckRepeatString( const OUString& rStr, ScDocument* pDoc, bool return true; } - - static void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, OUString& rStr ) { rStr = ""; diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index a4fdbe80f641..a1a7a7aea816 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -22,8 +22,6 @@ - - #include "scitems.hxx" #include <svl/eitem.hxx> @@ -47,8 +45,6 @@ ((SvxSetItem&)(set).Get(ATTR_PAGE_FOOTERSET)).GetItemSet(). \ Get(ATTR_PAGE_SHARED)).GetValue() - - ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet& rCoreSet, @@ -201,8 +197,6 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP, } } - - void ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage ) { // kann ja nur ne ScHFEditPage sein... @@ -211,6 +205,4 @@ void ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index cc42477cdc0a..dcbcedac8c81 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <editeng/eeitem.hxx> @@ -156,8 +154,6 @@ IMPL_LINK( ScHFEditPage, ObjectSelectHdl, ScEditWindow*, pEdit ) return 0; } - - ScHFEditPage::~ScHFEditPage() { } @@ -206,16 +202,12 @@ bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) return true; } - - #define SET_CMD(i,id) \ aCmd = aDel; \ aCmd += ScGlobal::GetRscString( id ); \ aCmd += aDel; \ aCmdArr[i] = aCmd; - - void ScHFEditPage::FillCmdArr() { OUString aDel( ScGlobal::GetRscString( STR_HFCMD_DELIMITER ) ); @@ -851,8 +843,6 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& true ) {} - - SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); }; @@ -867,8 +857,6 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r true ) {} - - SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); }; @@ -883,8 +871,6 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& false ) {} - - SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); }; @@ -899,8 +885,6 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& r false ) {} - - SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScLeftFooterEditPage( pParent, rCoreSet ) ); }; diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index a50a731d88aa..c382b413ec77 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -22,8 +22,6 @@ - - #define _TPHF_CXX #include "scitems.hxx" #include <sfx2/basedlgs.hxx> @@ -45,8 +43,6 @@ #undef _TPHF_CXX - - // class ScHFPage @@ -86,22 +82,16 @@ ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) m_pBtnEdit->SetHelpId( HID_SC_FOOTER_EDIT ); } - - ScHFPage::~ScHFPage() { } - - void ScHFPage::Reset( const SfxItemSet& rSet ) { SvxHFPage::Reset( rSet ); TurnOnHdl( 0 ); } - - bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) { sal_Bool bResult = SvxHFPage::FillItemSet( rOutSet ); @@ -120,8 +110,6 @@ bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) return bResult; } - - void ScHFPage::ActivatePage( const SfxItemSet& rSet ) { sal_uInt16 nPageWhich = GetWhich( SID_ATTR_PAGE ); @@ -138,8 +126,6 @@ void ScHFPage::ActivatePage( const SfxItemSet& rSet ) SvxHFPage::ActivatePage( rSet ); } - - int ScHFPage::DeactivatePage( SfxItemSet* pSetP ) { if ( LEAVE_PAGE == SvxHFPage::DeactivatePage( pSetP ) ) @@ -149,8 +135,6 @@ int ScHFPage::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } - - void ScHFPage::ActivatePage() { } @@ -176,8 +160,6 @@ IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) } - - IMPL_LINK_NOARG(ScHFPage, BtnHdl) { // When the Edit-Dialog is directly called from the Button's Click-Handler, @@ -273,15 +255,11 @@ ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) { } - - SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScHeaderPage( pParent, rCoreSet ) ); } - - sal_uInt16* ScHeaderPage::GetRanges() { return SvxHeaderPage::GetRanges(); @@ -296,21 +274,15 @@ ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) { } - - SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScFooterPage( pParent, rCoreSet ) ); } - - sal_uInt16* ScFooterPage::GetRanges() { return SvxHeaderPage::GetRanges(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index a6736a87e02f..b7b00018ea77 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -55,8 +55,6 @@ ScEditWindow* GetScEditWindow () return pActiveEdWnd; } - - static void lcl_GetFieldData( ScHeaderFieldData& rData ) { SfxViewShell* pShell = SfxViewShell::Current(); @@ -121,8 +119,6 @@ void ScEditWindow::Resize() Control::Resize(); } - - ScEditWindow::~ScEditWindow() { // delete Accessible object before deleting EditEngine and EditView @@ -141,16 +137,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScEditWindow(Window *pParen return new ScEditWindow (pParent, WB_BORDER|WB_TABSTOP, Left); } - - void ScEditWindow::SetNumType(SvxNumType eNumType) { pEdEngine->SetNumType(eNumType); pEdEngine->UpdateFields(); } - - EditTextObject* ScEditWindow::CreateTextObject() { // Absatzattribute zuruecksetzen @@ -164,8 +156,6 @@ EditTextObject* ScEditWindow::CreateTextObject() return pEdEngine->CreateTextObject(); } - - void ScEditWindow::SetFont( const ScPatternAttr& rPattern ) { SfxItemSet* pSet = new SfxItemSet( pEdEngine->GetEmptyItemSet() ); @@ -180,22 +170,16 @@ void ScEditWindow::SetFont( const ScPatternAttr& rPattern ) pEdEngine->SetDefaults( pSet ); } - - void ScEditWindow::SetText( const EditTextObject& rTextObject ) { pEdEngine->SetText( rTextObject ); } - - void ScEditWindow::InsertField( const SvxFieldItem& rFld ) { pEdView->InsertField( rFld ); } - - void ScEditWindow::SetCharAttriutes() { SfxObjectShell* pDocSh = SfxObjectShell::Current(); @@ -233,8 +217,6 @@ void ScEditWindow::SetCharAttriutes() } } - - void ScEditWindow::Paint( const Rectangle& rRect ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -252,15 +234,11 @@ void ScEditWindow::Paint( const Rectangle& rRect ) pEdView->ShowCursor(true,true); } - - void ScEditWindow::MouseMove( const MouseEvent& rMEvt ) { pEdView->MouseMove( rMEvt ); } - - void ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt ) { if ( !HasFocus() ) @@ -269,15 +247,11 @@ void ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt ) pEdView->MouseButtonDown( rMEvt ); } - - void ScEditWindow::MouseButtonUp( const MouseEvent& rMEvt ) { pEdView->MouseButtonUp( rMEvt ); } - - void ScEditWindow::KeyInput( const KeyEvent& rKEvt ) { sal_uInt16 nKey = rKEvt.GetKeyCode().GetModifier() @@ -299,15 +273,11 @@ void ScEditWindow::KeyInput( const KeyEvent& rKEvt ) } } - - void ScEditWindow::Command( const CommandEvent& rCEvt ) { pEdView->Command( rCEvt ); } - - void ScEditWindow::GetFocus() { pEdView->ShowCursor(true,true); @@ -333,8 +303,6 @@ void ScEditWindow::LoseFocus() pAcc = NULL; } - - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScEditWindow::CreateAccessible() { OUString sName; diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 256fd3aaccf5..7d35b067a199 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -49,8 +49,6 @@ const char UNO_ALIGNVCENTER[] = ".uno:AlignVCenter"; namespace sc { namespace sidebar { - - AlignmentPropertyPanel::AlignmentPropertyPanel( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, @@ -87,14 +85,10 @@ AlignmentPropertyPanel::AlignmentPropertyPanel( mpFtRotate->SetBackground(Wallpaper()); } - - AlignmentPropertyPanel::~AlignmentPropertyPanel() { } - - void AlignmentPropertyPanel::Initialize() { Link aLink = LINK(this, AlignmentPropertyPanel, TbxHorAlignSelectHdl); @@ -146,8 +140,6 @@ void AlignmentPropertyPanel::Initialize() #endif } - - IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) { OUString sTmp = mpMtrAngle->GetText(); @@ -168,8 +160,6 @@ IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) return 0; } - - IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG ) { sal_Int32 nTmp = mpCtrlDial->GetRotation(); @@ -181,8 +171,6 @@ IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG ) return 0; } - - IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG ) { bool bVertical = mpCbStacked->IsChecked() ? true : false; @@ -192,8 +180,6 @@ IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG ) return 0; } - - IMPL_LINK(AlignmentPropertyPanel, TbxHorAlignSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -232,8 +218,6 @@ IMPL_LINK(AlignmentPropertyPanel, TbxHorAlignSelectHdl, ToolBox*, pToolBox) return 0; } - - IMPL_LINK(AlignmentPropertyPanel, TbxVerAlignSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -265,8 +249,6 @@ IMPL_LINK(AlignmentPropertyPanel, TbxVerAlignSelectHdl, ToolBox*, pToolBox) return 0; } - - IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) { mpCBXWrapText->EnableTriState(false); @@ -277,8 +259,6 @@ IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) return( 0L ); } - - IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) { bool bState = mpCBXMergeCell->IsChecked(); @@ -296,8 +276,6 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) return 0; } - - IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) { bool bState = mpCBXWrapText->IsChecked(); @@ -306,8 +284,6 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) return 0; } - - AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, @@ -326,16 +302,12 @@ AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( pBindings); } - - void AlignmentPropertyPanel::DataChanged( const DataChangedEvent& rEvent) { (void)rEvent; } - - void AlignmentPropertyPanel::HandleContextChange( const ::sfx2::sidebar::EnumContext aContext) { @@ -347,13 +319,9 @@ void AlignmentPropertyPanel::HandleContextChange( maContext = aContext; - - // todo } - - void AlignmentPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, @@ -520,15 +488,11 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } } - - SfxBindings* AlignmentPropertyPanel::GetBindings() { return mpBindings; } - - void AlignmentPropertyPanel::FormatDegrees(double& dTmp) { while(dTmp<0) @@ -537,8 +501,6 @@ void AlignmentPropertyPanel::FormatDegrees(double& dTmp) dTmp = 359; } - - void AlignmentPropertyPanel::UpdateHorAlign() { const sal_uInt16 nIdLeft = mpTBHorizontal->GetItemId(UNO_ALIGNLEFT); @@ -589,8 +551,6 @@ void AlignmentPropertyPanel::UpdateHorAlign() } } - - void AlignmentPropertyPanel::UpdateVerAlign() { const sal_uInt16 nIdTop = mpTBVertical->GetItemId(UNO_ALIGNTOP); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index adc77f8bb98a..66e28c30f6f8 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -68,8 +68,6 @@ namespace namespace sc { namespace sidebar { - - svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateFillColorPopupControl(svx::sidebar::PopupContainer* pParent) { const ScResId aResId(VS_NOFILLCOLOR); @@ -94,8 +92,6 @@ void CellAppearancePropertyPanel::SetFillColor( maBackColor = aColor; } - - svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateLineColorPopupControl(svx::sidebar::PopupContainer* pParent) { return new svx::sidebar::ColorControl( @@ -118,8 +114,6 @@ void CellAppearancePropertyPanel::SetLineColor( maLineColor = aColor; } - - svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent) { return new CellLineStyleControl(pParent, *this); @@ -133,8 +127,6 @@ void CellAppearancePropertyPanel::EndCellLineStylePopupMode(void) } } - - svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent) { return new CellBorderStyleControl(pParent, *this); @@ -148,8 +140,6 @@ void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void) } } - - CellAppearancePropertyPanel::CellAppearancePropertyPanel( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, @@ -230,14 +220,10 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel( Initialize(); } - - CellAppearancePropertyPanel::~CellAppearancePropertyPanel() { } - - void CellAppearancePropertyPanel::Initialize() { const sal_uInt16 nIdBkColor = mpTBFillColor->GetItemId( UNO_BACKGROUNDCOLOR ); @@ -275,8 +261,6 @@ void CellAppearancePropertyPanel::Initialize() mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle); } - - IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -289,8 +273,6 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox) return 0; } - - IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -303,8 +285,6 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox return 0; } - - IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -328,8 +308,6 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBo return 0; } - - IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -354,8 +332,6 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox return 0; } - - IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) { bool bState = mpCBXShowGrid->IsChecked(); @@ -364,8 +340,6 @@ IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) return 0; } - - CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, @@ -384,16 +358,12 @@ CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( pBindings); } - - void CellAppearancePropertyPanel::DataChanged( const DataChangedEvent& rEvent) { (void)rEvent; } - - void CellAppearancePropertyPanel::HandleContextChange( const ::sfx2::sidebar::EnumContext aContext) { @@ -405,13 +375,9 @@ void CellAppearancePropertyPanel::HandleContextChange( maContext = aContext; - - // todo } - - void CellAppearancePropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, @@ -690,15 +656,11 @@ void CellAppearancePropertyPanel::NotifyItemUpdate( } } - - SfxBindings* CellAppearancePropertyPanel::GetBindings() { return mpBindings; } - - void CellAppearancePropertyPanel::SetStyleIcon() { const sal_uInt16 nIdBorderLineStyle = mpTBLineStyle->GetItemId( UNO_LINESTYLE ); diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 523adc891643..89e52dfad3cc 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -22,8 +22,6 @@ - - #include "scitems.hxx" #include <svx/numinf.hxx> #include <sfx2/objsh.hxx> @@ -130,8 +128,6 @@ ScStyleDlg::ScStyleDlg( Window* pParent, } } - - void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) { if ( nDlgRsc == RID_SCDLG_STYLES_PAR ) @@ -182,8 +178,6 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } - - const SfxItemSet* ScStyleDlg::GetRefreshedSet() { SfxItemSet* pItemSet = GetInputSetImpl(); diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx index 4409ab9ba93d..55eb288a0ec4 100644 --- a/sc/source/ui/undo/areasave.cxx +++ b/sc/source/ui/undo/areasave.cxx @@ -24,8 +24,6 @@ #include "document.hxx" #include <documentlinkmgr.hxx> - - ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLink& rSource ) : aFileName ( rSource.GetFile() ), aFilterName ( rSource.GetFilter() ), diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index bebe48cdf342..59845fa4a057 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -44,8 +44,6 @@ #include "refundo.hxx" #include "markdata.hxx" - - TYPEINIT1(ScUndoDoOutline, ScSimpleUndo); TYPEINIT1(ScUndoMakeOutline, ScSimpleUndo); TYPEINIT1(ScUndoOutlineLevel, ScSimpleUndo); diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 0bea09ef8713..811e85e54596 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -29,13 +29,9 @@ #include "inputhdl.hxx" #include "globstr.hrc" - - TYPEINIT1(ScUndoModifyStyle, ScSimpleUndo); TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo); - - // modify style (cell or page style) @@ -86,8 +82,6 @@ void ScStyleSaveData::InitFromStyle( const SfxStyleSheetBase* pSource ) *this = ScStyleSaveData(); // empty } - - ScUndoModifyStyle::ScUndoModifyStyle( ScDocShell* pDocSh, SfxStyleFamily eFam, const ScStyleSaveData& rOld, const ScStyleSaveData& rNew ) : ScSimpleUndo( pDocSh ), @@ -230,8 +224,6 @@ bool ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; // no repeat possible } - - // apply page style ScUndoApplyPageStyle::ApplyStyleEntry::ApplyStyleEntry( SCTAB nTab, const OUString& rOldStyle ) : diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index ce2794f619dc..51ba554e5439 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -68,8 +68,6 @@ void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, rRange.aEnd.Col(), rRange.aEnd.Row(), rRange.aEnd.Tab() ); } - - ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index 2a89cd8b7311..1ddc4877ba68 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -32,8 +32,6 @@ using namespace com::sun::star; - - ScAddressConversionObj::ScAddressConversionObj(ScDocShell* pDocSh, bool _bIsRange) : pDocShell( pDocSh ), nRefSheet( 0 ), diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 34de4c4035ca..9193aa148bb7 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -60,13 +60,9 @@ using namespace ::com::sun::star; - - // ein AutoFormat hat immer 16 Eintraege #define SC_AF_FIELD_COUNT 16 - - // AutoFormat-Map nur fuer PropertySetInfo, ohne Which-IDs static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() @@ -143,16 +139,12 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() return aAutoFieldMap_Impl; } - - #define SCAUTOFORMATSOBJ_SERVICE "com.sun.star.sheet.TableAutoFormats" SC_SIMPLE_SERVICE_INFO( ScAutoFormatFieldObj, "ScAutoFormatFieldObj", "com.sun.star.sheet.TableAutoFormatField" ) SC_SIMPLE_SERVICE_INFO( ScAutoFormatObj, "ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat" ) SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "ScAutoFormatsObj", SCAUTOFORMATSOBJ_SERVICE ) - - static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUString& rName, sal_uInt16& rOutIndex ) { ScAutoFormat::const_iterator itBeg = rFormats.begin(), itEnd = rFormats.end(); @@ -170,8 +162,6 @@ static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUStrin return false; // is nich } - - ScAutoFormatsObj::ScAutoFormatsObj() { //! Dieses Objekt darf es nur einmal geben, und es muss an den Auto-Format-Daten @@ -392,8 +382,6 @@ sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const OUString& aName ) *ScGlobal::GetOrCreateAutoFormat(), aString, nDummy ); } - - ScAutoFormatObj::ScAutoFormatObj(sal_uInt16 nIndex) : aPropSet( lcl_GetAutoFormatMap() ), nFormatIndex( nIndex ) @@ -657,8 +645,6 @@ uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyNa SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAutoFormatObj ) - - ScAutoFormatFieldObj::ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField) : aPropSet( lcl_GetAutoFieldMap() ), nFormatIndex( nFormat ), @@ -856,6 +842,4 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAutoFormatFieldObj ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 905b06998c67..f55c40a072c5 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -42,8 +42,6 @@ using namespace com::sun::star; - - // Calc document extern uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); extern OUString SAL_CALL ScDocument_getImplementationName() throw(); @@ -126,8 +124,6 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_crea const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw (uno::Exception, std::exception); - - // Anzahl der Funktionen, die als zuletzt benutzt gespeichert werden //! Define mit funcpage.hxx und dwfunctr.hxx zusammenfassen !!! #define LRU_MAX 10 @@ -141,8 +137,6 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_crea // Anzahl der PropertyValues in einer Function-Description #define SC_FUNCDESC_PROPCOUNT 5 - - // alles ohne Which-ID, Map nur fuer PropertySetInfo static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() @@ -172,8 +166,6 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() return aSettingsPropertyMap_Impl; } - - #define SCFUNCTIONLISTOBJ_SERVICE "com.sun.star.sheet.FunctionDescriptions" #define SCRECENTFUNCTIONSOBJ_SERVICE "com.sun.star.sheet.RecentFunctions" #define SCSPREADSHEETSETTINGS_SERVICE "com.sun.star.sheet.GlobalSheetSettings" @@ -182,8 +174,6 @@ SC_SIMPLE_SERVICE_INFO( ScFunctionListObj, "ScFunctionListObj", SCFUNCTIONLISTOB SC_SIMPLE_SERVICE_INFO( ScRecentFunctionsObj, "ScRecentFunctionsObj", SCRECENTFUNCTIONSOBJ_SERVICE ) SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREADSHEETSETTINGS_SERVICE ) - - extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( @@ -391,8 +381,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( } // extern C - - ScSpreadsheetSettings::ScSpreadsheetSettings() : aPropSet( lcl_GetSettingsPropertyMap() ) { @@ -668,8 +656,6 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aProp SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSpreadsheetSettings ) - - ScRecentFunctionsObj::ScRecentFunctionsObj() { } @@ -749,8 +735,6 @@ sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() throw(uno::Runt return LRU_MAX; } - - ScFunctionListObj::ScFunctionListObj() { } @@ -999,6 +983,4 @@ sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index a138f6bbcdde..647725cf0c2e 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -34,13 +34,9 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/util/XModifyListener.hpp> - - namespace calc { - - //= OCellListSource class OCellListSource; diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 5bb1309831f3..f9c9fc9aef0d 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -131,8 +131,6 @@ using namespace com::sun::star; - - class ScNamedEntry { OUString aName; @@ -146,8 +144,6 @@ public: const ScRange& GetRange() const { return aRange; } }; - - // The names in the maps must be sorted according to strcmp! //! Instead of Which-ID 0 use special IDs and do not compare via names! @@ -856,13 +852,9 @@ static const SvxItemPropertySet* lcl_GetEditPropertySet() return &aEditPropertySet; } - - using sc::HMMToTwips; using sc::TwipsToHMM; - - #define SCCHARPROPERTIES_SERVICE "com.sun.star.style.CharacterProperties" #define SCPARAPROPERTIES_SERVICE "com.sun.star.style.ParagraphProperties" #define SCCELLPROPERTIES_SERVICE "com.sun.star.table.CellProperties" @@ -883,8 +875,6 @@ SC_SIMPLE_SERVICE_INFO( ScCellsObj, "ScCellsObj", "com.sun.star.sheet.Cells" ) SC_SIMPLE_SERVICE_INFO( ScTableColumnObj, "ScTableColumnObj", "com.sun.star.table.TableColumn" ) SC_SIMPLE_SERVICE_INFO( ScTableRowObj, "ScTableRowObj", "com.sun.star.table.TableRow" ) - - //! ScLinkListener in anderes File verschieben !!! ScLinkListener::~ScLinkListener() @@ -896,8 +886,6 @@ void ScLinkListener::Notify( const SfxHint& rHint ) aLink.Call( (SfxHint*)&rHint ); } - - static void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& rSource ) { uno::Reference<beans::XPropertySetInfo> xInfo(rSource.getPropertySetInfo()); @@ -1051,8 +1039,6 @@ void ScHelperFunctions::AssignTableBorder2ToAny( uno::Any& rAny, rAny <<= aBorder; } - - //! lcl_ApplyBorder nach docfunc verschieben! void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& rRanges, @@ -1403,8 +1389,6 @@ static OUString lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPos, sal return aVal; } - - ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR) : pPropSet(lcl_GetCellsPropertySet()), pDocShell( pDocSh ), @@ -1802,8 +1786,6 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangesBase::getImplementationId() return css::uno::Sequence<sal_Int8>(); } - - void ScCellRangesBase::PaintRanges_Impl( sal_uInt16 nPart ) { for (size_t i = 0, nCount = aRanges.size(); i < nCount; ++i) @@ -4141,8 +4123,6 @@ ScCellRangesBase* ScCellRangesBase::getImplementation( const uno::Reference<uno: return pRet; } - - typedef boost::ptr_vector<ScNamedEntry> ScNamedEntryArr_Impl; struct ScCellRangesObj::Impl @@ -4773,8 +4753,6 @@ uno::Reference<table::XCellRange> ScCellRangeObj::CreateRangeFromDoc( ScDocument return NULL; } - - ScCellRangeObj::ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR) : ScCellRangesBase( pDocSh, rR ), pRangePropSet( lcl_GetRangePropertySet() ), @@ -6049,8 +6027,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() return aRet; } - - const SvxItemPropertySet* ScCellObj::GetEditPropertySet() { return lcl_GetEditPropertySet(); @@ -6859,8 +6835,6 @@ sal_Int16 SAL_CALL ScCellObj::resetActionLocks() throw(uno::RuntimeException, st return nRet; } - - ScTableSheetObj::ScTableSheetObj( ScDocShell* pDocSh, SCTAB nTab ) : ScCellRangeObj( pDocSh, ScRange(0,0,nTab, MAXCOL,MAXROW,nTab) ), pSheetPropSet(lcl_GetSheetPropertySet()) @@ -8710,8 +8684,6 @@ ScTableSheetObj* ScTableSheetObj::getImplementation( const uno::Reference<uno::X return pRet; } - - ScTableColumnObj::ScTableColumnObj( ScDocShell* pDocSh, SCCOL nCol, SCTAB nTab ) : ScCellRangeObj( pDocSh, ScRange(nCol,0,nTab, nCol,MAXROW,nTab) ), pColPropSet(lcl_GetColumnPropertySet()) @@ -8913,8 +8885,6 @@ const SfxItemPropertyMap& ScTableColumnObj::GetItemPropertyMap() return pColPropSet->getPropertyMap(); } - - ScTableRowObj::ScTableRowObj(ScDocShell* pDocSh, SCROW nRow, SCTAB nTab) : ScCellRangeObj( pDocSh, ScRange(0,nRow,nTab, MAXCOL,nRow,nTab) ), pRowPropSet(lcl_GetRowPropertySet()) @@ -9068,8 +9038,6 @@ const SfxItemPropertyMap& ScTableRowObj::GetItemPropertyMap() return pRowPropSet->getPropertyMap(); } - - ScCellsObj::ScCellsObj(ScDocShell* pDocSh, const ScRangeList& rR) : pDocShell( pDocSh ), aRanges( rR ) @@ -9129,8 +9097,6 @@ sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException, std::ex return bHas; } - - ScCellsEnumeration::ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR) : pDocShell( pDocSh ), aRanges( rR ), @@ -9261,8 +9227,6 @@ uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchEleme throw container::NoSuchElementException(); // no more elements } - - ScCellFormatsObj::ScCellFormatsObj(ScDocShell* pDocSh, const ScRange& rRange) : pDocShell( pDocSh ), aTotalRange( rRange ) @@ -9383,8 +9347,6 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFormatsObj::createEnumera return NULL; } - - ScCellFormatsEnumeration::ScCellFormatsEnumeration(ScDocShell* pDocSh, const ScRange& rRange) : pDocShell( pDocSh ), nTab( rRange.aStart.Tab() ), @@ -9491,8 +9453,6 @@ uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() throw(container::NoSuc return uno::makeAny(uno::Reference<table::XCellRange> (NextObject_Impl())); } - - ScUniqueCellFormatsObj::ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange& rRange) : pDocShell( pDocSh ), aTotalRange( rRange ), @@ -9761,8 +9721,6 @@ uno::Reference<container::XEnumeration> SAL_CALL ScUniqueCellFormatsObj::createE return NULL; } - - ScUniqueCellFormatsEnumeration::ScUniqueCellFormatsEnumeration(ScDocShell* pDocSh, const ScMyRangeLists& rRangeLists) : aRangeLists(rRangeLists), pDocShell( pDocSh ), diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 953b2a3a0544..a6c1958e21b0 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -609,8 +609,6 @@ namespace calc // TODO: place your code here } - - } // namespace calc diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 805f24a07f22..d3ea255dd599 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -35,13 +35,9 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> - - namespace calc { - - //= OCellValueBinding class OCellValueBinding; diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 48e04c9049c7..29a979e8691d 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -243,8 +243,6 @@ vector<ScTokenRef>* TokenTable::getAllRanges() const return pTokens.release(); } - - typedef std::map<sal_uInt32, FormulaToken*> FormulaTokenMap; typedef std::map<sal_uInt32, FormulaTokenMap*> FormulaTokenMapMap; @@ -433,8 +431,6 @@ vector<ScTokenRef>* Chart2PositionMap::getDataRowRanges(SCROW nRow) const return maData.getRowRanges( nRow); } - - /** * Designed to be a drop-in replacement for ScChartPositioner, in order to * handle external references. @@ -830,8 +826,6 @@ void Chart2Positioner::createPositionMap() } } - - /** * Function object to create a range string from a token list. */ @@ -2970,8 +2964,6 @@ IMPL_LINK( ScChart2DataSequence, ValueListenerHdl, SfxHint*, pHint ) return 0; } - - ScChart2DataSequence::ExternalRefListener::ExternalRefListener( ScChart2DataSequence& rParent, ScDocument* pDoc) : ScExternalRefManager::LinkListener(), @@ -3022,8 +3014,6 @@ const boost::unordered_set<sal_uInt16>& ScChart2DataSequence::ExternalRefListene return maFileIds; } - - uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 2e125d936b06..2560d5c075e0 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -49,13 +49,9 @@ using namespace com::sun::star; #define PROP_HANDLE_RELATED_CELLRANGES 1 - - SC_SIMPLE_SERVICE_INFO( ScChartObj, "ScChartObj", "com.sun.star.table.TableChart" ) SC_SIMPLE_SERVICE_INFO( ScChartsObj, "ScChartsObj", "com.sun.star.table.TableCharts" ) - - static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName ) { if (pDocShell) @@ -90,8 +86,6 @@ static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const OU return NULL; } - - ScChartsObj::ScChartsObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), nTab( nT ) @@ -443,8 +437,6 @@ sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName ) return ( lcl_FindChartObj( pDocShell, nTab, aName ) != NULL ); } - - ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN) :ScChartObj_Base( m_aMutex ) ,ScChartObj_PBase( ScChartObj_Base::rBHelper ) @@ -797,6 +789,4 @@ uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() throw - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 4bd06eec23f5..717ff353358f 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -81,8 +81,6 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() return aConfigPropertyMap_Impl; } - - ScDocumentConfiguration::ScDocumentConfiguration(ScDocShell* pDocSh) : pDocShell(pDocSh) , aPropSet ( lcl_GetConfigPropertyMap() ) diff --git a/sc/source/ui/unoobj/convuno.cxx b/sc/source/ui/unoobj/convuno.cxx index ea9c55144c07..c161e37d3ed7 100644 --- a/sc/source/ui/unoobj/convuno.cxx +++ b/sc/source/ui/unoobj/convuno.cxx @@ -24,8 +24,6 @@ using namespace com::sun::star; - - // everything is static... LanguageType ScUnoConversion::GetLanguage( const lang::Locale& rLocale ) @@ -46,6 +44,4 @@ void ScUnoConversion::FillLocale( lang::Locale& rLocale, LanguageType eLang ) rLocale = LanguageTag::convertToLocale( eLang ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index b02f1bf975e4..4f69c25005fa 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -34,13 +34,9 @@ using namespace com::sun::star; - - #define SCSHEETCELLCURSOR_SERVICE "com.sun.star.sheet.SheetCellCursor" #define SCCELLCURSOR_SERVICE "com.sun.star.table.CellCursor" - - ScCellCursorObj::ScCellCursorObj(ScDocShell* pDocSh, const ScRange& rR) : ScCellRangeObj( pDocSh, rR ) { @@ -486,6 +482,4 @@ uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 9af780d25144..6845eec59551 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -87,8 +87,6 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::table::CellAddress; using ::com::sun::star::table::CellRangeAddress; - - namespace { const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() @@ -110,8 +108,6 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() return aDataPilotDescriptorBaseMap_Impl; } - - const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() { using namespace ::com::sun::star::beans::PropertyAttribute; @@ -138,8 +134,6 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() return aDataPilotFieldMap_Impl; } - - const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap() { static const SfxItemPropertyMapEntry aDataPilotItemMap_Impl[] = @@ -152,8 +146,6 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap() return aDataPilotItemMap_Impl; } - - inline bool lclCheckValidDouble( double fValue, sal_Bool bAuto ) { return bAuto || ::rtl::math::isFinite( fValue ); @@ -171,8 +163,6 @@ bool lclCheckMinMaxStep( const DataPilotFieldGroupInfo& rInfo ) } // namespace - - SC_SIMPLE_SERVICE_INFO( ScDataPilotDescriptor, "ScDataPilotDescriptor", "stardiv::one::sheet::DataPilotDescriptor" ) SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldObj, "ScDataPilotFieldObj", "com.sun.star.sheet.DataPilotField" ) SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldsObj, "ScDataPilotFieldsObj", "com.sun.star.sheet.DataPilotFields" ) @@ -185,13 +175,9 @@ SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupsObj, "ScDataPilotFieldGroupsObj", SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupObj, "ScDataPilotFieldGroupObj", "com.sun.star.sheet.DataPilotFieldGroup" ) SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupItemObj, "ScDataPilotFieldGroupItemObj", "com.sun.star.sheet.DataPilotFieldGroupItem" ) - - // name that is used in the API for the data layout field #define SC_DATALAYOUT_NAME "Data" - - GeneralFunction ScDataPilotConversion::FirstFunc( sal_uInt16 nBits ) { if ( nBits & PIVOT_FUNC_SUM ) return GeneralFunction_SUM; @@ -244,8 +230,6 @@ void ScDataPilotConversion::FillGroupInfo( DataPilotFieldGroupInfo& rInfo, const rInfo.Step = rGroupInfo.mfStep; } - - static ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName ) { if (pDocShell) @@ -296,8 +280,6 @@ static sal_Int32 lcl_GetObjectIndex( ScDPObject* pDPObj, const ScFieldIdentifier return -1; // none } - - ScDataPilotTablesObj::ScDataPilotTablesObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), nTab( nT ) @@ -593,8 +575,6 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName ) return false; } - - ScDataPilotDescriptorBase::ScDataPilotDescriptorBase(ScDocShell* pDocSh) : maPropSet( lcl_GetDataPilotDescriptorBaseMap() ), pDocShell( pDocSh ) @@ -1100,8 +1080,6 @@ ScDataPilotDescriptorBase* ScDataPilotDescriptorBase::getImplementation( return pRet; } - - ScDataPilotTableObj::ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN) : ScDataPilotDescriptorBase( pDocSh ), nTab( nT ), @@ -1400,8 +1378,6 @@ void ScDataPilotTableObj::Refreshed_Impl() pDoc->AddUnoListenerCall( aModifyListeners[n], aEvent ); } - - ScDataPilotDescriptor::ScDataPilotDescriptor(ScDocShell* pDocSh) : ScDataPilotDescriptorBase( pDocSh ), mpDPObject(new ScDPObject(pDocSh ? pDocSh->GetDocument() : NULL) ) @@ -1466,8 +1442,6 @@ void SAL_CALL ScDataPilotDescriptor::setTag( const OUString& aNewTag ) mpDPObject->SetTag( aNewTag ); } - - ScDataPilotChildObjBase::ScDataPilotChildObjBase( ScDataPilotDescriptorBase& rParent ) : mrParent( rParent ) { @@ -1553,8 +1527,6 @@ ScDocShell* ScDataPilotChildObjBase::GetDocShell() const return mrParent.GetDocShell(); } - - ScDataPilotFieldsObj::ScDataPilotFieldsObj( ScDataPilotDescriptorBase& rParent ) : ScDataPilotChildObjBase( rParent ) { @@ -1817,8 +1789,6 @@ sal_Bool SAL_CALL ScDataPilotFieldsObj::hasByName( const OUString& aName ) return GetObjectByName_Impl(aName) != NULL; } - - ScDataPilotFieldObj::ScDataPilotFieldObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId ) : ScDataPilotChildObjBase( rParent, rFieldId ), @@ -2823,8 +2793,6 @@ Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( con return xRet; } - - namespace { bool lclExtractGroupMembers( ScFieldGroupMembers& rMembers, const Any& rElement ) @@ -2867,8 +2835,6 @@ bool lclExtractGroupMembers( ScFieldGroupMembers& rMembers, const Any& rElement } // namespace - - ScDataPilotFieldGroupsObj::ScDataPilotFieldGroupsObj( const ScFieldGroups& rGroups ) : maGroups( rGroups ) { @@ -3042,8 +3008,6 @@ ScFieldGroups::iterator ScDataPilotFieldGroupsObj::implFindByName( const OUStrin return maGroups.end(); } - - namespace { OUString lclExtractMember( const Any& rElement ) @@ -3060,8 +3024,6 @@ OUString lclExtractMember( const Any& rElement ) } // namespace - - ScDataPilotFieldGroupObj::ScDataPilotFieldGroupObj( ScDataPilotFieldGroupsObj& rParent, const OUString& rGroupName ) : mrParent( rParent ), maGroupName( rGroupName ) @@ -3216,8 +3178,6 @@ void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName ) throw(R maGroupName = rName; } - - ScDataPilotFieldGroupItemObj::ScDataPilotFieldGroupItemObj( ScDataPilotFieldGroupObj& rParent, const OUString& rName ) : mrParent( rParent ), maName( rName ) @@ -3246,8 +3206,6 @@ void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName ) thr maName = rName; } - - ScDataPilotItemsObj::ScDataPilotItemsObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId ) : ScDataPilotChildObjBase( rParent, rFieldId ) { @@ -3363,8 +3321,6 @@ sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException, std return ( getCount() != 0 ); } - - ScDataPilotItemObj::ScDataPilotItemObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId, sal_Int32 nIndex ) : ScDataPilotChildObjBase( rParent, rFieldId ), maPropSet( lcl_GetDataPilotItemMap() ), @@ -3551,6 +3507,4 @@ void SAL_CALL ScDataPilotItemObj::removeVetoableChangeListener( - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index ea5ffce0f32e..13e41ea20b36 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -61,8 +61,6 @@ using namespace com::sun::star; - - // alles ohne Which-ID, Map nur fuer PropertySetInfo static const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap() @@ -129,8 +127,6 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() - - SC_SIMPLE_SERVICE_INFO( ScConsolidationDescriptor, "ScConsolidationDescriptor", "com.sun.star.sheet.ConsolidationDescriptor" ) SC_SIMPLE_SERVICE_INFO( ScDatabaseRangesObj, "ScDatabaseRangesObj", "com.sun.star.sheet.DatabaseRanges" ) SC_SIMPLE_SERVICE_INFO( ScFilterDescriptorBase, "ScFilterDescriptorBase", "com.sun.star.sheet.SheetFilterDescriptor" ) @@ -162,8 +158,6 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e return eGeneral; } - - // ScImportDescriptor: alles static long ScImportDescriptor::GetPropertyCount() @@ -270,8 +264,6 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ } } - - // ScSortDescriptor: alles static //! SortAscending muss aus der SheetSortDescriptor service-Beschreibung raus @@ -467,8 +459,6 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b } } - - ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, sal_uInt16 nP ) : xRef( pDesc ), // Objekt festhalten rParent( *pDesc ), @@ -558,8 +548,6 @@ void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns( rParent.PutData(aParam); } - - ScSubTotalDescriptorBase::ScSubTotalDescriptorBase() : aPropSet( lcl_GetSubTotalPropertyMap() ) { @@ -813,8 +801,6 @@ ScSubTotalDescriptorBase* ScSubTotalDescriptorBase::getImplementation( return pRet; } - - ScSubTotalDescriptor::ScSubTotalDescriptor() { } @@ -838,8 +824,6 @@ void ScSubTotalDescriptor::SetParam( const ScSubTotalParam& rNew ) aStoredParam = rNew; // von aussen gesetzt } - - ScRangeSubTotalDescriptor::ScRangeSubTotalDescriptor(ScDatabaseRangeObj* pPar) : pParent(pPar) { @@ -865,8 +849,6 @@ void ScRangeSubTotalDescriptor::PutData( const ScSubTotalParam& rParam ) pParent->SetSubTotalParam( rParam ); } - - ScConsolidationDescriptor::ScConsolidationDescriptor() { } @@ -1557,8 +1539,6 @@ uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPro SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFilterDescriptorBase ) - - ScFilterDescriptor::ScFilterDescriptor(ScDocShell* pDocShell) : ScFilterDescriptorBase(pDocShell) @@ -1584,8 +1564,6 @@ void ScFilterDescriptor::SetParam( const ScQueryParam& rNew ) aStoredParam = rNew; // von aussen gesetzt } - - ScRangeFilterDescriptor::ScRangeFilterDescriptor(ScDocShell* pDocShell, ScDatabaseRangeObj* pPar) : ScFilterDescriptorBase(pDocShell), pParent(pPar) @@ -1612,8 +1590,6 @@ void ScRangeFilterDescriptor::PutData( const ScQueryParam& rParam ) pParent->SetQueryParam( rParam ); } - - ScDataPilotFilterDescriptor::ScDataPilotFilterDescriptor(ScDocShell* pDocShell, ScDataPilotDescriptorBase* pPar) : ScFilterDescriptorBase(pDocShell), pParent(pPar) @@ -1655,8 +1631,6 @@ void ScDataPilotFilterDescriptor::PutData( const ScQueryParam& rParam ) } } - - ScDatabaseRangeObj::ScDatabaseRangeObj(ScDocShell* pDocSh, const OUString& rNm) : pDocShell( pDocSh ), aName( rNm ), @@ -2226,8 +2200,6 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() return aRet; } - - ScDatabaseRangesObj::ScDatabaseRangesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -2424,8 +2396,6 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName ) return false; } - - ScUnnamedDatabaseRangesObj::ScUnnamedDatabaseRangesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -2511,6 +2481,4 @@ sal_Bool ScUnnamedDatabaseRangesObj::hasByTable( sal_Int32 nTab ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index d02cf443cf52..302aa3a579a2 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -38,8 +38,6 @@ using namespace ::com::sun::star; - - static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() { static const SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] = @@ -73,12 +71,8 @@ using sc::HMMToTwips; using sc::TwipsToHMM; using sc::TwipsToEvenHMM; - - SC_SIMPLE_SERVICE_INFO( ScDocDefaultsObj, "ScDocDefaultsObj", "com.sun.star.sheet.Defaults" ) - - ScDocDefaultsObj::ScDocDefaultsObj(ScDocShell* pDocSh) : pDocShell( pDocSh ), aPropertyMap(lcl_GetDocDefaultsMap()) diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx index 6edc743bc1ca..21edc1b21774 100644 --- a/sc/source/ui/unoobj/detreg.cxx +++ b/sc/source/ui/unoobj/detreg.cxx @@ -57,6 +57,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL scd_component_getFactory( } // extern "C" - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index c3731ce944fc..242361618c77 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -34,13 +34,9 @@ using namespace com::sun::star; - - static const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns"; //data into text static const char* cURLDocDataSource = ".uno:DataSourceBrowser/DocumentDataSource"; - - static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxViewShell* pViewShell ) { if ( pViewShell ) @@ -55,8 +51,6 @@ static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxVie } - - ScDispatchProviderInterceptor::ScDispatchProviderInterceptor(ScTabViewShell* pViewSh) : pViewShell( pViewSh ) { @@ -194,8 +188,6 @@ void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject& m_xIntercepted = NULL; } - - ScDispatch::ScDispatch(ScTabViewShell* pViewSh) : pViewShell( pViewSh ), bListeningToView( false ) diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 41ff1053113d..be5e7db7f6f0 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -193,8 +193,6 @@ static const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap() using sc::HMMToTwips; using sc::TwipsToHMM; - - #define SCMODELOBJ_SERVICE "com.sun.star.sheet.SpreadsheetDocument" #define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings" #define SCDOC_SERVICE "com.sun.star.document.OfficeDocument" @@ -207,8 +205,6 @@ SC_SIMPLE_SERVICE_INFO( ScTableColumnsObj, "ScTableColumnsObj", "com.sun.star.ta SC_SIMPLE_SERVICE_INFO( ScTableRowsObj, "ScTableRowsObj", "com.sun.star.table.TableRows" ) SC_SIMPLE_SERVICE_INFO( ScTableSheetsObj, "ScTableSheetsObj", "com.sun.star.sheet.Spreadsheets" ) - - class ScPrintUIOptions : public vcl::PrinterOptionsHelper { public: @@ -2381,8 +2377,6 @@ uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms() } - - ScDrawPagesObj::ScDrawPagesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -2493,8 +2487,6 @@ sal_Bool SAL_CALL ScDrawPagesObj::hasElements() throw(uno::RuntimeException, std return ( getCount() != 0 ); } - - ScTableSheetsObj::ScTableSheetsObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -2900,8 +2892,6 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName ) return false; } - - ScTableColumnsObj::ScTableColumnsObj(ScDocShell* pDocSh, SCTAB nT, SCCOL nSC, SCCOL nEC) : pDocShell( pDocSh ), nTab ( nT ), @@ -3168,8 +3158,6 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aProperty SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableColumnsObj ) - - ScTableRowsObj::ScTableRowsObj(ScDocShell* pDocSh, SCTAB nT, SCROW nSR, SCROW nER) : pDocShell( pDocSh ), nTab ( nT ), @@ -3454,8 +3442,6 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyNam SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableRowsObj ) - - ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj() { if (pDocShell) @@ -3501,8 +3487,6 @@ uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const OUString& /* SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSpreadsheetSettingsObj ) - - ScAnnotationsObj::ScAnnotationsObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), nTab( nT ) @@ -3633,8 +3617,6 @@ sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException, s return ( getCount() != 0 ); } - - ScScenariosObj::ScScenariosObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), nTab ( nT ) @@ -3844,6 +3826,4 @@ sal_Bool SAL_CALL ScScenariosObj::hasByName( const OUString& aName ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx index a6f5ed09359d..8aa8fda0ed5f 100644 --- a/sc/source/ui/unoobj/drdefuno.cxx +++ b/sc/source/ui/unoobj/drdefuno.cxx @@ -23,8 +23,6 @@ using namespace ::com::sun::star; - - ScDrawDefaultsObj::ScDrawDefaultsObj(ScDocShell* pDocSh) : SvxUnoDrawPool( NULL ), pDocShell( pDocSh ) diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index de0f08766d09..ff1fa5e33c2b 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -66,8 +66,6 @@ void ScHeaderFooterEditSource::UpdateData() mrTextData.UpdateData(); } - - ScCellEditSource::ScCellEditSource(ScDocShell* pDocSh, const ScAddress& rP) : pCellTextData(new ScCellTextData(pDocSh, rP)) {} @@ -106,8 +104,6 @@ ScEditEngineDefaulter* ScCellEditSource::GetEditEngine() return pCellTextData->GetEditEngine(); } - - ScAnnotationEditSource::ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddress& rP) : pDocShell( pDocSh ), aCellPos( rP ), @@ -216,8 +212,6 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - - ScSimpleEditSource::ScSimpleEditSource( SvxTextForwarder* pForw ) : pForwarder( pForw ) { @@ -245,8 +239,6 @@ void ScSimpleEditSource::UpdateData() // nothing } - - SAL_WNODEPRECATED_DECLARATIONS_PUSH ScAccessibilityEditSource::ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData ) : mpAccessibleTextData(pAccessibleCellTextData) diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 41b58d9fab99..969f680f955d 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -27,12 +27,8 @@ using namespace ::com::sun::star; - - SC_SIMPLE_SERVICE_INFO( ScSheetEventsObj, "ScSheetEventsObj", "com.sun.star.document.Events" ) - - ScSheetEventsObj::ScSheetEventsObj(ScDocShell* pDocSh, SCTAB nT) : mpDocShell( pDocSh ), mnTab( nT ) @@ -184,6 +180,4 @@ sal_Bool SAL_CALL ScSheetEventsObj::hasElements() throw(uno::RuntimeException, s return false; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index a84e8b885c13..0f6febfe9dc9 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -149,8 +149,6 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue ) SC_SIMPLE_SERVICE_INFO( ScCellFieldsObj, "ScCellFieldsObj", "com.sun.star.text.TextFields" ) SC_SIMPLE_SERVICE_INFO( ScHeaderFieldsObj, "ScHeaderFieldsObj", "com.sun.star.text.TextFields" ) - - // ScUnoEditEngine nur um aus einer EditEngine die Felder herauszubekommen... enum ScUnoCollectMode @@ -281,8 +279,6 @@ SvxFieldData* ScUnoEditEngine::FindByPos(sal_Int32 nPar, sal_Int32 nPos, sal_Int return pFound; } - - ScCellFieldsObj::ScCellFieldsObj( const uno::Reference<text::XTextRange>& xContent, ScDocShell* pDocSh, const ScAddress& rPos) : diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 5b5eca7488d5..68fb7d7a02c0 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -46,8 +46,6 @@ using namespace ::com::sun::star; using namespace rtl; using namespace com::sun::star::uno; - - #define SCFILTEROPTIONSOBJ_SERVICE "com.sun.star.ui.dialogs.FilterOptionsDialog" #define SCFILTEROPTIONSOBJ_IMPLNAME "com.sun.star.comp.Calc.FilterOptionsDialog" @@ -63,8 +61,6 @@ SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTE #define DBF_SEP_PATH_IMPORT "Office.Calc/Dialogs/DBFImport" #define DBF_SEP_PATH_EXPORT "Office.Calc/Dialogs/DBFExport" - - static void load_CharSet( rtl_TextEncoding &nCharSet, bool bExport ) { Sequence<Any> aValues; @@ -109,8 +105,6 @@ static void save_CharSet( rtl_TextEncoding nCharSet, bool bExport ) aItem.PutProperties(aNames, aValues); } - - ScFilterOptionsObj::ScFilterOptionsObj() : bExport( false ) { diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index d60a5f6afb15..ce1a2b4afe4e 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star; using namespace ::formula; - - // Map nur fuer PropertySetInfo static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() @@ -63,14 +61,10 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() return aValidatePropertyMap_Impl; } - - SC_SIMPLE_SERVICE_INFO( ScTableConditionalEntry, "ScTableConditionalEntry", "com.sun.star.sheet.TableConditionalEntry" ) SC_SIMPLE_SERVICE_INFO( ScTableConditionalFormat, "ScTableConditionalFormat", "com.sun.star.sheet.TableConditionalFormat" ) SC_SIMPLE_SERVICE_INFO( ScTableValidationObj, "ScTableValidationObj", "com.sun.star.sheet.TableValidation" ) - - static sal_Int32 lcl_ConditionModeToOperatorNew( ScConditionMode eMode ) { sal_Int32 eOper = sheet::ConditionOperator2::NONE; @@ -138,8 +132,6 @@ static ScConditionMode lcl_ConditionOperatorToMode( sheet::ConditionOperator eOp return eMode; } - - ScCondFormatEntryItem::ScCondFormatEntryItem() : meGrammar1( FormulaGrammar::GRAM_UNSPECIFIED ), meGrammar2( FormulaGrammar::GRAM_UNSPECIFIED ), @@ -147,8 +139,6 @@ ScCondFormatEntryItem::ScCondFormatEntryItem() : { } - - ScTableConditionalFormat::ScTableConditionalFormat( ScDocument* pDoc, sal_uLong nKey, SCTAB nTab, FormulaGrammar::Grammar eGrammar) { @@ -511,8 +501,6 @@ ScTableConditionalFormat* ScTableConditionalFormat::getImplementation( return pRet; } - - ScTableConditionalEntry::ScTableConditionalEntry(const ScCondFormatEntryItem& aItem) : aData( aItem ) { @@ -616,8 +604,6 @@ void SAL_CALL ScTableConditionalEntry::setStyleName( const OUString& aStyleName aData.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStyleName, SFX_STYLE_FAMILY_PARA ); } - - ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey, const formula::FormulaGrammar::Grammar eGrammar) : aPropSet( lcl_GetValidatePropertyMap() ) @@ -1044,6 +1030,4 @@ ScTableValidationObj* ScTableValidationObj::getImplementation( - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx index 031ccdf7f3b3..e6843c0f94e0 100644 --- a/sc/source/ui/unoobj/forbiuno.cxx +++ b/sc/source/ui/unoobj/forbiuno.cxx @@ -24,8 +24,6 @@ using namespace ::com::sun::star; - - static rtl::Reference<SvxForbiddenCharactersTable> lcl_GetForbidden( ScDocShell* pDocSh ) { rtl::Reference<SvxForbiddenCharactersTable> xRet; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index c2ac19067b0d..45e15db08e7c 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -48,16 +48,12 @@ using namespace com::sun::star; - - // registered as implementation for service FunctionAccess, // also supports service SpreadsheetDocumentSettings (to set null date etc.) #define SCFUNCTIONACCESS_SERVICE "com.sun.star.sheet.FunctionAccess" #define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings" - - // helper to use cached document if not in use, temporary document otherwise class ScTempDocSource @@ -75,8 +71,6 @@ public: ScDocument* GetDocument(); }; - - ScDocument* ScTempDocSource::CreateDocument() { ScDocument* pDoc = new ScDocument; // SCDOCMODE_DOCUMENT @@ -114,8 +108,6 @@ ScDocument* ScTempDocSource::GetDocument() return rCache.GetDocument(); } - - ScTempDocCache::ScTempDocCache() : pDoc( NULL ), bInUse( false ) @@ -141,8 +133,6 @@ void ScTempDocCache::Clear() pDoc = NULL; } - - // copy results from one document into another //! merge this with ScAreaLink::Refresh //! copy directly without a clipboard document? @@ -183,8 +173,6 @@ static sal_Bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, return sal_True; } - - ScFunctionAccess::ScFunctionAccess() : pOptions( NULL ), aPropertyMap( ScDocOptionsHelper::GetPropertyMap() ), diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 559e538e9814..bf1bf8f455ed 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -50,8 +50,6 @@ using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::uno::RuntimeException; using ::std::vector; - - // fuer Sheet- und Area-Links benutzt: static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() { @@ -67,8 +65,6 @@ static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() return aSheetLinkMap_Impl; } - - SC_SIMPLE_SERVICE_INFO( ScAreaLinkObj, "ScAreaLinkObj", "com.sun.star.sheet.CellAreaLink" ) SC_SIMPLE_SERVICE_INFO( ScAreaLinksObj, "ScAreaLinksObj", "com.sun.star.sheet.CellAreaLinks" ) SC_SIMPLE_SERVICE_INFO( ScDDELinkObj, "ScDDELinkObj", "com.sun.star.sheet.DDELink" ) @@ -76,8 +72,6 @@ SC_SIMPLE_SERVICE_INFO( ScDDELinksObj, "ScDDELinksObj", "com.sun.star.sheet.DDEL SC_SIMPLE_SERVICE_INFO( ScSheetLinkObj, "ScSheetLinkObj", "com.sun.star.sheet.SheetLink" ) SC_SIMPLE_SERVICE_INFO( ScSheetLinksObj, "ScSheetLinksObj", "com.sun.star.sheet.SheetLinks" ) - - ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName) : aPropSet( lcl_GetSheetLinkMap() ), pDocShell( pDocSh ), @@ -377,8 +371,6 @@ void ScSheetLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) ModifyRefreshDelay_Impl( nRefreshDelay ); } - - ScSheetLinksObj::ScSheetLinksObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -583,8 +575,6 @@ uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::R return aSeq; } - - static ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, size_t nPos ) { if (pDocShell) @@ -923,8 +913,6 @@ void SAL_CALL ScAreaLinkObj::setDestArea( const table::CellRangeAddress& aDestAr Modify_Impl( NULL, NULL, NULL, NULL, &aDestArea ); } - - ScAreaLinksObj::ScAreaLinksObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -1047,8 +1035,6 @@ sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException, std return ( getCount() != 0 ); } - - ScDDELinkObj::ScDDELinkObj(ScDocShell* pDocSh, const OUString& rA, const OUString& rT, const OUString& rI) : pDocShell( pDocSh ), @@ -1257,8 +1243,6 @@ void ScDDELinkObj::Refreshed_Impl() aRefreshListeners[n]->refreshed( aEvent ); } - - ScDDELinksObj::ScDDELinksObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -1470,8 +1454,6 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( return xLink; } - - ScExternalSheetCacheObj::ScExternalSheetCacheObj(ScDocShell* pDocShell, ScExternalRefCache::TableTypeRef pTable, size_t nIndex) : mpDocShell(pDocShell), mpTable(pTable), @@ -1577,8 +1559,6 @@ sal_Int32 SAL_CALL ScExternalSheetCacheObj::getTokenIndex() return static_cast< sal_Int32 >( mnIndex ); } - - ScExternalDocLinkObj::ScExternalDocLinkObj(ScDocShell* pDocShell, ScExternalRefManager* pRefMgr, sal_uInt16 nFileId) : mpDocShell(pDocShell), mpRefMgr(pRefMgr), mnFileId(nFileId) { @@ -1713,8 +1693,6 @@ sal_Int32 SAL_CALL ScExternalDocLinkObj::getTokenIndex() return static_cast<sal_Int32>(mnFileId); } - - ScExternalDocLinksObj::ScExternalDocLinksObj(ScDocShell* pDocShell) : mpDocShell(pDocShell), mpRefMgr(pDocShell->GetDocument()->GetExternalRefManager()) diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxx index 359307ad2139..b488e4ff4efa 100644 --- a/sc/source/ui/unoobj/listenercalls.cxx +++ b/sc/source/ui/unoobj/listenercalls.cxx @@ -23,8 +23,6 @@ using namespace com::sun::star; - - ScUnoListenerCalls::ScUnoListenerCalls() { } diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index 112bb73b1939..b5d18a97ad1c 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -26,12 +26,8 @@ using namespace com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; - - SC_SIMPLE_SERVICE_INFO( ScNameToIndexAccess, "ScNameToIndexAccess", "stardiv.unknown" ) - - uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::Any& rAny ) { if ( rAny.getValueTypeClass() == uno::TypeClass_INTERFACE ) @@ -185,8 +181,6 @@ void ScUnoHelpFunctions::SetOptionalPropertyValue( } } - - ScIndexEnumeration::ScIndexEnumeration(const uno::Reference<container::XIndexAccess>& rInd, const OUString& rServiceName) : xIndex( rInd ), @@ -247,8 +241,6 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceNa - - ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess>& rNameObj ) : xNameAccess( rNameObj ) @@ -299,6 +291,4 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::u - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 1f5725c9512f..14f8a56803d6 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -46,8 +46,6 @@ using ::com::sun::star::uno::Any; #include "scui_def.hxx" - - static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() { static const SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = @@ -71,8 +69,6 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap() return aNamedRangesMap_Impl; } - - #define SCNAMEDRANGEOBJ_SERVICE "com.sun.star.sheet.NamedRange" SC_SIMPLE_SERVICE_INFO( ScLabelRangeObj, "ScLabelRangeObj", "com.sun.star.sheet.LabelRange" ) @@ -471,8 +467,6 @@ const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId() return theScNamedRangeObjUnoTunnelId::get().getSeq(); } - - ScNamedRangesObj::ScNamedRangesObj(ScDocShell* pDocSh) : mbModifyAndBroadcast(true), pDocShell( pDocSh ) @@ -827,8 +821,6 @@ sal_Int16 ScNamedRangesObj::resetActionLocks() throw(uno::RuntimeException, std: return nLockCount; } - - ScGlobalNamedRangesObj::ScGlobalNamedRangesObj(ScDocShell* pDocSh) : ScNamedRangesObj(pDocSh) { @@ -880,8 +872,6 @@ SCTAB ScGlobalNamedRangesObj::GetTab_Impl() return -1; } - - ScLocalNamedRangesObj::ScLocalNamedRangesObj( ScDocShell* pDocSh, uno::Reference<container::XNamed> xSheet ) : ScNamedRangesObj(pDocSh), mxSheet(xSheet) @@ -943,8 +933,6 @@ SCTAB ScLocalNamedRangesObj::GetTab_Impl() return nTab; } - - ScLabelRangeObj::ScLabelRangeObj(ScDocShell* pDocSh, bool bCol, const ScRange& rR) : pDocShell( pDocSh ), bColumn( bCol ), @@ -1064,8 +1052,6 @@ void SAL_CALL ScLabelRangeObj::setDataArea( const table::CellRangeAddress& aData Modify_Impl( NULL, &aDataRange ); } - - ScLabelRangesObj::ScLabelRangesObj(ScDocShell* pDocSh, bool bCol) : pDocShell( pDocSh ), bColumn( bCol ) @@ -1230,6 +1216,4 @@ sal_Bool SAL_CALL ScLabelRangesObj::hasElements() throw(uno::RuntimeException, s - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index 68a9bc2c5fd5..c0bcef6d3fcc 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -38,8 +38,6 @@ using namespace com::sun::star; - - static const SvxItemPropertySet* lcl_GetAnnotationPropertySet() { static const SfxItemPropertyMapEntry aAnnotationPropertyMap_Impl[] = @@ -54,13 +52,9 @@ static const SvxItemPropertySet* lcl_GetAnnotationPropertySet() return &aAnnotationPropertySet_Impl; } - - SC_SIMPLE_SERVICE_INFO( ScAnnotationObj, "ScAnnotationObj", "com.sun.star.sheet.CellAnnotation" ) //SC_SIMPLE_SERVICE_INFO( ScAnnotationShapeObj, "ScAnnotationShapeObj", "com.sun.star.sheet.CellAnnotationShape" ) - - ScAnnotationObj::ScAnnotationObj(ScDocShell* pDocSh, const ScAddress& rPos) : pDocShell( pDocSh ), aCellPos( rPos ), diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index ea2901c2f8d9..9c9730494a6c 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -179,8 +179,6 @@ uno::Any ScDocOptionsHelper::getPropertyValue( return aRet; } - - ScDocOptionsObj::ScDocOptionsObj( const ScDocOptions& rOpt ) : ScModelObj( NULL ), aOptions( rOpt ) diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index a90d841f8240..7cb1392df075 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -24,8 +24,6 @@ using namespace ::com::sun::star; - - ScPageObj::ScPageObj( SdrPage* pPage ) : SvxFmDrawPage( pPage ) { diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 0d7935a1f462..ea7f9f7695a5 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -245,8 +245,6 @@ public: } }; - - struct ProvNamesId_Type { const char * pName; @@ -377,8 +375,6 @@ static const sal_Char* aOldNames[SC_SERVICE_COUNT] = - - // alles static @@ -663,6 +659,4 @@ uno::Sequence<OUString> ScServiceProvider::GetAllServiceNames() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 9fa68ec23c5c..bc470f6b0862 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -80,8 +80,6 @@ ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCr return 0; } - - namespace { void lcl_initializeNotifier( SdrObject& _rSdrObj, ::cppu::OWeakObject& _rShape ) @@ -91,8 +89,6 @@ namespace } } - - ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) : pShapePropertySet(NULL), pShapePropertyState(NULL), diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index b1038803536f..80ca0da2af81 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -34,8 +34,6 @@ using namespace com::sun::star; - - //! SearchWords sucht in ganzen Zellen - umbenennen ??? // SfxItemPropertyMapEntry nur fuer GetPropertySetInfo @@ -61,13 +59,9 @@ static const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap() return aSearchPropertyMap_Impl; } - - #define SCSEARCHDESCRIPTOR_SERVICE "com.sun.star.util.SearchDescriptor" #define SCREPLACEDESCRIPTOR_SERVICE "com.sun.star.util.ReplaceDescriptor" - - ScCellSearchObj::ScCellSearchObj() : aPropSet(lcl_GetSearchPropertyMap()) { @@ -250,8 +244,4 @@ ScCellSearchObj* ScCellSearchObj::getImplementation( - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 4a1b148febed..579e6a776f67 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -68,8 +68,6 @@ using namespace ::com::sun::star; - - static const SfxItemPropertySet* lcl_GetCellStyleSet() { static const SfxItemPropertyMapEntry aCellStyleMap_Impl[] = @@ -368,8 +366,6 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() } - - // Index-Access auf die Style-Typen: 0 = Cell, 1 = Page #define SC_STYLE_FAMILY_COUNT 2 @@ -379,13 +375,9 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() static const sal_uInt16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_PARA, SFX_STYLE_FAMILY_PAGE }; - - using sc::HMMToTwips; using sc::TwipsToHMM; - - #define SCSTYLE_SERVICE "com.sun.star.style.Style" #define SCCELLSTYLE_SERVICE "com.sun.star.style.CellStyle" #define SCPAGESTYLE_SERVICE "com.sun.star.style.PageStyle" @@ -393,12 +385,8 @@ using sc::TwipsToHMM; SC_SIMPLE_SERVICE_INFO( ScStyleFamiliesObj, "ScStyleFamiliesObj", "com.sun.star.style.StyleFamilies" ) SC_SIMPLE_SERVICE_INFO( ScStyleFamilyObj, "ScStyleFamilyObj", "com.sun.star.style.StyleFamily" ) - - #define SC_PAPERBIN_DEFAULTNAME "[From printer settings]" - - static bool lcl_AnyTabProtected( ScDocument& rDoc ) { SCTAB nTabCount = rDoc.GetTableCount(); @@ -408,8 +396,6 @@ static bool lcl_AnyTabProtected( ScDocument& rDoc ) return false; } - - ScStyleFamiliesObj::ScStyleFamiliesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -598,8 +584,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO return aSequence; } - - ScStyleFamilyObj::ScStyleFamilyObj(ScDocShell* pDocSh, SfxStyleFamily eFam) : pDocShell( pDocSh ), eFamily( eFam ) @@ -939,8 +923,6 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, c OSL_FAIL( "###unexpected!" ); } - - // Default-ctor wird fuer die Reflection gebraucht ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rName) : @@ -2013,6 +1995,4 @@ uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 1b4054c0c3cd..be358a8d45c4 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -39,8 +39,6 @@ using namespace ::com::sun::star; - - sal_uInt16 nTypeResIds[SC_LINKTARGETTYPE_COUNT] = { SCSTR_CONTENT_TABLE, // SC_LINKTARGETTYPE_SHEET @@ -59,8 +57,6 @@ static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() return aLinkTargetMap_Impl; } - - // service for ScLinkTargetTypeObj is not defined // must not support document::LinkTarget because the target type cannot be used as a target @@ -68,8 +64,6 @@ SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypesObj, "ScLinkTargetTypesObj", "com.sun.s SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypeObj, "ScLinkTargetTypeObj", "com.sun.star.document.LinkTargetSupplier" ) SC_SIMPLE_SERVICE_INFO( ScLinkTargetsObj, "ScLinkTargetsObj", "com.sun.star.document.LinkTargets" ) - - ScLinkTargetTypesObj::ScLinkTargetTypesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -137,8 +131,6 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements(void) throw( uno::RuntimeExc return sal_True; } - - ScLinkTargetTypeObj::ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT) : pDocShell( pDocSh ), nType( nT ) @@ -249,8 +241,6 @@ uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const OUString& Property SC_IMPL_DUMMY_PROPERTY_LISTENER( ScLinkTargetTypeObj ) - - ScLinkTargetsObj::ScLinkTargetsObj( const uno::Reference< container::XNameAccess > & rColl ) : xCollection( rColl ) { @@ -296,6 +286,4 @@ sal_Bool SAL_CALL ScLinkTargetsObj::hasElements(void) throw( uno::RuntimeExcepti return xCollection->hasElements(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 7a80e857bf18..ee57462ebc2c 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -49,8 +49,6 @@ using namespace com::sun::star; - - static const SvxItemPropertySet * lcl_GetHdFtPropertySet() { static SfxItemPropertyMapEntry aHdFtPropertyMap_Impl[] = @@ -87,13 +85,9 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet() return &aHdFtPropertySet_Impl; } - - SC_SIMPLE_SERVICE_INFO( ScHeaderFooterContentObj, "ScHeaderFooterContentObj", "com.sun.star.sheet.HeaderFooterContent" ) SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv.one.Text.Text" ) - - ScHeaderFooterContentObj::ScHeaderFooterContentObj( const EditTextObject* pLeft, const EditTextObject* pCenter, const EditTextObject* pRight ) : @@ -181,8 +175,6 @@ ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation( } - - ScHeaderFooterTextData::ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : mpTextObj(pTextObj ? pTextObj->Clone() : NULL), @@ -266,8 +258,6 @@ const EditTextObject* ScHeaderFooterTextData::GetTextObject() const return mpTextObj; } - - ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : aTextData(rContent, nP, pTextObj) @@ -578,8 +568,6 @@ sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() throw(uno::RuntimeExcepti return mxUnoText->hasElements(); } - - ScCellTextCursor::ScCellTextCursor(const ScCellTextCursor& rOther) : SvxUnoTextCursor( rOther ), rTextObj( rOther.rTextObj ) @@ -674,8 +662,6 @@ ScCellTextCursor* ScCellTextCursor::getImplementation( const uno::Reference<uno: return pRet; } - - ScHeaderFooterTextCursor::ScHeaderFooterTextCursor(const ScHeaderFooterTextCursor& rOther) : SvxUnoTextCursor( rOther ), rTextObj( rOther.rTextObj ) @@ -771,8 +757,6 @@ ScHeaderFooterTextCursor* ScHeaderFooterTextCursor::getImplementation( return pRet; } - - ScDrawTextCursor::ScDrawTextCursor(const ScDrawTextCursor& rOther) : SvxUnoTextCursor( rOther ), xParentText( rOther.xParentText ) @@ -866,8 +850,6 @@ ScDrawTextCursor* ScDrawTextCursor::getImplementation( const uno::Reference<uno: return pRet; } - - ScSimpleEditSourceHelper::ScSimpleEditSourceHelper() { SfxItemPool* pEnginePool = EditEngine::CreatePool(); @@ -911,8 +893,6 @@ EditTextObject* ScEditEngineTextObj::CreateTextObject() return GetEditEngine()->CreateTextObject(); } - - ScCellTextData::ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP) : pDocShell( pDocSh ), aCellPos( rP ), diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index c348635f16f5..98d81532c185 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -45,8 +45,6 @@ using namespace ::formula; using namespace ::com::sun::star; - - static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() { static const SfxItemPropertyMapEntry aFormulaParserMap_Impl[] = @@ -63,8 +61,6 @@ static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() SC_SIMPLE_SERVICE_INFO( ScFormulaParserObj, "ScFormulaParserObj", SC_SERVICENAME_FORMULAPARS ) - - ScFormulaParserObj::ScFormulaParserObj(ScDocShell* pDocSh) : mpDocShell( pDocSh ), mnConv( sheet::AddressConvention::UNSPECIFIED ), @@ -284,8 +280,6 @@ uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropert SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFormulaParserObj ) - - static void lcl_ExternalRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rRef ) { rAPI.Column = 0; @@ -496,8 +490,6 @@ bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, return !bError; } - - SAL_WNODEPRECATED_DECLARATIONS_PUSH ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler) : formula::FormulaOpCodeMapperObj(_pCompiler) @@ -505,6 +497,4 @@ ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::Form } SAL_WNODEPRECATED_DECLARATIONS_POP - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/unoreflist.cxx b/sc/source/ui/unoobj/unoreflist.cxx index aa78b4124473..c9689a0017d7 100644 --- a/sc/source/ui/unoobj/unoreflist.cxx +++ b/sc/source/ui/unoobj/unoreflist.cxx @@ -20,8 +20,6 @@ #include "unoreflist.hxx" #include "document.hxx" - - ScUnoRefList::ScUnoRefList() { } @@ -46,8 +44,6 @@ void ScUnoRefList::Undo( ScDocument* pDoc ) } } - - TYPEINIT1(ScUnoRefUndoHint, SfxHint); ScUnoRefUndoHint::ScUnoRefUndoHint( const ScUnoRefEntry& rRefEntry ) : diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 2eff3710c8ae..d7935889c76c 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -74,8 +74,6 @@ using namespace com::sun::star; - - //! Clipping-Markierungen // alles ohne Which-ID, Map nur fuer PropertySetInfo @@ -117,15 +115,11 @@ static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap() return aViewOptPropertyMap_Impl; } - - #define SCTABVIEWOBJ_SERVICE "com.sun.star.sheet.SpreadsheetView" #define SCVIEWSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetViewSettings" SC_SIMPLE_SERVICE_INFO( ScViewPaneBase, "ScViewPaneObj", "com.sun.star.sheet.SpreadsheetViewPane" ) - - ScViewPaneBase::ScViewPaneBase(ScTabViewShell* pViewSh, sal_uInt16 nP) : pViewShell( pViewSh ), nPane( nP ) @@ -419,8 +413,6 @@ awt::Rectangle ScViewPaneBase::GetVisArea() const return aVisArea; } - - ScViewPaneObj::ScViewPaneObj(ScTabViewShell* pViewSh, sal_uInt16 nP) : ScViewPaneBase( pViewSh, nP ) { @@ -451,8 +443,6 @@ void SAL_CALL ScViewPaneObj::release() throw() OWeakObject::release(); } - - // Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) : diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index cb724e0a99d3..8bf4ba9e19a1 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -43,8 +43,6 @@ namespace ooo { namespace vba { namespace excel { - - uno::Reference< sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) { @@ -377,8 +375,6 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangesBase* pRangeObj ) return pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : 0; } - - } // namespace excel } // namespace vba } // namespace ooo diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 47301b14bc8e..a59bee0fd1db 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -36,8 +36,6 @@ namespace ooo { namespace vba { namespace excel { - - // nTabs empty means apply zoom to all sheets void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs ); void implnCopy( const css::uno::Reference< css::frame::XModel>& xModel ); @@ -61,8 +59,6 @@ css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const cs ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException ); void setUpDocumentModules( const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xDoc ); - - class ScVbaCellRangeAccess { public: diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 93c9fa50ce07..1953f704fb85 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -100,8 +100,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; - - /** Global application settings shared by all open workbooks. */ struct ScVbaAppSettings { @@ -128,8 +126,6 @@ ScVbaAppSettings::ScVbaAppSettings() : struct ScVbaStaticAppSettings : public ::rtl::Static< ScVbaAppSettings, ScVbaStaticAppSettings > {}; - - ScVbaApplication::ScVbaApplication( const uno::Reference<uno::XComponentContext >& xContext ) : ScVbaApplication_BASE( xContext ), mrAppSettings( ScVbaStaticAppSettings::get() ) @@ -1113,8 +1109,6 @@ uno::Reference< excel::XRange > lclCreateVbaRange( } // namespace - - uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect( const uno::Reference< excel::XRange >& rArg1, const uno::Reference< excel::XRange >& rArg2, const uno::Any& rArg3, const uno::Any& rArg4, const uno::Any& rArg5, const uno::Any& rArg6, diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index e48e25764714..607a1cba58ca 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; - - namespace { /** Extracts a sheet index from the specified element of the passed sequence. @@ -110,8 +108,6 @@ uno::Reference< awt::XWindow > lclGetWindowForController( const uno::Reference< } // namespace - - typedef ::cppu::WeakImplHelper4< awt::XTopWindowListener, awt::XWindowListener, frame::XBorderResizeListener, util::XChangesListener > ScVbaEventListener_BASE; // This class is to process Workbook window related event @@ -180,8 +176,6 @@ private: bool mbDisposed; }; - - ScVbaEventListener::ScVbaEventListener( ScVbaEventsHelper& rVbaEvents, const uno::Reference< frame::XModel >& rxModel, ScDocShell* pDocShell ) : mrVbaEvents( rVbaEvents ), mxModel( rxModel ), @@ -511,8 +505,6 @@ IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, Window*, EMPTYARG pWind return 0; } - - ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& xContext ) : VbaEventsHelperBase( rArgs, xContext ), mbOpened( false ) diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 16d226041a55..be75085e1ddc 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -27,8 +27,6 @@ class ScVbaEventListener; - - class ScVbaEventsHelper : public VbaEventsHelperBase { public: @@ -67,8 +65,6 @@ private: bool mbOpened; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index e0ebb059aa31..8edd73f4cce0 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -75,8 +75,6 @@ public: }; - - #endif /* SC_VBA_FONT_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 6c2fb0520a81..30983e5579fb 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star::uno; using namespace ::ooo::vba; - - // ScVbaGlobals @@ -79,8 +77,6 @@ ScVbaGlobals::getExcel() throw (uno::RuntimeException, std::exception) return getApplication(); } - - uno::Reference< excel::XWorkbook > SAL_CALL ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index 420c1a8123ac..af6fbec8a7bd 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -30,8 +30,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - - ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& rxContext ) throw (lang::IllegalArgumentException) : HyperlinkImpl_BASE( getXSomethingFromArgs< XHelperInterface >( rArgs, 0 ), rxContext ), @@ -233,6 +231,4 @@ extern sdecl::ServiceDecl const serviceDecl( "ooo.vba.excel.Hyperlink" ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 68185d8ed7f8..bad71e7c81ae 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -28,8 +28,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - - namespace { /** Returns true, if every range of rxInner is contained in any range of rScOuter. */ @@ -45,8 +43,6 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan return true; } - - /** Functor to decide whether the anchors of two Hyperlink objects are equal. */ struct EqualAnchorFunctor { @@ -102,8 +98,6 @@ bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& } // namespace - - namespace detail { class ScVbaHlinkContainer : public ::cppu::WeakImplHelper1< container::XIndexAccess > @@ -130,8 +124,6 @@ private: HyperlinkVector maHlinks; }; - - ScVbaHlinkContainer::ScVbaHlinkContainer() throw (uno::RuntimeException) { // TODO FIXME: fill with existing hyperlinks @@ -185,8 +177,6 @@ sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() throw (uno::RuntimeExceptio return !maHlinks.empty(); } - - ScVbaHlinkContainerMember::ScVbaHlinkContainerMember( ScVbaHlinkContainer* pContainer ) : mxContainer( pContainer ) { @@ -198,8 +188,6 @@ ScVbaHlinkContainerMember::~ScVbaHlinkContainerMember() } // namespace detail - - ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext ) throw (uno::RuntimeException) : detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer ), @@ -281,6 +269,4 @@ uno::Any ScVbaHyperlinks::createCollectionObject( const uno::Any& rSource ) VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaHyperlinks, "ooo.vba.excel.Hyperlinks" ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx index baeca71f49a6..32d082b9564c 100644 --- a/sc/source/ui/vba/vbahyperlinks.hxx +++ b/sc/source/ui/vba/vbahyperlinks.hxx @@ -26,8 +26,6 @@ class ScRangeList; - - namespace detail { class ScVbaHlinkContainer; @@ -46,8 +44,6 @@ struct ScVbaHlinkContainerMember } // namespace detail - - class ScVbaHyperlinks; typedef ::rtl::Reference< ScVbaHyperlinks > ScVbaHyperlinksRef; @@ -137,8 +133,6 @@ private: ScVbaHyperlinksRef mxSheetHlinks; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 05cdda11d05f..d71551fb2fbd 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -339,8 +339,6 @@ public: }; - - class RangesEnumerationImpl : public EnumerationHelperImpl { bool mbIsRows; @@ -1015,8 +1013,6 @@ public: } }; - - class Dim2ArrayValueSetter : public ArrayVisitor { uno::Sequence< uno::Sequence< uno::Any > > aMatrix; @@ -1276,8 +1272,6 @@ getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const return new ScVbaRange( xFixThisParent, xContext, xRanges ); } - - namespace { template< typename RangeType > @@ -1382,8 +1376,6 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC } // namespace - - css::uno::Reference< excel::XRange > ScVbaRange::getRangeObjectForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sRangeName, diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 800a59de9f96..9f37431c40de 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -76,8 +76,6 @@ public: virtual const css::uno::Any& getValue() const = 0; }; - - class ScVbaRange : public ScVbaRange_BASE { css::uno::Reference< ov::XCollection > m_Areas; diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 5f1badf94afd..582bb9797d45 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -36,8 +36,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - - ScVbaButtonCharacters::ScVbaButtonCharacters( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -152,8 +150,6 @@ void ScVbaButtonCharacters::setFullString( const OUString& rString ) throw (uno: mxPropSet->setPropertyValue( "Label", uno::Any( rString ) ); } - - ScVbaSheetObjectBase::ScVbaSheetObjectBase( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -291,8 +287,6 @@ void ScVbaSheetObjectBase::implSetDefaultProperties() throw (uno::RuntimeExcepti { } - - ScVbaControlObjectBase::ScVbaControlObjectBase( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -419,8 +413,6 @@ sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const throw (uno::Runtim throw uno::RuntimeException(); } - - ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -535,6 +527,4 @@ void ScVbaButton::implSetDefaultProperties() throw (uno::RuntimeException) setCaption( getName() ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 6a8f6f11d5e9..5987576871ac 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -31,8 +31,6 @@ namespace com { namespace sun { namespace star { namespace drawing { class XControlShape; } } } } - - typedef InheritedHelperInterfaceImpl1< ov::excel::XCharacters > ScVbaButtonCharacters_BASE; /** Simple implementation of the Characters symbol for drawing button objects. */ @@ -75,8 +73,6 @@ private: sal_Int32 mnLength; }; - - typedef InheritedHelperInterfaceImpl1< ov::excel::XSheetObject > ScVbaSheetObject_BASE; /** Base class for drawing objects embedded in sheets. */ @@ -121,8 +117,6 @@ protected: css::uno::Reference< css::beans::XPropertySet > mxShapeProps; }; - - typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectBase, ov::excel::XControlObject > ScVbaControlObject_BASE; class ScVbaControlObjectBase : public ScVbaControlObject_BASE @@ -168,8 +162,6 @@ protected: OUString maEventMethod; }; - - typedef ::cppu::ImplInheritanceHelper1< ScVbaControlObjectBase, ov::excel::XButton > ScVbaButton_BASE; class ScVbaButton : public ScVbaButton_BASE @@ -206,8 +198,6 @@ protected: virtual void implSetDefaultProperties() throw (css::uno::RuntimeException) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 25878d962a75..05ec0f23a8d0 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - - namespace { template< typename Type > @@ -134,8 +132,6 @@ private: ShapeVector maShapes; }; - - ScVbaObjectContainer::ScVbaObjectContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -239,8 +235,6 @@ void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XS { } - - class ScVbaObjectEnumeration : public SimpleEnumerationBase { public: @@ -251,8 +245,6 @@ private: ScVbaObjectContainerRef mxContainer; }; - - ScVbaObjectEnumeration::ScVbaObjectEnumeration( const ScVbaObjectContainerRef& rxContainer ) : SimpleEnumerationBase( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), mxContainer( rxContainer ) @@ -264,8 +256,6 @@ uno::Any ScVbaObjectEnumeration::createCollectionObject( const uno::Any& rSource return mxContainer->createCollectionObject( rSource ); } - - ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException) : ScVbaSheetObjects_BASE( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), mxContainer( rxContainer ) @@ -371,8 +361,6 @@ protected: sal_Int16 mnComponentType; }; - - ScVbaControlContainer::ScVbaControlContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -473,8 +461,6 @@ protected: virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const SAL_OVERRIDE; }; - - ScVbaButtonContainer::ScVbaButtonContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -501,8 +487,6 @@ bool ScVbaButtonContainer::implCheckProperties( const uno::Reference< beans::XPr return lclGetProperty( bToggle, rxModelProps, "Toggle" ) && !bToggle; } - - ScVbaButtons::ScVbaButtons( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -514,6 +498,4 @@ ScVbaButtons::ScVbaButtons( VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaButtons, "ooo.vba.excel.Buttons" ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index 5a5489840761..152c6d6f0727 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -30,13 +30,9 @@ namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } } - - class ScVbaObjectContainer; typedef ::rtl::Reference< ScVbaObjectContainer > ScVbaObjectContainerRef; - - typedef CollTestImplHelper< ov::XCollection > ScVbaSheetObjects_BASE; /** Base class for collections containing a specific type of drawing object @@ -65,8 +61,6 @@ protected: ScVbaObjectContainerRef mxContainer; }; - - typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectsBase, ov::excel::XGraphicObjects > ScVbaGraphicObjects_BASE; /** Base class for collections containing a specific type of graphic object @@ -85,8 +79,6 @@ public: const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - /** Collection containing all button controls from a sheet (not ActiveX controls). */ class ScVbaButtons : public ScVbaGraphicObjectsBase { @@ -100,8 +92,6 @@ public: VBAHELPER_DECL_XHELPERINTERFACE }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index a930bc3327a8..3a9f8b6cd38d 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -25,8 +25,6 @@ using namespace ::com::sun::star; static OUString DISPLAYNAME("DisplayName"); - - uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 193bdfed4b41..fd4e9d1704a5 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -31,13 +31,9 @@ #include "sc.hrc" #include "document.hxx" - - #define ScAuditingShell #include "scslots.hxx" - - TYPEINIT1( ScAuditingShell, SfxShell ); SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL)) @@ -46,8 +42,6 @@ SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL)) } - - ScAuditingShell::ScAuditingShell(ScViewData* pData) : SfxShell(pData->GetViewShell()), pViewData( pData ), @@ -65,14 +59,10 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) : SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Auditing)); } - - ScAuditingShell::~ScAuditingShell() { } - - void ScAuditingShell::Execute( SfxRequest& rReq ) { SfxBindings& rBindings = pViewData->GetBindings(); @@ -132,8 +122,6 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) } } - - void ScAuditingShell::GetState( SfxItemSet& rSet ) { rSet.Put( SfxBoolItem( nFunction, true ) ); // aktive Funktion markieren diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 253cf2c26045..87038194612b 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -57,8 +57,6 @@ #include "clipparam.hxx" #include "markdata.hxx" - - #define ScCellShell #define CellMovement #include "scslots.hxx" @@ -102,8 +100,6 @@ ScCellShell::~ScCellShell() delete pImpl; } - - void ScCellShell::GetBlockState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -1068,6 +1064,4 @@ void ScCellShell::GetState(SfxItemSet &rSet) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index bf9cc0b28d82..eb8440680ae6 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1198,8 +1198,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // Clipboard - - case SID_COPY: // for graphs in DrawShell { WaitObject aWait( GetViewData()->GetDialogParent() ); @@ -2417,8 +2415,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) - - default: OSL_FAIL("incorrect slot in ExecuteEdit"); break; diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index a43b85d7a0f1..b3e1de0781a0 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -1201,6 +1201,4 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 25d2c1005674..36025b4119df 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -54,8 +54,6 @@ using sc::HMMToTwips; using sc::TwipsToHMM; using sc::TwipsToEvenHMM; - - void ScCellShell::Execute( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -523,8 +521,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - - case FID_ROW_HEIGHT: { if ( pReqArgs ) @@ -715,8 +711,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) break; - - case SID_CELL_FORMAT_RESET: { pTabViewShell->DeleteContents( IDF_HARDATTR | IDF_EDITATTR ); @@ -886,8 +880,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - - case FID_INPUTLINE_STATUS: OSL_FAIL("Execute von InputLine-Status"); break; diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index 99d2b0a433dd..3d4fc2fa4e9f 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.cxx @@ -445,6 +445,4 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 1700c0069341..3bc9c474d707 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -32,8 +32,6 @@ // STATIC DATA ----------------------------------------------------------- - - static OUString lcl_MetricString( long nTwips, const OUString& rText ) { if ( nTwips <= 0 ) @@ -54,8 +52,6 @@ static OUString lcl_MetricString( long nTwips, const OUString& rText ) } } - - ScColBar::ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : ScHeaderControl( pParent, pEng, MAXCOL+1, false ), @@ -215,8 +211,6 @@ bool ScColBar::IsLayoutRTL() const // overloaded only for columns return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); } - - ScRowBar::ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : ScHeaderControl( pParent, pEng, MAXROW+1, true ), diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 09e32bb30eae..82a4743a2594 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -37,8 +37,6 @@ #include "queryentry.hxx" #include "markdata.hxx" - - ScDBFunc::ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScViewFunc( pParent, rDocSh, pViewShell ) { @@ -507,6 +505,4 @@ bool ScDBFunc::ImportData( const ScImportParam& rParam, bool bRecord ) return aDBDocFunc.DoImport( GetViewData()->GetTabNo(), rParam, NULL, bRecord ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx index 8932146f1562..6261a5460d70 100644 --- a/sc/source/ui/view/dbfunc2.cxx +++ b/sc/source/ui/view/dbfunc2.cxx @@ -24,8 +24,6 @@ #include "sc.hrc" #include "globstr.hrc" - - void ScDBFunc::UpdateCharts( bool bAllCharts ) { sal_uInt16 nFound = 0; @@ -46,6 +44,4 @@ void ScDBFunc::UpdateCharts( bool bAllCharts ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 0b1f41a73d65..f3d3671b2f59 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -88,8 +88,6 @@ using ::std::vector; - - // Outliner @@ -364,8 +362,6 @@ void ScDBFunc::HideMarkedOutlines( bool bRecord ) } - - // Teilergebnisse diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index 17492f82927b..b3523335dcb4 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -25,12 +25,8 @@ #include "drwlayer.hxx" #include "document.hxx" - - using namespace com::sun::star; - - sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts ) { ScDrawLayer* pModel = pDoc->GetDrawLayer(); @@ -76,6 +72,4 @@ sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bo - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx index de9f5c4ffd14..653b1b8ec20e 100644 --- a/sc/source/ui/view/drawattr.cxx +++ b/sc/source/ui/view/drawattr.cxx @@ -20,15 +20,11 @@ #include "drawattr.hxx" #include "global.hxx" - - OUString SvxDrawToolItem::GetValueText() const { return GetValueText(GetValue()); } - - OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const { const sal_Char* p; @@ -50,15 +46,11 @@ OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const return OUString::createFromAscii( p ); } - - SfxPoolItem* SvxDrawToolItem::Clone( SfxItemPool * ) const { return new SvxDrawToolItem(*this); } - - SfxPoolItem* SvxDrawToolItem::Create( SvStream& rStream, sal_uInt16 nVer ) const { sal_uInt16 nVal; @@ -66,6 +58,4 @@ SfxPoolItem* SvxDrawToolItem::Create( SvStream& rStream, sal_uInt16 nVer ) const return new SvxDrawToolItem(nVal); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx index 7fbb4982e45f..8bcdc8810fd2 100644 --- a/sc/source/ui/view/drawutil.cxx +++ b/sc/source/ui/view/drawutil.cxx @@ -88,6 +88,4 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index dec25bc19cfe..3d1b90c81d82 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.cxx @@ -22,8 +22,6 @@ // STATIC DATA ----------------------------------------------------------- - - // UpdateBrowser in MarkListHasChanged gerufen void ScDrawView::UpdateBrowser() @@ -43,6 +41,4 @@ void ScDrawView::VCRemoveWin( Window* /* pWin */ ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index 6d38e04b6fe4..866949d4d00d 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -223,6 +223,4 @@ void ScDrawView::UpdateIMap( SdrObject* pObj ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 3dbc28da822b..138b94842984 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -54,8 +54,6 @@ using namespace com::sun::star; Point aDragStartDiff; - - void ScDrawView::CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rOneOle ) { rAnyOle = rOneOle = false; diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index c2def963ea64..022cc3f92a93 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -58,12 +58,8 @@ using namespace com::sun::star; - - #define SC_HANDLESIZE_BIG 9 - - void ScDrawView::Construct() { EnableExtendedKeyInputDispatcher(false); @@ -482,8 +478,6 @@ void ScDrawView::MarkListHasChanged() } } - - // Verben anpassen SfxViewFrame* pViewFrame = pViewSh->GetViewFrame(); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 9d9d9b34dae5..dff4d44f6461 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -150,8 +150,6 @@ ScFormatShell::~ScFormatShell() { } - - void ScFormatShell::GetStyleState( SfxItemSet& rSet ) { ScDocument* pDoc = GetViewData()->GetDocument(); @@ -246,8 +244,6 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet ) } } - - void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { // in case of vertical toolbar @@ -1252,8 +1248,6 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) } - - void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -1604,8 +1598,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) } - - void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2149,8 +2141,6 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) Invalidate(SID_ATTR_ALIGN_STACKED); } - - void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2340,8 +2330,6 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) } - - void ScFormatShell::GetBorderState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2356,8 +2344,6 @@ void ScFormatShell::GetBorderState( SfxItemSet& rSet ) rSet.Put( aInfoItem ); } - - void ScFormatShell::GetAlignState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx index 20d85945bc8d..caf79990ae27 100644 --- a/sc/source/ui/view/gridmerg.cxx +++ b/sc/source/ui/view/gridmerg.cxx @@ -21,8 +21,6 @@ #include "gridmerg.hxx" - - ScGridMerger::ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePixelY ) : pDev( pOutDev ), nOneX( nOnePixelX ), @@ -157,6 +155,4 @@ void ScGridMerger::Flush() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 5e5a4292102b..5f3764e7c557 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -173,8 +173,6 @@ struct ScGridWindow::MouseEventState #define SC_FILTERLISTBOX_LINES 12 - - ScGridWindow::VisibleRange::VisibleRange() : mnCol1(0), mnCol2(MAXCOL), mnRow1(0), mnRow2(MAXROW) { @@ -197,8 +195,6 @@ bool ScGridWindow::VisibleRange::set(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO return bChanged; } - - class ScFilterListBox : public ListBox { private: @@ -237,8 +233,6 @@ public: bool HasDates() const { return mbListHasDates; } }; - - // ListBox in einem FloatingWindow (pParent) ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ) : @@ -280,8 +274,6 @@ void ScFilterListBox::LoseFocus() #endif } - - bool ScFilterListBox::PreNotify( NotifyEvent& rNEvt ) { bool nDone = false; @@ -333,8 +325,6 @@ void ScFilterListBox::SelectHdl() } } - - // use a System floating window for the above filter listbox class ScFilterFloatingWindow : public FloatingWindow { @@ -360,8 +350,6 @@ Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() return GetWindow(WINDOW_FIRSTCHILD) ? GetWindow(WINDOW_FIRSTCHILD)->GetPreferredKeyInputWindow() : NULL; // will be the FilterBox } - - static sal_Bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) { // wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle @@ -3370,8 +3358,6 @@ void ScGridWindow::UpdateInputContext() SetInputContext( aContext ); } - - // sensitiver Bereich (Pixel) #define SCROLL_SENSITIVE 20 @@ -3459,13 +3445,9 @@ static ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const Sc return ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ); } - - extern bool bPasteIsDrop; // viewfun4 -> move to header extern bool bPasteIsMove; // viewfun7 -> move to header - - sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) { if ( rEvt.mbLeaving ) @@ -4438,8 +4420,6 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } - - void ScGridWindow::PasteSelection( const Point& rPosPixel ) { Point aLogicPos = PixelToLogic( rPosPixel ); @@ -4511,8 +4491,6 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) } } - - void ScGridWindow::UpdateEditViewPos() { if (pViewData->HasEditView(eWhich)) @@ -4732,8 +4710,6 @@ void ScGridWindow::LoseFocus() Point ScGridWindow::GetMousePosPixel() const { return aCurMousePos; } - - bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY) { @@ -5115,8 +5091,6 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, bool bUp ) pViewData->GetView()->ResetTimer(); } - - bool ScGridWindow::GetEditUrl( const Point& rPos, OUString* pName, OUString* pUrl, OUString* pTarget ) { diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 96727ae6761b..a07f268c2f69 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -57,8 +57,6 @@ using ::boost::unordered_map; // STATIC DATA ----------------------------------------------------------- - - DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const { using namespace ::com::sun::star::sheet; @@ -239,8 +237,6 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& } } - - // Data Pilot interaction @@ -277,8 +273,6 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) bTimer = sal_True; } - - SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPixel.X(), aPixel.Y(), eWhich, nPosX, nPosY ); @@ -626,8 +620,6 @@ void ScGridWindow::DPMouseButtonUp( const MouseEvent& rMEvt ) SetPointer( Pointer( POINTER_ARROW ) ); } - - void ScGridWindow::UpdateDragRect( bool bShowRange, const Rectangle& rPosRect ) { SCCOL nStartX = ( rPosRect.Left() >= 0 ) ? static_cast<SCCOL>(rPosRect.Left()) : SCCOL_MAX; @@ -655,8 +647,6 @@ void ScGridWindow::UpdateDragRect( bool bShowRange, const Rectangle& rPosRect ) UpdateDragRectOverlay(); } - - // Page-Break-Modus sal_uInt16 ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, @@ -1063,6 +1053,4 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 8a646ff8e0c7..5a7f6662fc40 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -396,6 +396,4 @@ void ScGridWindow::DrawMarkDropObj( SdrObject* pObj ) pDrView->MarkDropObj(pObj); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index c1c48d9a29df..d928cc1fc890 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -67,8 +67,6 @@ #include <boost/scoped_ptr.hpp> - - static void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) { if ( rRect.Top() < rVisible.Top()-1 ) rRect.Top() = rVisible.Top()-1; @@ -254,8 +252,6 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S } } - - static void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData, const std::vector<ScHighlightEntry>& rHighlightRanges ) { @@ -274,8 +270,6 @@ static void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData, } } - - void ScGridWindow::DoInvertRect( const Rectangle& rPixel ) { if ( rPixel == aInvertRect ) @@ -290,8 +284,6 @@ void ScGridWindow::DoInvertRect( const Rectangle& rPixel ) UpdateHeaderOverlay(); // uses aInvertRect } - - void ScGridWindow::PrePaint() { // forward PrePaint to DrawingLayer @@ -308,8 +300,6 @@ void ScGridWindow::PrePaint() } } - - void ScGridWindow::Paint( const Rectangle& rRect ) { ScDocument* pDoc = pViewData->GetDocument(); @@ -482,8 +472,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod nPPTX, nPPTY, false, bFormulaMode, &pViewData->GetMarkData() ); - - Fraction aZoomX = pViewData->GetZoomX(); Fraction aZoomY = pViewData->GetZoomY(); ScOutputData aOutputData( this, OUTTYPE_WINDOW, aTabInfo, pDoc, nTab, @@ -1527,8 +1515,6 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) } } - - void ScGridWindow::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged(rDCEvt); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index b35783c0e397..fba79cc17e2a 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -237,8 +237,6 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) return bDone; } - - void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) { //To know whether to prefix STR_CTRLCLICKHYERLINK or STR_CLICKHYPERLINK diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index 7e23d925731b..9c670b83d648 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -24,8 +24,6 @@ #define HINT_INDENT 3 #define HINT_MARGIN 4 - - ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ) : Window( pParent, WinBits( WB_BORDER ) ), aTitle( rTit ), diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx index 043058ce5c15..e648ffaf1b27 100644 --- a/sc/source/ui/view/imapwrap.cxx +++ b/sc/source/ui/view/imapwrap.cxx @@ -57,6 +57,4 @@ const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index d6c73c2d5bbe..432c2382fbfe 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -21,8 +21,6 @@ #include "invmerge.hxx" - - ScInvertMerger::ScInvertMerger( ::std::vector< Rectangle >* pRectangles ) : pRects( pRectangles ) { @@ -164,6 +162,4 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 75e5cec3533a..b0071fad92a8 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -35,8 +35,6 @@ #define SC_NOTEMARK_TIME 800 #define SC_NOTEMARK_SHORT 70 - - ScNoteMarker::ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal, ScDocument* pD, ScAddress aPos, const OUString& rUser, const MapMode& rMap, bool bLeftEdge, bool bForce, bool bKeyboard ) : @@ -190,6 +188,4 @@ void ScNoteMarker::InvalidateWin() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index b6bcb4ba784e..525df555779a 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -27,8 +27,6 @@ #include "dbfunc.hxx" #include "sc.hrc" - - const long SC_OL_BITMAPSIZE = 12; const long SC_OL_POSOFFSET = 2; @@ -40,8 +38,6 @@ const sal_uInt16 SC_OL_IMAGE_MINUS = SC_OL_IMAGE_PLUS + 1; const sal_uInt16 SC_OL_IMAGE_NOTPRESSED = SC_OL_IMAGE_MINUS + 1; const sal_uInt16 SC_OL_IMAGE_PRESSED = SC_OL_IMAGE_NOTPRESSED + 1; - - ScOutlineWindow::ScOutlineWindow( Window* pParent, ScOutlineMode eMode, ScViewData* pViewData, ScSplitPos eWhich ) : Window( pParent ), mrViewData( *pViewData ), @@ -1023,6 +1019,4 @@ void ScOutlineWindow::KeyInput( const KeyEvent& rKEvt ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index b79e5b7129ee..2f79de731f8a 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -28,8 +28,6 @@ // STATIC DATA ----------------------------------------------------------- - - void ActivateOlk( ScViewData* /* pViewData */ ) { // Browser fuer Virtual Controls fuellen @@ -48,6 +46,4 @@ void DeActivateOlk( ScViewData* /* pViewData */ ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index fff66e521180..9e329ebb5421 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -2551,6 +2551,4 @@ void ScOutputData::DrawClipMarks() mpDev->SetDrawMode(nOldDrawMode); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 18e3e8153e8d..c4b76cfc7eb8 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -82,8 +82,6 @@ const sal_uInt16 SC_SHRINKAGAIN_MAX = 7; // STATIC DATA ----------------------------------------------------------- - - class ScDrawStringsVars { ScOutputData* pOutput; // Verbindung @@ -184,8 +182,6 @@ private: void TextChanged(); }; - - ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, bool bPTL) : pOutput ( pData ), pPattern ( NULL ), @@ -807,8 +803,6 @@ sal_uLong ScDrawStringsVars::GetResultValueFormat() const return nValueFormat; } - - double ScOutputData::GetStretch() { if ( mpRefDevice->IsMapMode() ) @@ -836,8 +830,6 @@ double ScOutputData::GetStretch() } - - // output strings @@ -2079,8 +2071,6 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) mpDoc->EnableIdle(bWasIdleEnabled); } - - ScFieldEditEngine* ScOutputData::CreateOutputEditEngine() { ScFieldEditEngine* pEngine = new ScFieldEditEngine(mpDoc, mpDoc->GetEnginePool()); @@ -4634,8 +4624,6 @@ void ScOutputData::DrawEdit(bool bPixelToLogic) DrawRotated(bPixelToLogic); //! von aussen rufen ? } - - void ScOutputData::DrawRotated(bool bPixelToLogic) { //! nRotMax speichern @@ -5308,6 +5296,4 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) delete pEngine; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index 5412c0bd604d..67ce197b3eb2 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -35,8 +35,6 @@ #include <svx/fmview.hxx> - - // #i72502# Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY ) { @@ -250,6 +248,4 @@ void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx index 2b70ae011759..062716a3a2da 100644 --- a/sc/source/ui/view/pfuncache.cxx +++ b/sc/source/ui/view/pfuncache.cxx @@ -25,8 +25,6 @@ #include "markdata.hxx" #include "prevloc.hxx" - - ScPrintFuncCache::ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark, const ScPrintSelectionStatus& rStatus ) : aSelection( rStatus ), diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index 79c0759e0bad..d9f55f47c7c2 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -31,13 +31,9 @@ #include "document.hxx" #include "sc.hrc" - - #define ScPageBreakShell #include "scslots.hxx" - - TYPEINIT1( ScPageBreakShell, SfxShell ); SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell, ScResId(SCSTR_PAGEBREAKSHELL)) @@ -45,8 +41,6 @@ SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell, ScResId(SCSTR_PAGEBREAKSHELL)) SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_PAGEBREAK) ); } - - ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) : SfxShell(pViewSh) { diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 49a1e7b7facf..3380ebc4893d 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -69,8 +69,6 @@ // STATIC DATA ----------------------------------------------------------- - - #define SC_PREVIEW_SHADOWSIZE 2 static long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, std::vector<long>& nPages ) diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index bbfe54601f61..77dc60f3d426 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -78,8 +78,6 @@ using namespace com::sun::star; - - #define ScPreviewShell #include "scslots.hxx" @@ -98,8 +96,6 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" ) SFX_VIEW_REGISTRATION(ScDocShell); } - - void ScPreviewShell::Construct( Window* pParent ) { // Find the top-most window, and set the close window handler to intercept @@ -209,8 +205,6 @@ void ScPreviewShell::InitStartTable(SCTAB nTab) pPreview->SetPageNo( pPreview->GetFirstPage(nTab) ); } - - OUString ScPreviewShell::GetDescription() const { return OUString(" ** Test ** "); @@ -572,8 +566,6 @@ void ScPreviewShell::Deactivate(bool bMDI) } } - - void ScPreviewShell::Execute( SfxRequest& rReq ) { sal_uInt16 nSlot = rReq.GetSlot(); diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index f223eeb3061c..5478ec25bfb6 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -28,8 +28,6 @@ // STATIC DATA ----------------------------------------------------------- - - void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { sal_Bool bDataChanged = false; @@ -74,6 +72,4 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 034ef3bf13af..a2030da5cbf2 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -79,8 +79,6 @@ #define GET_USHORT(set,which) ((const SfxUInt16Item&)(set)->Get((which))).GetValue() #define GET_SHOW(set,which) ( VOBJ_MODE_SHOW == ScVObjMode( ((const ScViewObjectModeItem&)(set)->Get((which))).GetValue()) ) - - ScPageRowEntry::ScPageRowEntry(const ScPageRowEntry& r) { nStartRow = r.nStartRow; @@ -161,8 +159,6 @@ size_t ScPageRowEntry::CountVisible() const return nPagesX; } - - static long lcl_LineTotal(const ::editeng::SvxBorderLine* pLine) { return pLine ? ( pLine->GetScaledWidth() ) : 0; @@ -2587,8 +2583,6 @@ void ScPrintFunc::InitModes() // set MapModes from nZoom etc. aTwipMode = MapMode( MAP_TWIP, aTwipsOfs, aHorFract, aZoomFract ); } - - void ScPrintFunc::ApplyPrintSettings() { if ( pPrinter ) @@ -2643,8 +2637,6 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, if ( pPrinter && bDoPrint ) ApplyPrintSettings(); - - InitModes(); if ( pLocationData ) { @@ -2654,8 +2646,6 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, MakeTableString(); - - long nPageNo = 0; long nPrinted = 0; long nEndPage = rPageRanges.GetTotalRange().Max(); diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 842908cf98c8..66012a845943 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -31,8 +31,6 @@ #include "scmod.hxx" #include "validate.hxx" - - SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDlgWrapper, FID_DEFINE_NAME ) SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDefDlgWrapper, FID_ADD_NAME ) SFX_IMPL_MODELESSDIALOG_WITHID(ScSolverDlgWrapper, SID_OPENDLG_SOLVE ) @@ -232,8 +230,6 @@ void ScSimpleRefDlgWrapper::StartRefInput() } - - // ScAcceptChgDlgWrapper //FIXME: should be moved into ViewShell diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx index c6b750fb054b..1dad56395ffc 100644 --- a/sc/source/ui/view/scextopt.cxx +++ b/sc/source/ui/view/scextopt.cxx @@ -23,8 +23,6 @@ #include <map> #include <boost/shared_ptr.hpp> - - ScExtDocSettings::ScExtDocSettings() : mfTabBarWidth( -1.0 ), mnLinkCnt( 0 ), @@ -32,8 +30,6 @@ ScExtDocSettings::ScExtDocSettings() : { } - - ScExtTabSettings::ScExtTabSettings() : maUsedArea( ScAddress::INITIALIZE_INVALID ), maCursor( ScAddress::INITIALIZE_INVALID ), @@ -52,8 +48,6 @@ ScExtTabSettings::ScExtTabSettings() : { } - - /** A container for ScExtTabSettings objects. @descr Internally, a std::map with shared pointers to ScExtTabSettings is used. The copy constructor and assignment operator make deep copies of the @@ -80,8 +74,6 @@ private: ScExtTabSettingsMap maMap; }; - - ScExtTabSettingsCont::ScExtTabSettingsCont() { } @@ -123,8 +115,6 @@ void ScExtTabSettingsCont::CopyFromMap( const ScExtTabSettingsMap& rMap ) maMap[ aIt->first ].reset( new ScExtTabSettings( *aIt->second ) ); } - - /** Implementation struct for ScExtDocOptions containing all members. */ struct ScExtDocOptionsImpl { @@ -143,8 +133,6 @@ ScExtDocOptionsImpl::ScExtDocOptionsImpl() : { } - - ScExtDocOptions::ScExtDocOptions() : mxImpl( new ScExtDocOptionsImpl ) { @@ -223,6 +211,4 @@ void ScExtDocOptions::SetCodeName( SCTAB nTab, const OUString& rCodeName ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index faee3443df1d..af96c758714b 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -44,8 +44,6 @@ using namespace com::sun::star; static Point aSwitchPos; //! Member static bool bDidSwitch = false; - - // View (Gridwin / keyboard) ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) : pViewData( pNewViewData ), diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx index 3fda4b0dd124..d45969fb200b 100644 --- a/sc/source/ui/view/selectionstate.cxx +++ b/sc/source/ui/view/selectionstate.cxx @@ -23,8 +23,6 @@ #include "viewdata.hxx" #include "markdata.hxx" - - ScSelectionState::ScSelectionState( ScViewData& rViewData ) : meType( SC_SELECTTYPE_NONE ) { @@ -76,6 +74,4 @@ bool operator==( const ScSelectionState& rL, const ScSelectionState& rR ) return bEqual; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 9c37e661e724..ae2849a254c2 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -274,6 +274,4 @@ bool ScSpellDialogChildWindow::IsSelectionChanged() return (*mxOldRangeList != aCurrentRangeList); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 3d9c10eb384f..e243cc829493 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -268,8 +268,6 @@ void ScConversionEngineBase::FillFromCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) } } - - ScSpellingEngine::ScSpellingEngine( SfxItemPool* pEnginePoolP, ScViewData& rViewData, ScDocument* pUndoDoc, ScDocument* pRedoDoc, @@ -335,8 +333,6 @@ Window* ScSpellingEngine::GetDialogParent() return mrDocShell.GetActiveDialogParent(); } - - ScConversionParam::ScConversionParam( ScConversionType eConvType ) : meConvType( eConvType ), meSourceLang( LANGUAGE_NONE ), @@ -375,8 +371,6 @@ ScConversionParam::ScConversionParam( ScConversionType eConvType, mnOptions = i18n::TextConversionOption::CHARACTER_BY_CHARACTER; } - - ScTextConversionEngine::ScTextConversionEngine( SfxItemPool* pEnginePoolP, ScViewData& rViewData, const ScConversionParam& rConvParam, @@ -408,6 +402,4 @@ bool ScTextConversionEngine::NeedsConversion() return HasConvertibleTextPortion( maConvParam.GetSourceLang() ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 95c6ef66eeec..8875b360a452 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -36,8 +36,6 @@ // STATIC DATA ----------------------------------------------------------- - - ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) : TabBar( pParent, WinBits(WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_RANGESELECT | @@ -646,6 +644,4 @@ void ScTabControl::Mirror() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index e9913923f791..67fabedf2a4f 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -23,8 +23,6 @@ #include <vcl/settings.hxx> - - ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pData ) : Splitter( pParent, nWinStyle ), pViewData(pData) diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index b9307f8f62ee..aff402412a1d 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -162,8 +162,6 @@ void ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt ) } } - - static bool lcl_HasColOutline( const ScViewData& rViewData ) { const ScOutlineTable* pTable = rViewData.GetDocument()->GetOutlineTable(rViewData.GetTabNo()); diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 84e7740065b9..501459f3211a 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -1461,6 +1461,4 @@ void ScTabView::UpdatePageBreakData( bool bForcePaint ) pPageBreakData = pNewData; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 6bf03238df86..8b7e0a1c5044 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -95,8 +95,6 @@ ScRange lcl_getSubRangeByIndex( const ScRange& rRange, sal_Int32 nIndex ) using namespace com::sun::star; - - // --- Public-Funktionen diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 2f2dd64268ec..4f1ae9f74dbf 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -34,8 +34,6 @@ extern sal_uInt16 nScFillModeMouseModifier; // global.cxx // STATIC DATA ----------------------------------------------------------- - - // --- Referenz-Eingabe / Fill-Cursor @@ -462,8 +460,6 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos ) } } - - void ScTabView::InterpretVisible() { // make sure all visible cells are interpreted, @@ -502,6 +498,4 @@ void ScTabView::InterpretVisible() - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 3564485d21ab..551497636af7 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -248,8 +248,6 @@ void ScTabView::DoAddWin( ScGridWindow* pWin ) } } - - void ScTabView::TabChanged( bool bSameTabButMoved ) { if (pDrawView) @@ -533,8 +531,6 @@ void ScTabView::DigitLanguageChanged() pGridWin[i]->SetDigitLanguage( eNewLang ); } - - void ScTabView::ScrollToObject( SdrObject* pDrawObj ) { if ( pDrawObj ) @@ -620,8 +616,6 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect ) } } - - void ScTabView::SetBrushDocument( ScDocument* pNew, bool bLock ) { delete pBrushDocument; diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 7b6855398080..76ea68ec958f 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -49,8 +49,6 @@ #include <svx/svdpage.hxx> #include <fuconcustomshape.hxx> - - SdrView* ScTabViewShell::GetDrawView() const { return ((ScTabViewShell*)this)->GetScDrawView(); // GetScDrawView ist nicht-const @@ -457,6 +455,4 @@ bool ScTabViewShell::SelectObject( const OUString& rName ) return bFound; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index cabe51135f86..2b66df4b4800 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -68,8 +68,6 @@ #include <boost/scoped_ptr.hpp> - - /** Try to parse the given range using Calc-style syntax first, then Excel-style if that fails. */ static sal_uInt16 lcl_ParseRange(ScRange& rScRange, const OUString& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */) @@ -767,8 +765,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - - case FID_TAB_SELECTALL: SelectAllTables(); rReq.Done(); @@ -906,8 +902,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - - case FID_CHG_SHOW: { sal_uInt16 nId = ScHighlightChgDlgWrapper::GetChildWindowId(); @@ -1132,6 +1126,4 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 6d0a6e6a8179..4c0f3742f6fb 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -101,8 +101,6 @@ sal_uInt16 ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC; sal_uInt16 ScTabViewShell::nInsCellsCtrlState = 0; sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM; - - void ScTabViewShell::Activate(bool bMDI) { SfxViewShell::Activate(bMDI); @@ -314,8 +312,6 @@ bool ScTabViewShell::PrepareClose(bool bUI) return SfxViewShell::PrepareClose(bUI); } - - // Zoom fuer In-Place berechnen // aus Verhaeltnis von VisArea und Fenstergroesse des GridWin @@ -455,8 +451,6 @@ void ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const rRect.SetSize( pWin->LogicToPixel( aLogicRect.GetSize() ) ); } - - void ScTabViewShell::Move() { Point aNewPos = GetViewFrame()->GetWindow().OutputToScreenPixel(Point()); @@ -468,8 +462,6 @@ void ScTabViewShell::Move() } } - - void ScTabViewShell::ShowCursor(bool /* bOn */) { /*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen. @@ -482,8 +474,6 @@ void ScTabViewShell::ShowCursor(bool /* bOn */) */ } - - void ScTabViewShell::WriteUserData(OUString& rData, bool /* bBrowse */) { GetViewData()->WriteUserData(rData); @@ -574,8 +564,6 @@ void ScTabViewShell::DoReadUserData( const OUString& rData ) //! if ViewData has more tables than document, remove tables in ViewData } - - void ScTabViewShell::UpdateDrawShell() { // Called after user interaction that may delete the selected drawing object. @@ -1056,15 +1044,11 @@ void ScTabViewShell::SetDrawTextUndo( ::svl::IUndoManager* pNewUndoMgr ) } } - - ScTabViewShell* ScTabViewShell::GetActiveViewShell() { return PTR_CAST(ScTabViewShell,Current()); } - - SfxPrinter* ScTabViewShell::GetPrinter( bool bCreate ) { // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt) @@ -1097,8 +1081,6 @@ void ScTabViewShell::StopEditShell() SetEditShell(NULL, false ); } - - // close handler to ensure function of dialog: IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose) @@ -1205,8 +1187,6 @@ void ScTabViewShell::StopSimpleRefDialog() } } - - bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) { ScModule* pScMod = SC_MOD(); @@ -1469,8 +1449,6 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) return TabKeyInput( rKeyEvent ); } - - #define __INIT_ScTabViewShell \ eCurOST(OST_NONE), \ nDrawSfxId(0), \ @@ -1519,8 +1497,6 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) mbInSwitch(false) - - void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) { SfxApplication* pSfxApp = SFX_APP(); @@ -1722,8 +1698,6 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) - - ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ) : SfxViewShell( pViewFrame, SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), @@ -1776,8 +1750,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, #undef __INIT_ScTabViewShell - - ScTabViewShell::~ScTabViewShell() { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -1820,8 +1792,6 @@ ScTabViewShell::~ScTabViewShell() DELETEZ(pAccessibilityBroadcaster); } - - void ScTabViewShell::SetDialogDPObject( const ScDPObject* pObj ) { delete pDialogDPObject; @@ -1831,8 +1801,6 @@ void ScTabViewShell::SetDialogDPObject( const ScDPObject* pObj ) pDialogDPObject = NULL; } - - void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) { ScDocShell* pDocShell = GetViewData()->GetDocShell(); @@ -1859,8 +1827,6 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) // eNumType kennt der Dialog selber } - - void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ) { bChartAreaValid = true; @@ -1885,8 +1851,6 @@ ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings() } - - void ScTabViewShell::ExecTbx( SfxRequest& rReq ) { const SfxItemSet* pReqArgs = rReq.GetArgs(); diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 53ecb8bbe56d..56112f30bce0 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -40,8 +40,6 @@ #include "cellvalue.hxx" #include "svl/sharedstring.hxx" - - void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { if (rHint.ISA(SfxSimpleHint)) // ohne Parameter @@ -306,8 +304,6 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SfxViewShell::Notify( rBC, rHint ); } - - SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, ScViewData* pViewData ) { @@ -379,8 +375,6 @@ SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, ScViewD pDoc->GetFormatTable(), static_cast<const sal_uInt16>(SID_ATTR_NUMBERFORMAT_INFO)); } - - void ScTabViewShell::UpdateNumberFormatter( const SvxNumberInfoItem& rInfoItem ) { @@ -398,6 +392,4 @@ void ScTabViewShell::UpdateNumberFormatter( - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx index fa3f31cbc069..65a310fd0798 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -24,8 +24,6 @@ #include "document.hxx" - - void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine ) { if ( pLine ) @@ -42,8 +40,6 @@ void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine } } - - bool ScTabViewShell::HasSelection( bool bText ) const { bool bHas = false; @@ -70,8 +66,6 @@ bool ScTabViewShell::HasSelection( bool bText ) const return bHas; } - - void ScTabViewShell::UIDeactivated( SfxInPlaceClient* pClient ) { ClearHighlightRanges(); diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 72a38f273161..d6b7fd9341de 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -45,8 +45,6 @@ SvxIMapDlg* ScGetIMapDlg(); const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg ); const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ); - - void ScTabViewShell::ExecChildWin(SfxRequest& rReq) { sal_uInt16 nSlot = rReq.GetSlot(); @@ -72,8 +70,6 @@ void ScTabViewShell::GetChildWinState( SfxItemSet& rSet ) } } - - void ScTabViewShell::ExecGallery( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); @@ -106,15 +102,11 @@ void ScTabViewShell::GetGalleryState( SfxItemSet& /* rSet */ ) { } - - ScInputHandler* ScTabViewShell::GetInputHandler() const { return pInputHandler; } - - OUString ScTabViewShell::GetDescription() const { return OUString(" ** Test ** "); @@ -235,6 +227,4 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index c2de24009154..8cb4244e8f9a 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -136,8 +136,6 @@ bool ScTabViewShell::GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode ) return false; } - - // Functions that are disabled, depending on the selection // Default: // SID_DELETE, @@ -551,8 +549,6 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName } } - - bool ScTabViewShell::IsRefInputMode() const { ScModule* pScMod = SC_MOD(); @@ -598,8 +594,6 @@ bool ScTabViewShell::IsRefInputMode() const return false; } - - void ScTabViewShell::ExecuteInputDirect() { if ( !IsRefInputMode() ) @@ -612,8 +606,6 @@ void ScTabViewShell::ExecuteInputDirect() } } - - void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool bStopEditing /* = sal_True */ ) { ScInputHandler* pHdl = pInputHandler ? pInputHandler : SC_MOD()->GetInputHdl(); @@ -712,8 +704,6 @@ void ScTabViewShell::UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust ) pHdl->UpdateCellAdjust( eJust ); } - - void ScTabViewShell::ExecuteSave( SfxRequest& rReq ) { // only SID_SAVEDOC / SID_SAVEASDOC @@ -809,6 +799,4 @@ void ScTabViewShell::GetDrawOptState( SfxItemSet& rSet ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 8a8c5df576dd..e831738dc009 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -487,8 +487,6 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet) } - - void ScTabViewShell::ExecuteUndo(SfxRequest& rReq) { SfxShell* pSh = GetViewData()->GetDispatcher().GetShell(0); @@ -581,6 +579,4 @@ void ScTabViewShell::GetUndoState(SfxItemSet &rSet) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index ad3d4742fb68..758db9b68850 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -72,8 +72,6 @@ #include <config_orcus.h> - - void ScTabViewShell::SetCurRefDlgId( sal_uInt16 nNew ) { // CurRefDlgId is stored in ScModule to find if a ref dialog is open, @@ -459,6 +457,4 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( return pResult; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx index 77dcfcc463e5..e3a5a786e3ec 100644 --- a/sc/source/ui/view/tabvwshd.cxx +++ b/sc/source/ui/view/tabvwshd.cxx @@ -70,6 +70,4 @@ Window* ScTabViewShell::GetDialogParent() - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 8c1beedbfed6..7072292e1142 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -41,8 +41,6 @@ #include <svx/srchdlg.hxx> #include "document.hxx" - - OUString ScTabViewShell::GetSelectionText( bool bWholeWord ) { OUString aStrSelection; @@ -118,8 +116,6 @@ OUString ScTabViewShell::GetSelectionText( bool bWholeWord ) return aStrSelection; } - - void ScTabViewShell::InsertURL( const OUString& rName, const OUString& rURL, const OUString& rTarget, sal_uInt16 nMode ) { @@ -153,8 +149,6 @@ void ScTabViewShell::InsertURL( const OUString& rName, const OUString& rURL, con } } - - static void lcl_SelectFieldAfterInsert( EditView& rView ) { ESelection aSel = rView.GetSelection(); @@ -353,8 +347,4 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 61e826702189..84c77e5c4af8 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -781,8 +781,6 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } } - - void ScTabViewShell::GetStateTable( SfxItemSet& rSet ) { ScViewData* pViewData = GetViewData(); @@ -920,6 +918,4 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index 85f335e005b4..53ede02ca239 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -36,8 +36,6 @@ using namespace com::sun::star; #include "globstr.hrc" #include <avmedia/mediawindow.hxx> - - void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rURL, const OUString& rTarget, const Point* pInsPos ) @@ -116,6 +114,4 @@ void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rUR } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 4be04c6e49ee..3853aad088f3 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -40,8 +40,6 @@ using namespace com::sun::star; - - void ScTabViewShell::ExecuteSbx( SfxRequest& /* rReq */ ) { // SID_RANGE_OFFSET (Offset), @@ -53,8 +51,6 @@ void ScTabViewShell::GetSbxState( SfxItemSet& /* rSet */ ) // SID_RANGE_REGION (CurrentRegion) - removed (old Basic) } - - void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) { sal_uInt16 nSlotId = rReq.GetSlot(); @@ -274,6 +270,4 @@ bool ScTabViewShell::ExecuteRetypePassDlg(ScPasswordHash eDesiredHash) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 22bdc79ca58c..a6d5420212b0 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -101,8 +101,6 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ); // STATIC DATA --------------------------------------------------------------- - - bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -163,8 +161,6 @@ bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) } - - bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -203,8 +199,6 @@ bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) } - - enum ScAutoSum { ScAutoSumNone = 0, @@ -236,8 +230,6 @@ static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, } - - #define SC_AUTOSUM_MAXCOUNT 20 static ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow, @@ -271,8 +263,6 @@ static ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow #undef SC_AUTOSUM_MAXCOUNT - - static bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& nRow, SCTAB nTab, SCCOLROW& nExtend, SCROW nMinRow ) { @@ -290,8 +280,6 @@ static bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& n return false; } - - static bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow, SCTAB nTab, SCCOLROW& nExtend, SCROW nMinCol ) { @@ -309,8 +297,6 @@ static bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow return false; } - - static bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange ) { const ScAddress aStart = rRange.aStart; @@ -353,8 +339,6 @@ static bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeL return true; } - - static bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange ) { const ScAddress aStart = rRange.aStart; @@ -397,8 +381,6 @@ static bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList return true; } - - bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) { ScDocument* pDoc = GetViewData()->GetDocument(); @@ -503,16 +485,12 @@ bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) return false; } - - void ScViewFunc::EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr) { OUString aFormula = GetAutoSumFormula( rRangeList, bSubTotal, rAddr ); EnterBlock( aFormula, NULL ); } - - bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor, bool bContinue ) { ScDocument* pDoc = GetViewData()->GetDocument(); @@ -712,8 +690,6 @@ bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor return true; } - - OUString ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr ) { ScViewData* pViewData = GetViewData(); @@ -757,8 +733,6 @@ OUString ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSub return aBuf.makeStringAndClear(); } - - void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pData ) { // test for multi selection @@ -845,8 +819,6 @@ void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pDat delete pInsDoc; } - - // manual page break void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* pPos, @@ -867,8 +839,6 @@ void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* p } - - void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* pPos, bool bSetModified ) { @@ -886,8 +856,6 @@ void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* p UpdatePageBreakData( true ); // for PageBreak-Mode } - - void ScViewFunc::RemoveManualBreaks() { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -912,8 +880,6 @@ void ScViewFunc::RemoveManualBreaks() pDocSh->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); } - - void ScViewFunc::SetPrintZoom(sal_uInt16 nScale, sal_uInt16 nPages) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -929,8 +895,6 @@ void ScViewFunc::AdjustPrintZoom() GetViewData()->GetDocShell()->AdjustPrintZoom( aRange ); } - - void ScViewFunc::SetPrintRanges( bool bEntireSheet, const OUString* pPrint, const OUString* pRepCol, const OUString* pRepRow, bool bAddPrint ) @@ -1059,8 +1023,6 @@ bool ScViewFunc::TestMergeCells() // pre-test (for menu) } - - bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bCenter ) { // Editable- and Being-Nested- test must be at the beginning (in DocFunc too), @@ -1156,8 +1118,6 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bC } - - bool ScViewFunc::TestRemoveMerge() { bool bMerged = false; @@ -1172,8 +1132,6 @@ bool ScViewFunc::TestRemoveMerge() } - - static bool lcl_extendMergeRange(ScCellMergeOption& rOption, const ScRange& rRange) { bool bExtended = false; @@ -1248,8 +1206,6 @@ bool ScViewFunc::RemoveMerge( bool bRecord ) return true; //! bOk ?? } - - void ScViewFunc::FillSimple( FillDir eDir, bool bRecord ) { ScRange aRange; @@ -1268,8 +1224,6 @@ void ScViewFunc::FillSimple( FillDir eDir, bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } - - void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, double fStart, double fStep, double fMax, bool bRecord ) { @@ -1293,8 +1247,6 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, ErrorMessage(STR_NOMULTISELECT); } - - void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount, bool bRecord ) { @@ -1338,8 +1290,6 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, } } - - void ScViewFunc::FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink ) { //! allow source sheet to be protected @@ -1407,8 +1357,6 @@ void ScViewFunc::FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmp pDocSh->PostDataChanged(); } - - /** Downward fill of selected cell(s) by double-clicking cross-hair cursor Extends a current selection down to the last non-empty cell of an adjacent @@ -1482,8 +1430,6 @@ void ScViewFunc::FillCrossDblClick() } } - - void ScViewFunc::TransliterateText( sal_Int32 nType ) { ScMarkData aFuncMark = GetViewData()->GetMarkData(); @@ -1528,8 +1474,6 @@ ScAutoFormatData* ScViewFunc::CreateAutoFormatData() } - - void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord ) { ScRange aRange; @@ -1546,8 +1490,6 @@ void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } - - // Suchen & Ersetzen bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, @@ -1764,8 +1706,6 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, return bFound; } - - // Zielwertsuche void ScViewFunc::Solve( const ScSolveParam& rParam ) @@ -1840,8 +1780,6 @@ void ScViewFunc::Solve( const ScSolveParam& rParam ) } } - - // multi operation void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord ) @@ -1858,8 +1796,6 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord ) } - - void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) { @@ -1882,8 +1818,6 @@ void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, } - - void ScViewFunc::ExtendScenario() { ScEditableTester aTester( this ); @@ -1903,8 +1837,6 @@ void ScViewFunc::ExtendScenario() } - - void ScViewFunc::UseScenario( const OUString& rName ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -1915,8 +1847,6 @@ void ScViewFunc::UseScenario( const OUString& rName ) pDocSh->UseScenario( nTab, rName ); } - - // Insert table bool ScViewFunc::InsertTable( const OUString& rName, SCTAB nTab, bool bRecord ) @@ -1981,8 +1911,6 @@ bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, } - - bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2015,8 +1943,6 @@ bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) } - - bool ScViewFunc::DeleteTable( SCTAB nTab, bool bRecord ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2207,8 +2133,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) } - - bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) { // order Table/Name is inverted for DocFunc @@ -2223,8 +2147,6 @@ bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) } - - bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab ) { bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, true, false ); @@ -2245,8 +2167,6 @@ bool ScViewFunc::SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfo return bSuccess; } - - void ScViewFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, sal_uLong nRefresh ) @@ -2261,8 +2181,6 @@ void ScViewFunc::InsertAreaLink( const OUString& rFile, } - - void ScViewFunc::InsertTableLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rTabName ) @@ -2296,8 +2214,6 @@ void ScViewFunc::InsertTableLink( const OUString& rFile, } } - - // Copy/link tables from another document void ScViewFunc::ImportTables( ScDocShell* pSrcShell, @@ -2420,8 +2336,6 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, ErrorMessage(STR_NAMECONFLICT); } - - // Move/Copy table to another document void ScViewFunc::MoveTable( @@ -2777,8 +2691,6 @@ void ScViewFunc::MoveTable( } - - void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2817,8 +2729,6 @@ void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) } - - void ScViewFunc::HideTable( const ScMarkData& rMark ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2868,8 +2778,6 @@ void ScViewFunc::HideTable( const ScMarkData& rMark ) } - - void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) { ScEditableTester aTester( this ); @@ -2905,8 +2813,6 @@ void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) } - - void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, const SvxBorderLine* pDestLine, const SvxBorderLine* pSrcLine, @@ -2944,8 +2850,6 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, } - - void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, bool bColorOnly ) { @@ -3061,8 +2965,6 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, #undef SET_LINE_ATTRIBUTES - - void ScViewFunc::SetValidation( const ScValidationData& rNew ) { ScDocument* pDoc = GetViewData()->GetDocument(); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index aea072da40a8..b54831328443 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -71,8 +71,6 @@ using namespace com::sun::star; // STATIC DATA --------------------------------------------------------------- - - // GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx @@ -150,8 +148,6 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects ) ErrorMessage( STR_NOMULTISELECT ); } - - // C O P Y bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, bool bCut, bool bApi, bool bIncludeObjects, bool bStopEdit ) @@ -688,8 +684,6 @@ bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, bool bApi ) return bRet; } - - // P A S T E bool ScViewFunc::PasteOnDrawObjectLinked( @@ -1747,8 +1741,6 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark HelperNotifyChanges::Notify(*pModelObj, aChangeRanges); } - - // D R A G A N D D R O P // innerhalb des Dokuments diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 8cef91a85c99..55937e03e1a4 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -76,8 +76,6 @@ using namespace com::sun::star; bool bPasteIsDrop = false; - - void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ) diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index c4107ffc6ad4..311db7473c14 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -25,8 +25,6 @@ #include <svx/unomodel.hxx> #include <unotools/streamwrap.hxx> - - #include <svx/fmmodel.hxx> #include <svx/svdetc.hxx> #include <svx/svditer.hxx> @@ -72,8 +70,6 @@ using namespace com::sun::star; - - bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, const uno::Reference<datatransfer::XTransferable>& rxTransferable, SCCOL nPosX, SCROW nPosY, Point* pLogicPos, bool bLink, bool bAllowDialogs ) diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 6a017ef5773c..3eddb54742a7 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -77,8 +77,6 @@ #include "tokenarray.hxx" #include <rowheightcontext.hxx> - - static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDocShell *pDocSh ) { if( pCondFmt ) @@ -90,8 +88,6 @@ static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDo } - - ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScTabView( pParent, rDocSh, pViewShell ), bFormatValid( false ) @@ -102,8 +98,6 @@ ScViewFunc::~ScViewFunc() { } - - void ScViewFunc::StartFormatArea() { // anything to do? @@ -222,8 +216,6 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, aFormatSource.Set( nCol, nRow, nTab ); // then set a new source } - - // additional routines sal_uInt16 ScViewFunc::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, bool bFormula ) @@ -2906,6 +2898,4 @@ void ScViewFunc::UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAt pTabViewShell->AdjustBlockHeight(false, const_cast<ScMarkData*>(&rSel)); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx index e9a63b0d4338..e3139ea18745 100644 --- a/sc/source/ui/view/waitoff.cxx +++ b/sc/source/ui/view/waitoff.cxx @@ -21,8 +21,6 @@ #include "waitoff.hxx" - - ScWaitCursorOff::ScWaitCursorOff( Window* pWinP ) : pWin( pWinP ), @@ -51,6 +49,4 @@ ScWaitCursorOff::~ScWaitCursorOff() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index 97a153e8f634..d518462e00d1 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -99,8 +99,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } // extern C - - ScTestAddIn::ScTestAddIn() { } diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index 13ce3abee4d4..930878163489 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -27,12 +27,8 @@ using namespace com::sun::star; - - SV_IMPL_PTRARR( XResultListenerArr_Impl, XResultListenerPtr ); - - ScAddInResult::ScAddInResult(const String& rStr) : aArg( rStr ), nTickCount( 0 ) @@ -113,6 +109,4 @@ void SAL_CALL ScAddInResult::removeResultListener( const ::com::sun::star::uno:: - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 327f6bfc2756..4a4e4488381a 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -84,8 +84,6 @@ public: DECL_LINK(ViewHdl, PushButton*); }; - - class ScTestListener : public XSelectionChangeListener, public UsrObject { private: @@ -106,14 +104,10 @@ public: virtual void selectionChanged(const EventObject& aEvent); }; - - static long nBla = 0; static XCellRef xGlobalCell; - - ScTestListener::ScTestListener(FixedText* pF) : pFixedText( pF ) { @@ -165,8 +159,6 @@ void ScTestListener::selectionChanged(const EventObject& aEvent) } - - extern "C" Window* SAL_CALL CreateWindow( Window *pParent, const String& rParam ) { MyWindow *pWin = new MyWindow( pParent ); @@ -246,8 +238,6 @@ MyWindow::MyWindow( Window *pParent ) : aViewButton.Show(); } - - XSpreadsheetDocumentRef lcl_GetDocument() { XServiceManagerRef xProv = getGlobalServiceManager(); @@ -290,8 +280,6 @@ XInterfaceRef lcl_GetView() return xView; } - - void lcl_OutputNames( const XInterfaceRef& xSource, // XNameAccess const XSpreadsheetDocumentRef& xDoc, sal_uInt16 nCol, sal_uInt16 nRow, sal_uInt16 nTab ) @@ -324,8 +312,6 @@ void lcl_OutputNames( const XInterfaceRef& xSource, // XNameAccess } } - - void lcl_SetText( const XTextRef& xText ) { if (!xText.is()) return; @@ -353,8 +339,6 @@ void lcl_SetText( const XTextRef& xText ) xProp->setPropertyValue(L"Bold", UsrAny((sal_Bool)true)); } - - void lcl_DoCount() { XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model @@ -1634,8 +1618,6 @@ IMPL_LINK_NOARG(MyWindow, CountHdl) return 0; } - - IMPL_LINK_NOARG(MyWindow, TextHdl) { sal_uInt16 nCol = (sal_uInt16)aColField.GetValue(); @@ -1683,8 +1665,6 @@ IMPL_LINK_NOARG(MyWindow, TextHdl) return 0; } - - IMPL_LINK_NOARG(MyWindow, BlaHdl) { aTimeText.SetText("..."); @@ -1757,8 +1737,6 @@ IMPL_LINK_NOARG(MyWindow, BlaHdl) } - - IMPL_LINK_NOARG(MyWindow, TabHdl) { String aResult; @@ -1830,8 +1808,6 @@ IMPL_LINK_NOARG(MyWindow, TabHdl) return 0; } - - void lcl_FillCells(XCellCollectionRef xColl) { XEnumerationAccessRef xEnAcc = xColl->getCells(); |