diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-08-31 18:07:35 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-31 20:03:07 +0000 |
| commit | 91859ae19ca1a9793b8553e120683393f584dfb1 (patch) | |
| tree | 79cdb50468392752c94f0bc4aab8747501a8ec9f /sc | |
| parent | dbd0a194a78bcf5588f19d25ddecad0804d86c37 (diff) | |
fdo#62475 removed pointless comments
Change-Id: Ifc9837e9f6e3c6a84e9f01c192f10271b184fb6d
Reviewed-on: https://gerrit.libreoffice.org/5720
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'sc')
45 files changed, 48 insertions, 339 deletions
diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index 4b440a258652..f3b658a6a211 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -36,16 +36,13 @@ #include <boost/unordered_map.hpp> - class String; class SfxObjectShell; class ScUnoAddInFuncData; class ScFuncDesc; - typedef ::boost::unordered_map< OUString, const ScUnoAddInFuncData*, ScStringHashCode, ::std::equal_to< OUString > > ScAddInHashMap; - enum ScAddInArgumentType { SC_ADDINARG_NONE, ///< - @@ -62,8 +59,6 @@ enum ScAddInArgumentType SC_ADDINARG_VARARGS ///< sequence<any> }; -//------------------------------------------------------------------------ - struct ScAddInArgDesc { OUString aInternalName; ///< used to match configuration and reflection information @@ -135,8 +130,6 @@ public: void SetCompNames( const ::std::vector< LocalizedName >& rNew ); }; -//------------------------------------------------------------------------ - class SC_DLLPUBLIC ScUnoAddInCollection { private: @@ -188,7 +181,6 @@ public: bool GetCalcName( const OUString& rExcelName, OUString& rRetCalcName ); }; - class ScUnoAddInCall { private: @@ -238,7 +230,6 @@ public: GetVarRes() const { return xVarRes; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index e998de0f51e4..cc756d66af8d 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -108,8 +108,7 @@ const SCROW SCROW_REPEAT_NONE = SCROW_MAX; #endif const SCROW SCROWS64K = 65536; -// === old stuff defines ===================================================== - +// old stuff defines #define MAXROW_30 8191 #ifdef SC_LIMIT_ROWS @@ -121,8 +120,7 @@ const SCROW W16MAXROW = W16MAXROWCOUNT - 1; #define MAXROW W16MAXROW #endif -// === old stuff defines end ================================================= - +// old stuff defines end inline bool ValidCol( SCCOL nCol ) { return static_cast<SCCOL>(0) <= nCol && nCol <= MAXCOL; @@ -173,8 +171,7 @@ inline SCTAB SanitizeTab( SCTAB nTab, SCTAB nMaxTab ) return nTab < 0 ? 0 : (nTab > nMaxTab ? nMaxTab : nTab); } -// === ScAddress ============================================================= - +// ScAddress // The old cell address is combined in one UINT32: // +---+---+-------+ // |Tab|Col| Row | @@ -216,8 +213,7 @@ inline SCTAB SanitizeTab( SCTAB nTab, SCTAB nMaxTab ) #define SCA_ABS_3D SCA_ABS | SCA_TAB_3D #define SCR_ABS_3D SCR_ABS | SCA_TAB_3D -// === ScAddress ============================================================= - +// ScAddress class ScAddress { private: @@ -389,7 +385,6 @@ inline bool ScAddress::operator>=( const ScAddress& r ) const return !operator<( r ); } - inline size_t ScAddress::hash() const { // Assume that there are not that many addresses with row > 2^16 AND column @@ -423,8 +418,7 @@ inline bool ValidAddress( const ScAddress& rAddr ) return ValidCol(rAddr.Col()) && ValidRow(rAddr.Row()) && ValidTab(rAddr.Tab()); } -// === ScRange =============================================================== - +// ScRange class ScRange { public: @@ -570,7 +564,6 @@ inline bool ScRange::In( const ScRange& r ) const aStart.Tab() <= r.aStart.Tab() && r.aEnd.Tab() <= aEnd.Tab(); } - inline size_t ScRange::hashArea() const { // Assume that there are not that many ranges with identical corners so we @@ -587,7 +580,6 @@ inline size_t ScRange::hashArea() const static_cast<size_t>(aEnd.Row()); // end row <= 2^15 } - inline size_t ScRange::hashStartColumn() const { // Assume that for the start row more lower row numbers are used so that @@ -599,7 +591,6 @@ inline size_t ScRange::hashStartColumn() const static_cast<size_t>(aEnd.Row()); } - struct ScRangeHashAreaFunctor { size_t operator()( const ScRange & rRange ) const @@ -621,8 +612,7 @@ inline bool ValidRange( const ScRange& rRange ) return ValidAddress(rRange.aStart) && ValidAddress(rRange.aEnd); } -// === ScRangePair =========================================================== - +// ScRangePair class ScRangePair { private: @@ -659,8 +649,7 @@ inline int ScRangePair::operator!=( const ScRangePair& r ) const return !operator==( r ); } -// === ScRefAddress ========================================================== - +// ScRefAddress class ScRefAddress { ScAddress aAdr; @@ -746,9 +735,7 @@ inline int ScRefAddress::operator==( const ScRefAddress& r ) const bRelTab == r.bRelTab; } -// =========================================================================== // Global functions -// =========================================================================== // Special values for cells always broadcasting or listening (RECALCMODE_ALWAYS // and the like). diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx index 7f8a5941a67f..fad7496a591c 100644 --- a/sc/inc/appoptio.hxx +++ b/sc/inc/appoptio.hxx @@ -101,10 +101,7 @@ private: ScOptionsUtil::KeyBindingType meKeyBindingType; }; - -//================================================================== // Config Item containing app options -//================================================================== class ScAppCfg : public ScAppOptions { diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx index 965e316a7f66..c4f514bf145f 100644 --- a/sc/inc/attarray.hxx +++ b/sc/inc/attarray.hxx @@ -71,7 +71,6 @@ struct ScAttrEntry const ScPatternAttr* pPattern; }; - class ScAttrArray { private: @@ -190,10 +189,7 @@ public: void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow ); }; - -// ------------------------------------------------------------------------------ // Iterator for attributes -// ------------------------------------------------------------------------------ class ScAttrIterator { @@ -207,7 +203,6 @@ public: SCROW GetNextRow() const { return nRow; } }; - inline ScAttrIterator::ScAttrIterator( const ScAttrArray* pNewArray, SCROW nStart, SCROW nEnd ) : pArray( pNewArray ), nRow( nStart ), @@ -235,9 +230,6 @@ inline const ScPatternAttr* ScAttrIterator::Next( SCROW& rTop, SCROW& rBottom ) return pRet; } - - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx index 4a84e29321fb..1aa4d64e846e 100644 --- a/sc/inc/attrib.hxx +++ b/sc/inc/attrib.hxx @@ -27,8 +27,6 @@ #include "global.hxx" #include "address.hxx" -//------------------------------------------------------------------------ - // flags for cells hidden by merge // and control for auto filter #define SC_MF_HOR 0x0001 @@ -42,14 +40,11 @@ #define SC_MF_ALL 0x00FF - class EditTextObject; namespace editeng { class SvxBorderLine; } bool SC_DLLPUBLIC ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxBorderLine* pOther ); -//------------------------------------------------------------------------ - class SC_DLLPUBLIC ScMergeAttr: public SfxPoolItem { SCsCOL nColMerge; @@ -80,8 +75,6 @@ public: } }; -//------------------------------------------------------------------------ - class SC_DLLPUBLIC ScMergeFlagAttr: public SfxInt16Item { public: @@ -101,7 +94,6 @@ public: bool HasPivotPopupButton() const; }; -//------------------------------------------------------------------------ class SC_DLLPUBLIC ScProtectionAttr: public SfxPoolItem { bool bProtection; ///< protect cell @@ -151,8 +143,6 @@ public: } }; - -//---------------------------------------------------------------------------- // ScRangeItem: manages an area of a table #define SCR_INVALID 0x01 @@ -214,9 +204,8 @@ inline ScRangeItem& ScRangeItem::operator=( const ScRangeItem &rCpy ) return *this; } -//---------------------------------------------------------------------------- // ScTableListItem: manages a list of tables -//---------------------------------------------------------------------------- + class ScTableListItem : public SfxPoolItem { public: @@ -246,7 +235,6 @@ inline ScTableListItem::ScTableListItem( const sal_uInt16 nWhichP ) : SfxPoolItem(nWhichP), nCount(0), pTabArr(NULL) {} -//---------------------------------------------------------------------------- // page format item: contents of header and footer #define SC_HF_LEFTAREA 1 @@ -286,8 +274,6 @@ public: void SetArea( EditTextObject *pNew, int nArea ); }; - -//---------------------------------------------------------------------------- // page format item: contents of header and footer class SC_DLLPUBLIC ScViewObjectModeItem: public SfxEnumItem @@ -311,7 +297,6 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -//---------------------------------------------------------------------------- // class ScDoubleItem : public SfxPoolItem @@ -336,15 +321,11 @@ private: double nValue; }; - -// ============================================================================ - /** Member ID for "page scale to width" value in QueryValue() and PutValue(). */ const sal_uInt8 SC_MID_PAGE_SCALETO_WIDTH = 1; /** Member ID for "page scale to height" value in QueryValue() and PutValue(). */ const sal_uInt8 SC_MID_PAGE_SCALETO_HEIGHT = 2; - /** Contains the "scale to width/height" attribute in page styles. */ class SC_DLLPUBLIC ScPageScaleToItem : public SfxPoolItem { @@ -408,8 +389,6 @@ private: std::vector<sal_uInt32> maIndex; }; -// ============================================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx index d384e54d5916..7779297be25f 100644 --- a/sc/inc/cellform.hxx +++ b/sc/inc/cellform.hxx @@ -35,8 +35,6 @@ enum ScForceTextFmt { ftCheck ///< is the numberformat a textformat? }; -//------------------------------------------------------------------------ - class SC_DLLPUBLIC ScCellFormat { public: @@ -57,9 +55,6 @@ public: const ScDocument* pDoc ); }; - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 333a2dbc1e91..cd36cc441199 100644 --- a/sc/inc/chart2uno.hxx +++ b/sc/inc/chart2uno.hxx @@ -57,8 +57,7 @@ class ScDocument; -// DataProvider ============================================================== - +// DataProvider class ScChart2DataProvider : public ::cppu::WeakImplHelper5< ::com::sun::star::chart2::data::XDataProvider, @@ -74,8 +73,7 @@ public: virtual ~ScChart2DataProvider(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - // XDataProvider --------------------------------------------------------- - + // XDataProvider virtual ::sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::uno::RuntimeException); @@ -102,8 +100,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() throw (::com::sun::star::uno::RuntimeException); - // XSheetDataProvider ---------------------------------------------------- - + // XSheetDataProvider virtual sal_Bool SAL_CALL createDataSequenceByFormulaTokensPossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) throw (::com::sun::star::uno::RuntimeException); @@ -113,16 +110,14 @@ public: const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& aTokens ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - // XRangeXMLConversion --------------------------------------------------- - + // XRangeXMLConversion virtual OUString SAL_CALL convertRangeToXML( const OUString& sRangeRepresentation ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); virtual OUString SAL_CALL convertRangeFromXML( const OUString& sXMLRange ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); - // XPropertySet ---------------------------------------------------------- - + // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException); @@ -174,8 +169,7 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - // XServiceInfo ---------------------------------------------------------- - + // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException); @@ -193,9 +187,7 @@ private: sal_Bool m_bIncludeHiddenCells; }; - -// DataSource ================================================================ - +// DataSource class ScChart2DataSource : public ::cppu::WeakImplHelper2< ::com::sun::star::chart2::data::XDataSource, @@ -208,14 +200,12 @@ public: virtual ~ScChart2DataSource(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - // XDataSource ----------------------------------------------------------- - + // XDataSource virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() throw (::com::sun::star::uno::RuntimeException); - // XServiceInfo ---------------------------------------------------------- - + // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException); @@ -238,9 +228,7 @@ private: }; - -// DataSequence ============================================================== - +// DataSequence class ScChart2DataSequence : public ::cppu::WeakImplHelper7< ::com::sun::star::chart2::data::XDataSequence, @@ -261,8 +249,7 @@ public: virtual ~ScChart2DataSequence(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - // XDataSequence --------------------------------------------------------- - + // XDataSequence virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException); virtual OUString SAL_CALL getSourceRangeRepresentation() @@ -274,18 +261,15 @@ public: throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - // XNumericalDataSequence -------------------------------------------------- - + // XNumericalDataSequence virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData( ) throw (::com::sun::star::uno::RuntimeException); - // XTextualDataSequence -------------------------------------------------- - + // XTextualDataSequence virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData( ) throw (::com::sun::star::uno::RuntimeException); - // XPropertySet ---------------------------------------------------------- - + // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException); @@ -337,13 +321,11 @@ public: ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - // XCloneable ------------------------------------------------------------ - + // XCloneable virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException); - // XModifyBroadcaster ---------------------------------------------------- - + // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -351,8 +333,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); - // XServiceInfo ---------------------------------------------------------- - + // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException); @@ -366,8 +347,7 @@ public: private: void setDataChangedHint(bool b); - // Implementation -------------------------------------------------------- - + // Implementation void RefChanged(); DECL_LINK( ValueListenerHdl, SfxHint* ); diff --git a/sc/inc/chartarr.hxx b/sc/inc/chartarr.hxx index 73fdb1c6930e..549e7bdcc5e3 100644 --- a/sc/inc/chartarr.hxx +++ b/sc/inc/chartarr.hxx @@ -20,8 +20,6 @@ #ifndef SC_CHARTARR_HXX #define SC_CHARTARR_HXX -// ----------------------------------------------------------------------- - #include "rangelst.hxx" #include "chartpos.hxx" diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index ded1f3cb79ac..c50f0a4c3148 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -20,7 +20,6 @@ #ifndef SC_CHARTLIS_HXX #define SC_CHARTLIS_HXX - #include <vcl/timer.hxx> #include <svl/listener.hxx> #include "rangelst.hxx" @@ -121,8 +120,6 @@ public: bool operator!=( const ScChartListener& r ) const; }; -// ============================================================================ - class ScChartHiddenRangeListener { public: @@ -131,8 +128,6 @@ public: virtual void notify() = 0; }; -// ============================================================================ - class ScChartListenerCollection { public: @@ -223,7 +218,6 @@ public: void EndListeningHiddenRange( ScChartHiddenRangeListener* pListener ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index 785a925b01a9..af9bc66016e9 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -20,8 +20,6 @@ #ifndef SC_CHARTPOS_HXX #define SC_CHARTPOS_HXX -// ----------------------------------------------------------------------- - #include "rangelst.hxx" #include <map> @@ -94,7 +92,6 @@ public: } }; - enum ScChartGlue { SC_CHARTGLUE_NA, SC_CHARTGLUE_NONE, // old mimic @@ -158,7 +155,6 @@ public: const ScChartPositionMap* GetPositionMap(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 872f268599e0..5fdb50b8109c 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -52,7 +52,6 @@ enum ScChangeActionType SC_CAT_REJECT }; - enum ScChangeActionState { SC_CAS_VIRGIN, @@ -60,7 +59,6 @@ enum ScChangeActionState SC_CAS_REJECTED }; - enum ScChangeActionClipMode { SC_CACM_NONE, @@ -69,8 +67,7 @@ enum ScChangeActionClipMode SC_CACM_PASTE }; -// --- ScChangeActionLinkEntry --------------------------------------------- - +// ScChangeActionLinkEntry // Inserts itself as the head of a chain (better: linked list?), or before a LinkEntry // on delete: automatically remove of what is linked (German original was strange...) // ppPrev == &previous->pNext oder address of pointer to head of linked list, @@ -165,7 +162,7 @@ public: ScChangeAction* GetAction() { return pAction; } }; -// --- ScChangeActionCellListEntry ----------------------------------------- +// ScChangeActionCellListEntry // this is only for the XML Export in the hxx class ScChangeActionContent; @@ -193,8 +190,7 @@ public: DECL_FIXEDMEMPOOL_NEWDEL( ScChangeActionCellListEntry ) }; -// --- ScChangeAction ------------------------------------------------------- - +// ScChangeAction class ScChangeTrack; class ScChangeActionIns; class ScChangeActionDel; @@ -401,9 +397,7 @@ public: const ScChangeTrack* pTrack ); }; - -// --- ScChangeActionIns ---------------------------------------------------- - +// ScChangeActionIns class ScChangeActionIns : public ScChangeAction { friend class ScChangeTrack; @@ -432,9 +426,7 @@ public: OUString& rStr, ScDocument* pDoc, bool bSplitRange = false, bool bWarning = true) const; }; - -// --- ScChangeActionDel ---------------------------------------------------- - +// ScChangeActionDel class ScChangeActionMove; class ScChangeActionDelMoveEntry : public ScChangeActionLinkEntry @@ -483,7 +475,6 @@ public: short GetCutOffTo() const { return nCutOffTo; } }; - class ScChangeActionDel : public ScChangeAction { friend class ScChangeTrack; @@ -560,9 +551,7 @@ public: ScChangeActionMove* pMove, short nFrom, short nTo ); }; - -// --- ScChangeActionMove --------------------------------------------------- - +// ScChangeActionMove class ScChangeActionMove : public ScChangeAction { friend class ScChangeTrack; @@ -632,9 +621,7 @@ public: OUString& rStr, ScDocument* pDoc, bool bFlag3D = false ) const; }; - -// --- ScChangeActionContent ------------------------------------------------ - +// ScChangeActionContent enum ScChangeActionContentCellType { SC_CACCT_NONE = 0, @@ -808,9 +795,7 @@ public: bool IsOldMatrixReference() const; }; - -// --- ScChangeActionReject ------------------------------------------------- - +// ScChangeActionReject class ScChangeActionReject : public ScChangeAction { friend class ScChangeTrack; @@ -840,9 +825,7 @@ public: const OUString &sComment); // only to use in the XML import }; - -// --- ScChangeTrack -------------------------------------------------------- - +// ScChangeTrack enum ScChangeTrackMsgType { SC_CTM_NONE, @@ -1245,8 +1228,6 @@ public: void MergeActionState( ScChangeAction* pAct, const ScChangeAction* pOtherAct ); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index 6cb43010b079..5ce3a5d641e3 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -38,8 +38,6 @@ #include <boost/intrusive_ptr.hpp> #include <boost/unordered_map.hpp> -//----------------------------------------------- - // constants and data types also for external modules (ScInterpreter et al) #define MAXSTRLEN 1024 /* maximum length of input string of one symbol */ @@ -74,7 +72,6 @@ #define SC_COMPILER_FILE_TAB_SEP '#' // 'Doc'#Tab - class ScDocument; class ScMatrix; class ScRangeData; @@ -288,7 +285,6 @@ public: private: - static CharClass *pCharClassEnglish; // character classification for en_US locale static const Convention *pConventions[ formula::FormulaGrammar::CONV_LAST ]; diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx index a136eebf3417..09968ee19354 100644 --- a/sc/inc/compressedarray.hxx +++ b/sc/inc/compressedarray.hxx @@ -87,7 +87,6 @@ public: void CopyFrom( const ScCompressedArray& rArray, A nStart, A nEnd, long nSourceDy = 0 ); - // methods public for the coupled array sum methods /** Obtain index into entries for nPos */ SC_DLLPUBLIC size_t Search( A nPos ) const; @@ -100,7 +99,6 @@ protected: A nMaxAccess; }; - template< typename A, typename D > void ScCompressedArray<A,D>::Reset( const D& rValue ) { @@ -114,14 +112,12 @@ void ScCompressedArray<A,D>::Reset( const D& rValue ) pData[0].nEnd = nMaxAccess; } - template< typename A, typename D > void ScCompressedArray<A,D>::SetValue( A nPos, const D& rValue ) { SetValue( nPos, nPos, rValue); } - template< typename A, typename D > const D& ScCompressedArray<A,D>::GetValue( A nPos ) const { @@ -129,7 +125,6 @@ const D& ScCompressedArray<A,D>::GetValue( A nPos ) const return pData[nIndex].aValue; } - template< typename A, typename D > const D& ScCompressedArray<A,D>::GetValue( A nPos, size_t& nIndex, A& nEnd ) const { @@ -138,7 +133,6 @@ const D& ScCompressedArray<A,D>::GetValue( A nPos, size_t& nIndex, A& nEnd ) con return pData[nIndex].aValue; } - template< typename A, typename D > const D& ScCompressedArray<A,D>::GetNextValue( size_t& nIndex, A& nEnd ) const { @@ -149,8 +143,7 @@ const D& ScCompressedArray<A,D>::GetNextValue( size_t& nIndex, A& nEnd ) const return pData[nEntry].aValue; } -// === ScBitMaskCompressedArray ============================================== - +// ScBitMaskCompressedArray /** The data type represents bits, managable by bitwise operations. */ @@ -193,7 +186,6 @@ public: const D& rBitMask ) const; }; - template< typename A, typename D > void ScBitMaskCompressedArray<A,D>::AndValue( A nPos, const D& rValueToAnd ) { @@ -202,7 +194,6 @@ void ScBitMaskCompressedArray<A,D>::AndValue( A nPos, const D& rValueToAnd ) this->SetValue( nPos, rValue & rValueToAnd); } - template< typename A, typename D > void ScBitMaskCompressedArray<A,D>::OrValue( A nPos, const D& rValueToOr ) { @@ -211,7 +202,6 @@ void ScBitMaskCompressedArray<A,D>::OrValue( A nPos, const D& rValueToOr ) this->SetValue( nPos, rValue | rValueToOr); } - #endif // SC_COMPRESSEDARRAY_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/convuno.hxx b/sc/inc/convuno.hxx index 3106d18ac0a1..b30067b6f231 100644 --- a/sc/inc/convuno.hxx +++ b/sc/inc/convuno.hxx @@ -28,7 +28,6 @@ #include "global.hxx" #include "address.hxx" - class ScUnoConversion { public: @@ -78,7 +77,6 @@ public: const ::com::sun::star::table::CellRangeAddress& rApiInner ); }; - inline void ScUnoConversion::FillScAddress( ScAddress& rScAddress, const ::com::sun::star::table::CellAddress& rApiAddress ) @@ -168,8 +166,6 @@ inline bool ScUnoConversion::Contains( (rApiOuter.StartRow <= rApiInner.StartRow) && (rApiInner.EndRow <= rApiOuter.EndRow); } -//___________________________________________________________________ - inline sal_Bool operator==( const ::com::sun::star::table::CellAddress& rApiAddress1, const ::com::sun::star::table::CellAddress& rApiAddress2 ) diff --git a/sc/inc/defaultsoptions.hxx b/sc/inc/defaultsoptions.hxx index 4153a5ff507b..a9c37db9c0af 100644 --- a/sc/inc/defaultsoptions.hxx +++ b/sc/inc/defaultsoptions.hxx @@ -22,7 +22,6 @@ private: SCTAB nInitTabCount; // number of Tabs for new Spreadsheet doc OUString aInitTabPrefix; // The Tab prefix name in new Spreadsheet doc - public: ScDefaultsOptions(); ScDefaultsOptions( const ScDefaultsOptions& rCpy ); @@ -41,9 +40,7 @@ public: }; -//================================================================== // item for the dialog / options page -//================================================================== class SC_DLLPUBLIC ScTpDefaultsItem : public SfxPoolItem { @@ -64,9 +61,7 @@ private: ScDefaultsOptions theOptions; }; -//================================================================== // config item -//================================================================== class ScDefaultsCfg : public ScDefaultsOptions, public utl::ConfigItem { diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 62fbf074f566..f71becd0524e 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -23,8 +23,6 @@ #include <boost/ptr_container/ptr_vector.hpp> #include "global.hxx" - -//------------------------------------------------------------------------ enum ScDetOpType { SCDETOP_ADDSUCC, @@ -34,8 +32,6 @@ enum ScDetOpType SCDETOP_ADDERROR }; -//------------------------------------------------------------------------ - class ScDetOpData { ScAddress aPos; @@ -58,8 +54,6 @@ public: { return eOperation == r.eOperation && aPos == r.aPos; } }; -//------------------------------------------------------------------------ - // // list of operators // @@ -90,8 +84,6 @@ public: size_t Count() const { return aDetOpDataVector.size(); } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/docoptio.hxx b/sc/inc/docoptio.hxx index bc20c0a720b4..a90b70be38c2 100644 --- a/sc/inc/docoptio.hxx +++ b/sc/inc/docoptio.hxx @@ -140,9 +140,7 @@ inline bool ScDocOptions::operator!=( const ScDocOptions& rOpt ) const return !(operator==(rOpt)); } -//================================================================== // Item for preferences dialog - calculation -//================================================================== class SC_DLLPUBLIC ScTpCalcItem : public SfxPoolItem { @@ -163,9 +161,7 @@ private: ScDocOptions theOptions; }; -//================================================================== // Config Item containing document options -//================================================================== class ScDocCfg : public ScDocOptions { @@ -184,7 +180,6 @@ public: void SetOptions( const ScDocOptions& rNew ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index 30fc21224dfe..cffd0c8d68cc 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -39,7 +39,6 @@ namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldReference; } } } } - class ScAddress; class ScDocument; class ScDPSource; @@ -216,7 +215,6 @@ public: void SetInColRoot(bool bSet) { bIsInColRoot = bSet; } }; -// -------------------------------------------------------------------- // // results for a hierarchy dimension // @@ -346,7 +344,6 @@ public: const ScDPSource& GetSource() const; }; - class ScDPResultMember { private: @@ -505,7 +502,6 @@ public: typedef std::vector<ScDPDataMember*> ScDPDataMembers; - // result dimension contains only members class ScDPResultDimension @@ -666,8 +662,6 @@ public: ScDPDataMember* GetMember(long n); }; -// ---------------------------------------------------------------------------- - /** * This class collects visible members of each dimension and uses that * information to create filtering criteria (e.g. for drill-down data). diff --git a/sc/inc/filtopt.hxx b/sc/inc/filtopt.hxx index 4956d1e98f6d..20adaff1ccf7 100644 --- a/sc/inc/filtopt.hxx +++ b/sc/inc/filtopt.hxx @@ -24,9 +24,7 @@ #include <tools/solar.h> #include "scdllapi.h" -//================================================================== // filter options -//================================================================== class SC_DLLPUBLIC ScFilterOptions : public utl::ConfigItem { @@ -49,7 +47,6 @@ public: // values are never modified by office }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/forbiuno.hxx b/sc/inc/forbiuno.hxx index 0fc46157a065..4574470ae56e 100644 --- a/sc/inc/forbiuno.hxx +++ b/sc/inc/forbiuno.hxx @@ -25,8 +25,6 @@ class ScDocShell; -//------------------------------------------------------------------------ - // object to set forbidden charaters to document class ScForbiddenCharsObj : public SvxUnoForbiddenCharsTable, public SfxListener diff --git a/sc/inc/formulaopt.hxx b/sc/inc/formulaopt.hxx index 8ab4e0bf54cd..cce5549390d2 100644 --- a/sc/inc/formulaopt.hxx +++ b/sc/inc/formulaopt.hxx @@ -76,9 +76,7 @@ public: bool operator!= ( const ScFormulaOptions& rOpt ) const; }; -//================================================================== // item for the dialog / options page -//================================================================== class SC_DLLPUBLIC ScTpFormulaItem : public SfxPoolItem { @@ -99,9 +97,7 @@ private: ScFormulaOptions theOptions; }; -//================================================================== // config item -//================================================================== class ScFormulaCfg : public ScFormulaOptions, public utl::ConfigItem { diff --git a/sc/inc/formulaparserpool.hxx b/sc/inc/formulaparserpool.hxx index 337fef59de5b..80a2178d7f01 100644 --- a/sc/inc/formulaparserpool.hxx +++ b/sc/inc/formulaparserpool.hxx @@ -25,8 +25,6 @@ class ScDocument; -// ============================================================================ - /** Stores the used instances of the FilterFormulaParser service implementations, mapped by the formula namespace they support. */ class ScFormulaParserPool @@ -53,8 +51,6 @@ private: ParserMap maParsers; }; -// ============================================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 405834fd855a..72189af1ea9d 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -80,8 +80,6 @@ const sal_Unicode CHAR_RLM = 0x200F; const sal_Unicode CHAR_NBHY = 0x2011; const sal_Unicode CHAR_ZWNBSP = 0x2060; -// ---------------------------------------------------------------------------- - #define MINDOUBLE 1.7e-307 #define MAXDOUBLE 1.7e307 @@ -125,7 +123,6 @@ const SCSIZE MAXSUBTOTAL = 3; * 0.1986cm with TeX points, * 0.1993cm with PS points. */ - #define MAX_EXTRA_WIDTH 23811 /* 42cm in TWIPS, 41.8430cm TeX, 41.9999cm PS */ #define MAX_EXTRA_HEIGHT 23811 #define MAX_COL_WIDTH 56693 /* 1m in TWIPS, 99.6266cm TeX, 100.0001cm PS */ @@ -161,7 +158,6 @@ namespace sc #define PAINT_SIZE 64 #define PAINT_ALL ( PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS | PAINT_OBJECTS | PAINT_SIZE ) - // flags for columns / rows // FILTERED always together with HIDDEN // FILTERED and MANUALSIZE only valid for rows @@ -222,7 +218,6 @@ const sal_uInt16 IDF_AUTOFILL = IDF_ALL & ~(IDF_NOTE | IDF_OBJECTS); #define HASATTR_PAINTEXT ( HASATTR_LINES | HASATTR_SHADOW | HASATTR_CONDITIONAL ) - #define EMPTY_STRING ScGlobal::GetEmptyString() #define EMPTY_OUSTRING ScGlobal::GetEmptyOUString() @@ -425,7 +420,6 @@ enum ScLkUpdMode // modes for updating links LM_UNKNOWN }; - // enum with values equal to old DBObject enum from sdb enum ScDBObject { @@ -677,7 +671,6 @@ SC_DLLPUBLIC static xub_StrLen FindUnquoted( const String& rString, sal */ SC_DLLPUBLIC static const sal_Unicode* FindUnquoted( const sal_Unicode* pString, sal_Unicode cChar, sal_Unicode cQuote = '\'' ); - static CharSet GetCharsetValue( const String& rCharSet ); static String GetCharsetString( CharSet eVal ); diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx index 17367fb51097..edb2a4ec4e52 100644 --- a/sc/inc/hints.hxx +++ b/sc/inc/hints.hxx @@ -24,8 +24,6 @@ #include "address.hxx" #include <svl/hint.hxx> -// --------------------------------------------------------------------------- - class ScPaintHint : public SfxHint { ScRange aRange; @@ -52,7 +50,6 @@ public: sal_Bool GetPrintFlag() const { return bPrint; } }; - class ScUpdateRefHint : public SfxHint { UpdateRefMode eUpdateRefMode; @@ -75,7 +72,6 @@ public: SCsTAB GetDz() const { return nDz; } }; - #define SC_POINTERCHANGED_NUMFMT 1 class ScPointerChangedHint : public SfxHint @@ -90,7 +86,6 @@ public: sal_uInt16 GetFlags() const { return nFlags; } }; - //! move ScLinkRefreshedHint to a different file? #define SC_LINKREFTYPE_NONE 0 @@ -127,7 +122,6 @@ public: const ScAddress& GetDestPos() const { return aDestPos; } }; - //! move ScAutoStyleHint to a different file? class ScAutoStyleHint : public SfxHint diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx index 33e282a4cf8b..3a46bf6c442c 100644 --- a/sc/inc/inputopt.hxx +++ b/sc/inc/inputopt.hxx @@ -20,11 +20,9 @@ #ifndef SC_INPUTOPT_HXX #define SC_INPUTOPT_HXX - #include <unotools/configitem.hxx> #include <tools/solar.h> - class ScInputOptions { private: @@ -73,10 +71,7 @@ public: const ScInputOptions& operator= ( const ScInputOptions& rOpt ); }; - -//================================================================== // CfgItem for input options -//================================================================== class ScInputCfg : public ScInputOptions, public utl::ConfigItem @@ -93,7 +88,6 @@ public: virtual void Commit(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/navicfg.hxx b/sc/inc/navicfg.hxx index 71c74bd66027..e93be61a6b75 100644 --- a/sc/inc/navicfg.hxx +++ b/sc/inc/navicfg.hxx @@ -22,10 +22,7 @@ #include <tools/solar.h> - -//================================================================== // CfgItem for navigator-state -//================================================================== class ScNavipiCfg { @@ -45,7 +42,6 @@ public: sal_uInt16 GetRootType() const { return nRootType; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/pagepar.hxx b/sc/inc/pagepar.hxx index 5f004e7a2e81..a898d5a81099 100644 --- a/sc/inc/pagepar.hxx +++ b/sc/inc/pagepar.hxx @@ -23,8 +23,6 @@ #include "global.hxx" #include "address.hxx" -//----------------------------------------------------------------------- - struct ScPageTableParam { sal_Bool bCellContent; @@ -72,8 +70,6 @@ struct ScPageAreaParam void Reset (); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/pageuno.hxx b/sc/inc/pageuno.hxx index a0540d37a675..6332e1b67e35 100644 --- a/sc/inc/pageuno.hxx +++ b/sc/inc/pageuno.hxx @@ -22,8 +22,6 @@ #include <svx/fmdpage.hxx> -//------------------------------------------------------------------------ - // SvxFmDrawPage subclass to create ScShapeObj for shapes class ScPageObj : public SvxFmDrawPage diff --git a/sc/inc/paramisc.hxx b/sc/inc/paramisc.hxx index ca9031f23619..a4da3f6ed94e 100644 --- a/sc/inc/paramisc.hxx +++ b/sc/inc/paramisc.hxx @@ -42,8 +42,6 @@ struct ScSolveParam sal_Bool operator== ( const ScSolveParam& r ) const; }; -//----------------------------------------------------------------------- - struct ScTabOpParam { ScRefAddress aRefFormulaCell; diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index ae38c1022200..6c9b03e5742b 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -33,7 +33,6 @@ Make sure that either ColArr or RowArr contains a PivotDataField entry. */ - #ifndef SC_PIVOT_HXX #define SC_PIVOT_HXX @@ -52,7 +51,6 @@ #include <com/sun/star/sheet/DataPilotFieldLayoutInfo.hpp> #include <com/sun/star/sheet/DataPilotFieldAutoShowInfo.hpp> - struct ScDPName { OUString maName; ///< Original name of the dimension. @@ -61,8 +59,6 @@ struct ScDPName explicit ScDPName(const OUString& rName, const OUString& rLayoutName); }; -// ============================================================================ - struct ScDPLabelData { OUString maName; ///< Original name of the dimension. diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx index 2359dcff0fc1..c8468c44dcb9 100644 --- a/sc/inc/postit.hxx +++ b/sc/inc/postit.hxx @@ -36,8 +36,6 @@ class ScDocument; class Rectangle; struct ScCaptionInitData; -// ============================================================================ - /** Internal data for a cell annotation. */ struct SC_DLLPUBLIC ScNoteData { @@ -53,8 +51,6 @@ struct SC_DLLPUBLIC ScNoteData ~ScNoteData(); }; -// ============================================================================ - /** * Additional class containing cell annotation data. */ @@ -160,8 +156,6 @@ private: mutable ScNoteData maNoteData; /// Note data with pointer to caption object. }; -// ============================================================================ - class SC_DLLPUBLIC ScNoteUtil { public: @@ -306,8 +300,6 @@ public: void CreateAllNoteCaptions(SCTAB nTab); }; -// ============================================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/printopt.hxx b/sc/inc/printopt.hxx index c7726fc477da..7148c68da3f9 100644 --- a/sc/inc/printopt.hxx +++ b/sc/inc/printopt.hxx @@ -47,9 +47,7 @@ public: bool operator!= ( const ScPrintOptions& rOpt ) const; }; -//================================================================== // item for the dialog / options page -//================================================================== class SC_DLLPUBLIC ScTpPrintItem : public SfxPoolItem { @@ -70,9 +68,7 @@ private: ScPrintOptions theOptions; }; -//================================================================== // config item -//================================================================== class ScPrintCfg : public ScPrintOptions, public utl::ConfigItem { diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index 0d814cd0d9b5..ad311ffc6982 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -66,8 +66,6 @@ protected: EntriesType maEntries; }; -// ============================================================================ - struct ScQueryParamTable { SCCOL nCol1; @@ -81,8 +79,6 @@ struct ScQueryParamTable virtual ~ScQueryParamTable(); }; -// ============================================================================ - struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamTable { bool bDestPers; // not saved @@ -102,8 +98,6 @@ struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamT void MoveToDest(); }; -// ============================================================================ - struct ScDBQueryParamBase : public ScQueryParamBase { enum DataType { INTERNAL, MATRIX }; @@ -124,8 +118,6 @@ private: DataType meType; }; -// ============================================================================ - struct ScDBQueryParamInternal : public ScDBQueryParamBase, public ScQueryParamTable { ScDBQueryParamInternal(); @@ -134,8 +126,6 @@ struct ScDBQueryParamInternal : public ScDBQueryParamBase, public ScQueryParamTa virtual bool IsValidFieldIndex() const; }; -// ============================================================================ - struct ScDBQueryParamMatrix : public ScDBQueryParamBase { ScMatrixRef mpMatrix; diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index cca168d0ff12..486dab2bfc48 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -31,8 +31,6 @@ #include <com/sun/star/table/CellRangeAddress.hpp> #include <com/sun/star/uno/Sequence.hxx> -//------------------------------------------------------------------------ - class ScArea; class ScDocument; class ScRange; @@ -42,8 +40,6 @@ class ScDBCollection; enum RutlNameScope { RUTL_NONE=0, RUTL_NAMES, RUTL_DBASE }; -//------------------------------------------------------------------------ - class SC_DLLPUBLIC ScRangeUtil { public: @@ -96,8 +92,6 @@ public: ScAddress::Details const & rDetails = ScAddress::detailsOOOa1 ) const; }; -//------------------------------------------------------------------------ - class SC_DLLPUBLIC ScRangeStringConverter { public: @@ -265,8 +259,6 @@ public: static ScRangeData* GetRangeDataFromString(const OUString& rString, const SCTAB nTab, const ScDocument* pDoc); }; -//------------------------------------------------------------------------ - class ScArea { public: @@ -314,7 +306,6 @@ public: bool WasDBName() const { return !bFirstPass; } }; - #endif // SC_RANGEUTL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/rechead.hxx b/sc/inc/rechead.hxx index f7c4cad8136e..b2f256880909 100644 --- a/sc/inc/rechead.hxx +++ b/sc/inc/rechead.hxx @@ -71,13 +71,11 @@ #define SCID_DRAWPOOL 0x4260 #define SCID_DRAWMODEL 0x4261 - - // file version // if the high-byte is incremented, the document won't be opened by older SCs #define SC_INITIAL_VERSION 0x0001 #define SC_FORMULA_LCLVER 0x0002 // formula with local version no. -//-------------------------------- + #define SC_NEW_TOKEN_ARRAYS 0x0003 // new TokenArray format #define SC_FORMULA_VALUES 0x0004 // values in formula cells #define SC_FORMULA_VALUES2 0x0005 // values in formula cells @@ -85,28 +83,26 @@ #define SC_DATABYTES2 0x0007 // data bytes, small tables #define SC_NUMFMT 0x0008 // number format of formula cell #define SC_NEWIF 0x0009 // new coding of ocIf (komp.) -//-------------------------------- + #define SC_RELATIVE_REFS 0x0010 // relative references #define SC_SUBTOTAL_FLAG 0x0011 // bSubTotal of formula cell #define SC_COLROWNAME_RANGEPAIR 0x0012 // ColRowNameRanges as ScRangePair -//-------------------------------- + #define SC_31_EXPORT_VER 0x0012 // version for 3.1-export -//-------------------------------- since 4.0 +// since 4.0 #define SC_32K_ROWS 0x0100 // 32000 rows - incompatibel #define SC_FONTCHARSET 0x0101 // Font-CharSets have to be right -//-------------------------------- + #define SC_40_EXPORT_VER 0x0101 // version for 4.0-Export -//-------------------------------- since 5.0 +// since 5.0 #define SC_RECALC_MODE_BITS 0x0201 // TokenArray RecalcMode #define SC_MATRIX_DOUBLEREF 0x0202 // DoubleRef implicit intersection #define SC_VERSION_EDITPOOL 0x0203 // EditCells with EditPool #define SC_SUBTOTAL_BUGFIX 0x0204 // bSubTotal of formula cell (true) -//-------------------------------- since 5.2 +// since 5.2 #define SC_CONVERT_RECALC_ON_LOAD 0x0205 // CONVERT function recalculated on each load -//-------------------------------- #define SC_CURRENT_VERSION 0x0205 - // all above SC_31_EXPORT_VER has to be queried during saving, // because 3.1-export writes this version number. @@ -115,8 +111,6 @@ class SvStream; -// ----------------------------------------------------------------------- - // Header with size specification for multiple objects class ScMultipleReadHeader @@ -157,5 +151,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 738865f18bbe..cafeb43fa33e 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -62,7 +62,6 @@ public: virtual void SaveParameters() = 0; }; - class AbstractScAutoFormatDlg : public VclAbstractDialog //add for ScAutoFormatDlg { public: @@ -323,8 +322,7 @@ public: virtual bool IsDateConversionSet() const = 0; }; -//-------Scabstract fractory --------------------------- -class ScAbstractDialogFactory +//Scabstract fractoryclass ScAbstractDialogFactory { public: SC_DLLPUBLIC static ScAbstractDialogFactory* Create(); diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx index e4e5238844df..3b92de14239d 100644 --- a/sc/inc/scitems.hxx +++ b/sc/inc/scitems.hxx @@ -25,14 +25,12 @@ // EditEngine is not allowed to define it's own ITEMID's #define _EEITEMID_HXX -//-------------------------- // Item-IDs for UI-MsgPool: -//-------------------------- //! shall be moved to the below-1000 range! #define MSGPOOL_START 1100 -//-------------------------------------- + #define SCITEM_STRING 1100 #define SCITEM_SEARCHDATA 1101 #define SCITEM_SORTDATA 1102 @@ -43,12 +41,11 @@ #define SCITEM_SOLVEDATA 1107 #define SCITEM_USERLIST 1108 #define SCITEM_PRINTWARN 1109 -//-------------------------------------- + #define MSGPOOL_END 1109 -//------------------------- // Item-IDs for attributes: -//------------------------- + #define ATTR_STARTINDEX 100 // begin of attributes #define ATTR_PATTERN_START 100 // begin of cell-attribute-pattern @@ -160,9 +157,8 @@ #define ATTR_ENDINDEX ATTR_HIDDEN // end of pool-range -//-------------------------------- // Dummy Slot-IDs for dialogs -//-------------------------------- + #define SID_SCATTR_PAGE_NOTES ATTR_PAGE_NOTES #define SID_SCATTR_PAGE_GRID ATTR_PAGE_GRID #define SID_SCATTR_PAGE_HEADERS ATTR_PAGE_HEADERS @@ -187,5 +183,4 @@ #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 5f2e61a5ab68..f15b054a70b0 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -34,7 +34,6 @@ #include <algorithm> #include <stack> - class KeyEvent; class EditView; class SfxErrorHandler; @@ -75,15 +74,11 @@ struct ScDragData; struct ScClipData; class ScAnyRefModalDlg; -//================================================================== - // for internal Drag&Drop: #define SC_DROP_NAVIGATOR 1 #define SC_DROP_TABLE 2 -//================================================================== - class ScModule: public SfxModule, public SfxListener, utl::ConfigurationListener { Timer aIdleTimer; @@ -266,5 +261,4 @@ SC_DLLPUBLIC void SetAppOptions ( const ScAppOptions& rO #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/scresid.hxx b/sc/inc/scresid.hxx index 7687a4bb7d8e..343225281e75 100644 --- a/sc/inc/scresid.hxx +++ b/sc/inc/scresid.hxx @@ -23,8 +23,6 @@ #include <tools/resid.hxx> #include "scdllapi.h" -//=================================================================== - class SC_DLLPUBLIC ScResId : public ResId { public: diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index 5173c3523144..07618ca77748 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -47,8 +47,6 @@ struct SvEventDescription; class ShapeUnoEventAccessImpl; class ScMacroInfo; -//------------------------------------------------------------------------ - // object which aggregates all svx shape objects, // to add own properties diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx index 28e4a9d04d01..20fba2695c30 100644 --- a/sc/inc/stlsheet.hxx +++ b/sc/inc/stlsheet.hxx @@ -22,12 +22,8 @@ #include <svl/style.hxx> -//------------------------------------------------------------------------ - #define SCSTYLEBIT_STANDARD 0x0001 -//------------------------------------------------------------------------ - class ScStyleSheetPool; class ScStyleSheet : public SfxStyleSheet diff --git a/sc/inc/stringutil.hxx b/sc/inc/stringutil.hxx index 68670b9e6867..5984da798094 100644 --- a/sc/inc/stringutil.hxx +++ b/sc/inc/stringutil.hxx @@ -95,8 +95,6 @@ struct SC_DLLPUBLIC ScSetStringParam void setNumericInput(); }; -// ============================================================================ - struct ScInputStringType { enum StringType { Unknown = 0, Text, Formula, Number }; @@ -139,7 +137,6 @@ public: SvNumberFormatter& rFormatter, const OUString& rStr, LanguageType eLang ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx index b8eb7ab4a772..c0b0e3a6e9ff 100644 --- a/sc/inc/tabprotection.hxx +++ b/sc/inc/tabprotection.hxx @@ -54,8 +54,6 @@ private: ~ScPassHashHelper(); }; -// ============================================================================ - class SAL_NO_VTABLE ScPassHashProtectable { public: @@ -76,8 +74,6 @@ public: virtual bool verifyPassword(const String& aPassText) const = 0; }; -// ============================================================================ - class SC_DLLPUBLIC ScDocProtection : public ScPassHashProtectable { public: @@ -114,8 +110,6 @@ private: ::boost::shared_ptr<ScTableProtectionImpl> mpImpl; }; -// ============================================================================ - /** sheet protection state container * * This class stores sheet's protection state: 1) whether the protection @@ -173,7 +167,6 @@ private: ::boost::shared_ptr<ScTableProtectionImpl> mpImpl; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index 75b503138c74..a323b6297db5 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -35,8 +35,6 @@ class ScTokenArray; class ScDocShell; -// ============================================================================ - class ScTokenConversion { public: @@ -50,8 +48,6 @@ public: const ScTokenArray& rTokenArray ); }; -// ============================================================================ - class ScFormulaParserObj : public ::cppu::WeakImplHelper3< ::com::sun::star::sheet::XFormulaParser, ::com::sun::star::beans::XPropertySet, @@ -136,8 +132,6 @@ public: throw(::com::sun::star::uno::RuntimeException); }; -// ============================================================================ - class ScFormulaOpCodeMapperObj : public formula::FormulaOpCodeMapperObj { public: @@ -146,8 +140,6 @@ public: SAL_WNODEPRECATED_DECLARATIONS_POP }; -// ============================================================================ - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/userdat.hxx b/sc/inc/userdat.hxx index a13759f55a3d..86f124ea81b7 100644 --- a/sc/inc/userdat.hxx +++ b/sc/inc/userdat.hxx @@ -25,9 +25,6 @@ #include "global.hxx" #include "address.hxx" - -//------------------------------------------------------------------------- - #define SC_DRAWLAYER 0x30334353 // Inventor: "SC30" // Object-Ids fuer UserData @@ -36,8 +33,6 @@ #define SC_UD_MACRODATA 3 #define SC_UD_ALTOBJDATA 4 -//------------------------------------------------------------------------- - class ScDrawObjFactory { DECL_LINK( MakeUserData, SdrObjFactory * ); @@ -46,8 +41,6 @@ public: ~ScDrawObjFactory(); }; -//------------------------------------------------------------------------- - class SC_DLLPUBLIC ScDrawObjData : public SdrObjUserData { public: @@ -66,8 +59,6 @@ private: virtual ScDrawObjData* Clone( SdrObject* pObj ) const; }; -//------------------------------------------------------------------------- - class ScIMapInfo : public SdrObjUserData { ImageMap aImageMap; @@ -84,8 +75,6 @@ public: const ImageMap& GetImageMap() const { return aImageMap; } }; -//------------------------------------------------------------------------- - class ScMacroInfo : public SdrObjUserData { public: @@ -105,9 +94,6 @@ private: OUString maHlink; }; -//------------------------------------------------------------------------- - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |