diff options
950 files changed, 0 insertions, 4290 deletions
diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx index 0df34de462be..58be88f9856f 100644 --- a/sc/inc/AccessibleGlobal.hxx +++ b/sc/inc/AccessibleGlobal.hxx @@ -25,7 +25,6 @@ #include <set> - /// Generic XAccessibleStateSet implementation. class ScAccessibleStateSet : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleStateSet > { diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx index d933c1ce35e5..c3b5ed3ad554 100644 --- a/sc/inc/ScPanelFactory.hxx +++ b/sc/inc/ScPanelFactory.hxx @@ -35,7 +35,6 @@ namespace > PanelFactoryInterfaceBase; } - class ScPanelFactory : private ::boost::noncopyable, private ::cppu::BaseMutex, @@ -60,7 +59,6 @@ public: cssu::RuntimeException, std::exception ) SAL_OVERRIDE; }; - } } // end of namespace sc::sidebar #endif diff --git a/sc/inc/ViewSettingsSequenceDefines.hxx b/sc/inc/ViewSettingsSequenceDefines.hxx index c943d86c1be7..d427377ab877 100644 --- a/sc/inc/ViewSettingsSequenceDefines.hxx +++ b/sc/inc/ViewSettingsSequenceDefines.hxx @@ -49,7 +49,6 @@ #define SC_RASTERSUBY 21 #define SC_RASTERSYNC 22 - // this are the defines for the position of the settings in the // TableViewSettingsSequence diff --git a/sc/inc/addincfg.hxx b/sc/inc/addincfg.hxx index 33d7de40f5d2..ab8b6978d210 100644 --- a/sc/inc/addincfg.hxx +++ b/sc/inc/addincfg.hxx @@ -39,7 +39,6 @@ public: using ConfigItem::GetNodeNames; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index b0df2b3b7e21..c9af7bc92626 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -27,7 +27,6 @@ #include "global.hxx" #include "address.hxx" - class ScAddressConversionObj : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceInfo >, diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index 15c1e5fff20f..8ebdb14e3ef3 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -42,16 +42,13 @@ class ScAutoFormatFieldObj; class ScAutoFormatObj; - #define SC_AFMTOBJ_INVALID USHRT_MAX - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ScAutoFormatsObj_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); - class ScAutoFormatsObj : public ::cppu::WeakImplHelper4< ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XEnumerationAccess, @@ -125,7 +122,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScAutoFormatObj : public ::cppu::WeakImplHelper6< ::com::sun::star::container::XIndexAccess, ::com::sun::star::container::XEnumerationAccess, @@ -232,7 +228,6 @@ public: ::com::sun::star::uno::XInterface> xObj ); }; - class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper2< ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceInfo >, @@ -299,7 +294,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/appluno.hxx b/sc/inc/appluno.hxx index 49fbd8d5af1d..be5f2d40e056 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -136,7 +136,6 @@ class ScSpreadsheetSettings : public cppu::WeakImplHelper3< private: SfxItemPropertySet aPropSet; - bool getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException); sal_Int16 getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException); void setProperty(const OUString& aPropertyName, bool p1) throw (css::uno::RuntimeException) @@ -281,7 +280,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScRecentFunctionsObj : public cppu::WeakImplHelper2< com::sun::star::sheet::XRecentFunctions, com::sun::star::lang::XServiceInfo> @@ -311,7 +309,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScFunctionListObj : public cppu::WeakImplHelper4< com::sun::star::sheet::XFunctionDescriptions, com::sun::star::container::XEnumerationAccess, diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx index aad0604a5433..938ef5e8dd56 100644 --- a/sc/inc/autoform.hxx +++ b/sc/inc/autoform.hxx @@ -23,7 +23,6 @@ /************************************************************************* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - Die akt. Struktur der Autoformatierung darf nicht mehr veraendert werden. Diese wird durch unterschiedlichen Code vom StartWriter und vom StarCalc eingelesen/geschrieben. @@ -248,7 +247,6 @@ public: bool Save( SvStream& rStream, sal_uInt16 fileVersion ); }; - class SC_DLLPUBLIC ScAutoFormatData { private: @@ -346,7 +344,6 @@ public: iterator end(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/bigrange.hxx b/sc/inc/bigrange.hxx index b9a8beb0a04c..fd634e10e5e6 100644 --- a/sc/inc/bigrange.hxx +++ b/sc/inc/bigrange.hxx @@ -128,21 +128,18 @@ inline ScAddress ScBigAddress::MakeAddress() const return ScAddress( nColA, nRowA, nTabA ); } - inline SvStream& WriteScBigAddress( SvStream& rStream, const ScBigAddress& rAdr ) { rStream.WriteInt32( rAdr.nCol ).WriteInt32( rAdr.nRow ).WriteInt32( rAdr.nTab ); return rStream; } - inline SvStream& ReadScBigAddress( SvStream& rStream, ScBigAddress& rAdr ) { rStream.ReadInt32( rAdr.nCol ).ReadInt32( rAdr.nRow ).ReadInt32( rAdr.nTab ); return rStream; } - class ScBigRange { public: @@ -199,7 +196,6 @@ public: friend inline SvStream& ReadScBigRange( SvStream& rStream, ScBigRange& rRange ); }; - inline bool ScBigRange::In( const ScBigAddress& rAddr ) const { return @@ -208,7 +204,6 @@ inline bool ScBigRange::In( const ScBigAddress& rAddr ) const aStart.Tab() <= rAddr.Tab() && rAddr.Tab() <= aEnd.Tab(); } - inline bool ScBigRange::In( const ScBigRange& r ) const { return @@ -217,7 +212,6 @@ inline bool ScBigRange::In( const ScBigRange& r ) const aStart.Tab() <= r.aStart.Tab() && r.aEnd.Tab() <= aEnd.Tab(); } - inline bool ScBigRange::Intersects( const ScBigRange& r ) const { return !( @@ -227,7 +221,6 @@ inline bool ScBigRange::Intersects( const ScBigRange& r ) const ); } - inline SvStream& WriteScBigRange ( SvStream& rStream, const ScBigRange& rRange ) { WriteScBigAddress( rStream, rRange.aStart ); @@ -235,7 +228,6 @@ inline SvStream& WriteScBigRange ( SvStream& rStream, const ScBigRange& rRange ) return rStream; } - inline SvStream& ReadScBigRange( SvStream& rStream, ScBigRange& rRange ) { ReadScBigAddress( rStream, rRange.aStart ); diff --git a/sc/inc/brdcst.hxx b/sc/inc/brdcst.hxx index 39c0b86f7766..d63bb2c6b169 100644 --- a/sc/inc/brdcst.hxx +++ b/sc/inc/brdcst.hxx @@ -49,7 +49,6 @@ public: const ScRange& GetRange() const { return aNewRange; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/callform.hxx b/sc/inc/callform.hxx index a86deaec5220..e66c4d0c08f1 100644 --- a/sc/inc/callform.hxx +++ b/sc/inc/callform.hxx @@ -86,7 +86,6 @@ public: bool getParamDesc( OUString& aName, OUString& aDesc, sal_uInt16 nParam ) const; }; - class FuncCollection { typedef boost::ptr_map<OUString, FuncData> MapType; @@ -105,7 +104,6 @@ public: const_iterator end() const; }; - bool InitExternalFunc(const OUString& rModuleName); void ExitExternalFunc(); diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index ce7fe849bf08..7408ee2a5f44 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -122,7 +122,6 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > XModifyListenerRef; typedef boost::ptr_vector<XModifyListenerRef> XModifyListenerArr_Impl; - // ScCellRangesBase - base class for ScCellRangesObj (with access by index) // and ScCellRangeObj (without access by index) @@ -502,7 +501,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class SC_DLLPUBLIC ScCellRangesObj : public ScCellRangesBase, public com::sun::star::sheet::XSheetCellRangeContainer, public com::sun::star::container::XNameContainer, @@ -612,7 +610,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class SC_DLLPUBLIC ScCellRangeObj : public ScCellRangesBase, public com::sun::star::sheet::XCellRangeAddressable, public com::sun::star::sheet::XSheetCellRange, @@ -838,7 +835,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - //! really derive cell from range? class SC_DLLPUBLIC ScCellObj : public ScCellRangeObj, @@ -1013,7 +1009,6 @@ public: virtual sal_Int16 SAL_CALL resetActionLocks() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScTableSheetObj : public ScCellRangeObj, public com::sun::star::sheet::XSpreadsheet, public com::sun::star::container::XNamed, @@ -1280,7 +1275,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScTableColumnObj : public ScCellRangeObj, public com::sun::star::container::XNamed { @@ -1334,7 +1328,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScTableRowObj : public ScCellRangeObj { private: @@ -1370,7 +1363,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScCellsObj : public cppu::WeakImplHelper2< com::sun::star::container::XEnumerationAccess, com::sun::star::lang::XServiceInfo >, @@ -1404,7 +1396,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScCellsEnumeration : public cppu::WeakImplHelper2< com::sun::star::container::XEnumeration, com::sun::star::lang::XServiceInfo >, @@ -1487,7 +1478,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScCellFormatsEnumeration : public cppu::WeakImplHelper2< com::sun::star::container::XEnumeration, com::sun::star::lang::XServiceInfo >, @@ -1606,7 +1596,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/cfgids.hxx b/sc/inc/cfgids.hxx index 359ce976d81d..3b0210378ddd 100644 --- a/sc/inc/cfgids.hxx +++ b/sc/inc/cfgids.hxx @@ -28,7 +28,6 @@ #define SCCFG_INPUT (SFX_ITEMTYPE_SC_BEGIN + 8) #define SCCFG_NAVIPI (SFX_ITEMTYPE_SC_BEGIN + 9) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx index 506f2b87636a..497942bfadba 100644 --- a/sc/inc/chartlock.hxx +++ b/sc/inc/chartlock.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_INC_CHARTLOCK_HXX #define INCLUDED_SC_INC_CHARTLOCK_HXX - #include <vcl/timer.hxx> #include <cppuhelper/weakref.hxx> @@ -74,7 +73,6 @@ private: ScTemporaryChartLock( const ScTemporaryChartLock& ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index 30bd965fa2a5..da79b1bd26ae 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -36,11 +36,9 @@ #include <cppuhelper/compbase4.hxx> #include <cppuhelper/implbase4.hxx> - class ScDocShell; class ScChartObj; - class ScChartsObj : public cppu::WeakImplHelper4< com::sun::star::table::XTableCharts, com::sun::star::container::XEnumerationAccess, @@ -107,7 +105,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::table::XTableChart, ::com::sun::star::document::XEmbeddedObjectSupplier, diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx index 49c6409384b7..dc5f36c68446 100644 --- a/sc/inc/chgtrack.hxx +++ b/sc/inc/chgtrack.hxx @@ -51,7 +51,6 @@ private: sal_uInt16 nLastUserIndex; ColorData nColor; - public: ScActionColorChanger( const ScChangeTrack& rTrack ); ~ScActionColorChanger() {} diff --git a/sc/inc/chgviset.hxx b/sc/inc/chgviset.hxx index 6ed38baeaf17..aa66f760d3d3 100644 --- a/sc/inc/chgviset.hxx +++ b/sc/inc/chgviset.hxx @@ -96,7 +96,6 @@ public: void SetTheLastDateTime(const DateTime& aDateTime) {aLastDateTime=aDateTime;} const DateTime& GetTheLastDateTime()const {return aLastDateTime;} - bool HasAuthor() const {return bIsAuthor;} void SetHasAuthor(bool nFlag) {bIsAuthor=nFlag;} @@ -114,7 +113,6 @@ public: bool IsEveryoneButMe() const {return bEveryoneButMe;} void SetEveryoneButMe(bool nFlag) {bEveryoneButMe=nFlag;} - bool HasRange() const {return bIsRange;} void SetHasRange(bool nFlag) {bIsRange=nFlag;} diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index 3c636eb80098..61915770934b 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -646,5 +646,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx index f70b01bd6585..743c950070a6 100644 --- a/sc/inc/conditio.hxx +++ b/sc/inc/conditio.hxx @@ -281,10 +281,8 @@ private: mutable boost::scoped_ptr<ScConditionEntryCache> mpCache; }; - // single entry for conditional formatting - class SC_DLLPUBLIC ScCondFormatEntry : public ScConditionEntry { OUString aStyleName; @@ -376,10 +374,8 @@ private: OUString maStyleName; }; - // complete conditional formatting - class SC_DLLPUBLIC ScConditionalFormat: private boost::noncopyable { ScDocument* pDoc; @@ -446,10 +442,8 @@ public: void endRendering(); }; - // List of areas and formats: - class SC_DLLPUBLIC ScConditionalFormatList { private: @@ -511,5 +505,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx index 21e0d3b69ec2..f0551e0abdc4 100644 --- a/sc/inc/confuno.hxx +++ b/sc/inc/confuno.hxx @@ -94,7 +94,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/consoli.hxx b/sc/inc/consoli.hxx index 8811f5b55b13..3b1b65d89862 100644 --- a/sc/inc/consoli.hxx +++ b/sc/inc/consoli.hxx @@ -32,7 +32,6 @@ struct ScReferenceEntry // without constructor ! SCTAB nTab; }; - //! Use delta value for data? class ScReferenceList // without constructor ! @@ -53,7 +52,6 @@ public: void AddEntry( SCCOL nCol, SCROW nRow, SCTAB nTab ); }; - // Sequence: // 1) create ScConsData // 2) Parameter (Size/Flags) @@ -63,7 +61,6 @@ public: // perhaps AddName after each area // 6) OutputToDocument - //! Use structure ScDocument if a certain size is exceeded? class ScConsData @@ -112,8 +109,6 @@ public: SCROW GetInsertCount() const; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/cursuno.hxx b/sc/inc/cursuno.hxx index 9d3b3b14ad27..343b9d305ba3 100644 --- a/sc/inc/cursuno.hxx +++ b/sc/inc/cursuno.hxx @@ -99,7 +99,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/dapiuno.hxx b/sc/inc/dapiuno.hxx index f35342855f4a..cd2ffad67dc7 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -70,7 +70,6 @@ class ScDataPilotTableObj; class ScDataPilotFieldObj; class ScDataPilotItemObj; - class ScDataPilotConversion { public: diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index e3196ba988a8..f9c2b1081eb0 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -71,7 +71,6 @@ public: static com::sun::star::sheet::GeneralFunction SubTotalToGeneral( ScSubTotalFunc eSubTotal ); }; - // ImportDescriptor is not available as Uno-Objekt any longer, only Property-Sequence class ScImportDescriptor @@ -100,7 +99,6 @@ public: static long GetPropertyCount(); }; - // ScSubTotalDescriptorBase - base class for SubTotalDescriptor stand alone and in DB area (context?) // to uno, both look the same @@ -209,7 +207,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - // ScSubTotalDescriptor - dummy container to use with XImportTarget class ScSubTotalDescriptor : public ScSubTotalDescriptorBase @@ -229,7 +226,6 @@ public: void SetParam( const ScSubTotalParam& rNew ); }; - // ScRangeSubTotalDescriptor - SubTotalDescriptor of a data base area class ScRangeSubTotalDescriptor : public ScSubTotalDescriptorBase @@ -246,7 +242,6 @@ public: virtual void PutData( const ScSubTotalParam& rParam ) SAL_OVERRIDE; }; - class ScSubTotalFieldObj : public cppu::WeakImplHelper2< com::sun::star::sheet::XSubTotalField, com::sun::star::lang::XServiceInfo > @@ -279,7 +274,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScConsolidationDescriptor : public cppu::WeakImplHelper2< com::sun::star::sheet::XConsolidationDescriptor, com::sun::star::lang::XServiceInfo > @@ -328,7 +322,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - // ScFilterDescriptorBase - base class for FilterDescriptor // stand alone, in a DB area (or context?) and in the DataPilot @@ -428,7 +421,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - // ScFilterDescriptor - dummy container to use with XFilterable class ScFilterDescriptor : public ScFilterDescriptorBase @@ -449,7 +441,6 @@ public: const ScQueryParam& GetParam() const { return aStoredParam; } }; - // ScRangeFilterDescriptor - FilterDescriptor of a data base area class ScRangeFilterDescriptor : public ScFilterDescriptorBase @@ -466,7 +457,6 @@ public: virtual void PutData( const ScQueryParam& rParam ) SAL_OVERRIDE; }; - // ScDataPilotFilterDescriptor - FilterDescriptor of a DataPilotDescriptors class ScDataPilotFilterDescriptor : public ScFilterDescriptorBase @@ -483,7 +473,6 @@ public: virtual void PutData( const ScQueryParam& rParam ) SAL_OVERRIDE; }; - class ScDatabaseRangeObj : public cppu::WeakImplHelper6< com::sun::star::sheet::XDatabaseRange, com::sun::star::util::XRefreshable, @@ -600,7 +589,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScDatabaseRangesObj : public cppu::WeakImplHelper4< com::sun::star::sheet::XDatabaseRanges, com::sun::star::container::XEnumerationAccess, diff --git a/sc/inc/dbdocutl.hxx b/sc/inc/dbdocutl.hxx index bf3d68da645a..eeb1e169c396 100644 --- a/sc/inc/dbdocutl.hxx +++ b/sc/inc/dbdocutl.hxx @@ -29,7 +29,6 @@ namespace com { namespace sun { namespace star { namespace sdbc { class XRow; } } } } - class ScDatabaseDocUtil { public: diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx index 17d1f3026aba..2f4bfd734c44 100644 --- a/sc/inc/defltuno.hxx +++ b/sc/inc/defltuno.hxx @@ -29,7 +29,6 @@ class ScDocShell; - class ScDocDefaultsObj : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertySet, ::com::sun::star::beans::XPropertyState, @@ -117,7 +116,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/detdata.hxx b/sc/inc/detdata.hxx index d461e96190a3..e222cdd36713 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -54,10 +54,8 @@ public: { return eOperation == r.eOperation && aPos == r.aPos; } }; - // list of operators - typedef boost::ptr_vector<ScDetOpData> ScDetOpDataVector; class ScDetOpList diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index 393445b51f7a..cf01087744a7 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -27,19 +27,16 @@ #include "global.hxx" #include <boost/ptr_container/ptr_vector.hpp> - namespace com { namespace sun { namespace star { namespace frame { class XDispatchProviderInterception; } } } } class ScTabViewShell; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > XStatusListenerRef; typedef boost::ptr_vector<XStatusListenerRef> XStatusListenerArr_Impl; - class ScDispatchProviderInterceptor : public cppu::WeakImplHelper2< com::sun::star::frame::XDispatchProviderInterceptor, com::sun::star::lang::XEventListener>, @@ -97,7 +94,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScDispatch : public cppu::WeakImplHelper2< com::sun::star::frame::XDispatch, com::sun::star::view::XSelectionChangeListener >, @@ -140,7 +136,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/dociter.hxx b/sc/inc/dociter.hxx index 212a64440bb8..f0d82fe99573 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -446,7 +446,6 @@ private: SCROW FindNextNonEmptyRow(); }; - /** Row-wise value iterator. */ class ScHorizontalValueIterator { @@ -480,7 +479,6 @@ public: // returns all areas with non-default formatting (horizontal) - class ScHorizontalAttrIterator { private: @@ -506,10 +504,8 @@ public: const ScPatternAttr* GetNext( SCCOL& rCol1, SCCOL& rCol2, SCROW& rRow ); }; - // returns non-empty cells and areas with formatting (horizontal) - class SC_DLLPUBLIC ScUsedAreaIterator { private: @@ -595,8 +591,6 @@ private: const ::std::vector<TabRanges>* mpTabRangesArray; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/docpool.hxx b/sc/inc/docpool.hxx index 7e07d24c68b8..e5be85894a18 100644 --- a/sc/inc/docpool.hxx +++ b/sc/inc/docpool.hxx @@ -69,7 +69,6 @@ public: static void DeleteVersionMaps(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 368e644c3b44..00649b77c10e 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -222,7 +222,6 @@ enum ScDocumentMode SCDOCMODE_UNDO }; - struct ScDocStat { OUString aDocName; @@ -315,7 +314,6 @@ private: ::std::auto_ptr<ScExternalRefManager> pExternalRefMgr; ::std::auto_ptr<ScMacroManager> mpMacroMgr; - // mutable for lazy construction mutable ::std::auto_ptr< ScFormulaParserPool > mxFormulaParserPool; /// Pool for all external formula parsers used by this document. @@ -760,7 +758,6 @@ public: @return true = DDE link found and matrix set. */ bool SetDdeLinkResultMatrix( size_t nDdePos, ScMatrixRef pResults ); - SfxBindings* GetViewBindings(); SfxObjectShell* GetDocumentShell() const { return pShell; } SC_DLLPUBLIC ScDrawLayer* GetDrawLayer() { return pDrawLayer; } @@ -1117,7 +1114,6 @@ public: SCROW& rEndRow, bool bNotes = true ) const; void InvalidateTableArea(); - SC_DLLPUBLIC bool GetDataStart( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow ) const; /** @@ -1868,7 +1864,6 @@ public: const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); - void StartListeningCell( const ScAddress& rAddress, SvtListener* pListener ); void EndListeningCell( const ScAddress& rAddress, @@ -2164,5 +2159,4 @@ inline void ScDocument::SetSortParam( ScSortParam& rParam, SCTAB nTab ) #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 61881d4e581b..9e2f53c419bd 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -352,7 +352,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScDrawPagesObj : public cppu::WeakImplHelper2< com::sun::star::drawing::XDrawPages, com::sun::star::lang::XServiceInfo>, @@ -399,7 +398,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScTableSheetsObj : public cppu::WeakImplHelper5< com::sun::star::sheet::XSpreadsheets2, com::sun::star::sheet::XCellRangesAccess, @@ -510,7 +508,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScTableColumnsObj : public cppu::WeakImplHelper5< com::sun::star::table::XTableColumns, com::sun::star::container::XEnumerationAccess, @@ -618,7 +615,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScTableRowsObj : public cppu::WeakImplHelper4< com::sun::star::table::XTableRows, com::sun::star::container::XEnumerationAccess, @@ -714,7 +710,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper2< com::sun::star::beans::XPropertySet, com::sun::star::lang::XServiceInfo>, @@ -778,7 +773,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScAnnotationsObj : public cppu::WeakImplHelper3< com::sun::star::sheet::XSheetAnnotations, com::sun::star::container::XEnumerationAccess, @@ -832,7 +826,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScScenariosObj : public cppu::WeakImplHelper4< com::sun::star::sheet::XScenarios, com::sun::star::container::XEnumerationAccess, @@ -898,7 +891,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/dpgroup.hxx b/sc/inc/dpgroup.hxx index 60b5d18a213b..1420c2c47ddc 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -115,10 +115,8 @@ public: bool IsDateDimension() const { return mbDateDimension;} }; - // proxy implementation of ScDPTableData to add grouped items - class ScDPGroupTableData : public ScDPTableData { typedef ::boost::unordered_set< OUString, OUStringHash, ::std::equal_to< OUString > > StringHashSet; @@ -188,7 +186,6 @@ public: #endif }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index 696ec1f92766..12b83edcbf1c 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -80,7 +80,6 @@ struct ScDPServiceDesc bool operator== ( const ScDPServiceDesc& rOther ) const; }; - class SC_DLLPUBLIC ScDPObject { private: @@ -261,7 +260,6 @@ public: #endif }; - class ScDPCollection { friend class ScDPCache; diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx index d4ff356c739d..2127d37d7e4a 100644 --- a/sc/inc/dpoutput.hxx +++ b/sc/inc/dpoutput.hxx @@ -139,7 +139,6 @@ public: com::sun::star::uno::XInterface>& xDim ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/dpresfilter.hxx b/sc/inc/dpresfilter.hxx index 9f8e8e903905..059e931fdc06 100644 --- a/sc/inc/dpresfilter.hxx +++ b/sc/inc/dpresfilter.hxx @@ -17,7 +17,6 @@ #include <boost/noncopyable.hpp> #include <boost/unordered_map.hpp> - namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldFilter; }}}} diff --git a/sc/inc/dpsave.hxx b/sc/inc/dpsave.hxx index 4a4178d905d9..39b718ead5d6 100644 --- a/sc/inc/dpsave.hxx +++ b/sc/inc/dpsave.hxx @@ -45,7 +45,6 @@ namespace com { namespace sun { namespace star { namespace sheet { class ScDPDimensionSaveData; class ScDPTableData; - // classes to save Data Pilot settings class ScDPSaveMember @@ -90,7 +89,6 @@ public: #endif }; - bool operator == (const ::com::sun::star::sheet::DataPilotFieldSortInfo &l, const ::com::sun::star::sheet::DataPilotFieldSortInfo &r ); bool operator == (const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo &l, const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo &r ); bool operator == (const ::com::sun::star::sheet::DataPilotFieldReference &l, const ::com::sun::star::sheet::DataPilotFieldReference &r ); @@ -231,7 +229,6 @@ public: #endif }; - class ScDPSaveData { typedef boost::unordered_map<OUString, size_t, OUStringHash> DupNameCountType; diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index bde9dd1ac8cb..b0a24642f309 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -38,7 +38,6 @@ namespace com { namespace sun { namespace star { namespace sheet { struct DataPilotFieldFilter; }}}} - #define SC_DAPI_HIERARCHY_FLAT 0 #define SC_DAPI_HIERARCHY_QUARTER 1 #define SC_DAPI_HIERARCHY_WEEK 2 diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx index e02890a2ccb0..9368ff8af565 100644 --- a/sc/inc/dptabres.hxx +++ b/sc/inc/dptabres.hxx @@ -142,11 +142,9 @@ struct ScDPRelativePos ScDPRelativePos( long nBase, long nDir ); }; - // aggregated data //! separate header file? - // Possible values for the nCount member: // (greater than 0 counts the collected values) const long SC_DPAGG_EMPTY = 0; // empty during data collection @@ -192,10 +190,8 @@ public: #endif }; - // Row and grand total state, passed down (column total is at result member) - class ScDPRowTotals { ScDPAggData aRowTotal; @@ -213,10 +209,8 @@ public: void SetInColRoot(bool bSet) { bIsInColRoot = bSet; } }; - // results for a hierarchy dimension - class ScDPResultDimension; class ScDPDataDimension; class ScDPDataMember; diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index 733084952b18..c3e636f07c96 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -71,7 +71,6 @@ class ScDPResultData; class ScDPItemData; class ScDPTableData; - // implementation of DataPilotSource using ScDPTableData class ScDPDimensions; @@ -83,7 +82,6 @@ class ScDPLevel; class ScDPMembers; class ScDPMember; - class ScDPSource : public cppu::WeakImplHelper6< com::sun::star::sheet::XDimensionsSupplier, com::sun::star::sheet::XDataPilotResults, @@ -819,7 +817,6 @@ public: bool getShowDetails() const { return bShowDet;} }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/drawattr.hxx b/sc/inc/drawattr.hxx index a9082771d5b0..de40d49aefa0 100644 --- a/sc/inc/drawattr.hxx +++ b/sc/inc/drawattr.hxx @@ -22,7 +22,6 @@ #include <svl/eitem.hxx> #include <editeng/svxenum.hxx> - class SvxDrawToolItem : public SfxEnumItem { public: @@ -32,7 +31,6 @@ public: SvxDrawToolItem(sal_uInt16 nWhichP) : SfxEnumItem(nWhichP){} - virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE {return((sal_uInt16)SVX_SNAP_DRAW_TEXT);} @@ -46,5 +44,4 @@ public: }; #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/drawpage.hxx b/sc/inc/drawpage.hxx index 0f36a4e42ab7..c11d4ccf05dd 100644 --- a/sc/inc/drawpage.hxx +++ b/sc/inc/drawpage.hxx @@ -22,7 +22,6 @@ #include <svx/fmpage.hxx> - class ScDrawLayer; class ScDrawPage: public FmFormPage @@ -34,8 +33,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx index 36af4f6c26ca..bece16b7ae5e 100644 --- a/sc/inc/drwlayer.hxx +++ b/sc/inc/drwlayer.hxx @@ -207,8 +207,6 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel() SAL_OVERRIDE; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/editsrc.hxx b/sc/inc/editsrc.hxx index f5d1fca66d19..ffc9e43870e1 100644 --- a/sc/inc/editsrc.hxx +++ b/sc/inc/editsrc.hxx @@ -113,7 +113,6 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; }; - // EditSource with a shared forwarder for all children of one text object class ScSimpleEditSource : public SvxEditSource diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx index 1dee434c12ff..4acb1834b590 100644 --- a/sc/inc/editutil.hxx +++ b/sc/inc/editutil.hxx @@ -29,7 +29,6 @@ #include <tools/gen.hxx> #include <tools/fract.hxx> - class OutputDevice; class ScDocument; class ScPatternAttr; @@ -91,7 +90,6 @@ public: Rectangle GetEditArea( const ScPatternAttr* pPattern, bool bForceToTop ); }; - class ScEditAttrTester { ScEditEngineDefaulter* pEngine; @@ -108,7 +106,6 @@ public: const SfxItemSet& GetAttribs() const { return *pEditAttrs; } }; - // construct pool before constructing EditEngine, destroy pool after EditEngine class ScEnginePoolHelper { @@ -124,7 +121,6 @@ protected: virtual ~ScEnginePoolHelper(); }; - class SC_DLLPUBLIC ScEditEngineDefaulter : public ScEnginePoolHelper, public EditEngine { private: @@ -181,7 +177,6 @@ public: void RepeatDefaults(); }; - // 1/100 mm class SC_DLLPUBLIC ScTabEditEngine : public ScEditEngineDefaulter { @@ -194,7 +189,6 @@ public: SfxItemPool* pTextObjectPool = NULL ); }; - struct ScHeaderFieldData { OUString aTitle; // title or file name (if no title) @@ -210,7 +204,6 @@ struct ScHeaderFieldData ScHeaderFieldData(); }; - // for field commands (or just fields?) in a table class SC_DLLPUBLIC ScFieldEditEngine : public ScEditEngineDefaulter { @@ -229,7 +222,6 @@ public: virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ) SAL_OVERRIDE; }; - // for headers/footers with fields class SC_DLLPUBLIC ScHeaderEditEngine : public ScEditEngineDefaulter { @@ -257,8 +249,6 @@ public: // SvxFieldData derivations were moved to Svx (comment can be deleted?) - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 9b73b4a73ee3..cd5518e92bc6 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -429,7 +429,6 @@ private: typedef ::boost::unordered_map<sal_uInt16, SvNumberFormatterMergeMap> NumFmtMap; - typedef ::boost::unordered_set<LinkListener*, LinkListener::Hash> LinkListeners; typedef ::boost::unordered_map<sal_uInt16, LinkListeners> LinkListenerMap; @@ -854,7 +853,6 @@ private: DECL_LINK(TimeOutHdl, AutoTimer*); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index ce1f4d42fd53..53062c343e8d 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -61,7 +61,6 @@ enum EXCIMPFORMAT { EIF_AUTO, EIF_BIFF5, EIF_BIFF8, EIF_BIFF_LE4 }; enum ExportFormatLotus { ExpWK1, ExpWK3, ExpWK4 }; enum ExportFormatExcel { ExpBiff2, ExpBiff3, ExpBiff4, ExpBiff4W, ExpBiff5, ExpBiff8, Exp2007Xml }; - // options for DIF im-/export (combine with '|') #define SC_DIFOPT_PLAIN 0x00000000 #define SC_DIFOPT_DATE 0x00000001 diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx index fa188ed84a7c..68561c1d8155 100644 --- a/sc/inc/filtuno.hxx +++ b/sc/inc/filtuno.hxx @@ -32,13 +32,11 @@ namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ScFilterOptionsObj_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); - class ScFilterOptionsObj : public ::cppu::WeakImplHelper5< ::com::sun::star::beans::XPropertyAccess, ::com::sun::star::ui::dialogs::XExecutableDialog, @@ -97,7 +95,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/fmtuno.hxx b/sc/inc/fmtuno.hxx index ca46ec6ff7e0..44a8989949ab 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -49,7 +49,6 @@ class ScTableConditionalEntry; class ScConditionalFormat; class ScValidationData; - struct ScCondFormatEntryItem { css::uno::Sequence< css::sheet::FormulaToken > maTokens1; @@ -322,7 +321,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/funcuno.hxx b/sc/inc/funcuno.hxx index 25328df65b41..cfef28885588 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -29,13 +29,11 @@ class ScDocument; class ScDocOptions; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ScFunctionAccess_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); - class ScTempDocCache { private: @@ -136,7 +134,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/linkuno.hxx b/sc/inc/linkuno.hxx index 76369f67a399..a6e605d6d87c 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -154,7 +154,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScSheetLinksObj : public cppu::WeakImplHelper4< com::sun::star::container::XNameAccess, com::sun::star::container::XEnumerationAccess, @@ -209,7 +208,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScAreaLinkObj : public cppu::WeakImplHelper4< com::sun::star::sheet::XAreaLink, com::sun::star::util::XRefreshable, @@ -316,7 +314,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScAreaLinksObj : public cppu::WeakImplHelper3< com::sun::star::sheet::XAreaLinks, com::sun::star::container::XEnumerationAccess, @@ -369,7 +366,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - //! order of XNamed and DDELink changed to avoid "duplicate comdat" symbols class ScDDELinkObj : public cppu::WeakImplHelper5< @@ -435,7 +431,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScDDELinksObj : public cppu::WeakImplHelper4< com::sun::star::container::XEnumerationAccess, com::sun::star::container::XIndexAccess, diff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxx index 7ef5f65a751a..d691052ca873 100644 --- a/sc/inc/listenercalls.hxx +++ b/sc/inc/listenercalls.hxx @@ -33,7 +33,6 @@ namespace com { namespace sun { namespace star { } } } } - struct ScUnoListenerEntry { ::com::sun::star::uno::Reference< @@ -48,7 +47,6 @@ struct ScUnoListenerEntry {} }; - /** ScUnoListenerCalls stores notifications to XModifyListener that can't be processed during BroadcastUno and calls them together at the end. */ diff --git a/sc/inc/lookupcache.hxx b/sc/inc/lookupcache.hxx index 411ae6c54763..9ea2666b8ce3 100644 --- a/sc/inc/lookupcache.hxx +++ b/sc/inc/lookupcache.hxx @@ -206,7 +206,6 @@ private: }; - typedef ::boost::unordered_map< ScRange, ScLookupCache*, ScLookupCache::Hash, ::std::equal_to< ScRange > > ScLookupCacheMap; #endif diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx index ccfbd9eeab7b..5b15d4236529 100644 --- a/sc/inc/markarr.hxx +++ b/sc/inc/markarr.hxx @@ -59,7 +59,6 @@ public: SCROW GetMarkEnd( SCROW nRow, bool bUp ) const; }; - class ScMarkArrayIter // iterate over selected range { const ScMarkArray* pArray; diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx index 82c2247c7a29..fc7aec64c6ce 100644 --- a/sc/inc/markdata.hxx +++ b/sc/inc/markdata.hxx @@ -39,7 +39,6 @@ class ScRangeList; //! It should be possible to have MarkArrays for each table, in order to //! enable "search all" across more than one table again! - class SC_DLLPUBLIC ScMarkData { public: diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index 31141bdde57a..e1fd07c32acf 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -73,7 +73,6 @@ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ lang::WrappedTargetException, uno::RuntimeException, std::exception) \ { OSL_FAIL("not implemented"); } - #define SC_QUERYINTERFACE(x) \ if (rType == getCppuType((const uno::Reference<x>*)0)) \ { return uno::makeAny(uno::Reference<x>(this)); } @@ -85,7 +84,6 @@ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ if (rType == getCppuType((const uno::Reference<x>*)0)) \ { uno::Any aR; aR <<= uno::Reference<x>(static_cast<y*>(this)); return aR; } - class ScIndexEnumeration : public cppu::WeakImplHelper2< com::sun::star::container::XEnumeration, com::sun::star::lang::XServiceInfo > diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx index b09f70dc5dbb..0e4093ed4008 100644 --- a/sc/inc/mtvelements.hxx +++ b/sc/inc/mtvelements.hxx @@ -155,4 +155,3 @@ ScRefCellValue toRefCell( const sc::CellStoreType::const_iterator& itPos, size_t #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/sc/inc/mtvfunctions.hxx b/sc/inc/mtvfunctions.hxx index 28a15d9e32b3..2f701de0efa4 100644 --- a/sc/inc/mtvfunctions.hxx +++ b/sc/inc/mtvfunctions.hxx @@ -192,7 +192,6 @@ ParseElements1( else rFuncElse(it->type, nTopRow, nDataSize); - if (bLastBlock) break; } diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 3bc60ac4d69a..b250b818f47f 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -171,7 +171,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScNamedRangesObj : public ::cppu::WeakImplHelper6< ::com::sun::star::sheet::XNamedRanges, ::com::sun::star::container::XEnumerationAccess, @@ -338,7 +337,6 @@ public: virtual ~ScLocalNamedRangesObj(); }; - class ScLabelRangeObj : public ::cppu::WeakImplHelper2< ::com::sun::star::sheet::XLabelRange, ::com::sun::star::lang::XServiceInfo >, @@ -378,7 +376,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScLabelRangesObj : public ::cppu::WeakImplHelper3< ::com::sun::star::sheet::XLabelRanges, ::com::sun::star::container::XEnumerationAccess, @@ -429,7 +426,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/notesuno.hxx b/sc/inc/notesuno.hxx index cf5c1ae0adad..e11f3ad8f4fd 100644 --- a/sc/inc/notesuno.hxx +++ b/sc/inc/notesuno.hxx @@ -33,7 +33,6 @@ class ScDocShell; class SvxUnoText; class ScPostIt; - class ScAnnotationObj : public cppu::WeakImplHelper5< com::sun::star::container::XChild, com::sun::star::text::XSimpleText, diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx index 0312c6f3fefe..c46871ad6740 100644 --- a/sc/inc/olinetab.hxx +++ b/sc/inc/olinetab.hxx @@ -29,7 +29,6 @@ class ScTable; - class ScOutlineEntry { SCCOLROW nStart; @@ -140,7 +139,6 @@ public: void RemoveAll(); }; - class ScOutlineTable { private: @@ -164,7 +162,6 @@ public: bool DeleteRow( SCROW nStartRow, SCSIZE nSize ); }; - class ScSubOutlineIterator { private: @@ -187,5 +184,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/optuno.hxx b/sc/inc/optuno.hxx index b9c3fec85067..b6a1da3d60b0 100644 --- a/sc/inc/optuno.hxx +++ b/sc/inc/optuno.hxx @@ -36,7 +36,6 @@ #define PROP_UNO_STANDARDDEC 11 #define PROP_UNO_REGEXENABLED 12 - class ScDocOptionsHelper { public: @@ -52,7 +51,6 @@ public: const OUString& PropertyName ); }; - // empty doc object to supply only doc options class ScDocOptionsObj : public ScModelObj @@ -81,7 +79,6 @@ public: ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/optutil.hxx b/sc/inc/optutil.hxx index a020c4c67e8c..88bbc3f5b739 100644 --- a/sc/inc/optutil.hxx +++ b/sc/inc/optutil.hxx @@ -24,7 +24,6 @@ #include <tools/link.hxx> #include "scdllapi.h" - class ScOptionsUtil { public: @@ -34,7 +33,6 @@ public: static bool IsMetricSystem(); }; - // ConfigItem for classes that use items from several sub trees class SC_DLLPUBLIC ScLinkConfigItem : public utl::ConfigItem @@ -64,5 +62,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/patattr.hxx b/sc/inc/patattr.hxx index ff34b0c326ad..65b189afe103 100644 --- a/sc/inc/patattr.hxx +++ b/sc/inc/patattr.hxx @@ -33,7 +33,6 @@ class ScStyleSheet; class SvNumberFormatter; class ScDocument; - /// how to treat COL_AUTO in GetFont: enum ScAutoFontColorMode @@ -47,7 +46,6 @@ enum ScAutoFontColorMode SC_AUTOCOL_IGNOREALL ///< like DISPLAY, but ignore stored font and background colors }; - class SC_DLLPUBLIC ScPatternAttr: public SfxSetItem { OUString* pName; @@ -133,7 +131,6 @@ public: sal_uInt8 GetRotateDir( const SfxItemSet* pCondSet ) const; }; - class ScFontToSubsFontConverter_AutoPtr { FontToSubsFontConverter h; @@ -168,7 +165,6 @@ public: { return h; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/prnsave.hxx b/sc/inc/prnsave.hxx index fbc10920eed5..9bdbc28ecfd0 100644 --- a/sc/inc/prnsave.hxx +++ b/sc/inc/prnsave.hxx @@ -67,5 +67,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/progress.hxx b/sc/inc/progress.hxx index 541d54718b76..a658829612a2 100644 --- a/sc/inc/progress.hxx +++ b/sc/inc/progress.hxx @@ -36,7 +36,6 @@ class ScDocument; */ #define MIN_NO_CODES_PER_PROGRESS_UPDATE 100 - class SC_DLLPUBLIC ScProgress { private: @@ -147,7 +146,6 @@ public: } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx index 5e4d70cadc24..897bb978effb 100644 --- a/sc/inc/rangelst.hxx +++ b/sc/inc/rangelst.hxx @@ -98,7 +98,6 @@ private: }; typedef tools::SvRef<ScRangeList> ScRangeListRef; - // RangePairList: // aRange[0]: actual range, // aRange[1]: data for that range, e.g. Rows belonging to a ColName @@ -137,7 +136,6 @@ typedef tools::SvRef<ScRangePairList> ScRangePairListRef; extern "C" int SAL_CALL ScRangePairList_QsortNameCompare( const void*, const void* ); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx index 87560eef6d1a..533a1f3f287d 100644 --- a/sc/inc/rangeseq.hxx +++ b/sc/inc/rangeseq.hxx @@ -56,7 +56,6 @@ public: const ScMatrix* pMatrix, bool bDataTypes = false ); }; - class ScApiTypeConversion { public: @@ -75,7 +74,6 @@ public: }; - class ScSequenceToMatrix { public: @@ -91,7 +89,6 @@ public: }; - class ScByteSequenceToString { public: diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index 8741a7c55026..69e623953cb6 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -273,10 +273,8 @@ public: SCROW nRowEnd; }; - /// @return areas with reference and all db-areas - class SC_DLLPUBLIC ScAreaNameIterator { private: diff --git a/sc/inc/reffind.hxx b/sc/inc/reffind.hxx index bd2096fd11ad..1123a670dfb0 100644 --- a/sc/inc/reffind.hxx +++ b/sc/inc/reffind.hxx @@ -50,5 +50,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/reftokenhelper.hxx b/sc/inc/reftokenhelper.hxx index 6b04388685fe..137f266078ac 100644 --- a/sc/inc/reftokenhelper.hxx +++ b/sc/inc/reftokenhelper.hxx @@ -24,7 +24,6 @@ #include <vector> - class ScDocument; class ScRange; class ScRangeList; diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 2b8cc661f9e6..776ac2c0dc8f 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -57,5 +57,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/scwarngs.hxx b/sc/inc/scwarngs.hxx index a9713ffaad26..fb460d2cec12 100644 --- a/sc/inc/scwarngs.hxx +++ b/sc/inc/scwarngs.hxx @@ -23,7 +23,6 @@ #define ERRCODE_SC_EXPORT_WRN_ASCII (ERRCODE_WARNING_MASK | ERRCODE_AREA_SC | ERRCODE_CLASS_WRITE | 1) #define ERRCODE_SC_IMPORT_WRN_RNGOVRFLW (ERRCODE_WARNING_MASK | ERRCODE_AREA_SC | ERRCODE_CLASS_READ | 1) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/servuno.hxx b/sc/inc/servuno.hxx index b88b78316b75..37a5f46a2984 100644 --- a/sc/inc/servuno.hxx +++ b/sc/inc/servuno.hxx @@ -25,7 +25,6 @@ class ScDocShell; - //! AutoFormat here or global?????? #define SC_SERVICE_SHEET 0 @@ -88,7 +87,6 @@ class ScDocShell; #define SC_SERVICE_VBACODENAMEPROVIDER 41 #define SC_SERVICE_VBAGLOBALS 42 - #define SC_SERVICE_COUNT 44 #define SC_SERVICE_INVALID USHRT_MAX diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx index 38ae38e29bae..5df7d72de9a5 100644 --- a/sc/inc/sheetdata.hxx +++ b/sc/inc/sheetdata.hxx @@ -30,7 +30,6 @@ class ScAddress; class SvXMLNamespaceMap; - struct ScStreamEntry { sal_Int32 mnStartOffset; diff --git a/sc/inc/shellids.hxx b/sc/inc/shellids.hxx index f1f7283e0f88..80e2bf70f0d8 100644 --- a/sc/inc/shellids.hxx +++ b/sc/inc/shellids.hxx @@ -41,8 +41,6 @@ #define SCID_PAGEBREAK_SHELL (SFX_INTERFACE_SC_START+16) #define SCID_MEDIA_SHELL (SFX_INTERFACE_SC_START+17) - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/sortparam.hxx b/sc/inc/sortparam.hxx index f566aca799f9..55b09a6ca2ba 100644 --- a/sc/inc/sortparam.hxx +++ b/sc/inc/sortparam.hxx @@ -62,7 +62,6 @@ struct SC_DLLPUBLIC ScSortParam OUString aCollatorAlgorithm; sal_uInt16 nCompatHeader; - ScSortParam(); ScSortParam( const ScSortParam& r ); /// SubTotals sort @@ -79,7 +78,6 @@ struct SC_DLLPUBLIC ScSortParam inline sal_uInt16 GetSortKeyCount() const { return maKeyState.size(); } }; - #endif // INCLUDED_SC_INC_SORTPARAM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index f9bfc3b9d90d..c7d372162564 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -26,10 +26,8 @@ #include <svl/itemprop.hxx> #include <cppuhelper/implbase3.hxx> - class SvxSearchItem; - class ScCellSearchObj : public cppu::WeakImplHelper3< com::sun::star::util::XReplaceDescriptor, com::sun::star::lang::XUnoTunnel, @@ -116,7 +114,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/stlpool.hxx b/sc/inc/stlpool.hxx index 3144bd61e97e..e83aef029727 100644 --- a/sc/inc/stlpool.hxx +++ b/sc/inc/stlpool.hxx @@ -22,7 +22,6 @@ #include <svl/style.hxx> - class ScStyleSheet; class ScDocument; diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index 0da518c4fe1d..3f1863620610 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -103,7 +103,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScStyleFamilyObj : public ::cppu::WeakImplHelper4< ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XIndexAccess, @@ -196,7 +195,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - class ScStyleObj : public ::cppu::WeakImplHelper7< ::com::sun::star::style::XStyle, ::com::sun::star::beans::XPropertySet, diff --git a/sc/inc/subtotal.hxx b/sc/inc/subtotal.hxx index c7a890e2aeca..ee0f16ea95e1 100644 --- a/sc/inc/subtotal.hxx +++ b/sc/inc/subtotal.hxx @@ -30,7 +30,6 @@ public: static bool SafeDiv( double& fVal1, double fVal2); }; - struct ScFunctionData // to calculate single functions { ScSubTotalFunc eFunc; @@ -42,8 +41,6 @@ struct ScFunctionData // to calculate single functions eFunc(eFn), nVal(0.0), nCount(0), bError(false) {} }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index 3d70c4936549..412c6ca01d5f 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -1121,8 +1121,6 @@ private: }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx index f1d2799ac2e6..9acfefd42dc3 100644 --- a/sc/inc/tabprotection.hxx +++ b/sc/inc/tabprotection.hxx @@ -199,7 +199,6 @@ public: bool isBlockEditable( const ScRange& rRange ) const; bool isSelectionEditable( const ScRangeList& rRangeList ) const; - private: ::boost::shared_ptr<ScTableProtectionImpl> mpImpl; }; diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index a9e4a1f6b5c8..978cf286557d 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -53,7 +53,6 @@ class ScDocShell; - #define SC_LINKTARGETTYPE_SHEET 0 #define SC_LINKTARGETTYPE_RANGENAME 1 #define SC_LINKTARGETTYPE_DBAREA 2 @@ -62,10 +61,8 @@ class ScDocShell; #define SCLINKTARGET_SERVICE "com.sun.star.document.LinkTarget" - //! Graphic / OleObject (need separate collections!) - class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameAccess, ::com::sun::star::lang::XServiceInfo >, @@ -99,7 +96,6 @@ public: virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; - class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper3< ::com::sun::star::beans::XPropertySet, ::com::sun::star::document::XLinkTargetSupplier, @@ -162,7 +158,6 @@ public: virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; - class ScLinkTargetsObj : public ::cppu::WeakImplHelper2< ::com::sun::star::container::XNameAccess, ::com::sun::star::lang::XServiceInfo > @@ -192,7 +187,6 @@ public: virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 7f854ad3df27..d716cbaffac2 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -50,12 +50,10 @@ class ScHeaderFooterTextObj; struct ScHeaderFieldData; - #define SC_HDFT_LEFT 0 #define SC_HDFT_CENTER 1 #define SC_HDFT_RIGHT 2 - // ScHeaderFooterContentObj is a dumb container which must be re-written into // the page template using setPropertyValue @@ -108,7 +106,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - // ScHeaderFooterTextData: shared data between sub objects of a ScHeaderFooterTextObj class ScHeaderFooterTextData : boost::noncopyable @@ -238,7 +235,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - // derived cursor objects for getImplementation and getText/getStart/getEnd //! uno3: SvxUnoTextCursor is not derived from XUnoTunnel, but should be (?) @@ -330,10 +326,8 @@ public: com::sun::star::uno::XInterface> xObj ); }; - // ScAnnotationTextCursor isn't needed anymore - SvxUnoTextCursor is used instead - // ScEditEngineTextObj for formatted cell content that is not inserted in a cell or header/footer // (used for XML export of change tracking contents) @@ -361,7 +355,6 @@ public: EditTextObject* CreateTextObject(); }; - // ScCellTextData: shared data between sub objects of a cell text object class ScCellTextData : public SfxListener @@ -409,7 +402,6 @@ public: virtual ~ScCellTextObj() throw(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx index 6c15cbdf3ebe..655c68730f44 100644 --- a/sc/inc/token.hxx +++ b/sc/inc/token.hxx @@ -227,7 +227,6 @@ public: virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScExternalSingleRefToken(*this); } }; - class ScExternalDoubleRefToken : public ScToken { sal_uInt16 mnFileId; @@ -269,7 +268,6 @@ public: virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScExternalNameToken(*this); } }; - // Only created from within the interpreter, no conversion from ScRawToken, // never added to ScTokenArray! class ScJumpMatrixToken : public ScToken @@ -287,7 +285,6 @@ public: virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScJumpMatrixToken(*this); } }; - // Only created from within the interpreter, no conversion from ScRawToken, // never added to ScTokenArray! class ScRefListToken : public ScToken @@ -305,7 +302,6 @@ public: virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScRefListToken(*this); } }; - class SC_DLLPUBLIC ScEmptyCellToken : public ScToken { bool bInherited :1; @@ -327,7 +323,6 @@ public: virtual FormulaToken* Clone() const SAL_OVERRIDE { return new ScEmptyCellToken(*this); } }; - /** Transports the result from the interpreter to the formula cell. */ class SC_DLLPUBLIC ScMatrixCellResultToken : public ScToken { @@ -356,7 +351,6 @@ public: void Assign( const ScMatrixCellResultToken & r ); }; - /** Stores the matrix result at the formula cell, additionally the range the matrix formula occupies. */ class SC_DLLPUBLIC ScMatrixFormulaCellToken : public ScMatrixCellResultToken @@ -406,7 +400,6 @@ public: void ResetResult(); }; - class SC_DLLPUBLIC ScHybridCellToken : public ScToken { private: diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx index b6aee9504899..a83e11549eb5 100644 --- a/sc/inc/tokenarray.hxx +++ b/sc/inc/tokenarray.hxx @@ -75,7 +75,6 @@ public: /// Exactly and only one valid range (no #REF!s) bool IsValidReference( ScRange& rRange, const ScAddress& rPos ) const; - /** Determines the extent of direct adjacent references. Only use with real functions, e.g. GetOuterFuncOpCode() == ocSum ! */ diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx index bdac5fd5c48f..4280f22ebed9 100644 --- a/sc/inc/unitconv.hxx +++ b/sc/inc/unitconv.hxx @@ -43,7 +43,6 @@ public: const OUString& rFromUnit, const OUString& rToUnit ); }; - class ScUnitConverter : public boost::noncopyable { typedef boost::ptr_map<OUString, ScUnitConverterData> MapType; @@ -57,7 +56,6 @@ public: double& fValue, const OUString& rFromUnit, const OUString& rToUnit ) const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/unoreflist.hxx b/sc/inc/unoreflist.hxx index 4cff74f368a9..7da2a77cdd72 100644 --- a/sc/inc/unoreflist.hxx +++ b/sc/inc/unoreflist.hxx @@ -24,7 +24,6 @@ #include <svl/hint.hxx> #include "rangelst.hxx" - struct ScUnoRefEntry { sal_Int64 nObjectId; @@ -71,7 +70,6 @@ public: const ScRangeList& GetRanges() const { return aEntry.aRanges; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/unowids.hxx b/sc/inc/unowids.hxx index c2232e6a0c74..fc06efa0a32d 100644 --- a/sc/inc/unowids.hxx +++ b/sc/inc/unowids.hxx @@ -22,7 +22,6 @@ #include "scitems.hxx" - // WIDs for uno property maps, // never stored in files @@ -74,7 +73,6 @@ #define SC_WID_UNO_TBLBORD2 ( SC_WID_UNO_START + 43 ) #define SC_WID_UNO_END ( SC_WID_UNO_START + 43 ) - inline bool IsScUnoWid( sal_uInt16 nWid ) { return nWid >= SC_WID_UNO_START && nWid <= SC_WID_UNO_END; diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx index 532c4627effd..5b185cb50e8b 100644 --- a/sc/inc/validat.hxx +++ b/sc/inc/validat.hxx @@ -56,10 +56,8 @@ enum ScValidErrorStyle SC_VALERR_MACRO }; - // Entry for validation (only one condition exists) - class SC_DLLPUBLIC ScValidationData : public ScConditionEntry { private: @@ -170,10 +168,8 @@ private: bool IsListValid( ScRefCellValue& rCell, const ScAddress& rPos ) const; }; - // list of contitions: - struct CompareScValidationDataPtr { bool operator()( ScValidationData* const& lhs, ScValidationData* const& rhs ) const { return (*lhs)<(*rhs); } diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 3c2be51af348..ddef65e3bd45 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -130,7 +130,6 @@ private: ScViewOptions theOptions; }; - // CfgItem for View options class ScViewCfg : public ScViewOptions @@ -153,7 +152,6 @@ public: void SetOptions( const ScViewOptions& rNew ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index e1ebe6d47ae3..9a489f99f880 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -126,7 +126,6 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - // ScViewPaneObj for direct use (including OWeakObject) class ScViewPaneObj : public ScViewPaneBase, public cppu::OWeakObject diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx index a32c468cdde6..2f211b3d6cfe 100644 --- a/sc/inc/waitoff.hxx +++ b/sc/inc/waitoff.hxx @@ -34,7 +34,6 @@ public: ~ScWaitCursorOff(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/warnpassword.hxx b/sc/inc/warnpassword.hxx index 894ad983a142..fa2f1f6c9b5b 100644 --- a/sc/inc/warnpassword.hxx +++ b/sc/inc/warnpassword.hxx @@ -33,7 +33,6 @@ public: static bool WarningOnPassword( SfxMedium& rMedium ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/inc/zforauto.hxx b/sc/inc/zforauto.hxx index 4318daae3c89..fe72450dc7f3 100644 --- a/sc/inc/zforauto.hxx +++ b/sc/inc/zforauto.hxx @@ -23,11 +23,9 @@ #include <rtl/ustring.hxx> #include <i18nlangtag/lang.h> - class SvStream; class SvNumberFormatter; - class ScNumFormatAbbrev { OUString sFormatstring; @@ -59,5 +57,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/regression-test.cxx b/sc/qa/extras/regression-test.cxx index b195e913de77..ba3cca23a0e2 100644 --- a/sc/qa/extras/regression-test.cxx +++ b/sc/qa/extras/regression-test.cxx @@ -70,7 +70,6 @@ public: }; - void ScChartRegressionTest::test() { OUString aFileName; diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx index d407118a664a..f306e935f8b1 100644 --- a/sc/qa/extras/scannotationshapeobj.cxx +++ b/sc/qa/extras/scannotationshapeobj.cxx @@ -27,7 +27,6 @@ class ScAnnotationShapeObj : public UnoApiTest, apitest::XText public: ScAnnotationShapeObj(); - virtual void setUp(); virtual void tearDown(); virtual uno::Reference<uno::XInterface> init(); @@ -114,5 +113,4 @@ CPPUNIT_PLUGIN_IMPLEMENT(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/extras/sctablesheetobj.cxx b/sc/qa/extras/sctablesheetobj.cxx index 89e82187131d..f64905fdeda7 100644 --- a/sc/qa/extras/sctablesheetobj.cxx +++ b/sc/qa/extras/sctablesheetobj.cxx @@ -54,7 +54,6 @@ ScTableSheetObj::ScTableSheetObj(): { } - uno::Reference< uno::XInterface > ScTableSheetObj::init() { OUString aFileURL; diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx index 33c96921a6e9..bb60b7b0c5c7 100644 --- a/sc/qa/unit/filters-test.cxx +++ b/sc/qa/unit/filters-test.cxx @@ -406,7 +406,6 @@ void impl_testLegacyCellAnchoredRotatedShape( ScDocument& rDoc, Rectangle& aRect printf("expected right %ld actual %ld\n", aRect.Top(), aSnap.Top() ); CPPUNIT_ASSERT_EQUAL( true, testEqualsWithTolerance( aRect.Top(), aSnap.Top(), TOLERANCE ) ); - ScDrawObjData* pData = ScDrawLayer::GetObjData( pObj ); CPPUNIT_ASSERT_MESSAGE("expected object meta data", pData); printf("expected startrow %" SAL_PRIdINT32 " actual %" SAL_PRIdINT32 "\n", aAnchor.maStart.Row(), pData->maStart.Row() ); diff --git a/sc/qa/unit/helper/csv_handler.hxx b/sc/qa/unit/helper/csv_handler.hxx index 787c32974e0f..22534e4b9c8e 100644 --- a/sc/qa/unit/helper/csv_handler.hxx +++ b/sc/qa/unit/helper/csv_handler.hxx @@ -181,7 +181,6 @@ private: StringType meStringType; }; - class conditional_format_handler { public: diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index a22e3bc17d44..79d5716c5c1b 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -118,7 +118,6 @@ void testFile(OUString& aFileName, ScDocument& rDoc, SCTAB nTab, StringType aStr aConfig.text_qualifier = '"'; aConfig.trim_cell_value = false; - std::string aContent; loadFile(aFileName, aContent); orcus::csv_parser<csv_handler> parser ( &aContent[0], aContent.size() , aHandler, aConfig); diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 21e074958d9c..c23aa38f70b4 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -1209,7 +1209,6 @@ void ScOpenclTest::testFinacialSYDFormula() xDocShRes->DoClose(); } - void ScOpenclTest::testFinacialIRRFormula() { if (!detectOpenCLDevice()) @@ -3422,7 +3421,6 @@ void ScOpenclTest::testMathFormulaArcTan2() xDocShRes->DoClose(); } - //[AMLOEXT-148] void ScOpenclTest::testStatisticalFormulaChiSqInv() { diff --git a/sc/qa/unit/rangelst_test.cxx b/sc/qa/unit/rangelst_test.cxx index 0068d03641d3..943ac2084b9d 100644 --- a/sc/qa/unit/rangelst_test.cxx +++ b/sc/qa/unit/rangelst_test.cxx @@ -78,7 +78,6 @@ public: CPPUNIT_TEST(testInsertCol); CPPUNIT_TEST_SUITE_END(); - private: ScDocument *m_pDoc; ScDocShellRef m_xDocShRef; diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index d457538fd268..9fa0bc294d8e 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -278,7 +278,6 @@ void ScExportTest::testConditionalFormatExportXLSX() testCondFile(aCSVPath, &rDoc, 1); } - xDocSh->DoClose(); } diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 4374d6fb6988..d84b89587b1c 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -277,7 +277,6 @@ bool ScFiltersTest::load(const OUString &rFilter, const OUString &rURL, return bLoaded; } - namespace { void testRangeNameImpl(ScDocument& rDoc) diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index d6ed393497b7..8d2dd47b91be 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -1218,7 +1218,6 @@ void Test::testValueIterator() } } - m_pDoc->DeleteTab(0); } @@ -3451,7 +3450,6 @@ void Test::testCopyPaste() CPPUNIT_ASSERT_MESSAGE("After Redo, note again on Sheet2.C2, string cell content", m_pDoc->GetNote(ScAddress(2, 0, 0))->GetText() == m_pDoc->GetNote(ScAddress(2, 1, 1))->GetText()); - m_pDoc->DeleteTab(1); m_pDoc->DeleteTab(0); } @@ -4138,7 +4136,6 @@ void Test::testMergedCells() m_pDoc->DeleteTab(0); } - void Test::testRenameTable() { //test set rename table @@ -4197,7 +4194,6 @@ void Test::testSetBackgroundColor() CPPUNIT_ASSERT_MESSAGE("the correct color is not set", m_pDoc->GetTabBgColor(0) == aColor); - Color aOldTabBgColor=m_pDoc->GetTabBgColor(0); aColor.SetColor(COL_BLUE);//set BLUE getDocShell().GetDocFunc().SetTabBgColor(0,aColor,false, true); @@ -4703,7 +4699,6 @@ void Test::testFindAreaPosVertical() CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(0), nRow); CPPUNIT_ASSERT_EQUAL(static_cast<SCCOL>(2), nCol); - m_pDoc->DeleteTab(0); } @@ -6145,7 +6140,6 @@ void Test::testCondCopyPaste() CPPUNIT_ASSERT_EQUAL(size_t(1), pCondFormatItem->GetCondFormatData().size()); CPPUNIT_ASSERT( nIndex != pCondFormatItem->GetCondFormatData().at(0) ); - m_pDoc->DeleteTab(0); } diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx index 73181eed8063..2df47c0f1d0a 100644 --- a/sc/qa/unit/ucalc.hxx +++ b/sc/qa/unit/ucalc.hxx @@ -540,7 +540,6 @@ private: ScDocument *m_pDoc; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 6d521d6da690..f0f4a84589b1 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -989,10 +989,8 @@ void Test::testFormulaRefUpdate() // Clear all and start over. clearRange(m_pDoc, ScRange(0,0,0,10,10,0)); - // Test range updates - // Fill B2:C3 with values. m_pDoc->SetValue(ScAddress(1,1,0), 1); m_pDoc->SetValue(ScAddress(1,2,0), 2); diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx index 5f742a1f98c0..40b3d6c78c7d 100644 --- a/sc/qa/unit/ucalc_pivottable.cxx +++ b/sc/qa/unit/ucalc_pivottable.cxx @@ -643,7 +643,6 @@ void Test::testPivotTableFilters() CPPUNIT_ASSERT_MESSAGE("Table output check failed", bSuccess); } - pDPs->FreeTable(pDPObj); CPPUNIT_ASSERT_MESSAGE("There shouldn't be any data pilot table stored with the document.", pDPs->GetCount() == 0); diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index a8011c99c3d2..3cfc9be6ab41 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -49,7 +49,6 @@ // STATIC DATA ----------------------------------------------------------- - using ::editeng::SvxBorderLine; ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) : @@ -77,7 +76,6 @@ ScAttrArray::~ScAttrArray() delete[] pData; } - #if OSL_DEBUG_LEVEL > 1 void ScAttrArray::TestData() const { @@ -139,7 +137,6 @@ void ScAttrArray::Reset( const ScPatternAttr* pPattern ) pData[0].pPattern = pNewPattern; } - bool ScAttrArray::Concat(SCSIZE nPos) { bool bRet = false; @@ -208,7 +205,6 @@ bool ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const return bFound; } - const ScPatternAttr* ScAttrArray::GetPattern( SCROW nRow ) const { SCSIZE i; @@ -218,7 +214,6 @@ const ScPatternAttr* ScAttrArray::GetPattern( SCROW nRow ) const return NULL; } - const ScPatternAttr* ScAttrArray::GetPatternRange( SCROW& rStartRow, SCROW& rEndRow, SCROW nRow ) const { @@ -568,7 +563,6 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern #endif } - void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle ) { if (ValidRow(nStartRow) && ValidRow(nEndRow)) @@ -642,7 +636,6 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* #endif } - // const cast, otherwise it will be too inefficient/complicated #define SET_LINECOLOR(dest,c) \ if ((dest)) \ @@ -786,7 +779,6 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, #undef SET_LINECOLOR #undef SET_LINE - void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache, ScEditDataArray* pDataArray ) { #if OSL_DEBUG_LEVEL > 1 @@ -915,7 +907,6 @@ static void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource ) } } - void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow, ScMergePatternState& rState, bool bDeep ) const { @@ -995,7 +986,6 @@ static bool lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pN return true; // another line -> don't care } - static void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, const ScPatternAttr* pPattern, bool bLeft, SCCOL nDistRight, bool bTop, SCROW nDistBottom ) @@ -1059,7 +1049,6 @@ static void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner } } - void ScAttrArray::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight ) const @@ -1094,10 +1083,8 @@ void ScAttrArray::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLine } } - // apply border - // ApplyFrame - on an entry into the array bool ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, @@ -1172,7 +1159,6 @@ bool ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, } } - void ScAttrArray::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight ) { @@ -1425,7 +1411,6 @@ bool ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, return bFound; } - bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow) { bool bFound = false; @@ -1493,7 +1478,6 @@ void ScAttrArray::DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow) SetPatternAreaSafe( nStartRow, nEndRow, pDocument->GetDefPattern(), true ); } - void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pWantedPattern, bool bDefault ) { @@ -1549,7 +1533,6 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, } } - bool ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) { const ScPatternAttr* pOldPattern; @@ -1586,7 +1569,6 @@ bool ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) return bChanged; } - bool ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) { const ScPatternAttr* pOldPattern; @@ -1623,7 +1605,6 @@ bool ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags return bChanged; } - void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich ) { const ScPatternAttr* pOldPattern; @@ -1655,7 +1636,6 @@ void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* } } - void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement ) { SCSIZE nIndex; @@ -1717,7 +1697,6 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement } } - SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, bool bUp ) const { long nRet = nRow; @@ -1783,7 +1762,6 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo } } - bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const { @@ -1809,7 +1787,6 @@ bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle, return bIsUsed; } - bool ScAttrArray::IsEmpty() const { if (nCount == 1) @@ -1823,7 +1800,6 @@ bool ScAttrArray::IsEmpty() const return false; } - bool ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const { OSL_ENSURE( nCount, "nCount == 0" ); @@ -1920,7 +1896,6 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFu return bFound; } - bool ScAttrArray::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const { SCSIZE nIndex; @@ -1939,7 +1914,6 @@ bool ScAttrArray::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const return bFound; } - bool ScAttrArray::IsVisibleEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const { @@ -1976,7 +1950,6 @@ bool ScAttrArray::IsVisibleEqual( const ScAttrArray& rOther, return bEqual; } - bool ScAttrArray::IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const { // summarised with IsVisibleEqual @@ -2013,7 +1986,6 @@ bool ScAttrArray::IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW return bEqual; } - bool ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const { // Horizontal aggregate are not allowed to be moved out; if whole summary, @@ -2041,7 +2013,6 @@ bool ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const return bTest; } - bool ScAttrArray::TestInsertRow( SCSIZE nSize ) const { // if 1st row pushed out is vertically overlapped, summary would be broken @@ -2059,7 +2030,6 @@ bool ScAttrArray::TestInsertRow( SCSIZE nSize ) const return true; } - void ScAttrArray::InsertRow( SCROW nStartRow, SCSIZE nSize ) { if (!pData) @@ -2108,7 +2078,6 @@ void ScAttrArray::InsertRow( SCROW nStartRow, SCSIZE nSize ) RemoveFlags( nStartRow, nStartRow+nSize-1, SC_MF_HOR | SC_MF_VER | SC_MF_AUTO | SC_MF_BUTTON ); } - void ScAttrArray::DeleteRow( SCROW nStartRow, SCSIZE nSize ) { bool bFirst=true; @@ -2156,7 +2125,6 @@ void ScAttrArray::DeleteRow( SCROW nStartRow, SCSIZE nSize ) RemoveFlags( MAXROW-nSize+1, MAXROW, SC_MF_HOR | SC_MF_VER | SC_MF_AUTO ); } - void ScAttrArray::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex ) { ScDocumentPool* pDocPool = pDocument->GetPool(); @@ -2167,7 +2135,6 @@ void ScAttrArray::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex ) nCount -= nEndIndex-nStartIndex+1; } - void ScAttrArray::DeleteArea(SCROW nStartRow, SCROW nEndRow) { RemoveAreaMerge( nStartRow, nEndRow ); // remove from combined flags @@ -2178,7 +2145,6 @@ void ScAttrArray::DeleteArea(SCROW nStartRow, SCROW nEndRow) DeleteAreaSafe( nStartRow, nEndRow ); // leave merge flags } - void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow) { const ScPatternAttr* pDefPattern = pDocument->GetDefPattern(); @@ -2220,7 +2186,6 @@ void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow) } } - // move within a document void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray) @@ -2239,7 +2204,6 @@ void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray DeleteArea(nStartRow, nEndRow); } - // copy between documents (Clipboard) void ScAttrArray::CopyArea( @@ -2305,7 +2269,6 @@ void ScAttrArray::CopyArea( } } - // leave flags // summarized with CopyArea @@ -2349,7 +2312,6 @@ void ScAttrArray::CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttr } } - SCsROW ScAttrArray::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, bool bUp, const ScMarkArray* pMarkArray) const @@ -2413,7 +2375,6 @@ SCsROW ScAttrArray::SearchStyle( return nRow; } - bool ScAttrArray::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp, const ScMarkArray* pMarkArray) const diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 712bd0457e5c..07e3f29c9ba4 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -51,10 +51,8 @@ TYPEINIT1(ScDoubleItem, SfxPoolItem); TYPEINIT1(ScPageScaleToItem, SfxPoolItem); TYPEINIT1(ScCondFormatItem, SfxPoolItem); - // General Help Function - bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxBorderLine* pOther ) { @@ -87,7 +85,6 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB // Merge - ScMergeAttr::ScMergeAttr(): SfxPoolItem(ATTR_MERGE), nColMerge(0), @@ -143,10 +140,8 @@ SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) con return new ScMergeAttr(static_cast<SCCOL>(nCol),static_cast<SCROW>(nRow)); } - // MergeFlag - ScMergeFlagAttr::ScMergeFlagAttr(): SfxInt16Item(ATTR_MERGE_FLAG, 0) { @@ -171,10 +166,8 @@ bool ScMergeFlagAttr::HasPivotPopupButton() const return (GetValue() & SC_MF_BUTTON_POPUP) != 0; } - // Protection - ScProtectionAttr::ScProtectionAttr(): SfxPoolItem(ATTR_PROTECTION), bProtection(true), @@ -396,10 +389,8 @@ bool ScProtectionAttr::SetHidePrint( bool bHPrint) return true; } - // ScRangeItem - Tabellenbereich - bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -445,10 +436,8 @@ SfxItemPresentation ScRangeItem::GetPresentation return ePres; } - // ScTableListItem - List from Tables (-numbers) - ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) : SfxPoolItem ( rCpy.Which() ), nCount ( rCpy.nCount ) @@ -464,7 +453,6 @@ ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) pTabArr = NULL; } - ScTableListItem::~ScTableListItem() { delete [] pTabArr; @@ -559,7 +547,6 @@ SfxItemPresentation ScTableListItem::GetPresentation // ScPageHFItem - Dates from the Head and Foot lines - ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP ) : SfxPoolItem ( nWhichP ), pLeftArea ( NULL ), @@ -809,7 +796,6 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const return pItem; } - void ScPageHFItem::SetLeftArea( const EditTextObject& rNew ) { delete pLeftArea; @@ -840,10 +826,8 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea ) } } - // ScViewObjectModeItem - Display Mode of View Objects - ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP ) : SfxEnumItem( nWhichP, VOBJ_MODE_SHOW ) { @@ -949,10 +933,8 @@ SfxPoolItem* ScViewObjectModeItem::Create( } } - // double - ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal ) : SfxPoolItem ( nWhichP ), nValue ( nVal ) @@ -996,7 +978,6 @@ ScDoubleItem::~ScDoubleItem() { } - ScPageScaleToItem::ScPageScaleToItem() : SfxPoolItem( ATTR_PAGE_SCALETO ), mnWidth( 0 ), @@ -1130,7 +1111,6 @@ ScCondFormatItem* ScCondFormatItem::Clone(SfxItemPool*) const return new ScCondFormatItem(maIndex); } - void ScCondFormatItem::AddCondFormatData( sal_uInt32 nIndex ) { maIndex.push_back(nIndex); @@ -1141,5 +1121,4 @@ void ScCondFormatItem::SetCondFormatData( const std::vector<sal_uInt32>& rIndex maIndex = rIndex; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 2dfc9a7d6ac6..6d6eee24bde9 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -106,7 +106,6 @@ static SCSIZE nBcaSlots = initSlotDistribution( aSlotDistribution, nBcaSlotsRow) // Ensure that all static variables are initialized with this one call. #endif - ScBroadcastAreaSlot::ScBroadcastAreaSlot( ScDocument* pDocument, ScBroadcastAreaSlotMachine* pBASMa ) : aTmpSeekBroadcastArea( ScRange()), @@ -116,7 +115,6 @@ ScBroadcastAreaSlot::ScBroadcastAreaSlot( ScDocument* pDocument, { } - ScBroadcastAreaSlot::~ScBroadcastAreaSlot() { for ( ScBroadcastAreas::iterator aIter( aBroadcastAreaTbl.begin()); @@ -133,7 +131,6 @@ ScBroadcastAreaSlot::~ScBroadcastAreaSlot() } } - bool ScBroadcastAreaSlot::CheckHardRecalcStateCondition() const { if ( pDoc->GetHardRecalcState() ) @@ -156,7 +153,6 @@ bool ScBroadcastAreaSlot::CheckHardRecalcStateCondition() const return false; } - bool ScBroadcastAreaSlot::StartListeningArea( const ScRange& rRange, SvtListener* pListener, ScBroadcastArea*& rpArea ) { @@ -199,7 +195,6 @@ bool ScBroadcastAreaSlot::StartListeningArea( const ScRange& rRange, return bNewArea; } - void ScBroadcastAreaSlot::InsertListeningArea( ScBroadcastArea* pArea ) { OSL_ENSURE( pArea, "InsertListeningArea: pArea NULL"); @@ -209,7 +204,6 @@ void ScBroadcastAreaSlot::InsertListeningArea( ScBroadcastArea* pArea ) pArea->IncRef(); } - // If rpArea != NULL then no listeners are stopped, only the area is removed // and the reference count decremented. void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange, @@ -245,7 +239,6 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange, } } - ScBroadcastAreas::const_iterator ScBroadcastAreaSlot::FindBroadcastArea( const ScRange& rRange ) const { @@ -253,7 +246,6 @@ ScBroadcastAreas::const_iterator ScBroadcastAreaSlot::FindBroadcastArea( return aBroadcastAreaTbl.find( &aTmpSeekBroadcastArea); } - bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) { if (aBroadcastAreaTbl.empty()) @@ -286,7 +278,6 @@ bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) return bIsBroadcasted; } - bool ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint) { @@ -319,7 +310,6 @@ bool ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, return bIsBroadcasted; } - void ScBroadcastAreaSlot::DelBroadcastAreasInRange( const ScRange& rRange ) { if (aBroadcastAreaTbl.empty()) @@ -344,7 +334,6 @@ void ScBroadcastAreaSlot::DelBroadcastAreasInRange( const ScRange& rRange ) } } - void ScBroadcastAreaSlot::UpdateRemove( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ) { @@ -389,7 +378,6 @@ void ScBroadcastAreaSlot::UpdateRemove( UpdateRefMode eUpdateRefMode, } } - void ScBroadcastAreaSlot::UpdateRemoveArea( ScBroadcastArea* pArea ) { ScBroadcastAreas::iterator aIter( aBroadcastAreaTbl.find( pArea)); @@ -404,7 +392,6 @@ void ScBroadcastAreaSlot::UpdateRemoveArea( ScBroadcastArea* pArea ) } } - void ScBroadcastAreaSlot::UpdateInsert( ScBroadcastArea* pArea ) { ::std::pair< ScBroadcastAreas::iterator, bool > aPair = @@ -429,7 +416,6 @@ void ScBroadcastAreaSlot::UpdateInsert( ScBroadcastArea* pArea ) } } - void ScBroadcastAreaSlot::EraseArea( ScBroadcastAreas::iterator& rIter ) { if (mbInBroadcastIteration) @@ -476,7 +462,6 @@ void ScBroadcastAreaSlot::FinallyEraseAreas() pBASM->FinallyEraseAreas( this); } - // --- ScBroadcastAreaSlotMachine ------------------------------------- ScBroadcastAreaSlotMachine::TableSlots::TableSlots() @@ -485,7 +470,6 @@ ScBroadcastAreaSlotMachine::TableSlots::TableSlots() memset( ppSlots, 0 , sizeof( ScBroadcastAreaSlot* ) * nBcaSlots ); } - ScBroadcastAreaSlotMachine::TableSlots::~TableSlots() { for ( ScBroadcastAreaSlot** pp = ppSlots + nBcaSlots; --pp >= ppSlots; /* nothing */ ) @@ -496,7 +480,6 @@ ScBroadcastAreaSlotMachine::TableSlots::~TableSlots() delete [] ppSlots; } - ScBroadcastAreaSlotMachine::ScBroadcastAreaSlotMachine( ScDocument* pDocument ) : pBCAlways( NULL ), @@ -507,7 +490,6 @@ ScBroadcastAreaSlotMachine::ScBroadcastAreaSlotMachine( { } - ScBroadcastAreaSlotMachine::~ScBroadcastAreaSlotMachine() { for (TableSlotsMap::iterator iTab( aTableSlotsMap.begin()); @@ -521,7 +503,6 @@ ScBroadcastAreaSlotMachine::~ScBroadcastAreaSlotMachine() SAL_WARN_IF( !maAreasToBeErased.empty(), "sc", "ScBroadcastAreaSlotMachine::dtor: maAreasToBeErased not empty"); } - inline SCSIZE ScBroadcastAreaSlotMachine::ComputeSlotOffset( const ScAddress& rAddress ) const { @@ -546,7 +527,6 @@ inline SCSIZE ScBroadcastAreaSlotMachine::ComputeSlotOffset( return nBcaSlots - 1; } - void ScBroadcastAreaSlotMachine::ComputeAreaPoints( const ScRange& rRange, SCSIZE& rStart, SCSIZE& rEnd, SCSIZE& rRowBreak ) const { @@ -557,7 +537,6 @@ void ScBroadcastAreaSlotMachine::ComputeAreaPoints( const ScRange& rRange, ScAddress( rRange.aStart.Col(), rRange.aEnd.Row(), 0 ) ) - rStart; } - inline void ComputeNextSlot( SCSIZE & nOff, SCSIZE & nBreak, ScBroadcastAreaSlot** & pp, SCSIZE & nStart, ScBroadcastAreaSlot** const & ppSlots, SCSIZE const & nRowBreak ) { @@ -575,7 +554,6 @@ inline void ComputeNextSlot( SCSIZE & nOff, SCSIZE & nBreak, ScBroadcastAreaSlot } } - void ScBroadcastAreaSlotMachine::StartListeningArea( const ScRange& rRange, SvtListener* pListener ) { @@ -623,7 +601,6 @@ void ScBroadcastAreaSlotMachine::StartListeningArea( const ScRange& rRange, } } - void ScBroadcastAreaSlotMachine::EndListeningArea( const ScRange& rRange, SvtListener* pListener ) { @@ -676,7 +653,6 @@ void ScBroadcastAreaSlotMachine::EndListeningArea( const ScRange& rRange, } } - bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const { const ScAddress& rAddress = rHint.GetAddress(); @@ -704,7 +680,6 @@ bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const } } - bool ScBroadcastAreaSlotMachine::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) const { @@ -729,7 +704,6 @@ bool ScBroadcastAreaSlotMachine::AreaBroadcastInRange( const ScRange& rRange, return bBroadcasted; } - void ScBroadcastAreaSlotMachine::DelBroadcastAreasInRange( const ScRange& rRange ) { @@ -766,7 +740,6 @@ void ScBroadcastAreaSlotMachine::DelBroadcastAreasInRange( } } - // for all affected: remove, chain, update range, insert, and maybe delete void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode, @@ -942,13 +915,11 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( pEOUpdateChain = NULL; } - void ScBroadcastAreaSlotMachine::EnterBulkBroadcast() { ++nInBulkBroadcast; } - void ScBroadcastAreaSlotMachine::LeaveBulkBroadcast() { if (nInBulkBroadcast > 0) @@ -958,26 +929,22 @@ void ScBroadcastAreaSlotMachine::LeaveBulkBroadcast() } } - bool ScBroadcastAreaSlotMachine::InsertBulkArea( const ScBroadcastArea* pArea ) { return aBulkBroadcastAreas.insert( pArea ).second; } - size_t ScBroadcastAreaSlotMachine::RemoveBulkArea( const ScBroadcastArea* pArea ) { return aBulkBroadcastAreas.erase( pArea ); } - void ScBroadcastAreaSlotMachine::PushAreaToBeErased( ScBroadcastAreaSlot* pSlot, ScBroadcastAreas::iterator& rIter ) { maAreasToBeErased.push_back( ::std::make_pair( pSlot, rIter)); } - void ScBroadcastAreaSlotMachine::FinallyEraseAreas( ScBroadcastAreaSlot* pSlot ) { SAL_WARN_IF( pSlot->IsInBroadcastIteration(), "sc", diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx index d5dc3dc15831..1afe1f5c61a2 100644 --- a/sc/source/core/data/clipcontext.cxx +++ b/sc/source/core/data/clipcontext.cxx @@ -53,8 +53,6 @@ void CopyFromClipContext::setTabRange(SCTAB nStart, SCTAB nEnd) mnTabEnd = nEnd; } - - void CopyFromClipContext::setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { mnDestCol1 = nCol1; @@ -73,29 +71,21 @@ CopyFromClipContext::Range CopyFromClipContext::getDestRange() const return aRet; } - - - void CopyFromClipContext::setDeleteFlag( sal_uInt16 nFlag ) { mnDeleteFlag = nFlag; } - - void CopyFromClipContext::setCondFormatList( ScConditionalFormatList* pCondFormatList ) { mpCondFormatList = pCondFormatList; } - - void CopyFromClipContext::setSingleCellPattern( const ScPatternAttr* pAttr ) { mpSinglePattern = pAttr; } - void CopyFromClipContext::setSingleCellNote( const ScPostIt* pNote ) { mpSingleNote = pNote; @@ -106,10 +96,6 @@ void CopyFromClipContext::setTableProtected( bool b ) mbTableProtected = b; } - - - - bool CopyFromClipContext::isDateCell( const ScColumn& rCol, SCROW nRow ) const { sal_uLong nNumIndex = static_cast<const SfxUInt32Item*>(rCol.GetAttr(nRow, ATTR_VALUE_FORMAT))->GetValue(); @@ -123,8 +109,6 @@ CopyToClipContext::CopyToClipContext( CopyToClipContext::~CopyToClipContext() {} - - CopyToDocContext::CopyToDocContext(ScDocument& rDoc) : ClipContextBase(rDoc) {} CopyToDocContext::~CopyToDocContext() {} diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index d2e0eef2950b..d4726956b3bb 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -280,7 +280,6 @@ bool ScColorScaleEntry::NeedsRepaint() const return false; } - void ScColorScaleEntry::SetColor(const Color& rColor) { maColor = rColor; @@ -339,7 +338,6 @@ void ScColorScaleEntry::SetType( ScColorScaleEntryType eType ) } } - double ScColorScaleFormat::GetMinValue() const { const_iterator itr = maColorScales.begin(); @@ -841,7 +839,6 @@ ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const ScAddress& rAddr) const double nMin = getMin(nValMin, nValMax); double nMax = getMax(nValMin, nValMax); - double nValue = mpDoc->GetValue(rAddr); ScDataBarInfo* pInfo = new ScDataBarInfo(); @@ -908,7 +905,6 @@ ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const ScAddress& rAddr) const } } - // set color if(mpFormatData->mbNeg && nValue < 0) { diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 0f5bc92f5291..c32fb011b3fe 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -92,14 +92,12 @@ ScColumn::ScColumn() : { } - ScColumn::~ScColumn() { FreeAll(); delete pAttrArray; } - void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc) { nCol = nNewCol; @@ -108,13 +106,11 @@ void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc) pAttrArray = new ScAttrArray( nCol, nTab, pDocument ); } - SCsROW ScColumn::GetNextUnprotected( SCROW nRow, bool bUp ) const { return pAttrArray->GetNextUnprotected(nRow, bUp); } - sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const { using namespace sc; @@ -192,7 +188,6 @@ sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 n return nEdges; } - bool ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const { using namespace sc; @@ -304,13 +299,11 @@ bool ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const return false; } - bool ScColumn::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const { return pAttrArray->HasAttrib( nRow1, nRow2, nMask ); } - bool ScColumn::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const { bool bFound = false; @@ -331,7 +324,6 @@ bool ScColumn::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) c return bFound; } - bool ScColumn::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, bool bRefresh ) @@ -339,7 +331,6 @@ bool ScColumn::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, return pAttrArray->ExtendMerge( nThisCol, nStartRow, nEndRow, rPaintCol, rPaintRow, bRefresh ); } - void ScColumn::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, bool bDeep ) const { SCROW nTop; @@ -357,13 +348,11 @@ void ScColumn::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkD } } - void ScColumn::MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, bool bDeep ) const { pAttrArray->MergePatternArea( nRow1, nRow2, rState, bDeep ); } - void ScColumn::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight ) const @@ -371,26 +360,22 @@ void ScColumn::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInn pAttrArray->MergeBlockFrame( pLineOuter, pLineInner, rFlags, nStartRow, nEndRow, bLeft, nDistRight ); } - void ScColumn::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight ) { pAttrArray->ApplyBlockFrame( pLineOuter, pLineInner, nStartRow, nEndRow, bLeft, nDistRight ); } - const ScPatternAttr* ScColumn::GetPattern( SCROW nRow ) const { return pAttrArray->GetPattern( nRow ); } - const SfxPoolItem* ScColumn::GetAttr( SCROW nRow, sal_uInt16 nWhich ) const { return &pAttrArray->GetPattern( nRow )->GetItemSet().Get(nWhich); } - const ScPatternAttr* ScColumn::GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const { ::std::map< const ScPatternAttr*, size_t > aAttrMap; @@ -431,13 +416,11 @@ sal_uInt32 ScColumn::GetNumberFormat( SCROW nStartRow, SCROW nEndRow ) const return nFormat; } - sal_uInt32 ScColumn::GetNumberFormat( SCROW nRow ) const { return pAttrArray->GetPattern( nRow )->GetNumberFormat( pDocument->GetFormatTable() ); } - SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray ) { SCROW nTop = 0; @@ -462,7 +445,6 @@ SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData return nBottom; } - void ScColumn::ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark ) { SCROW nTop; @@ -489,7 +471,6 @@ void ScColumn::ClearSelectionItems( const sal_uInt16* pWhich,const ScMarkData& r } } - void ScColumn::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bool bBroadcast ) { SCROW nTop; @@ -503,7 +484,6 @@ void ScColumn::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bo } } - void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ) { const SfxItemSet* pSet = &rPatAttr.GetItemSet(); @@ -521,7 +501,6 @@ void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ) pAttrArray->SetPattern( nRow, pNewPattern ); } - void ScColumn::ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr, ScEditDataArray* pDataArray ) { @@ -571,7 +550,6 @@ void ScColumn::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nInd pAttrArray->RemoveCondFormat( nStartRow, nEndRow, nIndex ); } - void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle ) { const ScPatternAttr* pPattern = pAttrArray->GetPattern(nRow); @@ -583,13 +561,11 @@ void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle ) } } - void ScColumn::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle ) { pAttrArray->ApplyStyleArea(nStartRow, nEndRow, (ScStyleSheet*)&rStyle); } - void ScColumn::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark) { SCROW nTop; @@ -603,7 +579,6 @@ void ScColumn::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& } } - void ScColumn::ApplySelectionLineStyle( const ScMarkData& rMark, const SvxBorderLine* pLine, bool bColorOnly ) { @@ -621,13 +596,11 @@ void ScColumn::ApplySelectionLineStyle( const ScMarkData& rMark, } } - const ScStyleSheet* ScColumn::GetStyle( SCROW nRow ) const { return pAttrArray->GetPattern( nRow )->GetStyleSheet(); } - const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, bool& rFound ) const { rFound = false; @@ -664,7 +637,6 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, bool& return bEqual ? pStyle : NULL; } - const ScStyleSheet* ScColumn::GetAreaStyle( bool& rFound, SCROW nRow1, SCROW nRow2 ) const { rFound = false; @@ -700,38 +672,32 @@ bool ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyl return pAttrArray->IsStyleSheetUsed( rStyle, bGatherAllStyles ); } - bool ScColumn::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) { return pAttrArray->ApplyFlags( nStartRow, nEndRow, nFlags ); } - bool ScColumn::RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) { return pAttrArray->RemoveFlags( nStartRow, nEndRow, nFlags ); } - void ScColumn::ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich ) { pAttrArray->ClearItems( nStartRow, nEndRow, pWhich ); } - void ScColumn::SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, bool bPutToPool ) { pAttrArray->SetPattern( nRow, &rPatAttr, bPutToPool ); } - void ScColumn::SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr, bool bPutToPool ) { pAttrArray->SetPatternArea( nStartRow, nEndRow, &rPatAttr, bPutToPool ); } - void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) { // in order to only create a new SetItem, we don't need SfxItemPoolCache. @@ -750,8 +716,6 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) pDocPool->Remove( *pNewPattern ); // free up resources } - - ScRefCellValue ScColumn::GetCellValue( SCROW nRow ) const { std::pair<sc::CellStoreType::const_iterator,size_t> aPos = maCells.position(nRow); @@ -839,7 +803,6 @@ bool ScColumn::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const return pAttrArray ? pAttrArray->TestInsertCol(nStartRow, nEndRow) : true; } - bool ScColumn::TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const { // AttrArray only looks for merged cells @@ -870,7 +833,6 @@ bool ScColumn::TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const return pAttrArray->TestInsertRow(nSize); } - void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize ) { pAttrArray->InsertRow( nStartRow, nSize ); @@ -1670,7 +1632,6 @@ void ScColumn::CopyToColumn( } } - void ScColumn::UndoToColumn( sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, bool bMarked, ScColumn& rColumn, const ScMarkData* pMarkData ) const @@ -1684,7 +1645,6 @@ void ScColumn::UndoToColumn( CopyToColumn(rCxt, nRow2+1, MAXROW, IDF_FORMULA, false, rColumn); } - void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const { // Copy cells from this column to the destination column only for those @@ -1709,7 +1669,6 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const rDestCol.CellStorageModified(); } - void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) { // This is the scenario table, the data is copied into it @@ -1741,7 +1700,6 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) } } - void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const { // This is the scenario table, the data is copied to the other @@ -1772,7 +1730,6 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const } } - bool ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const { bool bOk = true; @@ -1790,7 +1747,6 @@ bool ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const return bOk; } - void ScColumn::MarkScenarioIn( ScMarkData& rDestMark ) const { ScRange aRange( nCol, 0, nTab ); @@ -2924,14 +2880,12 @@ void ScColumn::UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, sc::ProcessFormula(maCells, aFunc); } - void ScColumn::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ) { UpdateGrowHandler aFunc(*this, rArea, nGrowX, nGrowY); sc::ProcessFormula(maCells, aFunc); } - void ScColumn::UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) { if (nTab >= rCxt.mnInsertPos) @@ -2984,14 +2938,12 @@ void ScColumn::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt, SCTAB nTabNo ) CellStorageModified(); } - void ScColumn::UpdateCompile( bool bForceIfNameInUse ) { UpdateCompileHandler aFunc(bForceIfNameInUse); sc::ProcessFormula(maCells, aFunc); } - void ScColumn::SetTabNo(SCTAB nNewTab) { nTab = nNewTab; @@ -3318,7 +3270,6 @@ bool ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) return true; } - SCsROW ScColumn::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, bool bUp, bool bInSelection, const ScMarkData& rMark) const @@ -3334,7 +3285,6 @@ SCsROW ScColumn::SearchStyle( return pAttrArray->SearchStyle( nRow, pSearchStyle, bUp, NULL ); } - bool ScColumn::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp, bool bInSelection, const ScMarkData& rMark) const diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 744b64d1e484..2c6c89094b24 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -79,11 +79,8 @@ inline bool IsAmbiguousScript( sal_uInt8 nScript ) nScript != SCRIPTTYPE_COMPLEX ); } - // 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/column3.cxx b/sc/source/core/data/column3.cxx index 34a9506772e0..4947d9fd63d5 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -1445,7 +1445,6 @@ void ScColumn::MixData( CellStorageModified(); } - ScAttrIterator* ScColumn::CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const { return new ScAttrIterator( pAttrArray, nStartRow, nEndRow ); @@ -1486,7 +1485,6 @@ void ScColumn::StartAllListeners() sc::ProcessFormula(maCells, aFunc); } - void ScColumn::StartNeededListeners() { StartNeededListenerHandler aFunc(pDocument); @@ -2118,10 +2116,8 @@ public: } - // GetDataEntries - Strings from continuous Section around nRow - // DATENT_MAX - max. number of entries in list for auto entry // DATENT_SEARCH - max. number of cells that get transparent - new: only count Strings #define DATENT_MAX 200 @@ -2271,7 +2267,6 @@ void ScColumn::RemoveProtected( SCROW nStartRow, SCROW nEndRow ) aFunc.commitCells(*this); } - void ScColumn::SetError( SCROW nRow, const sal_uInt16 nError) { if (!ValidRow(nRow)) @@ -2527,7 +2522,6 @@ sal_uInt16 ScColumn::GetErrCode( SCROW nRow ) const return const_cast<ScFormulaCell*>(p)->GetErrCode(); } - bool ScColumn::HasStringData( SCROW nRow ) const { std::pair<sc::CellStoreType::const_iterator,size_t> aPos = maCells.position(nRow); @@ -2548,7 +2542,6 @@ bool ScColumn::HasStringData( SCROW nRow ) const return false; } - bool ScColumn::HasValueData( SCROW nRow ) const { std::pair<sc::CellStoreType::const_iterator,size_t> aPos = maCells.position(nRow); diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx index a14cd9d2bec9..234d96ba29dc 100644 --- a/sc/source/core/data/compressedarray.cxx +++ b/sc/source/core/data/compressedarray.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "compressedarray.hxx" #include "address.hxx" @@ -36,7 +35,6 @@ ScCompressedArray<A,D>::ScCompressedArray( A nMaxAccessP, const D& rValue, pData[0].nEnd = nMaxAccess; } - template< typename A, typename D > ScCompressedArray<A,D>::ScCompressedArray( A nMaxAccessP, const D* pDataArray, size_t nDataCount ) @@ -63,14 +61,12 @@ ScCompressedArray<A,D>::ScCompressedArray( A nMaxAccessP, const D* pDataArray, Resize( nCount); } - template< typename A, typename D > ScCompressedArray<A,D>::~ScCompressedArray() { delete[] pData; } - template< typename A, typename D > void ScCompressedArray<A,D>::Resize( size_t nNewLimit) { @@ -84,7 +80,6 @@ void ScCompressedArray<A,D>::Resize( size_t nNewLimit) } } - template< typename A, typename D > size_t ScCompressedArray<A,D>::Search( A nAccess ) const { @@ -116,7 +111,6 @@ size_t ScCompressedArray<A,D>::Search( A nAccess ) const return (bFound ? static_cast<size_t>(i) : (nAccess < 0 ? 0 : nCount-1)); } - template< typename A, typename D > void ScCompressedArray<A,D>::SetValue( A nStart, A nEnd, const D& rValue ) { @@ -243,7 +237,6 @@ void ScCompressedArray<A,D>::SetValue( A nStart, A nEnd, const D& rValue ) } } - template< typename A, typename D > void ScCompressedArray<A,D>::CopyFrom( const ScCompressedArray<A,D>& rArray, A nStart, A nEnd, long nSourceDy ) @@ -263,7 +256,6 @@ void ScCompressedArray<A,D>::CopyFrom( const ScCompressedArray<A,D>& rArray, A n } } - template< typename A, typename D > const D& ScCompressedArray<A,D>::Insert( A nStart, size_t nAccessCount ) { @@ -286,7 +278,6 @@ const D& ScCompressedArray<A,D>::Insert( A nStart, size_t nAccessCount ) return rValue; } - template< typename A, typename D > void ScCompressedArray<A,D>::Remove( A nStart, size_t nAccessCount ) { @@ -323,7 +314,6 @@ void ScCompressedArray<A,D>::Remove( A nStart, size_t nAccessCount ) pData[nCount-1].nEnd = nMaxAccess; } - // === ScBitMaskCompressedArray ============================================== template< typename A, typename D > @@ -352,7 +342,6 @@ void ScBitMaskCompressedArray<A,D>::AndValue( A nStart, A nEnd, } while (nIndex < this->nCount); } - template< typename A, typename D > void ScBitMaskCompressedArray<A,D>::OrValue( A nStart, A nEnd, const D& rValueToOr ) @@ -379,7 +368,6 @@ void ScBitMaskCompressedArray<A,D>::OrValue( A nStart, A nEnd, } while (nIndex < this->nCount); } - template< typename A, typename D > void ScBitMaskCompressedArray<A,D>::CopyFromAnded( const ScBitMaskCompressedArray<A,D>& rArray, A nStart, A nEnd, diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 2c6bc2918d29..e04acfbd475b 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -46,7 +46,6 @@ using namespace formula; - ScFormatEntry::ScFormatEntry(ScDocument* pDoc): mpDoc(pDoc) { @@ -1775,8 +1774,6 @@ void ScCondDateFormatEntry::SetDateType( condformat::ScCondFormatDateType eType meType = eType; } - - void ScCondDateFormatEntry::SetStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx index 2465518c53ba..66aa2e2e2c84 100644 --- a/sc/source/core/data/dbdocutl.cxx +++ b/sc/source/core/data/dbdocutl.cxx @@ -192,5 +192,4 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 06519a0569b6..568e5f5d915f 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -931,15 +931,11 @@ bool ScCellIterator::getCurrent() return false; } - OUString ScCellIterator::getString() { return maCurCell.getString(mpDoc); } - - - ScCellValue ScCellIterator::getCellValue() const { ScCellValue aRet; @@ -966,7 +962,6 @@ ScCellValue ScCellIterator::getCellValue() const return aRet; } - bool ScCellIterator::hasString() const { return maCurCell.hasString(); @@ -1218,7 +1213,6 @@ void ScQueryCellIterator::AdvanceQueryParamEntryField() } } - bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol, SCROW& nFoundRow, bool bSearchForEqualAfterMismatch, bool bIgnoreMismatchOnLeadingStringsP ) @@ -1880,7 +1874,6 @@ bool ScQueryCellIterator::BinarySearch() } } - ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) : pDoc( pDocument ), @@ -2481,7 +2474,6 @@ bool ScUsedAreaIterator::GetNext() return bFound; } - ScDocAttrIterator::ScDocAttrIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) : diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 7027e56babac..062297e86284 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <boost/static_assert.hpp> @@ -607,7 +606,6 @@ void ScDocumentPool::DeleteVersionMaps() // als noetig, um zu erkennen, wenn der RefCount aus Versehen doch "normal" veraendert // wird (Assertions). - const SfxPoolItem& ScDocumentPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich ) { if ( rItem.Which() != ATTR_PATTERN ) // nur Pattern ist special diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 2b143ff0d873..8ea270aa2ce3 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -294,7 +294,6 @@ void ScDocument::SetStorageGrammar( formula::FormulaGrammar::Grammar eGram ) formula::FormulaGrammar::CONV_OOO); } - void ScDocument::SetDocVisible( bool bSet ) { // called from view ctor - only for a visible document, @@ -302,7 +301,6 @@ void ScDocument::SetDocVisible( bool bSet ) bIsVisible = bSet; } - sal_uInt32 ScDocument::GetDocumentID() const { const ScDocument* pThis = this; @@ -312,7 +310,6 @@ sal_uInt32 ScDocument::GetDocumentID() const return nCrc; } - void ScDocument::StartChangeTracking() { if (!pChangeTrack) @@ -334,7 +331,6 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) pChangeTrack = pTrack; } - IMPL_LINK_NOARG(ScDocument, TrackTimeHdl) { if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln @@ -368,7 +364,6 @@ void ScDocument::SetExpandRefs( bool bVal ) bExpandRefs = bVal; } - void ScDocument::StartTrackTimer() { if (!aTrackTimer.IsActive()) // nicht ewig aufschieben @@ -543,7 +538,6 @@ ScNoteEditEngine& ScDocument::GetNoteEngine() return *pNoteEngine; } - void ScDocument::ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ) { if (bIsClip) @@ -1392,7 +1386,6 @@ void ScDocument::SetPreviewFont( SfxItemSet* pFont ) pPreviewFont = pFont; } - void ScDocument::SetPreviewSelection( ScMarkData& rSel ) { maPreviewSelection = rSel; diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index e25a742f60c7..766125cec96e 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -229,7 +229,6 @@ const ScRangeData* ScDocument::GetRangeAtBlock( const ScRange& rBlock, OUString* return pData; } - void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, bool bRemoveAutoFilter ) { if (pDBCollection && bRemoveAutoFilter) @@ -324,7 +323,6 @@ ScDPCollection* ScDocument::GetDPCollection() return pDPCollection; } - ScDPObject* ScDocument::GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const { if (!pDPCollection) @@ -354,14 +352,12 @@ ScDPObject* ScDocument::GetDPAtBlock( const ScRange & rBlock ) const return NULL; } - void ScDocument::StopTemporaryChartLock() { if( apTemporaryChartLock.get() ) apTemporaryChartLock->StopLocking(); } - void ScDocument::SetChartListenerCollection( ScChartListenerCollection* pNewChartListenerCollection, bool bSetChartRangeLists ) @@ -450,7 +446,6 @@ formula::FormulaGrammar::AddressConvention ScDocument::GetAddressConvention() co return formula::FormulaGrammar::extractRefConvention(eGrammar); } - void ScDocument::SetGrammar( formula::FormulaGrammar::Grammar eGram ) { eGrammar = eGram; @@ -960,7 +955,6 @@ void ScDocument::AddUnoRefChange( sal_Int64 nId, const ScRangeList& rOldRanges ) pUnoRefUndoList->Add( nId, rOldRanges ); } - void ScDocument::UpdateReference( sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc, bool bIncludeDraw, bool bUpdateNoteCaptionPos ) { @@ -1361,7 +1355,6 @@ SCSIZE ScDocument::Query(SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeep return 0; } - void ScDocument::GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rStr) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -1425,10 +1418,8 @@ bool ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, return ValidTab(nTab) && maTabs[nTab] && maTabs[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow ); } - // GetFilterEntries - Eintraege fuer AutoFilter-Listbox - bool ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, std::vector<ScTypedStrData>& rStrings, bool& rHasDates) { @@ -1483,10 +1474,8 @@ bool ScDocument::GetFilterEntries( return false; } - // GetFilterEntriesArea - Eintraege fuer Filter-Dialog - bool ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bCaseSens, std::vector<ScTypedStrData>& rStrings, bool& rHasDates) @@ -1501,10 +1490,8 @@ bool ScDocument::GetFilterEntriesArea( return false; } - // GetDataEntries - Eintraege fuer Auswahlliste-Listbox (keine Zahlen / Formeln) - bool ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bCaseSens, std::vector<ScTypedStrData>& rStrings, bool bLimit ) @@ -1542,16 +1529,13 @@ bool ScDocument::GetDataEntries( return bRet; } - // GetFormulaEntries - Eintraege fuer Formel-AutoEingabe - bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) { // Bereichsnamen - if ( pRangeName ) { ScRangeName::const_iterator itr = pRangeName->begin(), itrEnd = pRangeName->end(); @@ -1559,10 +1543,8 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) rStrings.insert(ScTypedStrData(itr->second->GetName(), 0.0, ScTypedStrData::Name)); } - // Datenbank-Bereiche - if ( pDBCollection ) { const ScDBCollection::NamedDBs& rDBs = pDBCollection->getNamedDBs(); @@ -1571,10 +1553,8 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) rStrings.insert(ScTypedStrData(itr->GetName(), 0.0, ScTypedStrData::DbName)); } - // Inhalte von Beschriftungsbereichen - ScRangePairList* pLists[2]; pLists[0] = GetColNameRanges(); pLists[1] = GetRowNameRanges(); @@ -1603,8 +1583,6 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) return true; } - - void ScDocument::GetEmbedded( ScRange& rRange ) const { rRange = aEmbedRange; @@ -1655,7 +1633,6 @@ void ScDocument::ResetEmbedded() aEmbedRange = ScRange(); } - /** Similar to ScViewData::AddPixelsWhile(), but add height twips and only while result is less than nStopTwips. @return true if advanced at least one row. @@ -1758,7 +1735,6 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect, bool bHidden bEnd = true; } - nSize = 0; nTwips = (long) (aPosRect.Top() / HMM_PER_TWIPS); diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index a156c3ba8529..6c92c546cb30 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -49,7 +49,6 @@ using namespace formula; - /** (Goal Seek) Find a value of x that is a root of f(x) This function is used internally for the goal seek operation. It uses the @@ -702,10 +701,8 @@ double ScDocument::RoundValueAsShown( double fVal, sal_uInt32 nFormat ) const return fVal; } - // bedingte Formate und Gueltigkeitsbereiche - sal_uLong ScDocument::AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab ) { if(!pNew) @@ -867,7 +864,6 @@ void ScDocument::SetCondFormList( ScConditionalFormatList* pList, SCTAB nTab ) maTabs[nTab]->SetCondFormList(pList); } - const ScValidationData* ScDocument::GetValidationEntry( sal_uLong nIndex ) const { if ( pValidationList ) @@ -915,7 +911,6 @@ void ScDocument::SetDetOpList(ScDetOpList* pNew) #define SC_DOCCOMP_COLUMNS 10 #define SC_DOCCOMP_ROWS 100 - sal_uInt16 ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, ScDocument& rOtherDoc, SCROW nOtherRow, SCTAB nOtherTab, SCCOL nMaxCol, SCCOLROW* pOtherCols ) @@ -1017,7 +1012,6 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW } bool bUseTotal = bColumns && !pTranslate; // nur beim ersten Durchgang - SCCOLROW nOtherRow = 0; sal_uInt16 nComp; SCCOLROW nThisRow; @@ -1152,10 +1146,8 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) bInFill = true; } - // Tabellen in der gefundenen Reihenfolge vergleichen - for (nThisTab=0; nThisTab<nThisCount; nThisTab++) { SCTAB nOtherTab = pOtherTabs[nThisTab]; @@ -1236,7 +1228,6 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) // bleibt bei pOtherCols, pOtherRows } - // Change-Actions erzeugen // 1) Spalten von rechts // 2) Zeilen von unten @@ -1353,6 +1344,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 d89be232d223..85fa41378ffe 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> @@ -572,7 +571,6 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode, } } - void ScDocument::SetChartRangeList( const OUString& rChartName, const ScRangeListRef& rNewRangeListRef ) { @@ -618,7 +616,6 @@ void ScDocument::SetChartRangeList( const OUString& rChartName, } } - bool ScDocument::HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) @@ -783,5 +780,4 @@ void ScDocument::AddOLEObjectToCollection(const OUString& rName) rNonOleObjects.insert(rName); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index 22b6c77cb7fe..a9a51fdfe94b 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -37,11 +37,9 @@ using namespace com::sun::star; - // this file is compiled with exceptions enabled // 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 a4897d7f266d..d973fc73c2a1 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -41,7 +41,6 @@ #include <tools/shl.hxx> - #include "globstr.hrc" extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkAround @@ -56,7 +55,6 @@ void ScDocument::StartListeningArea( const ScRange& rRange, pBASM->StartListeningArea( rRange, pListener ); } - void ScDocument::EndListeningArea( const ScRange& rRange, SvtListener* pListener ) @@ -201,7 +199,6 @@ void ScDocument::AreaBroadcast( const ScHint& rHint ) } } - void ScDocument::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) { if ( !pBASM ) @@ -250,7 +247,6 @@ void ScDocument::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHin } } - void ScDocument::DelBroadcastAreasInRange( const ScRange& rRange ) { if ( pBASM ) @@ -323,7 +319,6 @@ void ScDocument::PutInFormulaTree( ScFormulaCell* pCell ) nFormulaCodeInTree += pCell->GetCode()->GetCodeLen(); } - void ScDocument::RemoveFromFormulaTree( ScFormulaCell* pCell ) { OSL_ENSURE( pCell, "RemoveFromFormulaTree: pCell Null" ); @@ -358,13 +353,11 @@ void ScDocument::RemoveFromFormulaTree( ScFormulaCell* pCell ) } } - bool ScDocument::IsInFormulaTree( ScFormulaCell* pCell ) const { return pCell->GetPrevious() || pFormulaTree == pCell; } - void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSetAllDirty ) { OSL_ENSURE( !IsCalculatingFormulaTree(), "CalcFormulaTree recursion" ); @@ -475,7 +468,6 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSet mpFormulaGroupCxt.reset(); } - void ScDocument::ClearFormulaTree() { ScFormulaCell* pCell; @@ -489,7 +481,6 @@ void ScDocument::ClearFormulaTree() } } - void ScDocument::AppendToFormulaTrack( ScFormulaCell* pCell ) { OSL_ENSURE( pCell, "AppendToFormulaTrack: pCell Null" ); @@ -506,7 +497,6 @@ void ScDocument::AppendToFormulaTrack( ScFormulaCell* pCell ) ++nFormulaTrackCount; } - void ScDocument::RemoveFromFormulaTrack( ScFormulaCell* pCell ) { OSL_ENSURE( pCell, "RemoveFromFormulaTrack: pCell Null" ); @@ -529,13 +519,11 @@ void ScDocument::RemoveFromFormulaTrack( ScFormulaCell* pCell ) } } - bool ScDocument::IsInFormulaTrack( ScFormulaCell* pCell ) const { return pCell->GetPreviousTrack() || pFormulaTrack == pCell; } - /* Der erste wird gebroadcastet, die dadurch entstehenden werden durch das Notify an den Track gehaengt. @@ -599,7 +587,6 @@ void ScDocument::TrackFormulas( sal_uLong nHintId ) OSL_ENSURE( nFormulaTrackCount==0, "TrackFormulas: nFormulaTrackCount!=0" ); } - void ScDocument::StartAllListeners() { for ( SCTAB i = 0; i < static_cast<SCTAB>(maTabs.size()); ++i ) diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 54f1508f9298..584c1f543b49 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -1184,7 +1184,6 @@ SfxBindings* ScDocument::GetViewBindings() return NULL; } - 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 c9fe85bdd7f3..b1ccc46de75f 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -307,7 +307,6 @@ bool ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* p return false; } - void ScDocument::StartAnimations( SCTAB nTab, Window* pWin ) { if (!pDrawLayer) @@ -334,7 +333,6 @@ void ScDocument::StartAnimations( SCTAB nTab, Window* pWin ) } } - bool ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ) const { // Gibt es Objekte auf dem Hintergrund-Layer, die (teilweise) von rMMRect diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index fa71aa0d3c66..30b9a75c5a2b 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -300,7 +300,6 @@ void ScDocument::SetAnonymousDBData(SCTAB nTab, ScDBData* pDBData) maTabs[nTab]->SetAnonymousDBData(pDBData); } - bool ScDocument::ValidTabName( const OUString& rName ) { if (rName.isEmpty()) @@ -340,7 +339,6 @@ bool ScDocument::ValidTabName( const OUString& rName ) return true; } - bool ScDocument::ValidNewTabName( const OUString& rName ) const { bool bValid = ValidTabName(rName); @@ -355,7 +353,6 @@ bool ScDocument::ValidNewTabName( const OUString& rName ) const return bValid; } - void ScDocument::CreateValidTabName(OUString& rName) const { if ( !ValidTabName(rName) ) @@ -564,7 +561,6 @@ bool ScDocument::InsertTab( return bValid; } - bool ScDocument::InsertTabs( SCTAB nPos, const std::vector<OUString>& rNames, bool bExternalDocument, bool bNamesValid ) { @@ -654,7 +650,6 @@ bool ScDocument::InsertTabs( SCTAB nPos, const std::vector<OUString>& rNames, return bValid; } - bool ScDocument::DeleteTab( SCTAB nTab ) { bool bValid = false; @@ -740,7 +735,6 @@ bool ScDocument::DeleteTab( SCTAB nTab ) return bValid; } - bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets ) { bool bValid = false; @@ -831,7 +825,6 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets ) return bValid; } - bool ScDocument::RenameTab( SCTAB nTab, const OUString& rName, bool /* bUpdateRef */, bool bExternalDocument ) { @@ -872,7 +865,6 @@ bool ScDocument::RenameTab( SCTAB nTab, const OUString& rName, bool /* bUpdateRe return bValid; } - void ScDocument::SetVisible( SCTAB nTab, bool bVisible ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size())) @@ -880,7 +872,6 @@ void ScDocument::SetVisible( SCTAB nTab, bool bVisible ) maTabs[nTab]->SetVisible(bVisible); } - bool ScDocument::IsVisible( SCTAB nTab ) const { if (ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size())) @@ -890,7 +881,6 @@ bool ScDocument::IsVisible( SCTAB nTab ) const return false; } - bool ScDocument::IsStreamValid( SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) @@ -899,20 +889,17 @@ bool ScDocument::IsStreamValid( SCTAB nTab ) const return false; } - void ScDocument::SetStreamValid( SCTAB nTab, bool bSet, bool bIgnoreLock ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->SetStreamValid( bSet, bIgnoreLock ); } - void ScDocument::LockStreamValid( bool bLock ) { mbStreamValidLocked = bLock; } - bool ScDocument::IsPendingRowHeights( SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) @@ -921,14 +908,12 @@ bool ScDocument::IsPendingRowHeights( SCTAB nTab ) const return false; } - void ScDocument::SetPendingRowHeights( SCTAB nTab, bool bSet ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->SetPendingRowHeights( bSet ); } - void ScDocument::SetLayoutRTL( SCTAB nTab, bool bRTL ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) @@ -973,7 +958,6 @@ void ScDocument::SetLayoutRTL( SCTAB nTab, bool bRTL ) } } - bool ScDocument::IsLayoutRTL( SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) @@ -982,7 +966,6 @@ bool ScDocument::IsLayoutRTL( SCTAB nTab ) const return false; } - bool ScDocument::IsNegativePage( SCTAB nTab ) const { // Negative page area is always used for RTL layout. @@ -990,7 +973,6 @@ bool ScDocument::IsNegativePage( SCTAB nTab ) const return IsLayoutRTL( nTab ); } - /* ---------------------------------------------------------------------------- used search area: @@ -1000,7 +982,6 @@ bool ScDocument::IsNegativePage( SCTAB nTab ) const sweeps attributes all the way to bottom / right ---------------------------------------------------------------------------- */ - bool ScDocument::GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const { if (ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size())) @@ -1012,7 +993,6 @@ bool ScDocument::GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const return false; } - bool ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const { if (ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size())) @@ -1084,7 +1064,6 @@ void ScDocument::GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, maTabs[nTab]->GetDataArea( rStartCol, rStartRow, rEndCol, rEndRow, bIncludeOld, bOnlyDown ); } - void ScDocument::LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ) { @@ -1093,7 +1072,6 @@ void ScDocument::LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, maTabs[nTab]->LimitChartArea( rStartCol, rStartRow, rEndCol, rEndRow ); } - void ScDocument::LimitChartIfAll( ScRangeListRef& rRangeList ) { ScRangeListRef aNew = new ScRangeList; @@ -1127,7 +1105,6 @@ void ScDocument::LimitChartIfAll( ScRangeListRef& rRangeList ) rRangeList = aNew; } - static void lcl_GetFirstTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMarkData* pTabMark, SCTAB aMaxTab ) { // without ScMarkData, leave start/end unchanged @@ -1164,7 +1141,6 @@ static bool lcl_GetNextTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, con return false; } - bool ScDocument::CanInsertRow( const ScRange& rRange ) const { SCCOL nStartCol = rRange.aStart.Col(); @@ -1310,7 +1286,6 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab, return bRet; } - bool ScDocument::InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc ) { return InsertRow( rRange.aStart.Col(), rRange.aStart.Tab(), @@ -1319,7 +1294,6 @@ bool ScDocument::InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc ) pRefUndoDoc ); } - void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, @@ -1402,7 +1376,6 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab, pChartListenerCollection->UpdateDirtyCharts(); } - void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, bool* pUndoOutline ) { DeleteRow( rRange.aStart.Col(), rRange.aStart.Tab(), @@ -1411,7 +1384,6 @@ void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, bool pRefUndoDoc, pUndoOutline ); } - bool ScDocument::CanInsertCol( const ScRange& rRange ) const { SCCOL nStartCol = rRange.aStart.Col(); @@ -1511,7 +1483,6 @@ bool ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab, return bRet; } - bool ScDocument::InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc ) { return InsertCol( rRange.aStart.Row(), rRange.aStart.Tab(), @@ -1520,7 +1491,6 @@ bool ScDocument::InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc ) pRefUndoDoc ); } - void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc, bool* pUndoOutline, const ScMarkData* pTabMark ) @@ -1601,7 +1571,6 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA pChartListenerCollection->UpdateDirtyCharts(); } - void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, bool* pUndoOutline ) { DeleteCol( rRange.aStart.Row(), rRange.aStart.Tab(), @@ -1610,11 +1579,9 @@ void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, bool pRefUndoDoc, pUndoOutline ); } - // fuer Area-Links: Zellen einuegen/loeschen, wenn sich der Bereich veraendert // (ohne Paint) - static void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew, ScRange& rColRange, bool& rInsCol, bool& rDelCol, ScRange& rRowRange, bool& rInsRow, bool& rDelRow ) @@ -1663,7 +1630,6 @@ static void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew, } } - bool ScDocument::HasPartOfMerged( const ScRange& rRange ) { bool bPart = false; @@ -1763,7 +1729,6 @@ bool ScDocument::CanFitBlock( const ScRange& rOld, const ScRange& rNew ) return bOk; } - void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, bool bClear ) { if (bClear) @@ -1796,7 +1761,6 @@ void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, bool bClear } } - void ScDocument::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, sal_uInt16 nDelFlag) @@ -1812,7 +1776,6 @@ void ScDocument::DeleteArea(SCCOL nCol1, SCROW nRow1, SetAutoCalc( bOldAutoCalc ); } - void ScDocument::DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, sal_uInt16 nDelFlag) @@ -1828,7 +1791,6 @@ void ScDocument::DeleteAreaTab(SCCOL nCol1, SCROW nRow1, } } - void ScDocument::DeleteAreaTab( const ScRange& rRange, sal_uInt16 nDelFlag ) { for ( SCTAB nTab = rRange.aStart.Tab(); nTab <= rRange.aEnd.Tab(); nTab++ ) @@ -1837,7 +1799,6 @@ void ScDocument::DeleteAreaTab( const ScRange& rRange, sal_uInt16 nDelFlag ) nTab, nDelFlag ); } - void ScDocument::InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection, bool bColInfo, bool bRowInfo ) { @@ -1871,7 +1832,6 @@ void ScDocument::InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSe } } - void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2, bool bColInfo, bool bRowInfo ) { @@ -1900,7 +1860,6 @@ void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2, } } - void ScDocument::AddUndoTab( SCTAB nTab1, SCTAB nTab2, bool bColInfo, bool bRowInfo ) { if (bIsUndo) @@ -1923,7 +1882,6 @@ void ScDocument::AddUndoTab( SCTAB nTab1, SCTAB nTab2, bool bColInfo, bool bRowI } } - void ScDocument::SetCutMode( bool bVal ) { if (bIsClip) @@ -1934,7 +1892,6 @@ void ScDocument::SetCutMode( bool bVal ) } } - bool ScDocument::IsCutMode() { if (bIsClip) @@ -1946,7 +1903,6 @@ bool ScDocument::IsCutMode() } } - void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt16 nFlags, bool bOnlyMarked, ScDocument* pDestDoc, @@ -1974,7 +1930,6 @@ void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } } - void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt16 nFlags, bool bOnlyMarked, ScDocument* pDestDoc, @@ -2005,7 +1960,6 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } } - void ScDocument::CopyToDocument(const ScRange& rRange, sal_uInt16 nFlags, bool bOnlyMarked, ScDocument* pDestDoc, const ScMarkData* pMarks, bool bColRowFlags) @@ -2032,7 +1986,6 @@ void ScDocument::CopyToDocument(const ScRange& rRange, pDestDoc->SetAutoCalc( bOldAutoCalc ); } - void ScDocument::UndoToDocument(const ScRange& rRange, sal_uInt16 nFlags, bool bOnlyMarked, ScDocument* pDestDoc, const ScMarkData* pMarks) @@ -2231,7 +2184,6 @@ void ScDocument::CopyTabToClip(SCCOL nCol1, SCROW nRow1, } } - void ScDocument::TransposeClip( ScDocument* pTransClip, sal_uInt16 nFlags, bool bAsLink ) { OSL_ENSURE( bIsClip && pTransClip && pTransClip->bIsClip, @@ -2456,7 +2408,6 @@ bool ScDocument::IsClipboardSource() const xPoolHelper->GetDocPool() == pClipDoc->xPoolHelper->GetDocPool(); } - void ScDocument::StartListeningFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, sal_uInt16 nInsFlag ) @@ -2472,7 +2423,6 @@ void ScDocument::StartListeningFromClip( SCCOL nCol1, SCROW nRow1, } } - void ScDocument::BroadcastFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, sal_uInt16 nInsFlag ) @@ -2581,7 +2531,6 @@ void ScDocument::CopyBlockFromClip( } } - void ScDocument::CopyNonFilteredFromClip( sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, SCsCOL nDx, SCROW & rClipStartRow ) @@ -2629,7 +2578,6 @@ void ScDocument::CopyNonFilteredFromClip( rClipStartRow = nSourceRow; } - void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, sal_uInt16 nInsFlag, ScDocument* pRefUndoDoc, ScDocument* pClipDoc, bool bResetCut, @@ -2929,7 +2877,6 @@ void ScDocument::SetClipArea( const ScRange& rArea, bool bCut ) } } - void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, bool bIncludeFiltered) { if (!bIsClip) @@ -2982,7 +2929,6 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, bool bIncludeFiltered } } - void ScDocument::GetClipStart(SCCOL& nClipX, SCROW& nClipY) { if (bIsClip) @@ -3000,7 +2946,6 @@ void ScDocument::GetClipStart(SCCOL& nClipX, SCROW& nClipY) } } - bool ScDocument::HasClipFilteredRows() { // count on first used table in clipboard @@ -3022,7 +2967,6 @@ bool ScDocument::HasClipFilteredRows() return false; } - void ScDocument::MixDocument( const ScRange& rRange, sal_uInt16 nFunction, bool bSkipEmpty, ScDocument* pSrcDoc ) { @@ -3043,7 +2987,6 @@ void ScDocument::MixDocument( const ScRange& rRange, sal_uInt16 nFunction, bool } } - void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink ) @@ -3107,7 +3050,6 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, } } - void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink ) @@ -3170,7 +3112,6 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, } } - bool ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rString, ScSetStringParam* pParam ) { @@ -3376,7 +3317,6 @@ sal_uInt16 ScDocument::GetStringForFormula( const ScAddress& rPos, OUString& rSt return nErr; } - void ScDocument::GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue ) const { if (TableExists(nTab)) @@ -3486,7 +3426,6 @@ void ScDocument::GetNumberFormatInfo( short& nType, sal_uLong& nIndex, } } - void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rFormula ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3495,7 +3434,6 @@ void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rForm rFormula = OUString(); } - const ScFormulaCell* ScDocument::GetFormulaCell( const ScAddress& rPos ) const { if (!TableExists(rPos.Tab())) @@ -3520,7 +3458,6 @@ CellType ScDocument::GetCellType( const ScAddress& rPos ) const return CELLTYPE_NONE; } - void ScDocument::GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab, CellType& rCellType ) const { @@ -3538,7 +3475,6 @@ bool ScDocument::HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const return false; } - bool ScDocument::HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3570,7 +3506,6 @@ bool ScDocument::HasStringCells( const ScRange& rRange ) const return false; } - bool ScDocument::HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { sal_uInt32 nValidation = static_cast< const SfxUInt32Item* >( GetAttr( nCol, nRow, nTab, ATTR_VALIDDATA ) )->GetValue(); @@ -3583,7 +3518,6 @@ bool ScDocument::HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const return HasStringCells( ScRange( nCol, 0, nTab, nCol, MAXROW, nTab ) ); } - void ScDocument::SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt ) { bool bOldAutoCalc = GetAutoCalc(); @@ -3605,7 +3539,6 @@ void ScDocument::SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt ) SetAutoCalc( bOldAutoCalc ); } - void ScDocument::SetDirty( const ScRange& rRange ) { bool bOldAutoCalc = GetAutoCalc(); @@ -3619,7 +3552,6 @@ void ScDocument::SetDirty( const ScRange& rRange ) SetAutoCalc( bOldAutoCalc ); } - void ScDocument::SetTableOpDirty( const ScRange& rRange ) { bool bOldAutoCalc = GetAutoCalc(); @@ -3654,7 +3586,6 @@ void ScDocument::InterpretDirtyCells( const ScRangeList& rRanges ) mpFormulaGroupCxt.reset(); } - void ScDocument::AddTableOpFormulaCell( ScFormulaCell* pCell ) { if ( !aTableOpList.empty() ) @@ -3675,7 +3606,6 @@ void ScDocument::AddTableOpFormulaCell( ScFormulaCell* pCell ) } } - void ScDocument::CalcAll() { ClearFormulaContext(); @@ -3691,7 +3621,6 @@ void ScDocument::CalcAll() ClearFormulaTree(); } - void ScDocument::CompileAll() { sc::CompileFormulaContext aCxt(this); @@ -3704,7 +3633,6 @@ void ScDocument::CompileAll() SetAllFormulasDirty(aFormulaDirtyCxt); } - void ScDocument::CompileXML() { bool bOldAutoCalc = GetAutoCalc(); @@ -3787,7 +3715,6 @@ void ScDocument::CalcAfterLoad() } } - sal_uInt16 ScDocument::GetErrCode( const ScAddress& rPos ) const { SCTAB nTab = rPos.Tab(); @@ -3796,7 +3723,6 @@ sal_uInt16 ScDocument::GetErrCode( const ScAddress& rPos ) const return 0; } - void ScDocument::ResetChanged( const ScRange& rRange ) { SCTAB nTabSize = static_cast<SCTAB>(maTabs.size()); @@ -3807,7 +3733,6 @@ void ScDocument::ResetChanged( const ScRange& rRange ) maTabs[nTab]->ResetChanged(rRange); } - // Spaltenbreiten / Zeilenhoehen -------------------------------------- void ScDocument::SetColWidth( SCCOL nCol, SCTAB nTab, sal_uInt16 nNewWidth ) @@ -3828,7 +3753,6 @@ void ScDocument::SetRowHeight( SCROW nRow, SCTAB nTab, sal_uInt16 nNewHeight ) maTabs[nTab]->SetRowHeight( nRow, nNewHeight ); } - void ScDocument::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt16 nNewHeight ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3848,7 +3772,6 @@ void ScDocument::SetManualHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bo maTabs[nTab]->SetManualHeight( nStartRow, nEndRow, bManual ); } - sal_uInt16 ScDocument::GetColWidth( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3857,7 +3780,6 @@ sal_uInt16 ScDocument::GetColWidth( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) return 0; } - sal_uInt16 ScDocument::GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3866,7 +3788,6 @@ sal_uInt16 ScDocument::GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const return 0; } - sal_uInt16 ScDocument::GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3875,7 +3796,6 @@ sal_uInt16 ScDocument::GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const return 0; } - sal_uInt16 ScDocument::GetOriginalHeight( SCROW nRow, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3884,7 +3804,6 @@ sal_uInt16 ScDocument::GetOriginalHeight( SCROW nRow, SCTAB nTab ) const return 0; } - sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3893,7 +3812,6 @@ sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero return 0; } - sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3902,7 +3820,6 @@ sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, S return 0; } - sal_uLong ScDocument::GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bHiddenAsZero ) const { if (nStartRow == nEndRow) @@ -3950,7 +3867,6 @@ SCROW ScDocument::GetHiddenRowCount( SCROW nRow, SCTAB nTab ) const return 0; } - sal_uLong ScDocument::GetColOffset( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3959,7 +3875,6 @@ sal_uLong ScDocument::GetColOffset( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) return 0; } - sal_uLong ScDocument::GetRowOffset( SCROW nRow, SCTAB nTab, bool bHiddenAsZero ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3968,7 +3883,6 @@ sal_uLong ScDocument::GetRowOffset( SCROW nRow, SCTAB nTab, bool bHiddenAsZero ) return 0; } - sal_uInt16 ScDocument::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, @@ -3982,7 +3896,6 @@ sal_uInt16 ScDocument::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* return 0; } - long ScDocument::GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, @@ -3996,7 +3909,6 @@ long ScDocument::GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, return 0; } - bool ScDocument::SetOptimalHeight( sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) { ScTable* pTab = FetchTable(nTab); @@ -4006,7 +3918,6 @@ bool ScDocument::SetOptimalHeight( sc::RowHeightContext& rCxt, SCROW nStartRow, return pTab->SetOptimalHeight(rCxt, nStartRow, nEndRow); } - void ScDocument::UpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkData* pTabMark ) { // one progress across all (selected) sheets @@ -4030,42 +3941,36 @@ void ScDocument::UpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkDa // Spalten-/Zeilen-Flags ---------------------------------------------- - void ScDocument::ShowCol(SCCOL nCol, SCTAB nTab, bool bShow) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->ShowCol( nCol, bShow ); } - void ScDocument::ShowRow(SCROW nRow, SCTAB nTab, bool bShow) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->ShowRow( nRow, bShow ); } - void ScDocument::ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, bool bShow) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->ShowRows( nRow1, nRow2, bShow ); } - void ScDocument::SetRowFlags( SCROW nRow, SCTAB nTab, sal_uInt8 nNewFlags ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->SetRowFlags( nRow, nNewFlags ); } - void ScDocument::SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt8 nNewFlags ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->SetRowFlags( nStartRow, nEndRow, nNewFlags ); } - sal_uInt8 ScDocument::GetColFlags( SCCOL nCol, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4269,7 +4174,6 @@ void ScDocument::SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool maTabs[nTab]->SetRowFiltered(nStartRow, nEndRow, bFiltered); } - SCROW ScDocument::FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const { if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) || !maTabs[nTab]) @@ -4319,7 +4223,6 @@ SCROW ScDocument::GetLastFlaggedRow( SCTAB nTab ) const return 0; } - SCCOL ScDocument::GetLastChangedCol( SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4334,7 +4237,6 @@ SCROW ScDocument::GetLastChangedRow( SCTAB nTab ) const return 0; } - SCCOL ScDocument::GetNextDifferentChangedCol( SCTAB nTab, SCCOL nStart) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4454,17 +4356,14 @@ void ScDocument::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SC maTabs[nTab]->StripHidden( rX1, rY1, rX2, rY2 ); } - void ScDocument::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ) { if ( ValidTab(nTab) && maTabs[nTab] ) maTabs[nTab]->ExtendHidden( rX1, rY1, rX2, rY2 ); } - // Attribute ---------------------------------------------------------- - const SfxPoolItem* ScDocument::GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4507,22 +4406,18 @@ const ScPatternAttr* ScDocument::GetMostUsedPattern( SCCOL nCol, SCROW nStartRow return NULL; } - - void ScDocument::ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, const SfxPoolItem& rAttr ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->ApplyAttr( nCol, nRow, rAttr ); } - void ScDocument::ApplyPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->ApplyPattern( nCol, nRow, rAttr ); } - void ScDocument::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark, @@ -4536,7 +4431,6 @@ void ScDocument::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, maTabs[*itr]->ApplyPatternArea( nStartCol, nStartRow, nEndCol, nEndRow, rAttr, pDataArray ); } - void ScDocument::ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, const ScPatternAttr& rAttr ) { @@ -4585,7 +4479,6 @@ void ScDocument::RemoveCondFormatData( const ScRangeList& rRange, SCTAB nTab, sa maTabs[nTab]->RemoveCondFormatData(rRange, nIndex); } - void ScDocument::ApplyStyle( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScStyleSheet& rStyle) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size())) @@ -4593,7 +4486,6 @@ void ScDocument::ApplyStyle( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScStyleSh maTabs[nTab]->ApplyStyle( nCol, nRow, rStyle ); } - void ScDocument::ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark, @@ -4606,7 +4498,6 @@ void ScDocument::ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, maTabs[*itr]->ApplyStyleArea( nStartCol, nStartRow, nEndCol, nEndRow, rStyle ); } - void ScDocument::ApplyStyleAreaTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, const ScStyleSheet& rStyle) { @@ -4615,7 +4506,6 @@ void ScDocument::ApplyStyleAreaTab( SCCOL nStartCol, SCROW nStartRow, maTabs[nTab]->ApplyStyleArea( nStartCol, nStartRow, nEndCol, nEndRow, rStyle ); } - void ScDocument::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark) { // ApplySelectionStyle needs multi mark @@ -4636,7 +4526,6 @@ void ScDocument::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkDat } } - void ScDocument::ApplySelectionLineStyle( const ScMarkData& rMark, const SvxBorderLine* pLine, bool bColorOnly ) { @@ -4650,7 +4539,6 @@ void ScDocument::ApplySelectionLineStyle( const ScMarkData& rMark, maTabs[*itr]->ApplySelectionLineStyle( rMark, pLine, bColorOnly ); } - const ScStyleSheet* ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4659,7 +4547,6 @@ const ScStyleSheet* ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) c return NULL; } - const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) const { bool bEqual = true; @@ -4706,7 +4593,6 @@ const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) con return bEqual ? pStyle : NULL; } - void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, @@ -4725,7 +4611,6 @@ void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool b } } - bool ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const { if ( bStyleSheetUsageInvalid || rStyle.GetUsage() == ScStyleSheet::UNKNOWN ) @@ -4766,7 +4651,6 @@ bool ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllSt return rStyle.GetUsage() == ScStyleSheet::USED; } - bool ScDocument::ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, sal_Int16 nFlags ) { @@ -4778,7 +4662,6 @@ bool ScDocument::ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, return false; } - bool ScDocument::RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, sal_Int16 nFlags ) { @@ -4790,7 +4673,6 @@ bool ScDocument::RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, return false; } - void ScDocument::SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr, bool bPutToPool ) { @@ -4799,7 +4681,6 @@ void ScDocument::SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPattern maTabs[nTab]->SetPattern( nCol, nRow, rAttr, bPutToPool ); } - void ScDocument::SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, bool bPutToPool ) { @@ -4808,7 +4689,6 @@ void ScDocument::SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, maTabs[nTab]->SetPattern( rPos, rAttr, bPutToPool ); } - ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, bool bDeep ) { ScMergePatternState aState; @@ -4841,7 +4721,6 @@ ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, bool return new ScPatternAttr( GetPool() ); // empty } - const ScPatternAttr* ScDocument::GetSelectionPattern( const ScMarkData& rMark, bool bDeep ) { delete pSelectionAttr; @@ -4849,7 +4728,6 @@ const ScPatternAttr* ScDocument::GetSelectionPattern( const ScMarkData& rMark, b return pSelectionAttr; } - void ScDocument::GetSelectionFrame( const ScMarkData& rMark, SvxBoxItem& rLineOuter, SvxBoxInfoItem& rLineInner ) @@ -4893,7 +4771,6 @@ void ScDocument::GetSelectionFrame( const ScMarkData& rMark, rLineInner.SetValid( VALID_VERT, ( aFlags.nVert != SC_LINE_DONTCARE ) ); } - bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt16 nMask ) const { @@ -5058,7 +4935,6 @@ bool ScDocument::IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, return false; } - void ScDocument::LockTable(SCTAB nTab) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -5069,7 +4945,6 @@ void ScDocument::LockTable(SCTAB nTab) } } - void ScDocument::UnlockTable(SCTAB nTab) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -5080,7 +4955,6 @@ void ScDocument::UnlockTable(SCTAB nTab) } } - bool ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const @@ -5104,7 +4978,6 @@ bool ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, return false; } - bool ScDocument::IsSelectionEditable( const ScMarkData& rMark, bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const { @@ -5156,7 +5029,6 @@ bool ScDocument::IsSelectionEditable( const ScMarkData& rMark, return bOk; } - bool ScDocument::HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) const @@ -5222,7 +5094,6 @@ bool ScDocument::GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMat return true; } - bool ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ) const { @@ -5305,7 +5176,6 @@ bool ScDocument::ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow, return bFound; } - bool ScDocument::ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, SCTAB nTab, bool bRefresh ) @@ -5327,7 +5197,6 @@ bool ScDocument::ExtendMerge( SCCOL nStartCol, SCROW nStartRow, return bFound; } - bool ScDocument::ExtendMerge( ScRange& rRange, bool bRefresh ) { bool bFound = false; @@ -5495,7 +5364,6 @@ bool ScDocument::IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const } } - bool ScDocument::IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { const ScMergeFlagAttr* pAttr = (const ScMergeFlagAttr*) @@ -5509,7 +5377,6 @@ bool ScDocument::IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const } } - void ScDocument::ApplySelectionFrame( const ScMarkData& rMark, const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner ) @@ -5534,7 +5401,6 @@ void ScDocument::ApplySelectionFrame( const ScMarkData& rMark, } } - void ScDocument::ApplyFrameAreaTab( const ScRange& rRange, const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner ) @@ -5548,7 +5414,6 @@ void ScDocument::ApplyFrameAreaTab( const ScRange& rRange, rRange.aEnd.Col(), rRange.aEnd.Row() ); } - void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark, ScEditDataArray* pDataArray ) { const SfxItemSet* pSet = &rAttr.GetItemSet(); @@ -5580,7 +5445,6 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark } } - void ScDocument::ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark ) { SCTAB nMax = static_cast<SCTAB>(maTabs.size()); @@ -5590,7 +5454,6 @@ void ScDocument::ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark maTabs[*itr]->ChangeSelectionIndent( bIncrement, rMark ); } - void ScDocument::ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark ) { SCTAB nMax = static_cast<SCTAB>(maTabs.size()); @@ -5600,7 +5463,6 @@ void ScDocument::ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData maTabs[*itr]->ClearSelectionItems( pWhich, rMark ); } - void ScDocument::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bool bBroadcast ) { SCTAB nMax = static_cast<SCTAB>(maTabs.size()); @@ -5610,7 +5472,6 @@ void ScDocument::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, maTabs[*itr]->DeleteSelection(nDelFlag, rMark, bBroadcast); } - void ScDocument::DeleteSelectionTab( SCTAB nTab, sal_uInt16 nDelFlag, const ScMarkData& rMark, bool bBroadcast ) { @@ -5622,13 +5483,11 @@ void ScDocument::DeleteSelectionTab( } } - ScPatternAttr* ScDocument::GetDefPattern() const { return (ScPatternAttr*) &xPoolHelper->GetDocPool()->GetDefaultItem(ATTR_PATTERN); } - ScDocumentPool* ScDocument::GetPool() { return xPoolHelper->GetDocPool(); @@ -5639,7 +5498,6 @@ ScStyleSheetPool* ScDocument::GetStyleSheetPool() const return xPoolHelper->GetStylePool(); } - SCSIZE ScDocument::GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab, ScDirection eDir ) { @@ -5657,14 +5515,12 @@ SCSIZE ScDocument::GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, SCTAB return 0; } - void ScDocument::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, ScMoveDirection eDirection ) const { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->FindAreaPos( rCol, rRow, eDirection ); } - void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY, bool bMarked, bool bUnprotected, const ScMarkData& rMark ) const { @@ -5678,7 +5534,6 @@ void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, maTabs[nTab]->GetNextPos( rCol, rRow, nMovX, nMovY, bMarked, bUnprotected, aCopyMark ); } - // Datei-Operationen void ScDocument::UpdStlShtPtrsFrmNms() @@ -5698,7 +5553,6 @@ void ScDocument::UpdStlShtPtrsFrmNms() ((ScPatternAttr&)pPool->GetDefaultItem(ATTR_PATTERN)).UpdateStyleSheet(); } - void ScDocument::StylesToNames() { ScPatternAttr::pDoc = this; @@ -5716,7 +5570,6 @@ void ScDocument::StylesToNames() ((ScPatternAttr&)pPool->GetDefaultItem(ATTR_PATTERN)).StyleToName(); } - sal_uLong ScDocument::GetCellCount() const { sal_uLong nCellCount = 0L; @@ -5741,21 +5594,18 @@ sal_uLong ScDocument::GetCodeCount() const return nCodeCount; } - void ScDocument::PageStyleModified( SCTAB nTab, const OUString& rNewName ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->PageStyleModified( rNewName ); } - void ScDocument::SetPageStyle( SCTAB nTab, const OUString& rName ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->SetPageStyle( rName ); } - const OUString ScDocument::GetPageStyle( SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -5764,7 +5614,6 @@ const OUString ScDocument::GetPageStyle( SCTAB nTab ) const return OUString(); } - void ScDocument::SetPageSize( SCTAB nTab, const Size& rSize ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -5780,7 +5629,6 @@ Size ScDocument::GetPageSize( SCTAB nTab ) const return Size(); } - void ScDocument::SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -5814,7 +5662,6 @@ bool ScDocument::HasManualBreaks( SCTAB nTab ) const return false; } - void ScDocument::GetDocStat( ScDocStat& rDocStat ) { rDocStat.nTableCount = GetTableCount(); @@ -5822,7 +5669,6 @@ void ScDocument::GetDocStat( ScDocStat& rDocStat ) rDocStat.nCellCount = GetCellCount(); } - bool ScDocument::HasPrintRange() { bool bResult = false; @@ -5835,13 +5681,11 @@ bool ScDocument::HasPrintRange() return bResult; } - bool ScDocument::IsPrintEntireSheet( SCTAB nTab ) const { return (ValidTab(nTab) ) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] && maTabs[nTab]->IsPrintEntireSheet(); } - sal_uInt16 ScDocument::GetPrintRangeCount( SCTAB nTab ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) @@ -5850,7 +5694,6 @@ sal_uInt16 ScDocument::GetPrintRangeCount( SCTAB nTab ) return 0; } - const ScRange* ScDocument::GetPrintRange( SCTAB nTab, sal_uInt16 nPos ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) @@ -5859,7 +5702,6 @@ const ScRange* ScDocument::GetPrintRange( SCTAB nTab, sal_uInt16 nPos ) return NULL; } - const ScRange* ScDocument::GetRepeatColRange( SCTAB nTab ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) @@ -5868,7 +5710,6 @@ const ScRange* ScDocument::GetRepeatColRange( SCTAB nTab ) return NULL; } - const ScRange* ScDocument::GetRepeatRowRange( SCTAB nTab ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) @@ -5877,42 +5718,36 @@ const ScRange* ScDocument::GetRepeatRowRange( SCTAB nTab ) return NULL; } - void ScDocument::ClearPrintRanges( SCTAB nTab ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->ClearPrintRanges(); } - void ScDocument::AddPrintRange( SCTAB nTab, const ScRange& rNew ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->AddPrintRange( rNew ); } - void ScDocument::SetPrintEntireSheet( SCTAB nTab ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->SetPrintEntireSheet(); } - void ScDocument::SetRepeatColRange( SCTAB nTab, const ScRange* pNew ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->SetRepeatColRange( pNew ); } - void ScDocument::SetRepeatRowRange( SCTAB nTab, const ScRange* pNew ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->SetRepeatRowRange( pNew ); } - ScPrintRangeSaver* ScDocument::CreatePrintRangeSaver() const { SCTAB nCount = static_cast<SCTAB>(maTabs.size()); @@ -5923,7 +5758,6 @@ ScPrintRangeSaver* ScDocument::CreatePrintRangeSaver() const return pNew; } - void ScDocument::RestorePrintRanges( const ScPrintRangeSaver& rSaver ) { SCTAB nCount = rSaver.GetTabCount(); @@ -5932,7 +5766,6 @@ void ScDocument::RestorePrintRanges( const ScPrintRangeSaver& rSaver ) maTabs[i]->RestorePrintRanges( rSaver.GetTabData(i) ); } - bool ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const { // Die Seitennummern-Zaehlung faengt bei einer Tabelle neu an, wenn eine @@ -6079,7 +5912,6 @@ void ScDocument::EnableUndo( bool bVal ) mbUndoEnabled = bVal; } - void ScDocument::EnableUserInteraction( bool bVal ) { mbUserInteractionEnabled = bVal; diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx index a2aac0ac1a93..a1733629d790 100644 --- a/sc/source/core/data/document10.cxx +++ b/sc/source/core/data/document10.cxx @@ -239,7 +239,6 @@ void ScDocument::SetCalcConfig( const ScCalcConfig& rConfig ) maCalcConfig = rConfig; } - void ScDocument::PreprocessRangeNameUpdate() { sc::EndListeningContext aEndListenCxt(*this); diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index bf402f5beb4d..96435573617c 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -829,7 +829,6 @@ size_t ScDPCache::GetGroupFieldCount() const return maGroupFields.size(); } - SCROW ScDPCache::GetDataSize() const { OSL_ENSURE(mnDataSize <= GetRowCount(), "Data size should never be larger than the row count."); @@ -908,7 +907,6 @@ void ScDPCache::RemoveReference(ScDPObject* pObj) const mpDoc->GetDPCollection()->RemoveCache(this); } - SCROW ScDPCache::GetIdByItemData(long nDim, const ScDPItemData& rItem) const { if (nDim < 0) @@ -1148,7 +1146,6 @@ SCROW ScDPCache::GetOrder(long /*nDim*/, SCROW nIndex) const ; - #if DEBUG_PIVOT_TABLE namespace { diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 9deb8a92909d..7579a16923e5 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dpdimsave.hxx" #include "dpgroup.hxx" #include "dpobject.hxx" diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 1569034291ac..44efca627033 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -410,7 +410,6 @@ bool ScDPFilteredCache::isRowQualified(sal_Int32 nRow, const vector<Criterion>& return true; } - #if DEBUG_PIVOT_TABLE using std::cout; using std::endl; diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index 2b38717f54f5..f59a4ba97d08 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -434,7 +434,6 @@ void ScDPGroupDimension::SetDateDimension() mbDateDimension = true; } - ScDPNumGroupDimension::ScDPNumGroupDimension() : mbDateDimension(false) {} ScDPNumGroupDimension::ScDPNumGroupDimension( const ScDPNumGroupInfo& rInfo ) : @@ -456,7 +455,6 @@ void ScDPNumGroupDimension::DisposeData() maMemberEntries.clear(); } - ScDPNumGroupDimension::~ScDPNumGroupDimension() { } @@ -494,7 +492,6 @@ ScDPGroupTableData::~ScDPGroupTableData() delete[] pNumGroups; } - void ScDPGroupTableData::AddGroupDimension( const ScDPGroupDimension& rGroup ) { ScDPGroupDimension aNewGroup( rGroup ); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 98e6fa29a898..481541e3c881 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -408,7 +408,6 @@ void ScDPObject::SetHeaderLayout (bool bUseGrid) mbHeaderLayout = bUseGrid; } - void ScDPObject::SetOutRange(const ScRange& rRange) { aOutRange = rRange; @@ -1677,10 +1676,8 @@ bool ScDPObject::ParseFilters( std::vector<OUString> aFieldNames; // column/row/data fields std::vector< uno::Sequence<OUString> > aFieldValues; - // get all the field and item names - uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions(); uno::Reference<container::XIndexAccess> xIntDims = new ScNameToIndexAccess( xDimsName ); sal_Int32 nDimCount = xIntDims->getCount(); @@ -1744,10 +1741,8 @@ bool ScDPObject::ParseFilters( } } - // compare and build filters - SCSIZE nDataFields = aDataNames.size(); SCSIZE nFieldCount = aFieldNames.size(); OSL_ENSURE( aGivenNames.size() == nDataFields && aFieldValues.size() == nFieldCount, "wrong count" ); @@ -2465,7 +2460,6 @@ bool ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< return bRet; } - // convert old pivot tables into new datapilot tables namespace { @@ -3146,7 +3140,6 @@ uno::Reference<sdbc::XRowSet> ScDPCollection::DBCaches::createRowSet( return xRowSet; } - // set source parameters uno::Any aAny; @@ -3618,9 +3611,6 @@ bool ScDPCollection::InsertNewTable(ScDPObject* pDPObj) return true; } - - - ScRangeList ScDPCollection::GetAllTableRanges( SCTAB nTab ) const { return std::for_each(maTables.begin(), maTables.end(), AccumulateOutputRanges(nTab)).getRanges(); diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 0cec6affe9ac..a23110bf73f8 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -259,7 +259,6 @@ void ScDPOutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL else aBox.SetLine(&aLine, BOX_LINE_BOTTOM); - SvxBoxInfoItem aBoxInfo( ATTR_BORDER_INNER ); aBoxInfo.SetValid(VALID_VERT,false ); if ( bHori ) @@ -860,7 +859,6 @@ void ScDPOutput::FieldCell( pDoc->ApplyFlagsTab(nCol, nRow, nCol, nRow, nTab, nMergeFlag); } - lcl_SetStyleById( pDoc,nTab, nCol,nRow, nCol,nRow, STR_PIVOT_STYLE_FIELDNAME ); } @@ -1229,7 +1227,6 @@ void ScDPOutput::SetHeaderLayout(bool bUseGrid) bSizesValid = false; } - namespace { void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, sal_Int32& rDataLayoutIndex, @@ -1812,5 +1809,4 @@ bool ScDPOutput::GetHeaderDrag( const ScAddress& rPos, bool bMouseLeft, bool bMo return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 91fab1cca7e6..51b524f71246 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -865,7 +865,6 @@ const OUString* ScDPSaveData::GetGrandTotalName() const return mpGrandTotalName.get(); } - namespace { class DimOrderInserter : std::unary_function<const ScDPSaveDimension*, void> diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index efbdccf506ff..4cc16c51546e 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -85,7 +85,6 @@ long ScDatabaseDPData::GetColumnCount() return GetCacheTable().getColSize(); } - OUString ScDatabaseDPData::getDimensionName(long nColumn) { if (getIsDataLayoutDimension(nColumn)) @@ -160,5 +159,4 @@ void ScDatabaseDPData::ReloadCacheTable() CreateCacheTable(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 329dc7c49f49..679fbae307c5 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -252,7 +252,6 @@ void ScSheetSourceDesc::SetRangeName(const OUString& rName) maRangeName = rName; } - bool ScSheetSourceDesc::HasRangeName() const { return !maRangeName.isEmpty(); @@ -263,7 +262,6 @@ void ScSheetSourceDesc::SetQueryParam(const ScQueryParam& rParam) maQueryParam = rParam; } - bool ScSheetSourceDesc::operator== (const ScSheetSourceDesc& rOther) const { return maSourceRange == rOther.maSourceRange && diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 976c991099bf..154e266effcf 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -129,10 +129,8 @@ public: } - // function objects for sorting of the column and row members: - class ScDPRowMembersOrder { ScDPResultDimension& rDimension; @@ -315,10 +313,6 @@ ScDPRunningTotalState::ScDPRunningTotalState( ScDPResultMember* pColRoot, ScDPRe maRowSorted.push_back(-1); } - - - - void ScDPRunningTotalState::AddColIndex( long nVisible, long nSorted ) { maColVisible.back() = nVisible; @@ -891,7 +885,6 @@ bool ScDPResultData::HasCommonElement( SCROW nFirstDataId, long nFirstIndex, return false; } - ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDim, ScDPLevel* pLevel) const { if (nDim < static_cast<long>(maDimMembers.size()) && maDimMembers[nDim]) @@ -920,7 +913,6 @@ ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDi return maDimMembers[nDim]; } - ScDPResultMember::ScDPResultMember( const ScDPResultData* pData, const ScDPParentDimData& rParentDimData, bool bForceSub ) : pResultData( pData ), @@ -2315,10 +2307,8 @@ void ScDPDataMember::UpdateRunningTotals( long nRowPos = 0; long nColPos = 0; - // find the reference field in column or row dimensions - if ( bRefDimInRow ) // look in row dimensions { pSelectDim = rRunning.GetRowResRoot()->GetChildDimension(); @@ -2399,10 +2389,8 @@ void ScDPDataMember::UpdateRunningTotals( if ( !bRefDimInCol && !bRefDimInRow ) // invalid dimension specified bNoDetailsInRef = true; // pSelectDim is then already NULL - // get the member for the reference item and do the calculation - if ( bRunningTotal ) { // running total in (dimension) -> find first existing member @@ -2551,7 +2539,6 @@ void ScDPDataMember::UpdateRunningTotals( // set total values when they are encountered (always before their use) - ScDPAggData* pColTotalData = pRefMember->GetColTotal( nMemberMeasure ); ScDPAggData* pRowTotalData = rTotals.GetRowTotal( nMemberMeasure ); ScDPAggData* pGrandTotalData = rTotals.GetGrandTotal( nMemberMeasure ); @@ -2567,10 +2554,8 @@ void ScDPDataMember::UpdateRunningTotals( if ( rTotals.IsInColRoot() && pColTotalData ) pColTotalData->SetAuxiliary( fTotalValue ); - // find relation to total values - switch ( eRefType ) { case sheet::DataPilotFieldReferenceType::ROW_PERCENTAGE: diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 6490b2904554..dc10d439e2ee 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -805,7 +805,6 @@ void ScDPSource::CreateRes_Impl() ScDPTableData::CalcInfo aInfo; - // LateInit (initialize only those rows/children that are used) can be used unless // any data dimension needs reference values from column/row dimensions bool bLateInit = true; @@ -998,7 +997,6 @@ void ScDPSource::CreateRes_Impl() pRowResRoot->UpdateRunningTotals( pColResRoot, pResData->GetRowStartMeasure(), aRunning, aTotals ); } - void ScDPSource::FillLevelList( sal_uInt16 nOrientation, std::vector<ScDPLevel*> &rList ) { rList.clear(); @@ -1426,13 +1424,11 @@ bool ScDPDimension::getIsDataLayoutDimension() const return pSource->GetData()->getIsDataLayoutDimension( nDim ); } - void ScDPDimension::setFunction(sal_uInt16 nNew) { nFunction = nNew; } - void ScDPDimension::setUsedHierarchy(long /* nNew */) { // #i52547# don't use the incomplete date hierarchy implementation - ignore the call @@ -1458,7 +1454,6 @@ uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone() throw(uno return CreateCloneObject(); } - const ScDPItemData& ScDPDimension::GetSelectedData() { if ( !pSelectedData ) @@ -2195,7 +2190,6 @@ uno::Sequence<sheet::GeneralFunction> ScDPLevel::getSubTotals() const return aSubTotals; } - // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo() @@ -2431,7 +2425,6 @@ sal_Bool SAL_CALL ScDPMembers::hasElements() throw(uno::RuntimeException, std::e // end of XNameAccess implementation - long ScDPMembers::getMinMembers() const { // used in lcl_CountMinMembers @@ -2625,7 +2618,6 @@ const OUString* ScDPMember::GetLayoutName() const return mpLayoutName.get(); } - OUString ScDPMember::GetNameStr() const { const ScDPItemData* pData = GetItemData(); @@ -2644,8 +2636,6 @@ void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) throw(uno::R OSL_FAIL("not implemented"); //! exception? } - - // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo() @@ -2711,7 +2701,6 @@ uno::Any SAL_CALL ScDPMember::getPropertyValue( const OUString& aPropertyName ) SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPMember ) - const ScDPCache* ScDPSource::GetCache() { OSL_ENSURE( GetData() , "empty ScDPTableData pointer"); diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx index 63ac4fddac24..0c2eceed069e 100644 --- a/sc/source/core/data/drawpage.cxx +++ b/sc/source/core/data/drawpage.cxx @@ -41,5 +41,4 @@ ScDrawPage::~ScDrawPage() return static_cast<cppu::OWeakObject*>( new ScPageObj( this ) ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 073508af58cf..79c989ebd98d 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -182,7 +182,6 @@ static void lcl_ReverseTwipsToMM( Rectangle& rRect ) ReverseTwipsToMM( rRect.Bottom() ); } - ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : FmFormModel( SvtPathOptions().GetPalettePath(), NULL, // SfxItemPool* Pool @@ -1076,10 +1075,8 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR aTopLeft.Y() += aMove.Y(); } - // Detektiv-Pfeile: Zellpositionen anpassen - MoveCells( nTab, nCol1,nRow1, nCol2,nRow2, nDx,nDy, bUpdateNoteCaptionPos ); } @@ -1791,7 +1788,6 @@ void ScDrawLayer::SetCellAnchored( SdrObject &rObj, const ScDrawObjData &rAnchor pAnchor->maEndOffset = rAnchor.maEndOffset; } - void ScDrawLayer::SetCellAnchoredFromPosition( SdrObject &rObj, const ScDocument &rDoc, SCTAB nTab ) { ScDrawObjData aAnchor; @@ -1839,7 +1835,6 @@ void ScDrawLayer::GetCellAnchorFromPosition( SdrObject &rObj, ScDrawObjData &rAn } - void ScDrawLayer::UpdateCellAnchorFromPositionEnd( SdrObject &rObj, ScDrawObjData &rAnchor, const ScDocument &rDoc, SCTAB nTab, bool bUseLogicRect ) { Rectangle aObjRect(bUseLogicRect ? rObj.GetLogicRect() : rObj.GetSnapRect()); @@ -1976,7 +1971,6 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, if ( rGeo.nShearWink ) ShearPoint( aRelPoint, aLogRect.TopLeft(), -rGeo.nTan ); - if ( rGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL ) aGraphSize = rCmpWnd.PixelToLogic( rGraphic.GetPrefSize(), aMap100 ); diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index f30f8ab0e717..a6b7b90f62a0 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -44,7 +44,6 @@ const sal_uInt16 ROWINFO_MAX = 1024; - enum FillInfoLinePos { FILP_TOP, @@ -53,7 +52,6 @@ enum FillInfoLinePos FILP_RIGHT }; - // aehnlich wie in output.cxx static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, @@ -450,7 +448,6 @@ void ScDocument::FillInfo( SCSIZE nIndex; (void) pThisAttrArr->Search( nCurRow, nIndex ); - do { nThisRow=pThisAttrArr->pData[nIndex].nRow; // Ende des Bereichs @@ -613,7 +610,6 @@ void ScDocument::FillInfo( } while ( nIndex < pThisAttrArr->nCount && nThisRow < nYExtra ); - if (pMarkData && pMarkData->IsMultiMarked()) { // Blockmarken @@ -744,7 +740,6 @@ void ScDocument::FillInfo( // Daten von zusammengefassten Zellen anpassen - if (bAnyMerged) { for (nArrRow=0; nArrRow<nArrCount; nArrRow++) @@ -952,7 +947,6 @@ void ScDocument::FillInfo( rTabInfo.mnArrCount = sal::static_int_cast<sal_uInt16>(nArrCount); rTabInfo.mbPageMode = bPageMode; - // *** create the frame border array *** // RowInfo structs are filled in the range [ 0 , nArrCount-1 ] diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index ea2eadc8a7e9..f36eea3c149a 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -80,25 +80,21 @@ using std::deque; typedef SCCOLROW(*DimensionSelector)(const ScAddress&, const ScSingleRefData&); - static SCCOLROW lcl_GetCol(const ScAddress& rPos, const ScSingleRefData& rData) { return rData.toAbs(rPos).Col(); } - static SCCOLROW lcl_GetRow(const ScAddress& rPos, const ScSingleRefData& rData) { return rData.toAbs(rPos).Row(); } - static SCCOLROW lcl_GetTab(const ScAddress& rPos, const ScSingleRefData& rData) { return rData.toAbs(rPos).Tab(); } - /** Check if both references span the same range in selected dimension. */ static bool @@ -110,7 +106,6 @@ lcl_checkRangeDimension( aWhich(rPos, rRef1.Ref2) == aWhich(rPos, rRef2.Ref2); } - static bool lcl_checkRangeDimensions( const ScAddress& rPos, const SingleDoubleRefProvider& rRef1, const SingleDoubleRefProvider& rRef2, @@ -131,7 +126,6 @@ lcl_checkRangeDimensions( return false; } - /** Check if references in given reference list can possibly form a range. To do that, two of their dimensions must be the same. */ @@ -217,7 +211,6 @@ lcl_checkIfAdjacent( return std::equal(aBegin, aEnd, aBegin1, AdjacentByReference(rPos, aWhich)); } - static void lcl_fillRangeFromRefList( const ScAddress& aPos, const deque<ScToken*>& rReferences, ScRange& rRange) @@ -230,7 +223,6 @@ lcl_fillRangeFromRefList( rRange.aEnd = aEnd.toAbs(aPos); } - static bool lcl_refListFormsOneRange( const ScAddress& rPos, deque<ScToken*>& rReferences, @@ -277,7 +269,6 @@ lcl_refListFormsOneRange( return false; } - bool lcl_isReference(const FormulaToken& rToken) { return @@ -1001,8 +992,6 @@ void ScFormulaCell::SetNeedsDirty( bool bVar ) void ScFormulaCell::SetNeedNumberFormat( bool bVal ) { mbNeedsNumberFormat = bVal; } - - void ScFormulaCell::Compile( const OUString& rFormula, bool bNoListening, const FormulaGrammar::Grammar eGrammar ) { @@ -1274,7 +1263,6 @@ void ScFormulaCell::CompileXML( sc::CompileFormulaContext& rCxt, ScProgress& rPr pDocument->PutInFormulaTree(this); } - void ScFormulaCell::CalcAfterLoad( sc::CompileFormulaContext& rCxt ) { bool bNewCompiled = false; @@ -1336,13 +1324,11 @@ void ScFormulaCell::CalcAfterLoad( sc::CompileFormulaContext& rCxt ) // No SetDirty yet, as no all Listeners are known yet (only in SetDirtyAfterLoad) } - bool ScFormulaCell::MarkUsedExternalReferences() { return pCode && pDocument->MarkUsedExternalReferences(*pCode, aPos); } - void ScFormulaCell::Interpret() { if (!IsDirtyOrInTableOpDirty() || pDocument->GetRecursionHelper().IsInReturn()) @@ -1575,7 +1561,6 @@ void ScFormulaCell::Interpret() } } - void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) { class RecursionCounter @@ -1899,7 +1884,6 @@ void ScFormulaCell::SetCompile( bool bVal ) bCompile = bVal; } - void ScFormulaCell::SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag ) { ScMatrixFormulaCellToken* pMat = aResult.GetMatrixFormulaCellTokenNonConst(); @@ -1914,7 +1898,6 @@ void ScFormulaCell::SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag ) } } - void ScFormulaCell::GetMatColsRows( SCCOL & nCols, SCROW & nRows ) const { const ScMatrixFormulaCellToken* pMat = aResult.GetMatrixFormulaCellToken(); @@ -1932,7 +1915,6 @@ void ScFormulaCell::SetInChangeTrack( bool bVal ) bInChangeTrack = bVal; } - void ScFormulaCell::Notify( const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -2313,7 +2295,6 @@ bool ScFormulaCell::GetMatrixOrigin( ScAddress& rPos ) const return false; } - /* Edge-Values: @@ -3381,16 +3362,11 @@ void ScFormulaCell::FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName() ); } - - void ScFormulaCell::SetChanged(bool b) { bChanged = b; } - - - void ScFormulaCell::SetCode( ScTokenArray* pNew ) { assert(!mxGroup); // Don't call this if it's shared. @@ -3398,7 +3374,6 @@ void ScFormulaCell::SetCode( ScTokenArray* pNew ) pCode = pNew; // takes ownership. } - void ScFormulaCell::SetRunning( bool bVal ) { bRunning = bVal; @@ -3512,7 +3487,6 @@ ScFormulaCellGroupRef ScFormulaCell::CreateCellGroup( SCROW nLen, bool bInvarian return mxGroup; } - void ScFormulaCell::SetCellGroup( const ScFormulaCellGroupRef &xRef ) { if (!xRef) @@ -4041,5 +4015,4 @@ void ScFormulaCell::SyncSharedCode() pCode = mxGroup->mpCode; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index d7d1f9f96405..df48b13878e4 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -46,7 +46,6 @@ private: sal_uInt16 GetNum(); }; - class ScResourcePublisher : public Resource { private: @@ -59,10 +58,8 @@ public: }; - // class ScFuncDesc: - ScFuncDesc::ScFuncDesc() : pFuncName (NULL), pFuncDesc (NULL), @@ -382,10 +379,8 @@ bool ScFuncDesc::compareByName(const ScFuncDesc* a, const ScFuncDesc* b) return (ScGlobal::GetCaseCollator()->compareString(*a->pFuncName, *b->pFuncName ) < 0); } - // class ScFunctionList: - ScFunctionList::ScFunctionList() : nMaxFuncNameLen ( 0 ) { @@ -612,10 +607,8 @@ const ScFuncDesc* ScFunctionList::GetFunction( sal_uInt32 nIndex ) const return pDesc; } - // class ScFunctionCategory: - sal_uInt32 ScFunctionCategory::getCount() const { return m_pCategory->size(); @@ -646,10 +639,8 @@ sal_uInt32 ScFunctionCategory::getNumber() const return m_nCategory; } - // class ScFunctionMgr: - ScFunctionMgr::ScFunctionMgr() : pFuncList( ScGlobal::GetStarCalcFunctionList() ) { @@ -817,10 +808,8 @@ sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToke return 0; } - // class ScFuncRes: - ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) : Resource(aRes) { diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 5e081a00e12d..a0fc55d888d0 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -45,7 +45,6 @@ #include <ctype.h> #include <numeric> - #include <i18nlangtag/mslangid.hxx> #include <com/sun/star/lang/Locale.hpp> #include <comphelper/processfactory.hxx> @@ -80,7 +79,6 @@ #include "appoptio.hxx" #include "editutil.hxx" - tools::SvRef<ScDocShell>* ScGlobal::pDrawClipDocShellRef = NULL; SvxSearchItem* ScGlobal::pSearchItem = NULL; ScAutoFormat* ScGlobal::pAutoFormat = NULL; @@ -129,7 +127,6 @@ long ScGlobal::nLastColWidthExtra = STD_EXTRA_WIDTH; static sal_uInt16 nPPTZoom = 0; // ScreenZoom used to determine nScreenPPTX/Y - class SfxViewShell; SfxViewShell* pScActiveViewShell = NULL; //! als Member !!!!! sal_uInt16 nScClickMouseModifier = 0; //! dito @@ -196,7 +193,6 @@ SvNumberFormatter* ScGlobal::GetEnglishFormatter() return pEnglishFormatter; } - bool ScGlobal::CheckWidthInvalidate( bool& bNumFormatChanged, const SfxItemSet& rNewAttrs, const SfxItemSet& rOldAttrs ) @@ -568,7 +564,6 @@ void ScGlobal::SetClipDocName( const OUString& rNew ) *pStrClipDocName = rNew; } - void ScGlobal::InitTextHeight(SfxItemPool* pPool) { if (!pPool) @@ -742,7 +737,6 @@ ScUnitConverter* ScGlobal::GetUnitConverter() return pUnitConverter; } - const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c ) { @@ -1061,9 +1055,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 4d7ab25865a9..93da6d3d533a 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -38,7 +38,6 @@ using ::std::vector; - // struct ScImportParam: ScImportParam::ScImportParam() : @@ -103,7 +102,6 @@ bool ScImportParam::operator==( const ScImportParam& rOther ) const //! nQuerySh und pConnection sind gleich ? } - // struct ScConsolidateParam: ScConsolidateParam::ScConsolidateParam() : @@ -204,7 +202,6 @@ void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, sal_uInt16 nCount ) } } - // struct ScSolveParam ScSolveParam::ScSolveParam() @@ -265,7 +262,6 @@ bool ScSolveParam::operator==( const ScSolveParam& r ) const return bEqual; } - // struct ScTabOpParam ScTabOpParam::ScTabOpParam() : meMode(Column) {} diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx index 15e484ad5ee3..8dc24d421ba2 100644 --- a/sc/source/core/data/globalx.cxx +++ b/sc/source/core/data/globalx.cxx @@ -36,12 +36,10 @@ #include <comphelper/string.hxx> #include <unotools/localedatawrapper.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; - void ScGlobal::InitAddIns() { // multi paths separated by semicolons @@ -118,7 +116,6 @@ void ScGlobal::InitAddIns() } } - OUString ScGlobal::GetOrdinalSuffix( sal_Int32 nNumber) { try diff --git a/sc/source/core/data/listenercontext.cxx b/sc/source/core/data/listenercontext.cxx index 0463e7baa75a..2745749e18c4 100644 --- a/sc/source/core/data/listenercontext.cxx +++ b/sc/source/core/data/listenercontext.cxx @@ -20,7 +20,6 @@ StartListeningContext::StartListeningContext( ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet) : mrDoc(rDoc), mpSet(pSet) {} - ColumnBlockPosition* StartListeningContext::getBlockPosition(SCTAB nTab, SCCOL nCol) { return mpSet->getBlockPosition(nTab, nCol); @@ -40,8 +39,6 @@ void EndListeningContext::setPositionDelta( const ScAddress& rDelta ) maPosDelta = rDelta; } - - ScAddress EndListeningContext::getOldPosition( const ScAddress& rPos ) const { ScAddress aOldPos = rPos; diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index 2b1cfec80f72..00e3ce004540 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -337,10 +337,8 @@ SCROW ScMarkArray::GetMarkEnd( SCROW nRow, bool bUp ) const return nRet; } - // -------------- Iterator ---------------------------------------------- - ScMarkArrayIter::ScMarkArrayIter( const ScMarkArray* pNewArray ) : pArray( pNewArray ), nPos( 0 ) @@ -370,6 +368,4 @@ bool ScMarkArrayIter::Next( SCROW& rTop, SCROW& rBottom ) return true; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index fc200b23f132..482882e1e435 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.cxx @@ -216,7 +216,6 @@ SCTAB ScMarkData::GetLastSelected() const return 0; } - void ScMarkData::SetSelectedTabs(const MarkedTabsType& rTabs) { MarkedTabsType aTabs(rTabs.begin(), rTabs.end()); @@ -558,6 +557,4 @@ ScMarkData::const_iterator ScMarkData::end() const return maTabMarked.end(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index fb420674283a..3c24a6c5675a 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.cxx @@ -41,14 +41,11 @@ ScOutlineEntry::ScOutlineEntry( const ScOutlineEntry& rEntry ) : { } - - SCCOLROW ScOutlineEntry::GetEnd() const { return nStart+nSize-1; } - void ScOutlineEntry::Move( SCsCOLROW nDelta ) { SCCOLROW nNewPos = nStart + nDelta; @@ -289,7 +286,6 @@ bool ScOutlineArray::Insert( return true; } - bool ScOutlineArray::FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, size_t& rFindLevel) const { @@ -864,7 +860,6 @@ ScOutlineEntry* ScSubOutlineIterator::GetNext() return pEntry; // nSubLevel gueltig, wenn pEntry != 0 } - size_t ScSubOutlineIterator::LastEntry() const { if (nSubEntry == 0) @@ -896,5 +891,4 @@ void ScSubOutlineIterator::DeleteLast() rColl.erase(it); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx index 2e64611f07c4..18b04dd7b210 100644 --- a/sc/source/core/data/pagepar.cxx +++ b/sc/source/core/data/pagepar.cxx @@ -49,7 +49,6 @@ bool ScPageTableParam::operator==( const ScPageTableParam& r ) const return ( memcmp( this, &r, sizeof(ScPageTableParam) ) == 0 ); } - // struct ScPageAreaParam: ScPageAreaParam::ScPageAreaParam() diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 0599896315a1..bca6a4ba770c 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -491,7 +491,6 @@ void ScPatternAttr::GetFont( GetFont( rFont, GetItemSet(), eAutoMode, pOutDev, pScale, pCondSet, nScript, pBackConfigColor, pTextConfigColor ); } - void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& rSrcSet, const SfxItemSet* pCondSet ) { // Items auslesen @@ -731,7 +730,6 @@ void ScPatternAttr::FillEditItemSet( SfxItemSet* pEditSet, const SfxItemSet* pCo FillToEditItemSet( *pEditSet, GetItemSet(), pCondSet ); } - void ScPatternAttr::GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet& rEditSet ) { const SfxPoolItem* pItem; @@ -1116,7 +1114,6 @@ const OUString* ScPatternAttr::GetStyleName() const return pName ? pName : ( pStyle ? &pStyle->GetName() : NULL ); } - void ScPatternAttr::SetStyleSheet( ScStyleSheet* pNewStyle, bool bClearDirectFormat ) { if (pNewStyle) @@ -1194,7 +1191,6 @@ bool ScPatternAttr::IsSymbolFont() const return false; } - sal_uLong ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const { sal_uLong nFormat = @@ -1287,5 +1283,4 @@ sal_uInt8 ScPatternAttr::GetRotateDir( const SfxItemSet* pCondSet ) const return nRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index 699b8133a21c..2afb10989b12 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -118,5 +118,4 @@ void ScPoolHelper::SourceDocumentGone() pFormTable->SetColorLink( Link() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 141de43276e5..49f04cdc1814 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "postit.hxx" #include <rtl/ustrbuf.hxx> @@ -49,7 +48,6 @@ #include <utility> - namespace { const long SC_NOTECAPTION_WIDTH = 2900; /// Default width of note caption textbox. @@ -509,14 +507,11 @@ ScPostIt* ScPostIt::Clone( const ScAddress& rOwnPos, ScDocument& rDestDoc, const return bCloneCaption ? new ScPostIt( rDestDoc, rDestPos, *this ) : new ScPostIt( rDestDoc, rDestPos, maNoteData, false ); } - - void ScPostIt::SetDate( const OUString& rDate ) { maNoteData.maDate = rDate; } - void ScPostIt::SetAuthor( const OUString& rAuthor ) { maNoteData.maAuthor = rAuthor; @@ -568,7 +563,6 @@ void ScPostIt::SetText( const ScAddress& rPos, const OUString& rText ) maNoteData.mpCaption->SetText( rText ); } - SdrCaptionObj* ScPostIt::GetOrCreateCaption( const ScAddress& rPos ) const { CreateCaptionFromInitData( rPos ); @@ -592,7 +586,6 @@ void ScPostIt::ShowCaption( const ScAddress& rPos, bool bShow ) ScCaptionUtil::SetCaptionLayer( *maNoteData.mpCaption, bShow ); } - void ScPostIt::ShowCaptionTemp( const ScAddress& rPos, bool bShow ) { CreateCaptionFromInitData( rPos ); diff --git a/sc/source/core/data/refupdatecontext.cxx b/sc/source/core/data/refupdatecontext.cxx index 8bf52985953d..d63c745c961a 100644 --- a/sc/source/core/data/refupdatecontext.cxx +++ b/sc/source/core/data/refupdatecontext.cxx @@ -99,5 +99,4 @@ SetFormulaDirtyContext::SetFormulaDirtyContext() : } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/rowheightcontext.cxx b/sc/source/core/data/rowheightcontext.cxx index 08466ae2acad..5f51dfab0878 100644 --- a/sc/source/core/data/rowheightcontext.cxx +++ b/sc/source/core/data/rowheightcontext.cxx @@ -22,23 +22,16 @@ RowHeightContext::RowHeightContext( RowHeightContext::~RowHeightContext() {} - - - - - void RowHeightContext::setExtraHeight( sal_uInt16 nH ) { mnExtraHeight = nH; } - void RowHeightContext::setForceAutoSize( bool b ) { mbForceAutoSize = b; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index a5bf3c833d4e..14b051852448 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "segmenttree.hxx" #include <mdds/flat_segment_tree.hpp> @@ -291,7 +290,6 @@ bool ScFlatBoolRowSegments::ForwardIterator::getValue(SCROW nPos, bool& rVal) return true; } - ScFlatBoolRowSegments::RangeIterator::RangeIterator(ScFlatBoolRowSegments& rSegs) : mrSegs(rSegs) { @@ -456,7 +454,6 @@ bool ScFlatUInt16RowSegments::ForwardIterator::getValue(SCROW nPos, sal_uInt16& return true; } - 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 d7a19d5a8713..4bdb61f53e89 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -20,7 +20,6 @@ #include "sheetevents.hxx" #include <com/sun/star/script/vba/VBAEventId.hpp> - OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) diff --git a/sc/source/core/data/simpleformulacalc.cxx b/sc/source/core/data/simpleformulacalc.cxx index b1d56f36f55d..c17313d512bd 100644 --- a/sc/source/core/data/simpleformulacalc.cxx +++ b/sc/source/core/data/simpleformulacalc.cxx @@ -13,7 +13,6 @@ #include "interpre.hxx" #include "compiler.hxx" - ScSimpleFormulaCalculator::ScSimpleFormulaCalculator( ScDocument* pDoc, const ScAddress& rAddr, const OUString& rFormula, formula::FormulaGrammar::Grammar eGram ) : mnFormatType(0) @@ -65,7 +64,6 @@ sal_uInt16 ScSimpleFormulaCalculator::GetErrCode() return maResult.GetResultError(); } - double ScSimpleFormulaCalculator::GetValue() { Calculate(); diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index 34392e06d013..56448cf7d0a9 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -23,7 +23,6 @@ #include "queryparam.hxx" #include "subtotalparam.hxx" - ScSortParam::ScSortParam() { Clear(); diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 3e0fc00e21c9..c21d613b5f72 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -55,7 +55,6 @@ #include "editutil.hxx" #include "patattr.hxx" - ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP, ScDocument* pDocument ) : SfxStyleSheetPool( rPoolP ), @@ -238,7 +237,6 @@ void ScStyleSheetPool::CreateStandardStyles() OUString aStrStandard = ScGlobal::GetRscString(STR_STYLENAME_STANDARD); - // Zellformatvorlagen: // 1. Standard @@ -272,10 +270,8 @@ void ScStyleSheetPool::CreateStandardStyles() // if ( eCtl == LANGUAGE_THAI ) // pSet->Put( SvxFontHeightItem( 300, 100, ATTR_CTL_FONT_HEIGHT ) ); // 15 pt - // 2. Ergebnis - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT ), SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); @@ -286,10 +282,8 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); pSet->Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) ); - // 3. Ergebnis1 - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT1 ), SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); @@ -297,10 +291,8 @@ void ScStyleSheetPool::CreateStandardStyles() pSheet->SetParent( SCSTR( STR_STYLENAME_RESULT ) ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_ERG1 ); - // 4. Ueberschrift - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE ), SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); @@ -313,10 +305,8 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); pSet->Put( SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) ); - // 5. Ueberschrift1 - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE1 ), SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); @@ -326,12 +316,10 @@ void ScStyleSheetPool::CreateStandardStyles() pSet = &pSheet->GetItemSet(); pSet->Put( SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) ); - // Seitenformat-Vorlagen: // 1. Standard - pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PAGE, SCSTYLEBIT_STANDARD ); @@ -345,7 +333,6 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET ); DELETEZ( pHFSetItem ); - // Kopfzeile: // [leer][\TABELLE\][leer] @@ -358,7 +345,6 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHeaderItem ); DELETEZ( pTxtObj ); - // Fusszeile: // [leer][Seite \SEITE\][leer] @@ -373,10 +359,8 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pFooterItem ); DELETEZ( pTxtObj ); - // 2. Report - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_REPORT ), SFX_STYLE_FAMILY_PAGE, SCSTYLEBIT_STANDARD ); @@ -407,7 +391,6 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET ); DELETEZ( pHFSetItem ); - // Kopfzeile: // [\TABELLE\ (\DATEI\)][leer][\DATUM\, \ZEIT\] @@ -429,7 +412,6 @@ void ScStyleSheetPool::CreateStandardStyles() DELETEZ( pTxtObj ); pSet->Put( *pHeaderItem ); - // Fusszeile: // [leer][Seite: \SEITE\ / \SEITEN\][leer] @@ -447,7 +429,6 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pFooterItem ); DELETEZ( pTxtObj ); - DELETEZ( pEmptyTxtObj ); DELETEZ( pHeaderItem ); DELETEZ( pFooterItem ); diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index cac09e9d085a..68e70950075b 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -36,13 +36,11 @@ #include <svl/smplhint.hxx> #include "attrib.hxx" - #include <vcl/svapp.hxx> #include "globstr.hrc" #include "sc.hrc" - TYPEINIT1(ScStyleSheet, SfxStyleSheet); #define TWO_CM 1134 diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx index e066c6e2e596..27bbeb361b24 100644 --- a/sc/source/core/data/subtotalparam.cxx +++ b/sc/source/core/data/subtotalparam.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "subtotalparam.hxx" ScSubTotalParam::ScSubTotalParam() diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 5cba042224ed..daaaf8b4d0ba 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -394,7 +394,6 @@ void ScTable::SetLoadingRTL( bool bSet ) bLoadingRTL = bSet; } - void ScTable::SetTabBgColor(const Color& rColor) { if (aTabBgColor != rColor) @@ -903,7 +902,6 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S } } - bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const { @@ -1944,7 +1942,6 @@ void ScTable::AddPrintRange( const ScRange& rNew ) InvalidatePageBreaks(); } - void ScTable::SetPrintEntireSheet() { if( !IsPrintEntireSheet() ) @@ -2072,14 +2069,12 @@ ScRefCellValue ScTable::VisibleDataCellIterator::next() return ScRefCellValue(); } - void ScTable::SetAnonymousDBData(ScDBData* pDBData) { delete pDBDataNoName; pDBDataNoName = pDBData; } - sal_uLong ScTable::AddCondFormat( ScConditionalFormat* pNew ) { if(!mpCondFormatList) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 1d38126a2e0f..ce14a5f9fcf8 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -109,14 +109,12 @@ bool ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline ) return ( nNewSizeX != nOldSizeX || nNewSizeY != nOldSizeY ); // Groesse geaendert ? } - void ScTable::StartOutlineTable() { if (!pOutlineTable) pOutlineTable = new ScOutlineTable; } - void ScTable::SetSheetEvents( const ScSheetEvents* pNew ) { delete pSheetEvents; @@ -131,13 +129,11 @@ void ScTable::SetSheetEvents( const ScSheetEvents* pNew ) SetStreamValid(false); } - void ScTable::SetCalcNotification( bool bSet ) { bCalcNotification = bSet; } - bool ScTable::TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ) const { bool bTest = true; @@ -151,7 +147,6 @@ bool ScTable::TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SC return bTest; } - void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ) { if (nStartCol==0 && nEndCol==MAXCOL) @@ -201,7 +196,6 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE SetStreamValid(false); } - void ScTable::DeleteRow( const sc::ColumnSet& rRegroupCols, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize, bool* pUndoOutline ) @@ -260,7 +254,6 @@ void ScTable::DeleteRow( SetStreamValid(false); } - bool ScTable::TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ) const { bool bTest = true; @@ -277,7 +270,6 @@ bool ScTable::TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ) cons return bTest; } - void ScTable::InsertCol( const sc::ColumnSet& rRegroupCols, SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ) { @@ -313,7 +305,6 @@ void ScTable::InsertCol( } } - if ((nStartRow == 0) && (nEndRow == MAXROW)) { for (SCSIZE i=0; i < nSize; i++) @@ -421,7 +412,6 @@ void ScTable::DeleteCol( SetStreamValid(false); } - void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nDelFlag) { if (nCol2 > MAXCOL) nCol2 = MAXCOL; @@ -434,10 +424,8 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal aCol[i].DeleteArea(nRow1, nRow2, nDelFlag); } - // Zellschutz auf geschuetzter Tabelle nicht setzen - if ( IsProtected() && (nDelFlag & IDF_ATTRIB) ) { ScPatternAttr aPattern(pDocument->GetPool()); @@ -455,7 +443,6 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal SetStreamValid(false); } - void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bool bBroadcast ) { { // scope for bulk broadcast @@ -475,10 +462,8 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, boo mpCondFormatList->DeleteArea( pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row() ); } - // Zellschutz auf geschuetzter Tabelle nicht setzen - if ( IsProtected() && (nDelFlag & IDF_ATTRIB) ) { ScDocumentPool* pPool = pDocument->GetPool(); @@ -494,7 +479,6 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, boo SetStreamValid(false); } - // pTable = Clipboard void ScTable::CopyToClip( sc::CopyToClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, @@ -524,7 +508,6 @@ void ScTable::CopyToClip( if (pDBDataNoName) pTable->SetAnonymousDBData(new ScDBData(*pDBDataNoName)); - if (pRowFlags && pTable->pRowFlags && mpRowHeights && pTable->mpRowHeights) { pTable->pRowFlags->CopyFromAnded( *pRowFlags, 0, nRow2, CR_MANUALSIZE); @@ -710,7 +693,6 @@ void ScTable::CopyFromClip( } } - void ScTable::MixData( sc::MixDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nFunction, bool bSkipEmpty, const ScTable* pSrcTab ) @@ -719,7 +701,6 @@ void ScTable::MixData( aCol[i].MixData(rCxt, nRow1, nRow2, nFunction, bSkipEmpty, pSrcTab->aCol[i]); } - // Markierung von diesem Dokument void ScTable::MixMarked( sc::MixDocContext& rCxt, const ScMarkData& rMark, sal_uInt16 nFunction, @@ -1052,7 +1033,6 @@ void ScTable::StartNeededListeners() aCol[i].StartNeededListeners(); } - void ScTable::BroadcastInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { @@ -1063,7 +1043,6 @@ void ScTable::BroadcastInArea( SCCOL nCol1, SCROW nRow1, aCol[i].SetDirty(nRow1, nRow2); } - void ScTable::StartListeningInArea( sc::StartListeningContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { @@ -1074,7 +1053,6 @@ void ScTable::StartListeningInArea( aCol[i].StartListeningInArea(rCxt, nRow1, nRow2); } - void ScTable::CopyToTable( sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nFlags, bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData, @@ -1195,7 +1173,6 @@ void ScTable::CopyToTable( pDestTab->SetOutlineTable( pOutlineTable ); } - void ScTable::UndoToTable( sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nFlags, bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData ) @@ -1216,7 +1193,6 @@ void ScTable::UndoToTable( if (nFlags & IDF_ATTRIB) pDestTab->mpCondFormatList.reset(new ScConditionalFormatList(pDestTab->pDocument, *mpCondFormatList)); - if (bWidth||bHeight) { if (bWidth) @@ -1234,7 +1210,6 @@ void ScTable::UndoToTable( } } - void ScTable::CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const { for (SCCOL i=0; i<=MAXCOL; i++) @@ -1478,7 +1453,6 @@ void ScTable::GetInputString( SCCOL nCol, SCROW nRow, OUString& rString ) const rString = OUString(); } - double ScTable::GetValue( SCCOL nCol, SCROW nRow ) const { if (ValidColRow( nCol, nRow )) @@ -1636,7 +1610,6 @@ void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const rRow = ::std::max( rRow, aCol[nCol--].GetLastDataPos()); } - bool ScTable::HasData( SCCOL nCol, SCROW nRow ) const { if (ValidColRow(nCol,nRow)) @@ -1645,7 +1618,6 @@ bool ScTable::HasData( SCCOL nCol, SCROW nRow ) const return false; } - bool ScTable::HasStringData( SCCOL nCol, SCROW nRow ) const { if (ValidColRow(nCol,nRow)) @@ -1654,7 +1626,6 @@ bool ScTable::HasStringData( SCCOL nCol, SCROW nRow ) const return false; } - bool ScTable::HasValueData( SCCOL nCol, SCROW nRow ) const { if (ValidColRow(nCol,nRow)) @@ -1663,7 +1634,6 @@ bool ScTable::HasValueData( SCCOL nCol, SCROW nRow ) const return false; } - bool ScTable::HasStringCells( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const { @@ -1675,14 +1645,12 @@ bool ScTable::HasStringCells( SCCOL nStartCol, SCROW nStartRow, return false; } - void ScTable::SetDirtyVar() { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].SetDirtyVar(); } - void ScTable::SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt ) { sc::AutoCalcSwitch aACSwitch(*pDocument, false); @@ -1691,7 +1659,6 @@ void ScTable::SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt ) aCol[i].SetAllFormulasDirty(rCxt); } - void ScTable::SetDirty( const ScRange& rRange ) { bool bOldAutoCalc = pDocument->GetAutoCalc(); @@ -1702,7 +1669,6 @@ void ScTable::SetDirty( const ScRange& rRange ) pDocument->SetAutoCalc( bOldAutoCalc ); } - void ScTable::SetTableOpDirty( const ScRange& rRange ) { bool bOldAutoCalc = pDocument->GetAutoCalc(); @@ -1713,7 +1679,6 @@ void ScTable::SetTableOpDirty( const ScRange& rRange ) pDocument->SetAutoCalc( bOldAutoCalc ); } - void ScTable::SetDirtyAfterLoad() { bool bOldAutoCalc = pDocument->GetAutoCalc(); @@ -1723,7 +1688,6 @@ void ScTable::SetDirtyAfterLoad() pDocument->SetAutoCalc( bOldAutoCalc ); } - void ScTable::SetDirtyIfPostponed() { bool bOldAutoCalc = pDocument->GetAutoCalc(); @@ -1764,13 +1728,11 @@ void ScTable::SetLoadingMedium(bool bLoading) mpRowHeights->enableTreeSearch(!bLoading); } - void ScTable::CalcAll() { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CalcAll(); } - void ScTable::CompileAll( sc::CompileFormulaContext& rCxt ) { for (SCCOL i = 0; i <= MAXCOL; ++i) @@ -1780,7 +1742,6 @@ void ScTable::CompileAll( sc::CompileFormulaContext& rCxt ) mpCondFormatList->CompileAll(); } - void ScTable::CompileXML( sc::CompileFormulaContext& rCxt, ScProgress& rProgress ) { if (mpRangeName) @@ -1876,7 +1837,6 @@ const ScPatternAttr* ScTable::GetPattern( SCCOL nCol, SCROW nRow ) const } } - const ScPatternAttr* ScTable::GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const { if ( ValidColRow( nCol, nStartRow ) && ValidRow( nEndRow ) && (nStartRow <= nEndRow) ) @@ -1885,7 +1845,6 @@ const ScPatternAttr* ScTable::GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, S return NULL; } - bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nMask ) const { bool bFound = false; @@ -1894,7 +1853,6 @@ bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal return bFound; } - bool ScTable::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const { bool bFound = false; @@ -1903,7 +1861,6 @@ bool ScTable::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) co return bFound; } - bool ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bRefresh ) @@ -1921,7 +1878,6 @@ bool ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow, return bFound; } - bool ScTable::IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes ) const { if (!(ValidCol(nCol1) && ValidCol(nCol2))) @@ -2168,7 +2124,6 @@ bool ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR return false; } - bool ScTable::HasSelectionMatrixFragment( const ScMarkData& rMark ) const { bool bFound = false; @@ -2177,7 +2132,6 @@ bool ScTable::HasSelectionMatrixFragment( const ScMarkData& rMark ) const return bFound; } - bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const { @@ -2259,7 +2213,6 @@ bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, return bIsEditable; } - bool ScTable::IsSelectionEditable( const ScMarkData& rMark, bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const { @@ -2349,7 +2302,6 @@ void ScTable::LockTable() ++nLockCount; } - void ScTable::UnlockTable() { if (nLockCount) @@ -2360,14 +2312,12 @@ void ScTable::UnlockTable() } } - void ScTable::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, bool bDeep ) const { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].MergeSelectionPattern( rState, rMark, bDeep ); } - void ScTable::MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bDeep ) const { @@ -2375,7 +2325,6 @@ void ScTable::MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW aCol[i].MergePatternArea( rState, nRow1, nRow2, bDeep ); } - void ScTable::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const { @@ -2389,7 +2338,6 @@ void ScTable::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInne } } - void ScTable::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { @@ -2403,14 +2351,12 @@ void ScTable::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoIte } } - void ScTable::ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ) { if (ValidColRow(nCol,nRow)) aCol[nCol].ApplyPattern( nRow, rAttr ); } - void ScTable::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr, ScEditDataArray* pDataArray ) { @@ -2481,7 +2427,6 @@ void ScTable::ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ) aCol[nCol].ApplyStyle( nRow, rStyle ); } - void ScTable::ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle ) { if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow)) @@ -2493,14 +2438,12 @@ void ScTable::ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, S } } - void ScTable::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark) { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].ApplySelectionStyle( rStyle, rMark ); } - void ScTable::ApplySelectionLineStyle( const ScMarkData& rMark, const ::editeng::SvxBorderLine* pLine, bool bColorOnly ) { @@ -2511,7 +2454,6 @@ void ScTable::ApplySelectionLineStyle( const ScMarkData& rMark, aCol[i].ApplySelectionLineStyle( rMark, pLine, bColorOnly ); } - const ScStyleSheet* ScTable::GetStyle( SCCOL nCol, SCROW nRow ) const { if (ValidColRow(nCol, nRow)) @@ -2520,7 +2462,6 @@ const ScStyleSheet* ScTable::GetStyle( SCCOL nCol, SCROW nRow ) const return NULL; } - const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, bool& rFound ) const { rFound = false; @@ -2547,7 +2488,6 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, bool& r return bEqual ? pStyle : NULL; } - const ScStyleSheet* ScTable::GetAreaStyle( bool& rFound, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const { @@ -2574,7 +2514,6 @@ const ScStyleSheet* ScTable::GetAreaStyle( bool& rFound, SCCOL nCol1, SCROW nRow return bEqual ? pStyle : NULL; } - bool ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const { bool bIsUsed = false; @@ -2592,7 +2531,6 @@ bool ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyle return bIsUsed; } - void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, @@ -2619,7 +2557,6 @@ void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRem } } - bool ScTable::ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags ) { @@ -2630,7 +2567,6 @@ bool ScTable::ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW return bChanged; } - bool ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags ) { @@ -2641,21 +2577,18 @@ bool ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO return bChanged; } - void ScTable::SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, bool bPutToPool ) { if (ValidColRow(nCol,nRow)) aCol[nCol].SetPattern( nRow, rAttr, bPutToPool ); } - void ScTable::ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr ) { if (ValidColRow(nCol,nRow)) aCol[nCol].ApplyAttr( nRow, rAttr ); } - void ScTable::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray ) { @@ -2663,21 +2596,18 @@ void ScTable::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& r aCol[i].ApplySelectionCache( pCache, rMark, pDataArray ); } - void ScTable::ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark ) { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].ChangeSelectionIndent( bIncrement, rMark ); } - void ScTable::ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark ) { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].ClearSelectionItems( pWhich, rMark ); } - // Spaltenbreiten / Zeilenhoehen void ScTable::SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth ) @@ -2858,7 +2788,6 @@ void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, bool bManual ) } } - sal_uInt16 ScTable::GetColWidth( SCCOL nCol, bool bHiddenAsZero ) const { OSL_ENSURE(ValidCol(nCol),"wrong column number"); @@ -2874,7 +2803,6 @@ sal_uInt16 ScTable::GetColWidth( SCCOL nCol, bool bHiddenAsZero ) const return (sal_uInt16) STD_COL_WIDTH; } - sal_uInt16 ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingestellte { OSL_ENSURE(ValidCol(nCol),"wrong column number"); @@ -2885,7 +2813,6 @@ sal_uInt16 ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die ein return (sal_uInt16) STD_COL_WIDTH; } - sal_uInt16 ScTable::GetCommonWidth( SCCOL nEndCol ) const { // get the width that is used in the largest continuous column range (up to nEndCol) @@ -2932,7 +2859,6 @@ sal_uInt16 ScTable::GetCommonWidth( SCCOL nEndCol ) const return nMaxWidth; } - sal_uInt16 ScTable::GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero ) const { OSL_ENSURE(ValidRow(nRow),"Invalid row number"); @@ -2975,7 +2901,6 @@ sal_uInt16 ScTable::GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, } } - sal_uLong ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZero ) const { OSL_ENSURE(ValidRow(nStartRow) && ValidRow(nEndRow),"wrong row number"); @@ -3001,7 +2926,6 @@ sal_uLong ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZ return (nEndRow - nStartRow + 1) * (sal_uLong)ScGlobal::nStdRowHeight; } - sal_uLong ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const { OSL_ENSURE(ValidRow(nStartRow) && ValidRow(nEndRow),"wrong row number"); @@ -3042,7 +2966,6 @@ sal_uLong ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fS return (sal_uLong) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight * fScale); } - sal_uInt16 ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if hidden { OSL_ENSURE(ValidRow(nRow),"wrong row number"); @@ -3053,10 +2976,8 @@ sal_uInt16 ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if return (sal_uInt16) ScGlobal::nStdRowHeight; } - // Spalten-/Zeilen-Flags - SCROW ScTable::GetHiddenRowCount( SCROW nRow ) const { if (!ValidRow(nRow)) @@ -3069,7 +2990,6 @@ SCROW ScTable::GetHiddenRowCount( SCROW nRow ) const return nLastRow - nRow + 1; } - //! ShowRows / DBShowRows zusammenfassen void ScTable::ShowCol(SCCOL nCol, bool bShow) @@ -3092,7 +3012,6 @@ void ScTable::ShowCol(SCCOL nCol, bool bShow) } } - void ScTable::ShowRow(SCROW nRow, bool bShow) { if (ValidRow(nRow) && pRowFlags) @@ -3116,7 +3035,6 @@ void ScTable::ShowRow(SCROW nRow, bool bShow) } } - void ScTable::DBShowRow(SCROW nRow, bool bShow) { if (ValidRow(nRow) && pRowFlags) @@ -3143,7 +3061,6 @@ void ScTable::DBShowRow(SCROW nRow, bool bShow) } } - void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow) { SCROW nStartRow = nRow1; @@ -3176,7 +3093,6 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow) UpdateOutlineRow( nRow1, nRow2, bShow ); } - void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow) { SCROW nStartRow = nRow1; @@ -3250,7 +3166,6 @@ void ScTable::SetRowFlags( SCROW nRow, sal_uInt8 nNewFlags ) } } - void ScTable::SetRowFlags( SCROW nStartRow, SCROW nEndRow, sal_uInt8 nNewFlags ) { if (ValidRow(nStartRow) && ValidRow(nEndRow) && pRowFlags) @@ -3261,7 +3176,6 @@ void ScTable::SetRowFlags( SCROW nStartRow, SCROW nEndRow, sal_uInt8 nNewFlags ) } } - sal_uInt8 ScTable::GetColFlags( SCCOL nCol ) const { if (ValidCol(nCol) && pColFlags) @@ -3270,7 +3184,6 @@ sal_uInt8 ScTable::GetColFlags( SCCOL nCol ) const return 0; } - sal_uInt8 ScTable::GetRowFlags( SCROW nRow ) const { if (ValidRow(nRow) && pRowFlags) @@ -3279,7 +3192,6 @@ sal_uInt8 ScTable::GetRowFlags( SCROW nRow ) const return 0; } - SCROW ScTable::GetLastFlaggedRow() const { SCROW nLastFound = 0; @@ -3310,7 +3222,6 @@ SCROW ScTable::GetLastFlaggedRow() const return nLastFound; } - SCCOL ScTable::GetLastChangedCol() const { if ( !pColFlags ) @@ -3324,7 +3235,6 @@ SCCOL ScTable::GetLastChangedCol() const return nLastFound; } - SCROW ScTable::GetLastChangedRow() const { if ( !pRowFlags ) @@ -3342,7 +3252,6 @@ SCROW ScTable::GetLastChangedRow() const return std::max( nLastFlags, nLastHeight); } - bool ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, bool bShow ) { if (pOutlineTable && pColFlags) @@ -3354,7 +3263,6 @@ bool ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, bool bShow ) return false; } - bool ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, bool bShow ) { if (pOutlineTable && pRowFlags) @@ -3363,7 +3271,6 @@ bool ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, bool bShow ) return false; } - void ScTable::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) { // Column-wise expansion @@ -3394,7 +3301,6 @@ void ScTable::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) } } - void ScTable::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) { while ( rX2>rX1 && ColHidden(rX2) ) @@ -3421,7 +3327,6 @@ void ScTable::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) } } - // Auto-Outline template< typename T > @@ -3587,7 +3492,6 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW n } } - bool ScTable::RefVisible(ScFormulaCell* pCell) { ScRange aRef; @@ -3610,14 +3514,12 @@ bool ScTable::RefVisible(ScFormulaCell* pCell) return true; // irgendwie anders } - void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, OUString& rStr) { GetInputString(nCol, nRow, rStr); rStr = ScGlobal::pCharClass->uppercase(rStr.trim()); } - // Berechnen der Groesse der Tabelle und setzen der Groesse an der DrawPage void ScTable::SetDrawPageSize(bool bResetStreamValid, bool bUpdateNoteCaptionPos) @@ -3662,7 +3564,6 @@ ScRangeName* ScTable::GetRangeName() const return mpRangeName; } - sal_uLong ScTable::GetRowOffset( SCROW nRow, bool bHiddenAsZero ) const { sal_uLong n = 0; @@ -3712,7 +3613,6 @@ SCROW ScTable::GetRowForHeight(sal_uLong nHeight) const return -1; } - sal_uLong ScTable::GetColOffset( SCCOL nCol, bool bHiddenAsZero ) const { sal_uLong n = 0; diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 5b44baf605fc..959a91953af7 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/math.hxx> #include <unotools/textsearch.hxx> #include <svl/zforlist.hxx> @@ -221,7 +220,6 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo ) // END OF STATIC DATA ----------------------------------------------------- - class ScSortInfoArray : boost::noncopyable { public: @@ -500,7 +498,6 @@ bool ScTable::IsSortCollatorGlobal() const pSortCollator == ScGlobal::GetCaseCollator(); } - void ScTable::InitSortCollator( const ScSortParam& rPar ) { if ( !rPar.aCollatorLocale.Language.isEmpty() ) @@ -518,7 +515,6 @@ void ScTable::InitSortCollator( const ScSortParam& rPar ) } } - void ScTable::DestroySortCollator() { if ( pSortCollator ) @@ -1211,7 +1207,6 @@ static void lcl_RemoveNumberFormat( ScTable* pTab, SCCOL nCol, SCROW nRow ) } } - // at least MSC needs this at linkage level to be able to use it in a template typedef struct lcl_ScTable_DoSubTotals_RowEntry { @@ -2640,8 +2635,6 @@ bool ScTable::GetDataEntries(SCCOL nCol, SCROW nRow, std::set<ScTypedStrData>& r return aCol[nCol].GetDataEntries( nRow, rStrings, bLimit ); } - - sal_uLong ScTable::GetCellCount() const { sal_uLong nCellCount = 0; diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index f378c89c6511..48b475e1e3a1 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -477,10 +477,8 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if ( (nFillCount == 0) || !ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2) ) return; - // Detect direction - bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP); bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT); @@ -555,10 +553,8 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (pProgress) nProgress = pProgress->GetState(); - // execute - sal_uLong nActFormCnt = 0; for (rOuter = nOStart; rOuter <= nOEnd; rOuter++) { @@ -627,7 +623,6 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } } - break; } @@ -1429,7 +1424,6 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, // Detect direction - bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP); bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT); @@ -1507,10 +1501,8 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (pProgress) nProgress = pProgress->GetState(); - // execute - sal_uLong nActFormCnt = 0; for (rOuter = nOStart; rOuter <= nOEnd; rOuter++) { @@ -1814,7 +1806,6 @@ void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, eFillCmd, eFillDateCmd, nStepValue, nMaxValue, 0, true, pProgress); } - void ScTable::AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr, sal_uInt16 nFormatNo) { diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index dfe229f6da80..11c21c474776 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -55,7 +55,6 @@ using ::std::set; #define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue() - void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) { if ( pDocument->IsImportingXML() ) @@ -1244,6 +1243,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 a6101dbd70d4..8102c783d46f 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -33,7 +33,6 @@ #include "postit.hxx" #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 364f922d715a..9b00683450a7 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -189,7 +189,6 @@ ScTableProtectionImpl::ScTableProtectionImpl(const ScTableProtectionImpl& r) : { } - bool ScTableProtectionImpl::isProtectedWithPass() const { if (!mbProtected) @@ -220,7 +219,6 @@ void ScTableProtectionImpl::setPassword(const OUString& aPassText) } } - bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const { if (mbEmptyPass) @@ -351,7 +349,6 @@ void ScTableProtectionImpl::setEnhancedProtection( const ::std::vector< ScEnhanc maEnhancedProtection = rProt; } - bool ScTableProtectionImpl::updateReference( UpdateRefMode eMode, ScDocument* pDoc, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ) { @@ -459,7 +456,6 @@ bool ScTableProtectionImpl::isSelectionEditable( const ScRangeList& rRangeList ) return true; } - ScDocProtection::ScDocProtection() : mpImpl(new ScTableProtectionImpl(static_cast<SCSIZE>(ScDocProtection::NONE))) { diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 528f9585778a..bcd66e053a14 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -52,10 +52,8 @@ using namespace formula; - // Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung) - ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOper, const OUString& rExpr1, const OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, @@ -417,7 +415,6 @@ bool ScValidationData::DoError( Window* pParent, const OUString& rInput, return ( eErrorStyle == SC_VALERR_STOP || nRet == RET_CANCEL ); } - bool ScValidationData::IsDataValid( const OUString& rTest, const ScPatternAttr& rPattern, const ScAddress& rPos ) const { @@ -430,7 +427,6 @@ bool ScValidationData::IsDataValid( if (rTest[0] == '=') // formulas do not pass the validity test return false; - SvNumberFormatter* pFormatter = GetDocument()->GetFormatTable(); // get the value if any @@ -910,7 +906,6 @@ bool ScValidationData::IsListValid( ScRefCellValue& rCell, const ScAddress& rPos return bIsValid; } - 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 c0fed1fb527a..59ffc1e4b3f6 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.hxx @@ -43,7 +43,6 @@ public: OString GetHelpId( const OUString& rFuncName ) const; }; - #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 e7eb7992fbd8..29808753bb59 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -204,7 +204,6 @@ public: void UpdateRemoveArea( ScBroadcastArea* pArea ); void UpdateInsert( ScBroadcastArea* pArea ); - bool IsInBroadcastIteration() const { return mbInBroadcastIteration; } /** Erase an area from set and delete it if last reference, or if @@ -218,7 +217,6 @@ public: void GetAllListeners( const ScRange& rRange, std::vector<sc::AreaListener>& rListeners ); }; - /** BroadcastAreaSlots and their management, once per document. */ @@ -314,7 +312,6 @@ public: std::vector<sc::AreaListener> GetAllListeners( const ScRange& rRange ); }; - class ScBulkBroadcast { ScBroadcastAreaSlotMachine* pBASM; diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 4708e0488496..b3b999a6c7bc 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -181,7 +181,6 @@ private: VolatileType meVolatileType; - /// Merge global and document specific settings. void MergeCalcConfig(); diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx index 6186f7539db6..ec9277f87935 100644 --- a/sc/source/core/inc/poolhelp.hxx +++ b/sc/source/core/inc/poolhelp.hxx @@ -31,7 +31,6 @@ class ScStyleSheetPool; class SvNumberFormatter; class SfxItemPool; - class ScPoolHelper : public salhelper::SimpleReferenceObject { private: diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx index 0af07cfae288..20455ad8006f 100644 --- a/sc/source/core/inc/refupdat.hxx +++ b/sc/source/core/inc/refupdat.hxx @@ -71,7 +71,6 @@ public: const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY, ScRange& rRef ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/inc/scrdata.hxx b/sc/source/core/inc/scrdata.hxx index a7a07c9eb97c..3c322dc3c929 100644 --- a/sc/source/core/inc/scrdata.hxx +++ b/sc/source/core/inc/scrdata.hxx @@ -26,7 +26,6 @@ namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } } - class ScScriptTypeData { public: @@ -38,5 +37,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/opencl/clcc/clew.cxx b/sc/source/core/opencl/clcc/clew.cxx index 6a7c4c0a71e5..485cd926a7dc 100644 --- a/sc/source/core/opencl/clcc/clew.cxx +++ b/sc/source/core/opencl/clcc/clew.cxx @@ -4,7 +4,6 @@ // Distributed under the Boost Software License, Version 1.0. // (See accompanying file license.txt) - #include "clew.h" //! \file clew.c @@ -112,7 +111,6 @@ PFNCLENQUEUEBARRIER __clewEnqueueBarrier = NULL; PFNCLGETEXTENSIONFUNCTIONADDRESS __clewGetExtensionFunctionAddress = NULL; #endif // CLCC_GENERATE_DOCUMENTATION - //! \brief Unloads OpenCL dynamic library, should not be called directly static void clewExit(void) { diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 1b88527fbab4..0f61972c258e 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -62,7 +62,6 @@ using namespace formula; namespace sc { namespace opencl { - /// Map the buffer used by an argument and do necessary argument setting size_t VectorRef::Marshal(cl_kernel k, int argno, int, cl_program) { @@ -1700,7 +1699,6 @@ public: virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "less"; } }; - class OpGreater: public Binary { public: virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } diff --git a/sc/source/core/opencl/op_database.cxx b/sc/source/core/opencl/op_database.cxx index a77ce7fa337d..285da07002fa 100644 --- a/sc/source/core/opencl/op_database.cxx +++ b/sc/source/core/opencl/op_database.cxx @@ -18,7 +18,6 @@ #include <formula/vectortoken.hxx> #include <sstream> - namespace sc { namespace opencl { void OpDmax::GenSlidingWindowFunction(std::stringstream &ss, diff --git a/sc/source/core/opencl/op_database.hxx b/sc/source/core/opencl/op_database.hxx index ec0f57cc9a08..d64f3bcd37de 100644 --- a/sc/source/core/opencl/op_database.hxx +++ b/sc/source/core/opencl/op_database.hxx @@ -12,7 +12,6 @@ #include "opbase.hxx" - namespace sc { namespace opencl { class OpDmax: public CheckVariables @@ -103,7 +102,6 @@ public: virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dcount2"; } }; - }} #endif diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx index 6170bb77df7d..cc4e757c671b 100644 --- a/sc/source/core/opencl/op_financial.cxx +++ b/sc/source/core/opencl/op_financial.cxx @@ -363,7 +363,6 @@ void OpDISC::GenSlidingWindowFunction(std::stringstream& ss, ss << "}"; } - void OpINTRATE::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { @@ -2210,7 +2209,6 @@ void OpAccrintm::GenSlidingWindowFunction( funs.insert(IsLeapYear); } - void OpYield::GenSlidingWindowFunction( std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) { @@ -2233,7 +2231,6 @@ void OpYield::GenSlidingWindowFunction( ss << "double tmp005;\n\t"; ss << "double tmp006;\n\t"; - #ifdef ISNAN FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken(); const formula::SingleVectorRefToken*tmpCurDVR0= static_cast<const @@ -4482,7 +4479,6 @@ void OpYielddisc::GenSlidingWindowFunction( ss << "double tmp003;\n\t"; ss << "double tmp004;\n\t"; - #ifdef ISNAN FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken(); const formula::SingleVectorRefToken*tmpCurDVR0= static_cast<const diff --git a/sc/source/core/opencl/op_financial.hxx b/sc/source/core/opencl/op_financial.hxx index 415491f52be5..0136be7fc4f4 100644 --- a/sc/source/core/opencl/op_financial.hxx +++ b/sc/source/core/opencl/op_financial.hxx @@ -294,7 +294,6 @@ public: virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; - class OpSLN: public Normal { public: diff --git a/sc/source/core/opencl/op_logical.cxx b/sc/source/core/opencl/op_logical.cxx index 96170f2293f3..1a9fcd25fe64 100644 --- a/sc/source/core/opencl/op_logical.cxx +++ b/sc/source/core/opencl/op_logical.cxx @@ -18,7 +18,6 @@ #include <formula/vectortoken.hxx> #include <sstream> - using namespace formula; namespace sc { namespace opencl { diff --git a/sc/source/core/opencl/op_logical.hxx b/sc/source/core/opencl/op_logical.hxx index 4365a57e7625..be0ba3755fb2 100644 --- a/sc/source/core/opencl/op_logical.hxx +++ b/sc/source/core/opencl/op_logical.hxx @@ -12,7 +12,6 @@ #include "opbase.hxx" - namespace sc { namespace opencl { class OpAnd: public Normal diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx index 555da5926e9f..f9a7785104e9 100644 --- a/sc/source/core/opencl/op_math.cxx +++ b/sc/source/core/opencl/op_math.cxx @@ -285,7 +285,6 @@ void OpCot::GenSlidingWindowFunction(std::stringstream &ss, ss << "}"; } - void OpCoth::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { diff --git a/sc/source/core/opencl/op_math.hxx b/sc/source/core/opencl/op_math.hxx index d2500882f752..e839cf37b8d1 100644 --- a/sc/source/core/opencl/op_math.hxx +++ b/sc/source/core/opencl/op_math.hxx @@ -47,7 +47,6 @@ public: virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MROUND"; } }; - class OpCsc: public Normal { public: diff --git a/sc/source/core/opencl/op_spreadsheet.cxx b/sc/source/core/opencl/op_spreadsheet.cxx index 361085014542..a5823d49d981 100644 --- a/sc/source/core/opencl/op_spreadsheet.cxx +++ b/sc/source/core/opencl/op_spreadsheet.cxx @@ -165,7 +165,6 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss, ss << "[rowNum];\n"; ss << "}"; - } else { @@ -180,8 +179,6 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss, ss << "[rowNum];\n"; ss << "}"; - - } } ss << " return tmp;\n"; @@ -261,7 +258,6 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss, ss << "[rowNum];\n"; } - } ss << " return tmp;\n"; ss << " }\n"; diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx index 20dbb49362ba..c378e562ef9a 100644 --- a/sc/source/core/opencl/op_statistical.cxx +++ b/sc/source/core/opencl/op_statistical.cxx @@ -3625,7 +3625,6 @@ vSubArguments) ss << "}\n"; } - void OpFisherInv::GenSlidingWindowFunction( std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) { @@ -4053,7 +4052,6 @@ void OpPearson::GenSlidingWindowFunction( ss << "}\n"; } - void OpGammaLn::GenSlidingWindowFunction( std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) { @@ -4476,7 +4474,6 @@ void OpConfidence::GenSlidingWindowFunction(std::stringstream& ss, ss << "}"; } - void OpCritBinom::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { @@ -4592,7 +4589,6 @@ void OpCritBinom::GenSlidingWindowFunction(std::stringstream& ss, ss << "}"; } - void OpRsq::GenSlidingWindowFunction( std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) { @@ -5094,7 +5090,6 @@ void OpVariationen2::GenSlidingWindowFunction( ss << "}\n"; } - void OpPhi::GenSlidingWindowFunction( std::stringstream &ss,const std::string &sSymName, SubArguments &vSubArguments) @@ -7021,7 +7016,6 @@ void OpBinomdist::GenSlidingWindowFunction( ss << "}\n"; } - void OpChiSqDist::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { diff --git a/sc/source/core/opencl/opencl_device.cxx b/sc/source/core/opencl/opencl_device.cxx index 9070cd8ae519..0dec2673ffb7 100644 --- a/sc/source/core/opencl/opencl_device.cxx +++ b/sc/source/core/opencl/opencl_device.cxx @@ -24,7 +24,6 @@ #include "opencl_device.hxx" - #define INPUTSIZE 15360 #define OUTPUTSIZE 15360 diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index 4f8764479106..79e79255289b 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -179,7 +179,6 @@ std::vector<boost::shared_ptr<osl::File> > OpenclDevice::binaryGenerated( const if(clStatus != CL_SUCCESS) return aGeneratedFiles; - // grab the handles to all of the devices in the context. boost::scoped_array<cl_device_id> mpArryDevsID(new cl_device_id[numDevices]); clStatus = clGetContextInfo( context, CL_CONTEXT_DEVICES, diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx b/sc/source/core/opencl/opinlinefun_finacial.cxx index 04601b83c4ea..c18212fdeb58 100644 --- a/sc/source/core/opencl/opinlinefun_finacial.cxx +++ b/sc/source/core/opencl/opinlinefun_finacial.cxx @@ -271,7 +271,6 @@ std::string DateToDays_new= " return nDays;\n" "}\n"; - std::string GetNullDateDecl= "int GetNullDate(void);\n"; @@ -512,14 +511,12 @@ std::string getDaysInYearRange= ";\n" "}\n"; - std::string getDiffDecl= "int getDiff(int rFrom,int rTo,int fDay,int fMonth,int fYear,int fbLastDayMode," "int fbLastDay,int fb30Days,int fbUSMode,int fnDay,int tDay,int tMonth," "int tYear,int tbLastDayMode,int tbLastDay,int tb30Days," "int tbUSMode,int tnDay);\n"; - std::string getDiff= "int getDiff(int rFrom,int rTo,int fDay,int fMonth,int fYear,int fbLastDayMode," "int fbLastDay,int fb30Days,int fbUSMode,int fnDay,int tDay,int tMonth," @@ -581,7 +578,6 @@ std::string getDiff= std::string lcl_GetcoupdaybsDecl= "int lcl_Getcoupdaybs(int nNullDate,int nSettle, int nMat,int nFreq,int nBase);\n"; - std::string lcl_Getcoupdaybs= "int lcl_Getcoupdaybs(int nNullDate,int nSettle, int nMat,int nFreq,int nBase)\n" "{\n" @@ -837,11 +833,9 @@ std::string setDay= " }\n" "}\n"; - std::string coupdaysDecl= "double coupdays(int nSettle,int nMat,int nFreq,int nBase);\n"; - std::string coupdays= "double coupdays(int nSettle,int nMat,int nFreq,int nBase)\n" "{\n" @@ -887,7 +881,6 @@ std::string coupdaybs_new= std::string coupdaysncDecl= "double coupdaysnc( int nSettle,int nMat,int nFreq,int nBase);\n"; - std::string coupdaysnc= "double coupdaysnc( int nSettle,int nMat,int nFreq,int nBase)\n" "{\n" @@ -1009,7 +1002,6 @@ std::string getPrice_Decl= "double getPrice_(int nSettle, int nMat, double fRate, double fYield,\n" "double fRedemp, int nFreq, int nBase );\n"; - std::string getPrice_= "double getPrice_(int nSettle, int nMat, double fRate, double fYield,\n" "double fRedemp, int nFreq, int nBase )\n" @@ -1032,7 +1024,6 @@ std::string getPrice_new_Decl= "double getPrice_(int nSettle, int nMat, double fRate, double fYield,\n" "double fRedemp, int nFreq, int nBase );\n"; - std::string getPrice_new= "double getPrice_(int nSettle, int nMat, double fRate, double fYield,\n" "double fRedemp, int nFreq, int nBase )\n" @@ -1244,12 +1235,10 @@ std::string GetYearFrac= " return (double)( nDayDiff ) / (nDaysInYear);\n" "}\n"; - std::string GetYieldmatDecl= "double GetYieldmat( int nNullDate, int nSettle, int nMat, int nIssue,\n" "double fRate, double fPrice, int nBase );\n"; - std::string GetYieldmat= "double GetYieldmat( int nNullDate, int nSettle, int nMat, int nIssue,\n" "double fRate, double fPrice, int nBase )\n" @@ -1381,7 +1370,6 @@ std::string GetDiffDate360Decl= "int GetDiffDate360( int nNullDate, int nDate1, int nDate2," "bool bUSAMethod);\n"; - std::string GetDiffDate360= "int GetDiffDate360( int nNullDate, int nDate1, int nDate2," "bool bUSAMethod )\n" diff --git a/sc/source/core/opencl/opinlinefun_math.hxx b/sc/source/core/opencl/opinlinefun_math.hxx index 7666f9d36095..ab9dc02efa67 100644 --- a/sc/source/core/opencl/opinlinefun_math.hxx +++ b/sc/source/core/opencl/opinlinefun_math.hxx @@ -86,7 +86,6 @@ std::string atan2Content = " return a;\n" "}\n"; - #endif // INCLUDED_SC_SOURCE_CORE_OPENCL_OPINLINEFUN_MATH_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/opencl/opinlinefun_statistical.cxx b/sc/source/core/opencl/opinlinefun_statistical.cxx index 71cfd3df01b7..d16d9386feff 100644 --- a/sc/source/core/opencl/opinlinefun_statistical.cxx +++ b/sc/source/core/opencl/opinlinefun_statistical.cxx @@ -327,7 +327,6 @@ std::string GetBinomDistPMF = " }\n" "}\n"; - std::string lcl_GetBinomDistRangeDecl = "double lcl_GetBinomDistRange(double n, \n" "double xs, double xe, double fFactor, double p, double q);"; @@ -363,7 +362,6 @@ std::string GetLogGamma = " return lcl_GetLogGammaHelper(fZ+2) - log(fZ+1) - log(fZ);\n" "}\n"; - std::string GetChiDistDecl = "double GetChiDist(double fX, double fDF);\n"; std::string GetChiDist = "double GetChiDist(double fX, double fDF)\n" @@ -374,7 +372,6 @@ std::string GetChiDist = " return GetUpRegIGamma( fDF*pow(2.0,-1.0), fX*pow(2.0,-1.0));\n" "}\n"; - std::string GetChiSqDistCDFDecl = "double GetChiSqDistCDF(double fX, double fDF);\n"; std::string GetChiSqDistCDF = @@ -386,7 +383,6 @@ std::string GetChiSqDistCDF = " return GetLowRegIGamma( fDF*pow(2.0,-1.0), fX*pow(2.0,-1.0));\n" "}\n"; - std::string GetChiSqDistPDFDecl= "double GetChiSqDistPDF(double fX, double fDF);\n"; std::string GetChiSqDistPDF = @@ -426,7 +422,6 @@ std::string GetChiSqDistPDF = " return fValue;\n" "}\n"; - std::string lcl_IterateInverseBetaInvDecl = "static double lcl_IterateInverseBetaInv(double fp, double fAlpha, \n" " double fBeta, double fAx, double fBx, bool *rConvError );\n"; @@ -524,7 +519,6 @@ std::string lcl_IterateInverseBetaInv = " return fRx;\n" "}\n"; - std::string lcl_IterateInverseChiInvDecl = "static double lcl_IterateInverseChiInv" "(double fp, double fdf, double fAx, double fBx, bool *rConvError);\n"; @@ -1545,4 +1539,3 @@ std::string rtl_math_erfc_rd = #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index f0a757b071e8..9b52c862e5e9 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1346,7 +1346,6 @@ ScUnoAddInCall::~ScUnoAddInCall() // pFuncData is deleted with ScUnoAddInCollection } - ScAddInArgumentType ScUnoAddInCall::GetArgType( long nPos ) { if ( pFuncData ) @@ -1699,5 +1698,4 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx index cea7023d0a7b..abdd4c4b4c64 100644 --- a/sc/source/core/tool/addinlis.cxx +++ b/sc/source/core/tool/addinlis.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/objsh.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx index 8df2576e140d..2c7bb57f54df 100644 --- a/sc/source/core/tool/cellkeytranslator.cxx +++ b/sc/source/core/tool/cellkeytranslator.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "cellkeytranslator.hxx" #include <comphelper/processfactory.hxx> #include <i18nlangtag/mslangid.hxx> diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index e3d3a1914733..c92977fe0cca 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -147,10 +147,8 @@ ScMemChart* ScChartArray::CreateMemChartSingle() SCSIZE nCol; SCSIZE nRow; - // real size (without hidden rows/columns) - SCCOL nColAdd = HasRowHeaders() ? 1 : 0; SCROW nRowAdd = HasColHeaders() ? 1 : 0; @@ -264,7 +262,6 @@ ScMemChart* ScChartArray::CreateMemChartSingle() pMemChart->SetData( nCol, nRow, DBL_MIN ); } - // Column Header for (nCol=0; nCol<nColCount; nCol++) @@ -286,7 +283,6 @@ ScMemChart* ScChartArray::CreateMemChartSingle() pMemChart->SetColText( nCol, aString); } - // Row Header for (nRow=0; nRow<nRowCount; nRow++) @@ -376,10 +372,8 @@ ScMemChart* ScChartArray::CreateMemChartMulti() //TODO: Label when gaps - // Column header - SCCOL nPosCol = 0; for ( nCol = 0; nCol < nColCount; nCol++ ) { @@ -403,10 +397,8 @@ ScMemChart* ScChartArray::CreateMemChartMulti() pMemChart->SetColText( nCol, aString); } - // Row header - SCROW nPosRow = 0; for ( nRow = 0; nRow < nRowCount; nRow++ ) { diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index a19686bdf4a8..1fa991a4653a 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -95,7 +95,6 @@ void ScChartListener::ExternalRefListener::removeFileId(sal_uInt16 nFileId) maFileIds.erase(nFileId); } - ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, const ScRangeListRef& rRangeList ) : SvtListener(), @@ -172,7 +171,6 @@ ScChartListener::~ScChartListener() } } - void ScChartListener::SetUno( const uno::Reference< chart::XChartDataChangeEventListener >& rListener, const uno::Reference< chart::XChartData >& rSource ) @@ -469,9 +467,6 @@ bool ScChartListenerCollection::hasListeners() const return !maListeners.empty(); } - - - OUString ScChartListenerCollection::getUniqueName(const OUString& rPrefix) const { for (sal_Int32 nNum = 1; nNum < 10000; ++nNum) // arbitrary limit to prevent infinite loop. diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index 11a0bb281613..b36b6e9e4685 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -342,7 +342,6 @@ const ScChartPositionMap* ScChartPositioner::GetPositionMap() return pPositionMap; } - void ScChartPositioner::CreatePositionMap() { if ( eGlue == SC_CHARTGLUE_NA && pPositionMap ) @@ -361,10 +360,8 @@ void ScChartPositioner::CreatePositionMap() SCROW nRow, nRow1, nRow2; SCTAB nTab, nTab1, nTab2; - // real size (without hidden rows/columns) - SCSIZE nColCount = 0; SCSIZE nRowCount = 0; @@ -480,7 +477,6 @@ void ScChartPositioner::CreatePositionMap() delete pCols; } - ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows, SCCOL nColAdd, SCROW nRowAdd, ColumnMap& rCols ) : ppData( new ScAddress* [ nChartCols * nChartRows ] ), @@ -570,7 +566,6 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows, } } - ScChartPositionMap::~ScChartPositionMap() { for ( sal_uLong nIndex=0; nIndex < nCount; nIndex++ ) diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 239964488221..8f1691def1fd 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -553,13 +553,11 @@ OUString ScChangeAction::GetRefString( return aBuf.makeStringAndClear(); } - void ScChangeAction::SetUser( const OUString& r ) { aUser = r; } - void ScChangeAction::SetComment( const OUString& rStr ) { aComment = rStr; @@ -875,7 +873,6 @@ bool ScChangeActionDel::IsTabDeleteCol() const return p && p->GetType() == SC_CAT_DELETE_TABS; } - ScChangeActionDelMoveEntry* ScChangeActionDel::AddCutOffMove( ScChangeActionMove* pMove, short nFrom, short nTo ) { @@ -1443,8 +1440,6 @@ void ScChangeActionContent::GetNewString( OUString& rStr, const ScDocument* pDoc GetValueString(rStr, maNewValue, maNewCell, pDoc); } - - void ScChangeActionContent::GetDescription( OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { @@ -2201,7 +2196,6 @@ void ScChangeTrack::Clear() Init(); } - void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { if ( !pDoc->IsInDtorClear() ) @@ -2238,7 +2232,6 @@ void ScChangeTrack::SetUser( const OUString& rUser ) maUserCollection.insert(maUser); } - void ScChangeTrack::StartBlockModify( ScChangeTrackMsgType eMsgType, sal_uLong nStartAction ) { diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 48c505e9ff93..c5ba011739ff 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -802,10 +802,6 @@ ScDBCollection::ScDBCollection(ScDocument* pDocument) : ScDBCollection::ScDBCollection(const ScDBCollection& r) : pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs), maAnonDBs(r.maAnonDBs) {} - - - - const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly) const { // First, search the global named db ranges. diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 14d6aaee5bcc..39e4bbd531ef 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -1144,8 +1144,6 @@ sal_uInt16 ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2 return nResult; } - - bool ScDetectiveFunc::ShowPred( SCCOL nCol, SCROW nRow ) { ScDrawLayer* pModel = pDoc->GetDrawLayer(); diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 547bc21e6aec..2499c71f4105 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -266,7 +266,6 @@ void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam) pParam->bDuplicate = true; } - ScDBInternalRange::ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange) : ScDBRangeBase(pDoc, INTERNAL), maRange(rRange) { @@ -276,7 +275,6 @@ ScDBInternalRange::~ScDBInternalRange() { } - SCCOL ScDBInternalRange::getColSize() const { return maRange.aEnd.Col() - maRange.aStart.Col() + 1; diff --git a/sc/source/core/tool/editdataarray.cxx b/sc/source/core/tool/editdataarray.cxx index a635d64a465e..63b9b1d53ff9 100644 --- a/sc/source/core/tool/editdataarray.cxx +++ b/sc/source/core/tool/editdataarray.cxx @@ -72,7 +72,4 @@ const EditTextObject* ScEditDataArray::Item::GetNewData() const return mpNewData.get(); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 732d55c15609..e3aa845cffe0 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -716,10 +716,8 @@ void ScTabEditEngine::Init( const ScPatternAttr& rPattern ) // Feldbefehle fuer Kopf- und Fusszeilen - // Zahlen aus \sw\source\core\doc\numbers.cxx - static OUString lcl_GetCharStr( sal_Int32 nNo ) { OSL_ENSURE( nNo, "0 is an invalid number !!" ); @@ -844,10 +842,8 @@ OUString ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, return aRet; } - // Feld-Daten - ScFieldEditEngine::ScFieldEditEngine( ScDocument* pDoc, SfxItemPool* pEnginePoolP, SfxItemPool* pTextObjectPool, bool bDeleteEnginePoolP) : diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx index 658eb97821e5..983da5daaccd 100644 --- a/sc/source/core/tool/formularesult.cxx +++ b/sc/source/core/tool/formularesult.cxx @@ -67,7 +67,6 @@ ScFormulaResult::~ScFormulaResult() mpToken->DecRef(); } - void ScFormulaResult::ResetToDefaults() { mnError = 0; diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 8c86e56a7839..d9a7d588dcc0 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -211,7 +211,6 @@ void ScInterpreter::ScIfJump() } } - /** Store a matrix value in another matrix in the context of that other matrix is the result matrix of a jump matrix. All arguments must be valid and are not checked. */ @@ -233,7 +232,6 @@ static void lcl_storeJumpMatResult( } } - void ScInterpreter::ScIfError( bool bNAonly ) { const short* pJump = pCur->GetJump(); @@ -393,7 +391,6 @@ void ScInterpreter::ScIfError( bool bNAonly ) } } - void ScInterpreter::ScChoseJump() { // We have to set a jump, if there was none chosen because of an error set @@ -879,7 +876,6 @@ double ScInterpreter::Compare() return sc::CompareFunc(aComp.maCells[0], aComp.maCells[1], aComp.mbIgnoreCase); } - sc::RangeMatrix ScInterpreter::CompareMat( ScQueryOp eOp, sc::CompareOptions* pOptions ) { sc::Compare aComp; @@ -1041,7 +1037,6 @@ sc::RangeMatrix ScInterpreter::CompareMat( ScQueryOp eOp, sc::CompareOptions* pO return aRes; } - ScMatrixRef ScInterpreter::QueryMat( const ScMatrixRef& pMat, sc::CompareOptions& rOptions ) { short nSaveCurFmtType = nCurFmtType; @@ -1081,7 +1076,6 @@ void ScInterpreter::ScEqual() PushInt( int(Compare() == 0) ); } - void ScInterpreter::ScNotEqual() { if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) @@ -1099,7 +1093,6 @@ void ScInterpreter::ScNotEqual() PushInt( int(Compare() != 0) ); } - void ScInterpreter::ScLess() { if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) @@ -1117,7 +1110,6 @@ void ScInterpreter::ScLess() PushInt( int(Compare() < 0) ); } - void ScInterpreter::ScGreater() { if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) @@ -1135,7 +1127,6 @@ void ScInterpreter::ScGreater() PushInt( int(Compare() > 0) ); } - void ScInterpreter::ScLessEqual() { if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) @@ -1153,7 +1144,6 @@ void ScInterpreter::ScLessEqual() PushInt( int(Compare() <= 0) ); } - void ScInterpreter::ScGreaterEqual() { if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) @@ -1171,7 +1161,6 @@ void ScInterpreter::ScGreaterEqual() PushInt( int(Compare() >= 0) ); } - void ScInterpreter::ScAnd() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -1271,7 +1260,6 @@ void ScInterpreter::ScAnd() } } - void ScInterpreter::ScOr() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -1372,7 +1360,6 @@ void ScInterpreter::ScOr() } } - void ScInterpreter::ScXor() { @@ -1476,7 +1463,6 @@ void ScInterpreter::ScXor() } } - void ScInterpreter::ScNeg() { // Simple negation doesn't change current format type to number, keep @@ -1519,7 +1505,6 @@ void ScInterpreter::ScNeg() } } - void ScInterpreter::ScPercentSign() { nFuncFmtType = NUMBERFORMAT_PERCENT; @@ -1534,7 +1519,6 @@ void ScInterpreter::ScPercentSign() cPar = nSavePar; } - void ScInterpreter::ScNot() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -1575,7 +1559,6 @@ void ScInterpreter::ScNot() } } - void ScInterpreter::ScBitAnd() { @@ -1591,7 +1574,6 @@ void ScInterpreter::ScBitAnd() PushDouble ((sal_uInt64) num1 & (sal_uInt64) num2); } - void ScInterpreter::ScBitOr() { @@ -1607,7 +1589,6 @@ void ScInterpreter::ScBitOr() PushDouble ((sal_uInt64) num1 | (sal_uInt64) num2); } - void ScInterpreter::ScBitXor() { @@ -1623,7 +1604,6 @@ void ScInterpreter::ScBitXor() PushDouble ((sal_uInt64) num1 ^ (sal_uInt64) num2); } - void ScInterpreter::ScBitLshift() { @@ -1647,7 +1627,6 @@ void ScInterpreter::ScBitLshift() } } - void ScInterpreter::ScBitRshift() { @@ -1671,117 +1650,98 @@ void ScInterpreter::ScBitRshift() } } - void ScInterpreter::ScPi() { PushDouble(F_PI); } - void ScInterpreter::ScRandom() { PushDouble(::comphelper::rng::uniform()); } - void ScInterpreter::ScTrue() { nFuncFmtType = NUMBERFORMAT_LOGICAL; PushInt(1); } - void ScInterpreter::ScFalse() { nFuncFmtType = NUMBERFORMAT_LOGICAL; PushInt(0); } - void ScInterpreter::ScDeg() { PushDouble((GetDouble() / F_PI) * 180.0); } - void ScInterpreter::ScRad() { PushDouble(GetDouble() * (F_PI / 180)); } - void ScInterpreter::ScSin() { PushDouble(::rtl::math::sin(GetDouble())); } - void ScInterpreter::ScCos() { PushDouble(::rtl::math::cos(GetDouble())); } - void ScInterpreter::ScTan() { PushDouble(::rtl::math::tan(GetDouble())); } - void ScInterpreter::ScCot() { PushDouble(1.0 / ::rtl::math::tan(GetDouble())); } - void ScInterpreter::ScArcSin() { PushDouble(asin(GetDouble())); } - void ScInterpreter::ScArcCos() { PushDouble(acos(GetDouble())); } - void ScInterpreter::ScArcTan() { PushDouble(atan(GetDouble())); } - void ScInterpreter::ScArcCot() { PushDouble((F_PI2) - atan(GetDouble())); } - void ScInterpreter::ScSinHyp() { PushDouble(sinh(GetDouble())); } - void ScInterpreter::ScCosHyp() { PushDouble(cosh(GetDouble())); } - void ScInterpreter::ScTanHyp() { PushDouble(tanh(GetDouble())); } - void ScInterpreter::ScCotHyp() { PushDouble(1.0 / tanh(GetDouble())); } - void ScInterpreter::ScArcSinHyp() { PushDouble( ::rtl::math::asinh( GetDouble())); @@ -1805,7 +1765,6 @@ void ScInterpreter::ScArcTanHyp() PushDouble( ::rtl::math::atanh( fVal)); } - void ScInterpreter::ScArcCotHyp() { double nVal = GetDouble(); @@ -1835,13 +1794,11 @@ void ScInterpreter::ScSecantHyp() PushDouble(1.0 / cosh(GetDouble())); } - void ScInterpreter::ScExp() { PushDouble(exp(GetDouble())); } - void ScInterpreter::ScSqrt() { double fVal = GetDouble(); @@ -1851,7 +1808,6 @@ void ScInterpreter::ScSqrt() PushIllegalArgument(); } - void ScInterpreter::ScIsEmpty() { short nRes = 0; @@ -1907,7 +1863,6 @@ void ScInterpreter::ScIsEmpty() PushInt( nRes ); } - bool ScInterpreter::IsString() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -1968,19 +1923,16 @@ bool ScInterpreter::IsString() return nRes; } - void ScInterpreter::ScIsString() { PushInt( int(IsString()) ); } - void ScInterpreter::ScIsNonString() { PushInt( int(!IsString()) ); } - void ScInterpreter::ScIsLogical() { bool nRes = false; @@ -2019,7 +1971,6 @@ void ScInterpreter::ScIsLogical() PushInt( int(nRes) ); } - void ScInterpreter::ScType() { short nType = 0; @@ -2098,13 +2049,11 @@ void ScInterpreter::ScType() PushInt( nType ); } - static inline bool lcl_FormatHasNegColor( const SvNumberformat* pFormat ) { return pFormat && pFormat->GetColor( 1 ); } - static inline bool lcl_FormatHasOpenPar( const SvNumberformat* pFormat ) { return pFormat && (pFormat->GetFormatstring().indexOf('(') != -1); @@ -2527,7 +2476,6 @@ void ScInterpreter::ScIsRef() PushInt( int(nRes) ); } - void ScInterpreter::ScIsValue() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -2591,7 +2539,6 @@ void ScInterpreter::ScIsValue() PushInt( int(nRes) ); } - void ScInterpreter::ScIsFormula() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -2615,7 +2562,6 @@ void ScInterpreter::ScIsFormula() PushInt( int(nRes) ); } - void ScInterpreter::ScFormula() { OUString aFormula; @@ -2695,7 +2641,6 @@ void ScInterpreter::ScIsNV() PushInt( int(nRes) ); } - void ScInterpreter::ScIsErr() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -2750,7 +2695,6 @@ void ScInterpreter::ScIsErr() PushInt( int(nRes) ); } - void ScInterpreter::ScIsError() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -2802,7 +2746,6 @@ void ScInterpreter::ScIsError() PushInt( int(nRes) ); } - bool ScInterpreter::IsEven() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -2886,13 +2829,11 @@ bool ScInterpreter::IsEven() return nRes; } - void ScInterpreter::ScIsEven() { PushInt( int(IsEven()) ); } - void ScInterpreter::ScIsOdd() { PushInt( int(!IsEven()) ); @@ -2931,14 +2872,12 @@ void ScInterpreter::ScTrim() PushString(aStr.makeStringAndClear()); } - void ScInterpreter::ScUpper() { OUString aString = ScGlobal::pCharClass->uppercase(GetString().getString()); PushString(aString); } - void ScInterpreter::ScPropper() { //2do: what to do with I18N-CJK ?!? @@ -2963,20 +2902,17 @@ void ScInterpreter::ScPropper() PushString(aStr.makeStringAndClear()); } - void ScInterpreter::ScLower() { OUString aString = ScGlobal::pCharClass->lowercase(GetString().getString()); PushString(aString); } - void ScInterpreter::ScLen() { PushDouble(GetString().getLength()); } - void ScInterpreter::ScT() { switch ( GetStackType() ) @@ -3045,7 +2981,6 @@ void ScInterpreter::ScT() } } - void ScInterpreter::ScValue() { OUString aInputString; @@ -3127,7 +3062,6 @@ void ScInterpreter::ScValue() PushIllegalArgument(); } - // fdo#57180 void ScInterpreter::ScNumberValue() { @@ -3224,7 +3158,6 @@ void ScInterpreter::ScNumberValue() PushNoValue(); } - //2do: this should be a proper unicode string method static inline bool lcl_ScInterpreter_IsPrintable( sal_Unicode c ) { @@ -3242,7 +3175,6 @@ void ScInterpreter::ScClean() PushString(aStr); } - void ScInterpreter::ScCode() { //2do: make it full range unicode? @@ -3258,7 +3190,6 @@ void ScInterpreter::ScCode() PushInt( (unsigned char) OUStringToOString(OUString(aStr[0]), osl_getThreadTextEncoding(), convertFlags).toChar() ); } - void ScInterpreter::ScChar() { //2do: make it full range unicode? @@ -3279,7 +3210,6 @@ void ScInterpreter::ScChar() } } - /* #i70213# fullwidth/halfwidth conversion provided by * Takashi Nakamoto <bluedwarf@ooo> * erAck: added Excel compatibility conversions as seen in issue's test case. */ @@ -3298,7 +3228,6 @@ static OUString lcl_convertIntoHalfWidth( const OUString & rStr ) return aTrans.transliterate( rStr, 0, sal_uInt16( rStr.getLength() ), NULL ); } - static OUString lcl_convertIntoFullWidth( const OUString & rStr ) { static bool bFirstJISCall = true; @@ -3313,7 +3242,6 @@ static OUString lcl_convertIntoFullWidth( const OUString & rStr ) return aTrans.transliterate( rStr, 0, sal_uInt16( rStr.getLength() ), NULL ); } - /* ODFF: * Summary: Converts half-width to full-width ASCII and katakana characters. * Semantics: Conversion is done for half-width ASCII and katakana characters, @@ -3330,7 +3258,6 @@ void ScInterpreter::ScJis() PushString( lcl_convertIntoFullWidth( GetString().getString())); } - /* ODFF: * Summary: Converts full-width to half-width ASCII and katakana characters. * Semantics: Conversion is done for full-width ASCII and katakana characters, @@ -3374,7 +3301,6 @@ void ScInterpreter::ScUnichar() } } - void ScInterpreter::ScMin( bool bTextAsZero ) { short nParamCount = GetByte(); @@ -3683,7 +3609,6 @@ void ScInterpreter::GetStVarParams( double& rVal, double& rValCount, rVal = vSum; } - void ScInterpreter::ScVar( bool bTextAsZero ) { double nVal; @@ -3696,7 +3621,6 @@ void ScInterpreter::ScVar( bool bTextAsZero ) PushDouble( nVal / (nValCount - 1.0)); } - void ScInterpreter::ScVarP( bool bTextAsZero ) { double nVal; @@ -3706,7 +3630,6 @@ void ScInterpreter::ScVarP( bool bTextAsZero ) PushDouble( div( nVal, nValCount)); } - void ScInterpreter::ScStDev( bool bTextAsZero ) { double nVal; @@ -3718,7 +3641,6 @@ void ScInterpreter::ScStDev( bool bTextAsZero ) PushDouble( sqrt( nVal / (nValCount - 1.0))); } - void ScInterpreter::ScStDevP( bool bTextAsZero ) { double nVal; @@ -3747,7 +3669,6 @@ void ScInterpreter::ScStDevP( bool bTextAsZero ) */ } - void ScInterpreter::ScColumns() { sal_uInt8 nParamCount = GetByte(); @@ -3805,7 +3726,6 @@ void ScInterpreter::ScColumns() PushDouble((double)nVal); } - void ScInterpreter::ScRows() { sal_uInt8 nParamCount = GetByte(); @@ -3917,7 +3837,6 @@ void ScInterpreter::ScTables() PushDouble( (double) nVal ); } - void ScInterpreter::ScColumn() { sal_uInt8 nParamCount = GetByte(); @@ -3999,7 +3918,6 @@ void ScInterpreter::ScColumn() } } - void ScInterpreter::ScRow() { sal_uInt8 nParamCount = GetByte(); @@ -4589,7 +4507,6 @@ void ScInterpreter::ScMatch() } } - void ScInterpreter::ScCountEmptyCells() { if ( MustHaveParamCount( GetByte(), 1 ) ) @@ -4637,7 +4554,6 @@ void ScInterpreter::ScCountEmptyCells() } } - double ScInterpreter::IterateParametersIf( ScIterFuncIf eFunc ) { sal_uInt8 nParamCount = GetByte(); @@ -5840,7 +5756,6 @@ void ScInterpreter::ScLookup() SetError( errIllegalParameter); } - if (nGlobalError) { PushError( nGlobalError); @@ -6248,7 +6163,6 @@ void ScInterpreter::ScLookup() } } - void ScInterpreter::ScHLookup() { CalculateLookup(true); @@ -6852,7 +6766,6 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField ) return NULL; } - void ScInterpreter::DBIterator( ScIterFunc eFunc ) { double nErg = 0.0; @@ -6919,13 +6832,11 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc ) PushDouble( nErg ); } - void ScInterpreter::ScDBSum() { DBIterator( ifSUM ); } - void ScInterpreter::ScDBCount() { bool bMissingField = true; @@ -6986,7 +6897,6 @@ void ScInterpreter::ScDBCount() PushIllegalParameter(); } - void ScInterpreter::ScDBCount2() { bool bMissingField = true; @@ -7019,31 +6929,26 @@ void ScInterpreter::ScDBCount2() PushIllegalParameter(); } - void ScInterpreter::ScDBAverage() { DBIterator( ifAVERAGE ); } - void ScInterpreter::ScDBMax() { DBIterator( ifMAX ); } - void ScInterpreter::ScDBMin() { DBIterator( ifMIN ); } - void ScInterpreter::ScDBProduct() { DBIterator( ifPRODUCT ); } - void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount ) { std::vector<double> values; @@ -7088,7 +6993,6 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount ) rVal = vSum; } - void ScInterpreter::ScDBStdDev() { double fVal, fCount; @@ -7096,7 +7000,6 @@ void ScInterpreter::ScDBStdDev() PushDouble( sqrt(fVal/(fCount-1))); } - void ScInterpreter::ScDBStdDevP() { double fVal, fCount; @@ -7104,7 +7007,6 @@ void ScInterpreter::ScDBStdDevP() PushDouble( sqrt(fVal/fCount)); } - void ScInterpreter::ScDBVar() { double fVal, fCount; @@ -7112,7 +7014,6 @@ void ScInterpreter::ScDBVar() PushDouble(fVal/(fCount-1)); } - void ScInterpreter::ScDBVarP() { double fVal, fCount; @@ -7200,7 +7101,6 @@ void ScInterpreter::ScIndirect() } } - void ScInterpreter::ScAddressFunc() { OUString sTabStr; @@ -7291,7 +7191,6 @@ void ScInterpreter::ScAddressFunc() PushString( aRefStr ); } - void ScInterpreter::ScOffset() { sal_uInt8 nParamCount = GetByte(); @@ -7439,7 +7338,6 @@ void ScInterpreter::ScOffset() } } - void ScInterpreter::ScIndex() { sal_uInt8 nParamCount = GetByte(); @@ -7645,7 +7543,6 @@ void ScInterpreter::ScIndex() } } - void ScInterpreter::ScMultiArea() { // Legacy support, convert to RefList @@ -7659,7 +7556,6 @@ void ScInterpreter::ScMultiArea() } } - void ScInterpreter::ScAreas() { sal_uInt8 nParamCount = GetByte(); @@ -7696,7 +7592,6 @@ void ScInterpreter::ScAreas() } } - void ScInterpreter::ScCurrency() { sal_uInt8 nParamCount = GetByte(); @@ -7755,7 +7650,6 @@ void ScInterpreter::ScCurrency() } } - void ScInterpreter::ScReplace() { if ( MustHaveParamCount( GetByte(), 4 ) ) @@ -7783,7 +7677,6 @@ void ScInterpreter::ScReplace() } } - void ScInterpreter::ScFixed() { sal_uInt8 nParamCount = GetByte(); @@ -7841,7 +7734,6 @@ void ScInterpreter::ScFixed() } } - void ScInterpreter::ScFind() { sal_uInt8 nParamCount = GetByte(); @@ -7866,7 +7758,6 @@ void ScInterpreter::ScFind() } } - void ScInterpreter::ScExact() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -7878,7 +7769,6 @@ void ScInterpreter::ScExact() } } - void ScInterpreter::ScLeft() { sal_uInt8 nParamCount = GetByte(); @@ -8107,7 +7997,6 @@ void ScInterpreter::ScRight() } } - void ScInterpreter::ScSearch() { sal_uInt8 nParamCount = GetByte(); @@ -8247,7 +8136,6 @@ void ScInterpreter::ScText() } } - void ScInterpreter::ScSubstitute() { sal_uInt8 nParamCount = GetByte(); @@ -8301,7 +8189,6 @@ void ScInterpreter::ScSubstitute() } } - void ScInterpreter::ScRept() { if ( MustHaveParamCount( GetByte(), 2 ) ) @@ -8328,7 +8215,6 @@ void ScInterpreter::ScRept() } } - void ScInterpreter::ScConcat() { sal_uInt8 nParamCount = GetByte(); @@ -8341,7 +8227,6 @@ void ScInterpreter::ScConcat() PushString( aRes ); } - void ScInterpreter::ScErrorType() { sal_uInt16 nErr; @@ -8422,7 +8307,6 @@ void ScInterpreter::ScErrorType() } } - bool ScInterpreter::MayBeRegExp( const OUString& rStr, const ScDocument* pDoc ) { if ( pDoc && !pDoc->GetDocOptions().IsFormulaRegexEnabled() ) diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 51453ddc892f..02938092f217 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2184,10 +2184,8 @@ void ScInterpreter::ScStyle() if (nTimeOut < 0) nTimeOut = 0; - // Request ausfuehren, um Vorlage anzuwenden - if ( !pDok->IsClipOrUndo() ) { SfxObjectShell* pShell = pDok->GetDocumentShell(); diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index dba4882c62da..f20b07f0b560 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -249,10 +249,8 @@ double ScInterpreter::gauss(double x) return nVal; } - // #i26836# new gaussinv implementation by Martin Eitzenberger <m.eitzenberger@unix.net> - double ScInterpreter::gaussinv(double x) { double q,t,z; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 5ed260e6871b..3238d066f9d6 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -82,7 +82,6 @@ using ::std::auto_ptr; //-----------------------------static data ----------------- - // Funktionen fuer den Zugriff auf das Document void ScInterpreter::ReplaceCell( ScAddress& rPos ) @@ -104,7 +103,6 @@ void ScInterpreter::ReplaceCell( ScAddress& rPos ) } } - void ScInterpreter::ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ) { ScAddress aCellPos( rCol, rRow, rTab ); @@ -129,7 +127,6 @@ void ScInterpreter::ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ) } } - bool ScInterpreter::IsTableOpInRange( const ScRange& rRange ) { if ( rRange.aStart == rRange.aEnd ) @@ -148,7 +145,6 @@ bool ScInterpreter::IsTableOpInRange( const ScRange& rRange ) return false; } - sal_uLong ScInterpreter::GetCellNumberFormat( const ScAddress& rPos, ScRefCellValue& rCell ) { sal_uLong nFormat; @@ -171,7 +167,6 @@ sal_uLong ScInterpreter::GetCellNumberFormat( const ScAddress& rPos, ScRefCellVa return nFormat; } - /// Only ValueCell, formula cells already store the result rounded. double ScInterpreter::GetValueCellValue( const ScAddress& rPos, double fOrig ) { @@ -657,7 +652,6 @@ bool ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, return true; } - bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr) @@ -755,7 +749,6 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, return true; } - bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr) @@ -916,7 +909,6 @@ void ScInterpreter::Push( FormulaToken& r ) } } - void ScInterpreter::PushTempToken( FormulaToken* p ) { if ( sp >= MAXSTACK ) @@ -948,7 +940,6 @@ void ScInterpreter::PushTempToken( FormulaToken* p ) } } - void ScInterpreter::PushTempTokenWithoutError( FormulaToken* p ) { p->IncRef(); @@ -969,14 +960,12 @@ void ScInterpreter::PushTempTokenWithoutError( FormulaToken* p ) } } - void ScInterpreter::PushTempToken( const FormulaToken& r ) { if (!IfErrorPushError()) PushTempTokenWithoutError( r.Clone()); } - void ScInterpreter::PushCellResultToken( bool bDisplayEmptyAsString, const ScAddress & rAddress, short * pRetTypeExpr, sal_uLong * pRetIndexExpr ) { @@ -1024,7 +1013,6 @@ void ScInterpreter::PushCellResultToken( bool bDisplayEmptyAsString, } } - // Simply throw away TOS. void ScInterpreter::Pop() @@ -1035,7 +1023,6 @@ void ScInterpreter::Pop() SetError(errUnknownStackVariable); } - // Simply throw away TOS and set error code, used with ocIsError et al. void ScInterpreter::PopError() @@ -1050,7 +1037,6 @@ void ScInterpreter::PopError() SetError(errUnknownStackVariable); } - FormulaTokenRef ScInterpreter::PopToken() { if (sp) @@ -1066,7 +1052,6 @@ FormulaTokenRef ScInterpreter::PopToken() return NULL; } - double ScInterpreter::PopDouble() { nCurFmtType = NUMBERFORMAT_NUMBER; @@ -1094,7 +1079,6 @@ double ScInterpreter::PopDouble() return 0.0; } - svl::SharedString ScInterpreter::PopString() { nCurFmtType = NUMBERFORMAT_TEXT; @@ -1123,7 +1107,6 @@ svl::SharedString ScInterpreter::PopString() return svl::SharedString::getEmptyString(); } - void ScInterpreter::ValidateRef( const ScSingleRefData & rRef ) { SCCOL nCol; @@ -1132,14 +1115,12 @@ void ScInterpreter::ValidateRef( const ScSingleRefData & rRef ) SingleRefToVars( rRef, nCol, nRow, nTab); } - void ScInterpreter::ValidateRef( const ScComplexRefData & rRef ) { ValidateRef( rRef.Ref1); ValidateRef( rRef.Ref2); } - void ScInterpreter::ValidateRef( const ScRefList & rRefList ) { ScRefList::const_iterator it( rRefList.begin()); @@ -1150,7 +1131,6 @@ void ScInterpreter::ValidateRef( const ScRefList & rRefList ) } } - void ScInterpreter::SingleRefToVars( const ScSingleRefData & rRef, SCCOL & rCol, SCROW & rRow, SCTAB & rTab ) { @@ -1177,7 +1157,6 @@ void ScInterpreter::SingleRefToVars( const ScSingleRefData & rRef, SetError( errNoRef ), rTab = 0; } - void ScInterpreter::PopSingleRef(SCCOL& rCol, SCROW &rRow, SCTAB& rTab) { if( sp ) @@ -1202,7 +1181,6 @@ void ScInterpreter::PopSingleRef(SCCOL& rCol, SCROW &rRow, SCTAB& rTab) SetError( errUnknownStackVariable); } - void ScInterpreter::PopSingleRef( ScAddress& rAdr ) { if( sp ) @@ -1233,7 +1211,6 @@ void ScInterpreter::PopSingleRef( ScAddress& rAdr ) SetError( errUnknownStackVariable); } - void ScInterpreter::DoubleRefToVars( const ScToken* p, SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2, @@ -1316,7 +1293,6 @@ void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, SetError( errUnknownStackVariable); } - void ScInterpreter::DoubleRefToRange( const ScComplexRefData & rCRef, ScRange & rRange, bool bDontCheckForTableOp ) { @@ -1334,7 +1310,6 @@ void ScInterpreter::DoubleRefToRange( const ScComplexRefData & rCRef, } } - void ScInterpreter::PopDoubleRef( ScRange & rRange, short & rParam, size_t & rRefInList ) { if (sp) @@ -1380,7 +1355,6 @@ void ScInterpreter::PopDoubleRef( ScRange & rRange, short & rParam, size_t & rRe SetError( errUnknownStackVariable); } - void ScInterpreter::PopDoubleRef( ScRange& rRange, bool bDontCheckForTableOp ) { if( sp ) @@ -1610,7 +1584,6 @@ bool ScInterpreter::PopDoubleRefOrSingleRef( ScAddress& rAdr ) return false; } - void ScInterpreter::PopDoubleRefPushMatrix() { if ( GetStackType() == svDoubleRef ) @@ -1625,13 +1598,11 @@ void ScInterpreter::PopDoubleRefPushMatrix() SetError( errNoRef ); } - ScTokenMatrixMap* ScInterpreter::CreateTokenMatrixMap() { return new ScTokenMatrixMap; } - bool ScInterpreter::ConvertMatrixParameters() { sal_uInt16 nParams = pCur->GetParamCount(); @@ -1792,7 +1763,6 @@ bool ScInterpreter::ConvertMatrixParameters() return false; } - ScMatrixRef ScInterpreter::PopMatrix() { if( sp ) @@ -1906,7 +1876,6 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef& xMat, short& rRetTypeExpr, sal_ SetError( errUnknownStackVariable); } - void ScInterpreter::PushDouble(double nVal) { TreatDoubleError( nVal ); @@ -1914,14 +1883,12 @@ void ScInterpreter::PushDouble(double nVal) PushTempTokenWithoutError( new FormulaDoubleToken( nVal ) ); } - void ScInterpreter::PushInt(int nVal) { if (!IfErrorPushError()) PushTempTokenWithoutError( new FormulaDoubleToken( nVal ) ); } - void ScInterpreter::PushStringBuffer( const sal_Unicode* pString ) { if ( pString ) @@ -1944,7 +1911,6 @@ void ScInterpreter::PushString( const svl::SharedString& rString ) PushTempTokenWithoutError( new FormulaStringToken( rString ) ); } - void ScInterpreter::PushSingleRef(SCCOL nCol, SCROW nRow, SCTAB nTab) { if (!IfErrorPushError()) @@ -1955,7 +1921,6 @@ void ScInterpreter::PushSingleRef(SCCOL nCol, SCROW nRow, SCTAB nTab) } } - void ScInterpreter::PushDoubleRef(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2) { @@ -1967,7 +1932,6 @@ void ScInterpreter::PushDoubleRef(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } } - void ScInterpreter::PushExternalSingleRef( sal_uInt16 nFileId, const OUString& rTabName, SCCOL nCol, SCROW nRow, SCTAB nTab) { @@ -1979,7 +1943,6 @@ void ScInterpreter::PushExternalSingleRef( } } - void ScInterpreter::PushExternalDoubleRef( sal_uInt16 nFileId, const OUString& rTabName, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2) @@ -2017,7 +1980,6 @@ void ScInterpreter::PushMatrix(const ScMatrixRef& pMat) PushTempTokenWithoutError( new ScMatrixToken( pMat ) ); } - void ScInterpreter::PushError( sal_uInt16 nError ) { SetError( nError ); // only sets error if not already set @@ -2029,37 +1991,31 @@ void ScInterpreter::PushParameterExpected() PushError( errParameterExpected); } - void ScInterpreter::PushIllegalParameter() { PushError( errIllegalParameter); } - void ScInterpreter::PushIllegalArgument() { PushError( errIllegalArgument); } - void ScInterpreter::PushNA() { PushError( NOTAVAILABLE); } - void ScInterpreter::PushNoValue() { PushError( errNoValue); } - bool ScInterpreter::IsMissing() { return sp && pStack[sp - 1]->GetType() == svMissing; } - StackVar ScInterpreter::GetRawStackType() { StackVar eRes; @@ -2075,7 +2031,6 @@ StackVar ScInterpreter::GetRawStackType() return eRes; } - StackVar ScInterpreter::GetStackType() { StackVar eRes; @@ -2093,7 +2048,6 @@ StackVar ScInterpreter::GetStackType() return eRes; } - StackVar ScInterpreter::GetStackType( sal_uInt8 nParam ) { StackVar eRes; @@ -2108,7 +2062,6 @@ StackVar ScInterpreter::GetStackType( sal_uInt8 nParam ) return eRes; } - bool ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& rAdr ) { // Check for a singleton first - no implicit intersection for them. @@ -2292,7 +2245,6 @@ double ScInterpreter::GetDouble() return nVal; } - double ScInterpreter::GetDoubleWithDefault(double nDefault) { bool bMissing = IsMissing(); @@ -2302,7 +2254,6 @@ double ScInterpreter::GetDoubleWithDefault(double nDefault) return nResultVal; } - svl::SharedString ScInterpreter::GetString() { switch (GetRawStackType()) @@ -2473,7 +2424,6 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix( return nMatValType; } - void ScInterpreter::ScDBGet() { bool bMissingField = false; @@ -2511,7 +2461,6 @@ void ScInterpreter::ScDBGet() PushString(aValue.maString); } - void ScInterpreter::ScExternal() { sal_uInt8 nParamCount = GetByte(); @@ -3078,7 +3027,6 @@ void ScInterpreter::ScExternal() } } - void ScInterpreter::ScMissing() { PushTempToken( new FormulaMissingToken ); @@ -3629,7 +3577,6 @@ void ScInterpreter::ScDBArea() PushError( errNoName); } - void ScInterpreter::ScColRowNameAuto() { ScComplexRefData aRefData( static_cast<const ScToken*>(pCur)->GetDoubleRef() ); @@ -3713,7 +3660,6 @@ void ScInterpreter::ScColRowNameAuto() // --- internals ------------------------------------------------------------ - void ScInterpreter::ScTTT() { // Temporaerer Test-Tanz, zum auspropieren von Funktionen etc. sal_uInt8 nParamCount = GetByte(); @@ -3725,7 +3671,6 @@ void ScInterpreter::ScTTT() PushError(errNoValue); } - ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc, const ScAddress& rPos, ScTokenArray& r ) : aCode(r) @@ -4369,7 +4314,6 @@ StackVar ScInterpreter::Interpret() pJumpMatrix = NULL; } while ( bGotResult ); - // Functions that evaluate an error code and directly set nGlobalError to 0, // usage: switch( OpCode ) { CASE_OCERRFUNC statements; } #define CASE_OCERRFUNC \ diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 944a0ce053d5..f2669c6fdfd8 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -334,7 +334,6 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR, bool bEmpty) return pMat; } - ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2 ) diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index 9ae88f9700ea..f7e8259da573 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "interpre.hxx" #include "columnspanset.hxx" #include "column.hxx" @@ -747,13 +746,11 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero ) return fRes; } - void ScInterpreter::ScSumSQ() { PushDouble( IterateParameters( ifSUMSQ ) ); } - void ScInterpreter::ScSum() { short nParamCount = GetByte(); @@ -890,13 +887,11 @@ void ScInterpreter::ScSum() PushDouble(fRes); } - void ScInterpreter::ScProduct() { PushDouble( IterateParameters( ifPRODUCT ) ); } - void ScInterpreter::ScAverage( bool bTextAsZero ) { PushDouble( IterateParameters( ifAVERAGE, bTextAsZero ) ); @@ -1054,7 +1049,6 @@ void ScInterpreter::ScCount() PushDouble(nCount); } - void ScInterpreter::ScCount2() { PushDouble( IterateParameters( ifCOUNT2 ) ); diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index c0c9bf0715c4..8131a5465d52 100644 --- a/sc/source/core/tool/interpr7.cxx +++ b/sc/source/core/tool/interpr7.cxx @@ -58,7 +58,6 @@ void ScInterpreter::ScFilterXML() return; } - boost::shared_ptr<xmlXPathContext> pXPathCtx( xmlXPathNewContext(pDoc.get()), xmlXPathFreeContext ); diff --git a/sc/source/core/tool/jumpmatrix.cxx b/sc/source/core/tool/jumpmatrix.cxx index 625e425c18b4..dae7f109bd8e 100644 --- a/sc/source/core/tool/jumpmatrix.cxx +++ b/sc/source/core/tool/jumpmatrix.cxx @@ -110,7 +110,6 @@ void ScJumpMatrix::SetJumpParameters(ScTokenVec* p) pParams = p; } - void ScJumpMatrix::GetPos(SCSIZE& rCol, SCSIZE& rRow) const { rCol = nCurCol; diff --git a/sc/source/core/tool/lookupcache.cxx b/sc/source/core/tool/lookupcache.cxx index ac92fe627309..15d161bda9e1 100644 --- a/sc/source/core/tool/lookupcache.cxx +++ b/sc/source/core/tool/lookupcache.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "lookupcache.hxx" #include "document.hxx" #include "queryentry.hxx" @@ -72,12 +71,10 @@ ScLookupCache::ScLookupCache( ScDocument * pDoc, const ScRange & rRange ) : { } - ScLookupCache::~ScLookupCache() { } - ScLookupCache::Result ScLookupCache::lookup( ScAddress & o_rResultAddress, const QueryCriteria & rCriteria, const ScAddress & rQueryAddress ) const { @@ -94,7 +91,6 @@ ScLookupCache::Result ScLookupCache::lookup( ScAddress & o_rResultAddress, return FOUND; } - bool ScLookupCache::insert( const ScAddress & rResultAddress, const QueryCriteria & rCriteria, const ScAddress & rQueryAddress, const bool bAvailable ) @@ -109,7 +105,6 @@ bool ScLookupCache::insert( const ScAddress & rResultAddress, return bInserted; } - void ScLookupCache::Notify( const SfxHint& rHint ) { if (!mpDoc->IsInDtorClear()) diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx index e57bd8fda363..011979d3d1d4 100644 --- a/sc/source/core/tool/odffmap.cxx +++ b/sc/source/core/tool/odffmap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "compiler.hxx" #include <sal/macros.h> diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx index b47341892859..d85e60b4c0e4 100644 --- a/sc/source/core/tool/prnsave.cxx +++ b/sc/source/core/tool/prnsave.cxx @@ -23,10 +23,8 @@ // STATIC DATA - // Daten pro Tabelle - ScPrintSaverTab::ScPrintSaverTab() : mpRepeatCol(NULL), mpRepeatRow(NULL), @@ -68,10 +66,8 @@ bool ScPrintSaverTab::operator==( const ScPrintSaverTab& rCmp ) const (maPrintRanges == rCmp.maPrintRanges); } - // Daten fuer das ganze Dokument - ScPrintRangeSaver::ScPrintRangeSaver( SCTAB nCount ) : nTabCount( nCount ) { diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index 5909fa909974..c1d2991b1fdb 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -33,7 +33,6 @@ using namespace com::sun::star; - static ScProgress theDummyInterpretProgress; SfxProgress* ScProgress::pGlobalProgress = NULL; sal_uLong ScProgress::nGlobalRange = 0; @@ -46,7 +45,6 @@ bool ScProgress::bAllowInterpretProgress = true; ScDocument* ScProgress::pInterpretDoc; bool ScProgress::bIdleWasEnabled = false; - static bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh ) { if (pObjSh) @@ -116,13 +114,11 @@ ScProgress::ScProgress( SfxObjectShell* pObjSh, const OUString& rText, } } - ScProgress::ScProgress() : pProgress( NULL ) { // DummyInterpret } - ScProgress::~ScProgress() { if ( pProgress ) @@ -135,7 +131,6 @@ ScProgress::~ScProgress() } } - void ScProgress::CreateInterpretProgress( ScDocument* pDoc, bool bWait ) { if ( bAllowInterpretProgress ) diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index af739594a2a4..0b23da5add61 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -79,8 +79,6 @@ ScQueryEntry& ScQueryEntry::operator=( const ScQueryEntry& r ) return *this; } - - void ScQueryEntry::SetQueryByEmpty() { eOp = SC_EQUAL; diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index 295d952af67e..5f8c769fe03b 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -394,7 +394,6 @@ ScDBQueryParamBase::~ScDBQueryParamBase() { } - ScDBQueryParamInternal::ScDBQueryParamInternal() : ScDBQueryParamBase(ScDBQueryParamBase::INTERNAL), ScQueryParamTable() diff --git a/sc/source/core/tool/recursionhelper.cxx b/sc/source/core/tool/recursionhelper.cxx index 68ad21e287b3..7d7a32cbc772 100644 --- a/sc/source/core/tool/recursionhelper.cxx +++ b/sc/source/core/tool/recursionhelper.cxx @@ -95,6 +95,3 @@ void ScRecursionHelper::Clear() } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - - - diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx index 435326514f30..d508247ad641 100644 --- a/sc/source/core/tool/refdata.cxx +++ b/sc/source/core/tool/refdata.cxx @@ -41,7 +41,6 @@ void ScSingleRefData::InitAddressRel( const ScAddress& rAdr, const ScAddress& rP SetAddress(rAdr, rPos); } - void ScSingleRefData::SetAbsCol( SCCOL nVal ) { Flags.bColRel = false; @@ -98,19 +97,16 @@ void ScSingleRefData::SetColDeleted( bool bVal ) Flags.bColDeleted = bVal; } - void ScSingleRefData::SetRowDeleted( bool bVal ) { Flags.bRowDeleted = bVal; } - void ScSingleRefData::SetTabDeleted( bool bVal ) { Flags.bTabDeleted = bVal; } - bool ScSingleRefData::IsDeleted() const { return IsColDeleted() || IsRowDeleted() || IsTabDeleted(); @@ -289,7 +285,6 @@ ScComplexRefData& ScComplexRefData::Extend( const ScSingleRefData & rRef, const return *this; } - ScComplexRefData& ScComplexRefData::Extend( const ScComplexRefData & rRef, const ScAddress & rPos ) { return Extend( rRef.Ref1, rPos).Extend( rRef.Ref2, rPos); diff --git a/sc/source/core/tool/refhint.cxx b/sc/source/core/tool/refhint.cxx index 8327b6186cec..25dc699976e5 100644 --- a/sc/source/core/tool/refhint.cxx +++ b/sc/source/core/tool/refhint.cxx @@ -14,23 +14,16 @@ namespace sc { RefHint::RefHint( Type eType ) : SfxSimpleHint(SC_HINT_REFERENCE), meType(eType) {} RefHint::~RefHint() {} - RefMovedHint::RefMovedHint( const ScRange& rRange, const ScAddress& rMove ) : RefHint(Moved), maRange(rRange), maMoveDelta(rMove) {} RefMovedHint::~RefMovedHint() {} - - RefColReorderHint::RefColReorderHint( const sc::ColReorderMapType& rColMap, SCTAB nTab, SCROW nRow1, SCROW nRow2 ) : RefHint(ColumnReordered), mrColMap(rColMap), mnTab(nTab), mnRow1(nRow1), mnRow2(nRow2) {} RefColReorderHint::~RefColReorderHint() {} - - - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 8874218e677e..964fd471723a 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -314,7 +314,6 @@ void ScMatrixImpl::SetImmutable(bool bVal) mbCloneIfConst = bVal; } - void ScMatrixImpl::Resize(SCSIZE nC, SCSIZE nR) { maMat.resize(nR, nC); @@ -2243,4 +2242,3 @@ void ScMatrix::Dump() const #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx index b5d253992a4d..2f3ffeadbcf0 100644 --- a/sc/source/core/tool/subtotal.cxx +++ b/sc/source/core/tool/subtotal.cxx @@ -36,7 +36,6 @@ bool SubTotal::SafePlus(double& fVal1, double fVal2) return bOk; } - bool SubTotal::SafeMult(double& fVal1, double fVal2) { bool bOk = true; @@ -50,7 +49,6 @@ bool SubTotal::SafeMult(double& fVal1, double fVal2) return bOk; } - bool SubTotal::SafeDiv(double& fVal1, double fVal2) { bool bOk = true; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 92900583f69a..8f8fe8467c91 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -138,7 +138,6 @@ sal_Int32 ScRawToken::GetStrLen( const sal_Unicode* pStr ) return sal::static_int_cast<sal_Int32>( p - pStr ); } - void ScRawToken::SetOpCode( OpCode e ) { eOp = e; @@ -285,7 +284,6 @@ void ScRawToken::SetExternal( const sal_Unicode* pStr ) nRefCnt = 0; } - bool ScRawToken::IsValidReference() const { switch (eType) @@ -303,7 +301,6 @@ bool ScRawToken::IsValidReference() const return false; } - sal_uInt16 ScRawToken::sbyteOffset() { // offset of sbyte in ScRawToken @@ -359,7 +356,6 @@ ScRawToken* ScRawToken::Clone() const return p; } - FormulaToken* ScRawToken::CreateToken() const { #if OSL_DEBUG_LEVEL > 1 @@ -436,7 +432,6 @@ FormulaToken* ScRawToken::CreateToken() const #undef IF_NOT_OPCODE_ERROR } - void ScRawToken::Delete() { if ( bRaw ) @@ -454,7 +449,6 @@ void ScRawToken::Delete() } } - // --- class ScToken -------------------------------------------------------- static ScSingleRefData lcl_ScToken_InitSingleRef() @@ -516,7 +510,6 @@ bool ScToken::TextEqual( const FormulaToken& _rToken ) const return *this == _rToken; // else normal operator== } - bool ScToken::Is3DRef() const { switch ( eType ) @@ -725,7 +718,6 @@ ScMatrix* ScToken::GetMatrix() return NULL; } - ScJumpMatrix* ScToken::GetJumpMatrix() const { OSL_FAIL( "ScToken::GetJumpMatrix: virtual dummy called" ); @@ -745,8 +737,6 @@ ScRefList* ScToken::GetRefList() // real implementations of virtual functions - - const ScSingleRefData& ScSingleRefToken::GetSingleRef() const { return aSingleRef; } ScSingleRefData& ScSingleRefToken::GetSingleRef() { return aSingleRef; } bool ScSingleRefToken::operator==( const FormulaToken& r ) const @@ -1179,9 +1169,6 @@ bool ScHybridCellToken::operator==( const FormulaToken& r ) const maFormula == static_cast<const ScHybridCellToken &>(r).GetFormula(); } - - - bool ScTokenArray::AddFormulaToken( const css::sheet::FormulaToken& rToken, svl::SharedStringPool& rSPool, formula::ExternalReferenceHelper* pExtRef) { @@ -1675,8 +1662,6 @@ void ScTokenArray::GenHash() mnHashValue = nHash; } - - bool ScTokenArray::IsInvariant() const { FormulaToken** p = pCode; @@ -1991,7 +1976,6 @@ FormulaToken* ScTokenArray::MergeArray( ) return AddMatrix( pArray ); } - FormulaToken* ScTokenArray::MergeRangeReference( const ScAddress & rPos ) { if (!pCode || !nLen) @@ -2224,7 +2208,6 @@ bool ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, return false; } - void ScTokenArray::ReadjustRelative3DReferences( const ScAddress& rOldPos, const ScAddress& rNewPos ) { @@ -3122,7 +3105,6 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInMovedName( const sc::RefUpdat sc::RefUpdateResult aRes; - FormulaToken** p = pCode; FormulaToken** pEnd = p + static_cast<size_t>(nLen); for (; p != pEnd; ++p) @@ -3995,5 +3977,4 @@ void ScTokenArray::Dump() const } #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/tokenstringcontext.cxx b/sc/source/core/tool/tokenstringcontext.cxx index 3eb2f16b8474..44babecdc21f 100644 --- a/sc/source/core/tool/tokenstringcontext.cxx +++ b/sc/source/core/tool/tokenstringcontext.cxx @@ -128,7 +128,6 @@ void CompileFormulaContext::updateTabNames() } } - void CompileFormulaContext::setGrammar( formula::FormulaGrammar::Grammar eGram ) { bool bUpdate = (meGram != eGram); @@ -137,8 +136,6 @@ void CompileFormulaContext::setGrammar( formula::FormulaGrammar::Grammar eGram ) updateTabNames(); } - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index de9b8ba14a71..700e68b78569 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -104,9 +104,6 @@ bool ScTypedStrData::IsStrData() const return meStrType != Value; } - - - FindTypedStrData::FindTypedStrData(const ScTypedStrData& rVal, bool bCaseSens) : maVal(rVal), mbCaseSens(bCaseSens) {} diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index b9d5c61856c7..9ab85c09e599 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -41,8 +41,6 @@ ScUnitConverterData::ScUnitConverterData( const ScUnitConverterData& r ) : ScUnitConverterData::~ScUnitConverterData() {} - - OUString ScUnitConverterData::BuildIndexString( const OUString& rFromUnit, const OUString& rToUnit ) { diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx index a379e2288d13..6f594dff46da 100644 --- a/sc/source/core/tool/userlist.cxx +++ b/sc/source/core/tool/userlist.cxx @@ -27,7 +27,6 @@ #include <boost/bind.hpp> - namespace { class FindByName : public ::std::unary_function<ScUserListData::SubStr, bool> @@ -316,7 +315,6 @@ bool ScUserList::operator!=( const ScUserList& r ) const return !operator==( r ); } - bool ScUserList::HasEntry( const OUString& rStr ) const { DataType::const_iterator itr = ::std::find_if( diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index e5a2fc785e51..6cc1c82a4916 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.cxx @@ -47,7 +47,6 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* p return ScExportDif( rStream, pDoc, ScRange( aStart, aEnd ), eNach, nDifOption ); } - FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc, const ScRange&rRange, const rtl_TextEncoding eCharSet, sal_uInt32 nDifOption ) { @@ -296,5 +295,4 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc return eRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 3d393549e711..243f6faefdf8 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <math.h> #include <svl/zforlist.hxx> @@ -47,7 +46,6 @@ const sal_Unicode pKeyNA[] = { 'N', 'A', 0 }; const sal_Unicode pKeyV[] = { 'V', 0 }; const sal_Unicode pKey1_0[] = { '1', ',', '0', 0 }; - FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos, const rtl_TextEncoding eVon, sal_uInt32 nDifOption ) { @@ -122,7 +120,6 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, } - if( eTopic == T_DATA ) { // Ab hier kommen die Daten SCCOL nBaseCol = rInsPos.Col(); @@ -233,7 +230,6 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, return eERR_OK; } - DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rDoc, rtl_TextEncoding e ) : fVal(0.0) , nVector(0) @@ -257,7 +253,6 @@ DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rD pNumFormatter = rDoc.GetFormatTable(); } - TOPIC DifParser::GetNextTopic( void ) { enum STATE { S_VectorVal, S_Data, S_END, S_START, S_UNKNOWN, S_ERROR_L2 }; @@ -401,7 +396,6 @@ TOPIC DifParser::GetNextTopic( void ) return eRet; } - static void lcl_DeEscapeQuotesDif( OUString& rString ) { // Special handling for DIF import: Escaped (duplicated) quotes are resolved. @@ -607,7 +601,6 @@ DATASET DifParser::GetNextDataset( void ) return eRet; } - const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet ) { // eat leading whitespace, not specified, but seen in the wild @@ -636,7 +629,6 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, sal_uInt32& return pStart; } - bool DifParser::ScanFloatVal( const sal_Unicode* pStart ) { bool bNeg = false; @@ -843,7 +835,6 @@ void DifColumn::SetLogical( SCROW nRow ) } } - void DifColumn::SetNumFormat( SCROW nRow, const sal_uInt32 nNumFormat ) { OSL_ENSURE( ValidRow(nRow), "*DifColumn::SetNumFormat(): Row too big!" ); @@ -869,7 +860,6 @@ void DifColumn::SetNumFormat( SCROW nRow, const sal_uInt32 nNumFormat ) pAkt = NULL; } - void DifColumn::NewEntry( const SCROW nPos, const sal_uInt32 nNumFormat ) { pAkt = new ENTRY; @@ -879,14 +869,12 @@ void DifColumn::NewEntry( const SCROW nPos, const sal_uInt32 nNumFormat ) aEntries.push_back(pAkt); } - void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& rPattAttr ) { for (boost::ptr_vector<ENTRY>::const_iterator it = aEntries.begin(); it != aEntries.end(); ++it) rDoc.ApplyPatternAreaTab( nCol, it->nStart, nCol, it->nEnd, nTab, rPattAttr ); } - void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab ) { ScPatternAttr aAttr( rDoc.GetPool() ); @@ -905,7 +893,6 @@ void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab ) } } - DifAttrCache::DifAttrCache( const bool bNewPlain ) { bPlain = bNewPlain; @@ -914,7 +901,6 @@ DifAttrCache::DifAttrCache( const bool bNewPlain ) ppCols[ nCnt ] = NULL; } - DifAttrCache::~DifAttrCache() { for( SCCOL nCnt = 0 ; nCnt <= MAXCOL ; nCnt++ ) @@ -948,7 +934,6 @@ void DifAttrCache::SetNumFormat( const SCCOL nCol, const SCROW nRow, const sal_u ppCols[ nCol ]->SetNumFormat( nRow, nNumFormat ); } - void DifAttrCache::Apply( ScDocument& rDoc, SCTAB nTab ) { if( bPlain ) diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 40ed956b624e..4b60de0238db 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -84,7 +84,6 @@ static OUString lcl_GetVbaTabName( SCTAB n ) return aRet; } - static void lcl_AddBookviews( XclExpRecordList<>& aRecList, ExcTable& self ) { aRecList.AppendNewRecord( new XclExpXmlStartElementRecord( XML_bookViews ) ); @@ -131,7 +130,6 @@ static void lcl_AddScenariosAndFilters( XclExpRecordList<>& aRecList, const XclE aRecList.AppendRecord( rRoot.GetFilterManager().CreateRecord( nScTab ) ); } - ExcTable::ExcTable( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), mnScTab( SCTAB_GLOBAL ), @@ -141,7 +139,6 @@ ExcTable::ExcTable( const XclExpRoot& rRoot ) : { } - ExcTable::ExcTable( const XclExpRoot& rRoot, SCTAB nScTab ) : XclExpRoot( rRoot ), mnScTab( nScTab ), @@ -151,20 +148,17 @@ ExcTable::ExcTable( const XclExpRoot& rRoot, SCTAB nScTab ) : { } - ExcTable::~ExcTable() { delete pTabNames; } - void ExcTable::Add( XclExpRecordBase* pRec ) { OSL_ENSURE( pRec, "-ExcTable::Add(): pRec is NULL!" ); aRecList.AppendNewRecord( pRec ); } - void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) { InitializeGlobals(); @@ -322,7 +316,6 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) aRecList.AppendRecord( CreateRecord( EXC_ID_PALETTE ) ); } - if( GetBiff() <= EXC_BIFF5 ) { // Bundlesheet @@ -397,7 +390,6 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) Add( new ExcEof ); } - void ExcTable::FillAsTable( SCTAB nCodeNameIdx ) { InitializeTable( mnScTab ); @@ -433,7 +425,6 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx ) return; } - // WSBOOL needs data from page settings, create it here, add it later boost::shared_ptr< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) ); bool bFitToPages = xPageSett->GetPageData().mbFitToPages; @@ -653,7 +644,6 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx ) Add( new ExcEof ); } - void ExcTable::FillAsEmptyTable( SCTAB nCodeNameIdx ) { InitializeTable( mnScTab ); @@ -675,7 +665,6 @@ void ExcTable::FillAsEmptyTable( SCTAB nCodeNameIdx ) } } - void ExcTable::Write( XclExpStream& rStrm ) { SetCurrScTab( mnScTab ); @@ -684,7 +673,6 @@ void ExcTable::Write( XclExpStream& rStrm ) aRecList.Save( rStrm ); } - void ExcTable::WriteXml( XclExpXmlStream& rStrm ) { if (GetTabInfo().IsExportTab( mnScTab ) ) @@ -714,7 +702,6 @@ void ExcTable::WriteXml( XclExpXmlStream& rStrm ) } } - ExcDocument::ExcDocument( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), aHeader( rRoot ), @@ -722,14 +709,12 @@ ExcDocument::ExcDocument( const XclExpRoot& rRoot ) : { } - ExcDocument::~ExcDocument() { maTableList.RemoveAllRecords(); //! for the following assertion delete pExpChangeTrack; } - void ExcDocument::ReadDoc( void ) { InitializeConvert(); @@ -767,7 +752,6 @@ void ExcDocument::ReadDoc( void ) } } - void ExcDocument::Write( SvStream& rSvStrm ) { if( !maTableList.IsEmpty() ) diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 9d574cbb591b..88d1d6e07e44 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> #include <sfx2/app.hxx> @@ -142,7 +141,6 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument return eRet; } - static FltError lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument, SvStream* pMedStrm, bool bBiff8, rtl_TextEncoding eNach ) { diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index ccc38e574dc3..0e5eacc0301f 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -42,7 +42,6 @@ using ::std::vector; const sal_uInt16 ExcelToSc::nRowMask = 0x3FFF; const sal_uInt16 ExcelToSc::nLastInd = 399; - void ImportExcel::Formula25() { XclAddress aXclPos; @@ -78,13 +77,11 @@ void ImportExcel::Formula25() Formula( aXclPos, nXF, nFormLen, fCurVal, bShrFmla ); } - void ImportExcel::Formula3() { Formula4(); } - void ImportExcel::Formula4() { XclAddress aXclPos; @@ -99,7 +96,6 @@ void ImportExcel::Formula4() Formula( aXclPos, nXF, nFormLen, fCurVal, false ); } - void ImportExcel::Formula( const XclAddress& rXclPos, sal_uInt16 nXF, sal_uInt16 nFormLen, double fCurVal, bool bShrFmla) { @@ -182,7 +178,6 @@ void ImportExcel::Formula( GetXFRangeBuffer().SetXF(aScPos, nXF); } - ExcelToSc::ExcelToSc( XclImpRoot& rRoot ) : ExcelConverterBase(rRoot.GetDocImport().getDoc().GetSharedStringPool(), 512), XclImpRoot( rRoot ), @@ -203,7 +198,6 @@ void ExcelToSc::GetDummy( const ScTokenArray*& pErgebnis ) pErgebnis = aPool[ aStack.Get() ]; } - // if bAllowArrays is false stream seeks to first byte after <nFormulaLen> // otherwise it will seek to the first byte after the additional content (eg // inline arrays) following <nFormulaLen> @@ -897,7 +891,6 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s return eRet; } - // stream seeks to first byte after <nFormulaLen> ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT ) @@ -1606,7 +1599,6 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz ) aPool >> aStack; } - void ExcelToSc::ExcRelToScRel( sal_uInt16 nRow, sal_uInt8 nCol, ScSingleRefData &rSRD, const bool bName ) { if( bName ) @@ -1658,7 +1650,6 @@ void ExcelToSc::ExcRelToScRel( sal_uInt16 nRow, sal_uInt8 nCol, ScSingleRefData } } - const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType ) { sal_uInt16 nError; @@ -1742,7 +1733,6 @@ void ExcelToSc::SetError( ScFormulaCell &rCell, const ConvErr eErr ) rCell.SetErrCode( nInd ); } - void ExcelToSc::SetComplCol( ScComplexRefData &rCRD ) { ScSingleRefData &rSRD = rCRD.Ref2; @@ -1752,7 +1742,6 @@ void ExcelToSc::SetComplCol( ScComplexRefData &rCRD ) rSRD.SetAbsCol(MAXCOL); } - void ExcelToSc::SetComplRow( ScComplexRefData &rCRD ) { ScSingleRefData &rSRD = rCRD.Ref2; diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index a056dc121f6b..3686671f57ca 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -85,7 +85,6 @@ ExcelToSc8::ExcelToSc8( XclImpRoot& rRoot ) : { } - ExcelToSc8::~ExcelToSc8() { } @@ -839,7 +838,6 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, ScSingleRefData &rR1 = aCRD.Ref1; ScSingleRefData &rR2 = aCRD.Ref2; - rR1.SetAbsTab(nTabFirst); rR2.SetAbsTab(nTabLast); rR1.SetFlag3D(true); @@ -920,7 +918,6 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, return eRet; } - // stream seeks to first byte after <nFormulaLen> ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT ) @@ -1437,7 +1434,6 @@ void ExcelToSc8::ExcRelToScRel8( sal_uInt16 nRow, sal_uInt16 nC, ScSingleRefData } } - // stream seeks to first byte after <nLen> bool ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen ) { diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 53d0a1d0c199..9a3d312ae290 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -187,7 +187,6 @@ public: } }; - namespace { /** Future Record Type header. @@ -202,7 +201,6 @@ bool readFrtHeader( XclImpStream& rStrm, sal_uInt16 nRecordID ) } - ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) : ImportExcel( rImpData, rStrm ) { @@ -211,12 +209,10 @@ ImportExcel8::ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ) : pFormConv = pExcRoot->pFmlaConverter = new ExcelToSc8( GetRoot() ); } - ImportExcel8::~ImportExcel8() { } - void ImportExcel8::Calccount( void ) { ScDocOptions aOpt = pD->GetDocOptions(); @@ -224,7 +220,6 @@ void ImportExcel8::Calccount( void ) pD->SetDocOptions( aOpt ); } - void ImportExcel8::Precision( void ) { ScDocOptions aOpt = pD->GetDocOptions(); @@ -232,7 +227,6 @@ void ImportExcel8::Precision( void ) pD->SetDocOptions( aOpt ); } - void ImportExcel8::Delta( void ) { ScDocOptions aOpt = pD->GetDocOptions(); @@ -240,7 +234,6 @@ void ImportExcel8::Delta( void ) pD->SetDocOptions( aOpt ); } - void ImportExcel8::Iteration( void ) { ScDocOptions aOpt = pD->GetDocOptions(); @@ -248,7 +241,6 @@ void ImportExcel8::Iteration( void ) pD->SetDocOptions( aOpt ); } - void ImportExcel8::Boundsheet( void ) { sal_uInt8 nLen; @@ -281,7 +273,6 @@ void ImportExcel8::Boundsheet( void ) nBdshtTab++; } - void ImportExcel8::Scenman( void ) { sal_uInt16 nLastDispl; @@ -292,13 +283,11 @@ void ImportExcel8::Scenman( void ) maScenList.nLastScenario = nLastDispl; } - void ImportExcel8::Scenario( void ) { maScenList.aEntries.push_back( new ExcScenario( aIn, *pExcRoot ) ); } - void ImportExcel8::Labelsst( void ) { XclAddress aXclPos; @@ -317,7 +306,6 @@ void ImportExcel8::Labelsst( void ) } } - void ImportExcel8::FeatHdr( void ) { if (!readFrtHeader( aIn, 0x0867)) @@ -335,7 +323,6 @@ void ImportExcel8::FeatHdr( void ) GetSheetProtectBuffer().ReadOptions( aIn, GetCurrScTab() ); } - void ImportExcel8::Feat( void ) { if (!readFrtHeader( aIn, 0x0868)) @@ -384,7 +371,6 @@ void ImportExcel8::Feat( void ) GetSheetProtectBuffer().AppendEnhancedProtection( aProt, GetCurrScTab() ); } - void ImportExcel8::ReadBasic( void ) { SfxObjectShell* pShell = GetDocShell(); @@ -438,7 +424,6 @@ void ImportExcel8::ReadBasic( void ) } } - void ImportExcel8::EndSheet( void ) { ImportExcel::EndSheet(); @@ -446,7 +431,6 @@ void ImportExcel8::EndSheet( void ) GetValidationManager().Apply(); } - void ImportExcel8::PostDocLoad( void ) { #ifndef DISABLE_SCRIPTING @@ -498,7 +482,6 @@ void ImportExcel8::LoadDocumentProperties() } } - // autofilter void ImportExcel8::FilterMode( void ) diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 36a3254a3760..0ea43ff47ab7 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -49,7 +49,6 @@ #include <svl/zformat.hxx> #include <svtools/ctrltool.hxx> - #include <string.h> #include "global.hxx" @@ -140,20 +139,17 @@ void ExcRecord::SaveXml( XclExpXmlStream& /*rStrm*/ ) { } - //--------------------------------------------------------- class ExcEmptyRec - void ExcEmptyRec::Save( XclExpStream& /*rStrm*/ ) { } - sal_uInt16 ExcEmptyRec::GetNum() const { return 0; } - sal_Size ExcEmptyRec::GetLen() const { return 0; @@ -166,7 +162,6 @@ void ExcDummyRec::Save( XclExpStream& rStrm ) rStrm.Write( GetData(), GetLen() ); // raw write mode } - sal_uInt16 ExcDummyRec::GetNum( void ) const { return 0x0000; @@ -179,13 +174,11 @@ void ExcBoolRecord::SaveCont( XclExpStream& rStrm ) rStrm << (sal_uInt16)(bVal ? 0x0001 : 0x0000); } - sal_Size ExcBoolRecord::GetLen( void ) const { return 2; } - //--------------------------------------------------------- class ExcBof_Base - ExcBof_Base::ExcBof_Base() @@ -204,19 +197,16 @@ ExcBof::ExcBof( void ) nVers = 0x0500; } - void ExcBof::SaveCont( XclExpStream& rStrm ) { rStrm << nVers << nDocType << nRupBuild << nRupYear; } - sal_uInt16 ExcBof::GetNum( void ) const { return 0x0809; } - sal_Size ExcBof::GetLen( void ) const { return 8; @@ -230,7 +220,6 @@ ExcBofW::ExcBofW( void ) nVers = 0x0500; } - void ExcBofW::SaveCont( XclExpStream& rStrm ) { rStrm << nVers << nDocType << nRupBuild << nRupYear; @@ -253,7 +242,6 @@ sal_uInt16 ExcEof::GetNum( void ) const return 0x000A; } - sal_Size ExcEof::GetLen( void ) const { return 0; @@ -266,7 +254,6 @@ sal_Size ExcDummy_00::GetLen( void ) const return nMyLen; } - const sal_uInt8* ExcDummy_00::GetData( void ) const { return pMyData; @@ -279,19 +266,16 @@ sal_Size ExcDummy_040::GetLen( void ) const return nMyLen; } - const sal_uInt8* ExcDummy_040::GetData( void ) const { return pMyData; } - sal_Size ExcDummy_041::GetLen( void ) const { return nMyLen; } - const sal_uInt8* ExcDummy_041::GetData( void ) const { return pMyData; @@ -306,13 +290,11 @@ Exc1904::Exc1904( ScDocument& rDoc ) bDateCompatibility = pDate && !( *pDate == Date( 30, 12, 1899 )); } - sal_uInt16 Exc1904::GetNum( void ) const { return 0x0022; } - void Exc1904::SaveXml( XclExpXmlStream& rStrm ) { bool bISOIEC = ( rStrm.getVersion() == oox::core::ISOIEC_29500_2008 ); @@ -342,7 +324,6 @@ ExcBundlesheetBase::ExcBundlesheetBase( RootData& rRootData, SCTAB nTabNum ) : { } - ExcBundlesheetBase::ExcBundlesheetBase() : m_nStrPos( STREAM_SEEK_TO_END ), m_nOwnPos( STREAM_SEEK_TO_END ), @@ -351,7 +332,6 @@ ExcBundlesheetBase::ExcBundlesheetBase() : { } - void ExcBundlesheetBase::UpdateStreamPos( XclExpStream& rStrm ) { rStrm.SetSvStreamPos( m_nOwnPos ); @@ -360,13 +340,11 @@ void ExcBundlesheetBase::UpdateStreamPos( XclExpStream& rStrm ) rStrm.EnableEncryption(); } - sal_uInt16 ExcBundlesheetBase::GetNum( void ) const { return 0x0085; } - ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) : ExcBundlesheetBase( rRootData, _nTab ) { @@ -375,7 +353,6 @@ ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) : aName = OUStringToOString(sTabName, rRootData.pER->GetTextEncoding()); } - void ExcBundlesheet::SaveCont( XclExpStream& rStrm ) { m_nOwnPos = rStrm.GetSvStreamPos(); @@ -384,13 +361,11 @@ void ExcBundlesheet::SaveCont( XclExpStream& rStrm ) rStrm.WriteByteString(aName); // 8 bit length, max 255 chars } - sal_Size ExcBundlesheet::GetLen() const { return 7 + std::min( aName.getLength(), (sal_Int32) 255 ); } - //--------------------------------------------------------- class ExcDummy_02 - sal_Size ExcDummy_02a::GetLen( void ) const @@ -459,7 +434,6 @@ void XclExpXmlSheetPr::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_sheetPr ); } - // XclExpWindowProtection =============================================================== XclExpWindowProtection::XclExpWindowProtection(bool bValue) : @@ -552,7 +526,6 @@ void XclExpSheetProtection::SaveXml( XclExpXmlStream& rStrm ) } } - XclExpPassHash::XclExpPassHash(const Sequence<sal_Int8>& aHash) : XclExpRecord(EXC_ID_PASSWORD, 2), mnHash(0x0000) diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx index 780b943e73e2..cf6d867a853c 100644 --- a/sc/source/filter/excel/exctools.cxx +++ b/sc/source/filter/excel/exctools.cxx @@ -76,7 +76,6 @@ RootData::~RootData() delete pPrintTitles; } - XclImpOutlineBuffer::XclImpOutlineBuffer( SCSIZE nNewSize ) : maLevels(0, nNewSize, 0), mpOutlineArray(NULL), diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index f1453e945695..ade579405587 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> - ExportBiff5::ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ): ExportTyp( rStrm, &rExpData.mrDoc, rExpData.meTextEnc ), XclExpRoot( rExpData ) @@ -53,13 +52,11 @@ ExportBiff5::ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ): pExcDoc = new ExcDocument( *this ); } - ExportBiff5::~ExportBiff5() { delete pExcDoc; } - FltError ExportBiff5::Write() { SfxObjectShell* pDocShell = GetDocShell(); @@ -122,7 +119,6 @@ ExportBiff8::ExportBiff8( XclExpRootData& rExpData, SvStream& rStrm ) : pExcRoot->eDateiTyp = Biff8; } - ExportBiff8::~ExportBiff8() { } diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx index 75859817b74e..580a5132c987 100644 --- a/sc/source/filter/excel/fontbuff.cxx +++ b/sc/source/filter/excel/fontbuff.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "lotfntbf.hxx" #include "scitems.hxx" @@ -80,7 +79,6 @@ void LotusFontBuffer::Fill( const sal_uInt8 nIndex, SfxItemSet& rItemSet ) } } - void LotusFontBuffer::SetName( const sal_uInt16 nIndex, const OUString& rName ) { OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetName(): Array too small!" ); @@ -94,7 +92,6 @@ void LotusFontBuffer::SetName( const sal_uInt16 nIndex, const OUString& rName ) } } - void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeight ) { OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetHeight(): Array too small!" ); @@ -102,7 +99,6 @@ void LotusFontBuffer::SetHeight( const sal_uInt16 nIndex, const sal_uInt16 nHeig pData[ nIndex ].Height( *( new SvxFontHeightItem( ( sal_uLong ) nHeight * 20, 100, ATTR_FONT_HEIGHT ) ) ); } - void LotusFontBuffer::SetType( const sal_uInt16 nIndex, const sal_uInt16 nType ) { OSL_ENSURE( nIndex < nSize, "*LotusFontBuffer::SetType(): Array too small!" ); @@ -116,7 +112,6 @@ void LotusFontBuffer::SetType( const sal_uInt16 nIndex, const sal_uInt16 nType ) } } - void LotusFontBuffer::MakeFont( ENTRY* pEntry ) { FontFamily eFamily = FAMILY_DONTKNOW; diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index d2179e0fe1d2..08b0b4e16847 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "formel.hxx" _ScRangeListTabs::_ScRangeListTabs() @@ -28,7 +27,6 @@ _ScRangeListTabs::~_ScRangeListTabs() { } - void _ScRangeListTabs::Append( const ScAddress& aSRD, SCTAB nTab, const bool b ) { ScAddress a = aSRD; @@ -189,7 +187,6 @@ void ConverterBase::Reset() aStack.Reset(); } - ExcelConverterBase::ExcelConverterBase( svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffer ) : ConverterBase(rSPool, nNewBuffer) { @@ -211,7 +208,6 @@ void ExcelConverterBase::Reset() aEingPos.Set( 0, 0, 0 ); } - LotusConverterBase::LotusConverterBase( SvStream &rStr, svl::SharedStringPool& rSPool, sal_uInt16 nNewBuffers ) : ConverterBase(rSPool, nNewBuffers), aIn( rStr ), diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index dfbd0dbcb11e..0967cbe3ea67 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -85,29 +85,24 @@ using namespace ::com::sun::star; - const double ImportExcel::fExcToTwips = ( double ) TWIPS_PER_CHAR / 256.0; - ImportTyp::ImportTyp( ScDocument* pDoc, rtl_TextEncoding eQ ) { eQuellChar = eQ; pD = pDoc; } - ImportTyp::~ImportTyp() { } - FltError ImportTyp::Read() { return eERR_INTERN; } - ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ): ImportTyp( &rImpData.mrDoc, rImpData.meTextEnc ), XclImpRoot( rImpData ), @@ -157,7 +152,6 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ): pD->SetDocOptions( aDocOpt ); } - ImportExcel::~ImportExcel( void ) { GetDoc().SetSrcCharSet( GetTextEncoding() ); @@ -409,13 +403,11 @@ void ImportExcel::ReadRk() } } - void ImportExcel::Window1() { GetDocViewSettings().ReadWindow1( maStrm ); } - void ImportExcel::Row25( void ) { sal_uInt16 nRow, nRowHeight; @@ -446,7 +438,6 @@ void ImportExcel::Row25( void ) } } - void ImportExcel::Bof2( void ) { sal_uInt16 nSubType; @@ -462,7 +453,6 @@ void ImportExcel::Bof2( void ) pExcRoot->eDateiTyp = Biff2; } - void ImportExcel::Eof( void ) { // POST: darf nur nach einer GUELTIGEN Tabelle gerufen werden! @@ -470,7 +460,6 @@ void ImportExcel::Eof( void ) IncCurrScTab(); } - void ImportExcel::SheetPassword( void ) { if (GetRoot().GetBiff() != EXC_BIFF8) @@ -479,7 +468,6 @@ void ImportExcel::SheetPassword( void ) GetRoot().GetSheetProtectBuffer().ReadPasswordHash( aIn, GetCurrScTab() ); } - void ImportExcel::Externsheet( void ) { OUString aUrl, aTabName; @@ -489,7 +477,6 @@ void ImportExcel::Externsheet( void ) mnLastRefIdx = pExcRoot->pExtSheetBuff->Add( aUrl, aTabName, bSameWorkBook ); } - void ImportExcel:: WinProtection( void ) { if (GetRoot().GetBiff() != EXC_BIFF8) @@ -498,7 +485,6 @@ void ImportExcel:: WinProtection( void ) GetRoot().GetDocProtectBuffer().ReadWinProtect( aIn ); } - void ImportExcel::Columndefault( void ) {// Default Cell Attributes sal_uInt16 nColMic, nColMac; @@ -524,7 +510,6 @@ void ImportExcel::Columndefault( void ) } } - void ImportExcel::Array25( void ) { sal_uInt16 nFirstRow, nLastRow, nFormLen; @@ -560,7 +545,6 @@ void ImportExcel::Array25( void ) } } - void ImportExcel::Rec1904( void ) { sal_uInt16 n1904; @@ -576,7 +560,6 @@ void ImportExcel::Rec1904( void ) } } - void ImportExcel::Externname25( void ) { sal_uInt32 nRes; @@ -601,7 +584,6 @@ void ImportExcel::Externname25( void ) } } - void ImportExcel::Colwidth( void ) {// Column Width sal_uInt8 nColFirst, nColLast; @@ -617,7 +599,6 @@ void ImportExcel::Colwidth( void ) pColRowBuff->SetWidthRange( nColFirst, nColLast, nScWidth ); } - void ImportExcel::Defrowheight2( void ) { sal_uInt16 nDefHeight; @@ -626,7 +607,6 @@ void ImportExcel::Defrowheight2( void ) pColRowBuff->SetDefHeight( nDefHeight, EXC_DEFROW_UNSYNCED ); } - void ImportExcel::SheetProtect( void ) { if (GetRoot().GetBiff() != EXC_BIFF8) @@ -656,13 +636,11 @@ void ImportExcel::Codepage( void ) SetCodePage( maStrm.ReaduInt16() ); } - void ImportExcel::Ixfe( void ) { maStrm >> mnIxfeIndex; } - void ImportExcel::DefColWidth( void ) { // stored as entire characters -> convert to 1/256 of characters (as in COLINFO) @@ -676,12 +654,10 @@ void ImportExcel::DefColWidth( void ) pColRowBuff->SetDefWidth( nScWidth ); } - void ImportExcel::Builtinfmtcnt( void ) { } - void ImportExcel::Colinfo( void ) {// Column Formatting Information sal_uInt16 nColFirst, nColLast, nColWidth, nXF; @@ -708,7 +684,6 @@ void ImportExcel::Colinfo( void ) pColRowBuff->SetDefaultXF( nColFirst, nColLast, nXF ); } - void ImportExcel::Wsbool( void ) { sal_uInt16 nFlags; @@ -720,7 +695,6 @@ void ImportExcel::Wsbool( void ) GetPageSettings().SetFitToPages( ::get_flag( nFlags, EXC_WSBOOL_FITTOPAGE ) ); } - void ImportExcel::Boundsheet( void ) { sal_uInt16 nGrbit = 0; @@ -754,7 +728,6 @@ void ImportExcel::Boundsheet( void ) nBdshtTab++; } - void ImportExcel::Country( void ) { sal_uInt16 nUICountry, nDocCountry; @@ -771,7 +744,6 @@ void ImportExcel::Country( void ) SetUILanguage( eLanguage ); } - void ImportExcel::ReadUsesElfs() { if( maStrm.ReaduInt16() != 0 ) @@ -782,7 +754,6 @@ void ImportExcel::ReadUsesElfs() } } - void ImportExcel::Hideobj( void ) { sal_uInt16 nHide; @@ -818,19 +789,16 @@ void ImportExcel::Hideobj( void ) pD->SetViewOptions( aOpts ); } - void ImportExcel::Bundleheader( void ) { } - void ImportExcel::Standardwidth( void ) { sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(), GetCharWidth() ); pColRowBuff->SetDefWidth( nScWidth, true ); } - void ImportExcel::Shrfmla( void ) { switch (mnLastRecId) @@ -888,7 +856,6 @@ void ImportExcel::Shrfmla( void ) mpLastFormula->mpCell = pCell; } - void ImportExcel::Mulrk( void ) { XclAddress aXclPos; @@ -910,7 +877,6 @@ void ImportExcel::Mulrk( void ) } } - void ImportExcel::Mulblank( void ) { XclAddress aXclPos; @@ -928,7 +894,6 @@ void ImportExcel::Mulblank( void ) } } - void ImportExcel::Rstring( void ) { XclAddress aXclPos; @@ -957,7 +922,6 @@ void ImportExcel::Rstring( void ) } } - void ImportExcel::Cellmerging() { XclImpAddressConverter& rAddrConv = GetAddressConverter(); @@ -975,7 +939,6 @@ void ImportExcel::Cellmerging() } } - void ImportExcel::Olesize( void ) { XclRange aXclOleSize( ScAddress::UNINITIALIZED ); @@ -986,7 +949,6 @@ void ImportExcel::Olesize( void ) GetAddressConverter().ConvertRange( maScOleSize, aXclOleSize, nScTab, nScTab, false ); } - void ImportExcel::Row34( void ) { sal_uInt16 nRow, nRowHeight, nGrbit, nXF; @@ -1016,7 +978,6 @@ void ImportExcel::Row34( void ) } } - void ImportExcel::Bof3( void ) { sal_uInt16 nSubType; @@ -1035,7 +996,6 @@ void ImportExcel::Bof3( void ) pExcRoot->eDateiTyp = Biff3; } - void ImportExcel::Array34( void ) { sal_uInt16 nFirstRow, nLastRow, nFormLen; @@ -1062,12 +1022,10 @@ void ImportExcel::Array34( void ) } } - void ImportExcel::Externname34( void ) { } - void ImportExcel::Defrowheight345( void ) { sal_uInt16 nFlags, nDefHeight; @@ -1075,7 +1033,6 @@ void ImportExcel::Defrowheight345( void ) pColRowBuff->SetDefHeight( nDefHeight, nFlags ); } - void ImportExcel::TableOp( void ) { sal_uInt16 nFirstRow, nLastRow; @@ -1151,7 +1108,6 @@ void ImportExcel::TableOp( void ) } } - void ImportExcel::Bof4( void ) { sal_uInt16 nSubType; @@ -1169,7 +1125,6 @@ void ImportExcel::Bof4( void ) pExcRoot->eDateiTyp = Biff4; } - void ImportExcel::Bof5( void ) { //POST: eDateiTyp = Typ der zu lesenden Datei @@ -1210,7 +1165,6 @@ void ImportExcel::EndSheet( void ) FinalizeTable(); } - void ImportExcel::NewTable( void ) { SCTAB nTab = GetCurrScTab(); @@ -1238,13 +1192,11 @@ void ImportExcel::NewTable( void ) pRowOutlineBuff = pNewItem->GetRowOutline(); } - const ScTokenArray* ImportExcel::ErrorToFormula( bool bErrOrVal, sal_uInt8 nError, double& rVal ) { return pFormConv->GetBoolErr( XclTools::ErrorToEnum( rVal, bErrOrVal, nError ) ); } - void ImportExcel::AdjustRowHeight() { /* Speed up chart import: import all sheets without charts, then @@ -1255,7 +1207,6 @@ void ImportExcel::AdjustRowHeight() pDocObj->UpdateAllRowHeights(); } - void ImportExcel::PostDocLoad( void ) { /* Set automatic page numbering in Default page style (default is "page number = 1"). diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index 85dfb194cc4a..ab0981cc84be 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "namebuff.hxx" #include "document.hxx" @@ -48,7 +47,6 @@ sal_uInt32 StringHashEntry::MakeHashCode( const OUString& r ) return n; } - NameBuffer::~NameBuffer() { std::vector<StringHashEntry*>::iterator pIter; @@ -56,7 +54,6 @@ NameBuffer::~NameBuffer() delete *pIter; } - //void NameBuffer::operator <<( const SpString &rNewString ) void NameBuffer::operator <<( const OUString &rNewString ) { @@ -105,7 +102,6 @@ sal_Int16 ExtSheetBuffer::Add( const OUString& rFPAN, const OUString& rTN, const return static_cast< sal_Int16 >( maEntries.size() ); } - bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScIndex ) { OSL_ENSURE( nExcIndex, @@ -161,7 +157,6 @@ bool ExtSheetBuffer::GetScTabIndex( sal_uInt16 nExcIndex, sal_uInt16& rScIndex ) return false; } - bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const { OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index has to be >0!" ); @@ -172,7 +167,6 @@ bool ExtSheetBuffer::IsLink( const sal_uInt16 nExcIndex ) const return maEntries[ nExcIndex -1 ].bLink; } - bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUString& rDoc ) const { OSL_ENSURE( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index has to be >0!" ); @@ -188,38 +182,32 @@ bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUStr return true; } - void ExtSheetBuffer::Reset( void ) { maEntries.clear(); } - bool ExtName::IsDDE( void ) const { return ( nFlags & 0x0001 ) != 0; } - bool ExtName::IsOLE( void ) const { return ( nFlags & 0x0002 ) != 0; } - ExtNameBuff::ExtNameBuff( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) { } - void ExtNameBuff::AddDDE( const OUString& rName, sal_Int16 nRefIdx ) { ExtName aNew( rName, 0x0001 ); maExtNames[ nRefIdx ].push_back( aNew ); } - void ExtNameBuff::AddOLE( const OUString& rName, sal_Int16 nRefIdx, sal_uInt32 nStorageId ) { ExtName aNew( rName, 0x0002 ); @@ -227,14 +215,12 @@ void ExtNameBuff::AddOLE( const OUString& rName, sal_Int16 nRefIdx, sal_uInt32 n maExtNames[ nRefIdx ].push_back( aNew ); } - void ExtNameBuff::AddName( const OUString& rName, sal_Int16 nRefIdx ) { ExtName aNew( GetScAddInName( rName ), 0x0004 ); maExtNames[ nRefIdx ].push_back( aNew ); } - const ExtName* ExtNameBuff::GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameIdx ) const { OSL_ENSURE( nNameIdx > 0, "ExtNameBuff::GetNameByIndex() - invalid name index" ); @@ -242,11 +228,9 @@ const ExtName* ExtNameBuff::GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameI return ((aIt != maExtNames.end()) && (0 < nNameIdx) && (nNameIdx <= aIt->second.size())) ? &aIt->second[ nNameIdx - 1 ] : 0; } - void ExtNameBuff::Reset( void ) { maExtNames.clear(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 7c4d7bd09d3b..4aee5ba55f9b 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -766,7 +766,6 @@ FltError ImportExcel::Read( void ) return eLastErr; } - FltError ImportExcel8::Read( void ) { #ifdef EXC_INCL_DUMPER @@ -978,7 +977,6 @@ FltError ImportExcel8::Read( void ) } break; - // prefetch for workbook globals case EXC_STATE_GLOBALS_PRE: { @@ -1019,7 +1017,6 @@ FltError ImportExcel8::Read( void ) } break; - // workbook globals case EXC_STATE_GLOBALS: { @@ -1079,7 +1076,6 @@ FltError ImportExcel8::Read( void ) } break; - // prefetch for worksheet case EXC_STATE_SHEET_PRE: { @@ -1146,7 +1142,6 @@ FltError ImportExcel8::Read( void ) } break; - // worksheet case EXC_STATE_SHEET: { @@ -1237,7 +1232,6 @@ FltError ImportExcel8::Read( void ) } break; - default:; } } diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 9522e3bfaeb4..4c4550a62e83 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tokstack.hxx" #include "compiler.hxx" #include "global.hxx" @@ -30,7 +29,6 @@ const sal_uInt16 TokenPool::nScTokenOff = 8192; - TokenStack::TokenStack( sal_uInt16 nNewSize ) { pStack = new TokenId[ nNewSize ]; @@ -39,20 +37,15 @@ TokenStack::TokenStack( sal_uInt16 nNewSize ) nSize = nNewSize; } - TokenStack::~TokenStack() { delete[] pStack; } - - - // !ACHTUNG!: nach Aussen hin beginnt die Nummerierung mit 1! // !ACHTUNG!: SC-Token werden mit einem Offset nScTokenOff abgelegt // -> Unterscheidung von anderen Token - TokenPool::TokenPool( svl::SharedStringPool& rSPool ) : mrStringPool(rSPool) { @@ -106,7 +99,6 @@ TokenPool::TokenPool( svl::SharedStringPool& rSPool ) : Reset(); } - TokenPool::~TokenPool() { sal_uInt16 n; @@ -144,7 +136,6 @@ TokenPool::~TokenPool() delete pScToken; } - /** Returns the new number of elements, or 0 if overflow. */ static sal_uInt16 lcl_canGrow( sal_uInt16 nOld, sal_uInt16 nByMin = 1 ) { @@ -161,7 +152,6 @@ static sal_uInt16 lcl_canGrow( sal_uInt16 nOld, sal_uInt16 nByMin = 1 ) return static_cast<sal_uInt16>(nNew); } - bool TokenPool::GrowString( void ) { sal_uInt16 nP_StrNew = lcl_canGrow( nP_Str); @@ -186,14 +176,12 @@ bool TokenPool::GrowString( void ) return true; } - bool TokenPool::GrowDouble( void ) { sal_uInt16 nP_DblNew = lcl_canGrow( nP_Dbl); if (!nP_DblNew) return false; - double* pP_DblNew = new (::std::nothrow) double[ nP_DblNew ]; if (!pP_DblNew) return false; @@ -208,7 +196,6 @@ bool TokenPool::GrowDouble( void ) return true; } - /* TODO: in case we had FormulaTokenArray::AddError() */ #if 0 void TokenPool::GrowError( void ) @@ -217,7 +204,6 @@ void TokenPool::GrowError( void ) if (!nP_ErrNew) return false; - sal_uInt16* pP_ErrNew = new (::std::nothrow) sal_uInt16[ nP_ErrNew ]; if (!pP_ErrNew) return false; @@ -233,7 +219,6 @@ void TokenPool::GrowError( void ) } #endif - bool TokenPool::GrowTripel( sal_uInt16 nByMin ) { sal_uInt16 nP_RefTrNew = lcl_canGrow( nP_RefTr, nByMin); @@ -258,14 +243,12 @@ bool TokenPool::GrowTripel( sal_uInt16 nByMin ) return true; } - bool TokenPool::GrowId( void ) { sal_uInt16 nP_IdNew = lcl_canGrow( nP_Id); if (!nP_IdNew) return false; - sal_uInt16* pP_IdNew = new (::std::nothrow) sal_uInt16[ nP_IdNew ]; if (!pP_IdNew) return false; @@ -280,14 +263,12 @@ bool TokenPool::GrowId( void ) return true; } - bool TokenPool::GrowElement( void ) { sal_uInt16 nElementNew = lcl_canGrow( nElement); if (!nElementNew) return false; - sal_uInt16* pElementNew = new (::std::nothrow) sal_uInt16[ nElementNew ]; E_TYPE* pTypeNew = new (::std::nothrow) E_TYPE[ nElementNew ]; sal_uInt16* pSizeNew = new (::std::nothrow) sal_uInt16[ nElementNew ]; @@ -317,7 +298,6 @@ bool TokenPool::GrowElement( void ) return true; } - bool TokenPool::GrowExt( void ) { sal_uInt16 nNewSize = lcl_canGrow( nP_Ext); @@ -337,7 +317,6 @@ bool TokenPool::GrowExt( void ) return true; } - bool TokenPool::GrowNlf( void ) { sal_uInt16 nNewSize = lcl_canGrow( nP_Nlf); @@ -357,7 +336,6 @@ bool TokenPool::GrowNlf( void ) return true; } - bool TokenPool::GrowMatrix( void ) { sal_uInt16 nNewSize = lcl_canGrow( nP_Matrix); @@ -537,7 +515,6 @@ bool TokenPool::GetElement( const sal_uInt16 nId ) return bRet; } - bool TokenPool::GetElementRek( const sal_uInt16 nId ) { #ifdef DBG_UTIL @@ -565,7 +542,6 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId ) return false; } - bool bRet = true; sal_uInt16 nAnz = pSize[ nId ]; sal_uInt16 nFirstId = pElement[ nId ]; @@ -603,14 +579,12 @@ bool TokenPool::GetElementRek( const sal_uInt16 nId ) pScToken->AddOpCode( ( DefTokenId ) ( *pAkt - nScTokenOff ) ); } - #ifdef DBG_UTIL m_nRek--; #endif return bRet; } - void TokenPool::operator >>( TokenId& rId ) { rId = ( TokenId ) ( nElementAkt + 1 ); @@ -628,7 +602,6 @@ void TokenPool::operator >>( TokenId& rId ) nP_IdLast = nP_IdAkt; } - const TokenId TokenPool::Store( const double& rDouble ) { if( nElementAkt >= nElement ) @@ -652,13 +625,11 @@ const TokenId TokenPool::Store( const double& rDouble ) return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } - const TokenId TokenPool::Store( const sal_uInt16 nIndex ) { return StoreName(nIndex, true); } - const TokenId TokenPool::Store( const OUString& rString ) { // weitgehend nach Store( const sal_Char* ) kopiert, zur Vermeidung @@ -667,12 +638,10 @@ const TokenId TokenPool::Store( const OUString& rString ) if (!GrowElement()) return (const TokenId) nElementAkt+1; - if( nP_StrAkt >= nP_Str ) if (!GrowString()) return (const TokenId) nElementAkt+1; - pElement[ nElementAkt ] = nP_StrAkt; // Index in String-Array pType[ nElementAkt ] = T_Str; // Typinfo String eintragen @@ -696,7 +665,6 @@ const TokenId TokenPool::Store( const OUString& rString ) return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } - const TokenId TokenPool::Store( const ScSingleRefData& rTr ) { if( nElementAkt >= nElement ) @@ -721,7 +689,6 @@ const TokenId TokenPool::Store( const ScSingleRefData& rTr ) return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } - const TokenId TokenPool::Store( const ScComplexRefData& rTr ) { if( nElementAkt >= nElement ) @@ -752,7 +719,6 @@ const TokenId TokenPool::Store( const ScComplexRefData& rTr ) return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } - const TokenId TokenPool::Store( const DefTokenId e, const OUString& r ) { if( nElementAkt >= nElement ) @@ -780,7 +746,6 @@ const TokenId TokenPool::Store( const DefTokenId e, const OUString& r ) return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } - const TokenId TokenPool::StoreNlf( const ScSingleRefData& rTr ) { if( nElementAkt >= nElement ) @@ -919,7 +884,6 @@ void TokenPool::Reset( void ) maExtAreaRefs.clear(); } - bool TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const { sal_uInt16 nId = (sal_uInt16) rId; diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 5d10e380fc80..11a29a22c8de 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xechart.hxx" #include <com/sun/star/i18n/XBreakIterator.hpp> @@ -1698,7 +1697,6 @@ bool XclExpChSerTrendLine::Convert( Reference< XRegressionCurve > xRegCurve, sal if (bIsForceIntercept) aCurveProp.GetProperty(maData.mfIntercept, EXC_CHPROP_INTERCEPT_VALUE); - // line formatting XclChDataPointPos aPointPos( nSeriesIdx ); mxDataFmt.reset( new XclExpChDataFormat( GetChRoot(), aPointPos, 0 ) ); diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index d91e15d03cd4..51f8781364be 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xeescher.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 0231faf207fb..1cd20563001e 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -313,7 +313,6 @@ public: bool IsRef2D( const ScSingleRefData& rRefData, bool bCheck3DFlag ) const; bool IsRef2D( const ScComplexRefData& rRefData, bool bCheck3DFlag ) const; - private: const XclExpCompConfig* GetConfigForType( XclFormulaType eType ) const; inline sal_uInt16 GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); } @@ -449,7 +448,6 @@ private: void AppendExt( double fData ); void AppendExt( const OUString& rString ); - private: typedef ::std::map< XclFormulaType, XclExpCompConfig > XclExpCompConfigMap; typedef boost::shared_ptr< XclExpCompData > XclExpCompDataRef; diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 944a0723cf9b..a856cf56b4a2 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -36,10 +36,8 @@ using ::std::find_if; using ::std::vector; using ::com::sun::star::uno::Any; - // *** Helper classes *** - // External names ============================================================= /** This is a base class for any external name (i.e. add-in names or DDE links). @@ -609,10 +607,8 @@ private: XclExpXtiVec maXtiVec; /// List of XTI structures for the EXTERNSHEET record. }; - // *** Implementation *** - // Excel sheet indexes ======================================================== const sal_uInt8 EXC_TABBUF_IGNORE = 0x01; /// Sheet will be ignored completely. @@ -1370,7 +1366,6 @@ XclExpSupbook::XclExpSupbook( const XclExpRoot& rRoot, const OUString& rUrl, Xcl SetRecSize( 2 + maUrlEncoded.GetSize() ); } - XclExpSupbook::XclExpSupbook( const XclExpRoot& rRoot, const OUString& rUrl ) : XclExpExternSheetBase( rRoot, EXC_ID_SUPBOOK ), maUrl( rUrl ), @@ -1970,7 +1965,6 @@ bool XclExpLinkManagerImpl5::InsertEuroTool( return false; } - bool XclExpLinkManagerImpl5::InsertDde( sal_uInt16& /*rnExtSheet*/, sal_uInt16& /*rnExtName*/, const OUString& /*rApplic*/, const OUString& /*rTopic*/, const OUString& /*rItem*/ ) @@ -2172,7 +2166,6 @@ bool XclExpLinkManagerImpl8::InsertEuroTool( return false; } - bool XclExpLinkManagerImpl8::InsertDde( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 005ec4bfab0b..8c8a010fd951 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -36,7 +36,6 @@ using namespace ::oox; // *** Helper classes *** - /** Represents an internal defined name, supports writing it to a NAME record. */ class XclExpName : public XclExpRecord, protected XclExpRoot { @@ -57,7 +56,6 @@ public: @param bFunc true = Macro function; false = Macro procedure. */ void SetMacroCall( bool bVBasic, bool bFunc ); - /** Sets the name's symbol value @param sValue the name's symbolic value */ void SetSymbol( const OUString& rValue ); @@ -185,10 +183,8 @@ private: size_t mnFirstUserIdx; /// List index of first user-defined NAME record. }; - // *** Implementation *** - XclExpName::XclExpName( const XclExpRoot& rRoot, const OUString& rName ) : XclExpRecord( EXC_ID_NAME ), XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 8db13be1d52c..69e9b1107e42 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xepage.hxx" #include <svl/itemset.hxx> #include "scitems.hxx" diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 4b8ca1384e29..444cc5aa1b4f 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -58,7 +58,6 @@ using ::com::sun::star::sheet::DataPilotFieldReference; // Pivot cache - namespace { // constants to track occurrence of specific data types @@ -899,10 +898,8 @@ void XclExpPivotCache::WriteSxindexlistList( XclExpStream& rStrm ) const } } - // Pivot table - namespace { /** Returns a display string for a data field containing the field name and aggregation function. */ diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 683f9097804b..1cab39a7b60f 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/random.h> #include <sfx2/docfile.hxx> #include <sfx2/request.hxx> diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 345d08674caa..362ba34e398c 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -924,7 +924,6 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper return pStream; } - 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 0f052a70a867..2e4cb8104ab8 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <stdio.h> #include "xlstyle.hxx" @@ -27,7 +26,6 @@ using namespace ::oox; - namespace { // compare vectors diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index c27fd95a2c9a..ed4b1377c0d8 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -37,13 +37,10 @@ using namespace ::oox; - namespace ApiScriptType = ::com::sun::star::i18n::ScriptType; - // Helper records for cell records - XclExpStringRec::XclExpStringRec( const XclExpRoot& rRoot, const OUString& rResult ) : XclExpRecord( EXC_ID3_STRING ), mxResult( XclExpStringHelper::CreateString( rRoot, rResult ) ) @@ -522,10 +519,8 @@ XclExpTableopRef XclExpTableopBuffer::TryCreate( const ScAddress& rScPos, const return xRec; } - // Cell records - XclExpCellBase::XclExpCellBase( sal_uInt16 nRecId, sal_Size nContSize, const XclAddress& rXclPos ) : XclExpRecord( nRecId, nContSize + 4 ), @@ -1329,10 +1324,8 @@ void XclExpRkCell::WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) rStrm << maRkValues[ nRelCol ]; } - // Rows and Columns - XclExpOutlineBuffer::XclExpOutlineBuffer( const XclExpRoot& rRoot, bool bRows ) : mpScOLArray( 0 ), maLevelInfos( SC_OL_MAXDEPTH ), @@ -2163,7 +2156,6 @@ void XclExpRowBuffer::Save( XclExpStream& rStrm ) RowMap::iterator itrBlkStart = maRowMap.begin(), itrBlkEnd = maRowMap.begin(); sal_uInt16 nStartXclRow = (nSize == 0) ? 0 : itrBeg->second->GetXclRow(); - for (itr = itrBeg; itr != itrEnd; ++itr) { // find end of row block @@ -2205,7 +2197,6 @@ void XclExpRowBuffer::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_sheetData ); } - XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysEmpty ) { RowMap::iterator itr = maRowMap.begin(); @@ -2230,10 +2221,8 @@ XclExpRow& XclExpRowBuffer::GetOrCreateRow( sal_uInt32 nXclRow, bool bRowAlwaysE } - // Cell Table - XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), maColInfoBfr( rRoot ), diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index 08e12169e5af..82d69efee523 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -26,7 +26,6 @@ using namespace ::oox; - // Workbook view settings records ============================================= XclExpWindow1::XclExpWindow1( const XclExpRoot& rRoot ) @@ -515,5 +514,4 @@ void XclExpTabViewSettings::WriteTabBgColor( XclExpStream& rStrm ) const XclExpTabBgColor( maData ).Save( rStrm ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index fb8d326b0631..b0ec5bdfdf22 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -2801,7 +2801,6 @@ void XclImpChTypeGroup::ReadChDataFormat( XclImpStream& rStrm ) mxGroupFmt = xDataFmt; } - void XclImpChTypeGroup::InsertDataSeries( Reference< XChartType > xChartType, Reference< XDataSeries > xSeries, sal_Int32 nApiAxesSetIdx ) const { diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 221ac467a8a6..d572ae709449 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -64,7 +64,6 @@ using ::com::sun::star::uno::Sequence; using ::std::auto_ptr; - // Shared string table ======================================================== XclImpSst::XclImpSst( const XclImpRoot& rRoot ) : @@ -760,7 +759,6 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm ) // Not enough bytes left in the record. Bail out. return; - // first formula // string list is single tStr token with NUL separators -> replace them with LF rStrm.SetNulSubstChar( '\n' ); @@ -847,7 +845,6 @@ void XclImpValidationManager::ReadDV( XclImpStream& rStrm ) // No valid validation found. Bail out. return; - // first range for base address for relative references const ScRange& rScRange = *aScRanges.front(); // aScRanges is not empty diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 29897285cee8..ad655952fe44 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1923,7 +1923,6 @@ void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) co aPropSet.SetBoolProperty( "EnableVisible", rDrawObj.IsVisible() ); aPropSet.SetBoolProperty( "Printable", rDrawObj.IsPrintable() ); - // virtual call for type specific processing DoProcessControl( aPropSet ); } @@ -3211,7 +3210,6 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData( { } - XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) : XclImpSimpleDffConverter( rRoot, rDffStrm ), oox::ole::MSConvertOCXControls( rRoot.GetDocShell()->GetModel() ), diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index ccc47475a9f9..865a7834de83 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -38,7 +38,6 @@ public: const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr ); - private: XclFunctionProvider maFuncProv; /// Excel function data provider. const XclBiff meBiff; /// Cached BIFF version to save GetBiff() calls. diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index 774d24479854..0af9836bc931 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -811,7 +811,6 @@ XclImpCachedValue::~XclImpCachedValue() { } - sal_uInt16 XclImpCachedValue::GetScError() const { return (mnType == EXC_CACHEDVAL_ERROR) ? XclTools::GetScErrorCode( mnBoolErr ) : 0; diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index 49e2acb55fb9..c2b23270f307 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -38,7 +38,6 @@ using ::std::vector; // *** Helper classes *** - // Cached external cells ====================================================== /** @@ -212,10 +211,8 @@ private: XclImpSupbookList maSupbookList; /// List of external documents. }; - // *** Implementation *** - // Excel sheet indexes ======================================================== // original Excel sheet names ------------------------------------------------- @@ -544,7 +541,6 @@ XclImpCrn::XclImpCrn( XclImpStream& rStrm, const XclAddress& rXclPos ) : { } - // Sheet in an external document ============================================== XclImpSupbookTab::XclImpSupbookTab( const OUString& rTabName ) : diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 3cda3814c0aa..4a1ef2096b94 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -27,7 +27,6 @@ // *** Implementation *** - XclImpName::TokenStrmData::TokenStrmData( XclImpStream& rStrm ) : mrStrm(rStrm), mnStrmPos(0), mnStrmSize(0) {} diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 966abdf2f073..6fb756f09f6f 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xipivot.hxx" #include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp> @@ -62,10 +61,8 @@ using ::com::sun::star::sheet::DataPilotFieldLayoutInfo; using ::com::sun::star::sheet::DataPilotFieldReference; using ::std::vector; - // Pivot cache - XclImpPCItem::XclImpPCItem( XclImpStream& rStrm ) { switch( rStrm.GetRecId() ) @@ -876,10 +873,8 @@ bool XclImpPivotCache::IsValid() const return maSrcRange.IsValid(); } - // Pivot table - XclImpPTItem::XclImpPTItem( const XclImpPCField* pCacheField ) : mpCacheField( pCacheField ) { diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 6fc2651f2cad..8e98ff3e6a45 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -735,7 +735,6 @@ void XclImpCellProt::FillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) c ScfTools::PutItem( rItemSet, ScProtectionAttr( mbLocked, mbHidden ), bSkipPoolDefs ); } - void XclImpCellAlign::FillFromXF2( sal_uInt8 nFlags ) { mnHorAlign = ::extract_value< sal_uInt8 >( nFlags, 0, 3 ); @@ -1069,7 +1068,6 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& r } } - XclImpXF::XclImpXF( const XclImpRoot& rRoot ) : XclXFBase( true ), // default is cell XF XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 58ccbaea5c2d..de9b15711333 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xlchart.hxx" #include <com/sun/star/container/XNameContainer.hpp> diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 2d6d29e29c8b..986d77cf8a51 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xlescher.hxx" #include <com/sun/star/drawing/XControlShape.hpp> diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index ff3d1c714ece..3944c5706bbd 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -381,7 +381,6 @@ static const XclFunctionInfo saFuncTable_8[] = { ocEuroConvert, 255, 4, 6, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY, "EUROCONVERT" } }; - #define EXC_FUNCENTRY_V_VR( opcode, minparam, maxparam, flags, asciiname ) \ { opcode, NOID, minparam, maxparam, V, { VR }, EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }, \ { opcode, 255, (minparam)+1, (maxparam)+1, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) } @@ -406,7 +405,6 @@ static const XclFunctionInfo saFuncTable_Oox[] = EXC_FUNCENTRY_V_VR( ocCeil_ISO, 2, 2, 0, "ISO.CEILING" ) }; - #define EXC_FUNCENTRY_V_VR_IMPORT( opcode, minparam, maxparam, flags, asciiname ) \ { opcode, NOID, minparam, maxparam, V, { VR }, EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) } @@ -571,7 +569,6 @@ static const XclFunctionInfo saFuncTable_2013[] = EXC_FUNCENTRY_V_RX( ocXor, 1, MX, 0, "XOR" ) }; - #define EXC_FUNCENTRY_ODF( opcode, minparam, maxparam, flags, asciiname ) \ { opcode, NOID, minparam, maxparam, V, { VR }, EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME_ODF( asciiname ) }, \ { opcode, 255, (minparam)+1, (maxparam)+1, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME_ODF( asciiname ) } @@ -585,7 +582,6 @@ static const XclFunctionInfo saFuncTable_Odf[] = #undef EXC_FUNCENTRY_ODF - #define EXC_FUNCENTRY_OOO( opcode, minparam, maxparam, flags, asciiname ) \ { opcode, NOID, minparam, maxparam, V, { VR }, EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }, \ { opcode, 255, (minparam)+1, (maxparam)+1, V, { RO_E, RO }, EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) } diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx index 0cccec7f7349..36232de41425 100644 --- a/sc/source/filter/excel/xlpage.cxx +++ b/sc/source/filter/excel/xlpage.cxx @@ -42,7 +42,6 @@ struct XclPaperSize #define MM2TWIPS( v ) ((long)((v) * EXC_TWIPS_PER_INCH / CM_PER_INCH / 10.0 + 0.5)) #define TWIPS2MM( v ) ((long)((v - 0.5) / EXC_TWIPS_PER_INCH * CM_PER_INCH * 10.0)) - static const XclPaperSize pPaperSizeTable[] = { /* 0*/ { PAPER_USER, 0, 0 }, // undefined diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 6682d46659de..4acdf8ae1fa5 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -34,10 +34,8 @@ namespace ScDPLayoutMode = ::com::sun::star::sheet::DataPilotFieldLayoutMode; namespace ScDPRefItemType = ::com::sun::star::sheet::DataPilotFieldReferenceItemType; namespace ScDPGroupBy = ::com::sun::star::sheet::DataPilotFieldGroupBy; - // Pivot cache - XclPCItem::XclPCItem() : meType( EXC_PCITEM_INVALID ), maDateTime( DateTime::EMPTY ) @@ -384,10 +382,8 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPCInfo& rInfo ) << XclExpString( rInfo.maUserName ); } - // Pivot table - // cached name ================================================================ XclImpStream& operator>>( XclImpStream& rStrm, XclPTCachedName& rCachedName ) diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index d2bf5e4d48b0..69f27748853f 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xlstyle.hxx" #include <com/sun/star/awt/FontFamily.hpp> #include <com/sun/star/awt/FontSlant.hpp> @@ -329,7 +328,6 @@ void XclFontData::SetFontEncoding( rtl_TextEncoding eFontEnc ) mnCharSet = rtl_getBestWindowsCharsetFromTextEncoding( eFontEnc ); } - void XclFontData::SetScPosture( FontItalic eScPosture ) { mbItalic = (eScPosture == ITALIC_OBLIQUE) || (eScPosture == ITALIC_NORMAL); diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index 468de5eac05b..0121b21d810e 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -417,7 +417,6 @@ bool ScCTBWrapper::ImportCustomToolBar( SfxObjectShell& rDocSh ) // such menus will be dealt with when they are encountered // as part of importing the appropriate MenuSpecific toolbar control ) - if ( !(*it).IsMenuToolbar() ) { if ( !(*it).ImportCustomToolBar( *this, helper ) ) diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index 4a99bf9495f4..b5481caccd3c 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -66,7 +66,6 @@ public: bool ImportMenuTB( ScCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); OUString GetName() { return tb.getName().getString(); } - }; class CTBS : public TBBase @@ -107,7 +106,6 @@ public: ScCTB* GetCustomizationData( const OUString& name ); }; - #endif // INCLUDED_SC_SOURCE_FILTER_EXCEL_XLTOOLBAR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 01c3b4890102..38b6dd07bed9 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <math.h> #include <sal/mathconf.h> @@ -38,7 +37,6 @@ #include "xiroot.hxx" #include "xltools.hxx" - // GUID import/export XclGuid::XclGuid() diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index 92516b239fda..e602f01d6732 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -42,7 +42,6 @@ #include <stdio.h> - // ScFilterTools::ReadLongDouble() double ScfTools::ReadLongDouble( SvStream& rStrm ) diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index db086107dc89..7104f6096756 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -68,7 +68,6 @@ #include <editeng/borderline.hxx> #include <unotools/syslocale.hxx> - // Without sc.hrc: error C2679: binary '=' : no operator defined which takes a // right-hand operand of type 'const class String (__stdcall *)(class ScResId)' // at @@ -82,7 +81,6 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <rtl/strbuf.hxx> - using ::editeng::SvxBorderLine; using namespace ::com::sun::star; @@ -108,7 +106,6 @@ const sal_uInt16 ScHTMLExport::nCellSpacing = 0; const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; - // Macros for HTML export #define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag ) @@ -126,8 +123,6 @@ const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] = #define GLOBSTR(id) ScGlobal::GetRscString( id ) - - FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const OUString& rBaseURL, ScDocument* pDoc, const ScRange& rRange, const rtl_TextEncoding /*eNach*/, bool bAll, const OUString& rStreamPath, OUString& rNonConvertibleChars, const OUString& rFilterOptions ) @@ -138,7 +133,6 @@ FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const OUString return nErr; } - static OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) { OStringBuffer aByteStr(OOO_STRING_SVTOOLS_HTML_colgroup); @@ -157,7 +151,6 @@ static OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth) return aByteStr.makeStringAndClear(); } - static void lcl_AddStamp( OUString& rStr, const OUString& rName, const ::com::sun::star::util::DateTime& rDateTime, const LocaleDataWrapper& rLoc ) @@ -187,7 +180,6 @@ static void lcl_AddStamp( OUString& rStr, const OUString& rName, rStr += "???"; } - static OString lcl_makeHTMLColorTriplet(const Color& rColor) { OStringBuffer aStr( "\"#" ); @@ -263,13 +255,11 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const OUString& rBaseURL, ScDocume } } - ScHTMLExport::~ScHTMLExport() { aGraphList.clear(); } - sal_uInt16 ScHTMLExport::GetFontSizeNumber( sal_uInt16 nHeight ) { sal_uInt16 nSize = 1; @@ -290,7 +280,6 @@ const char* ScHTMLExport::GetFontSizeCss( sal_uInt16 nHeight ) return pFontSizeCss[ nSize-1 ]; } - sal_uInt16 ScHTMLExport::ToPixel( sal_uInt16 nVal ) { if( nVal ) @@ -303,7 +292,6 @@ sal_uInt16 ScHTMLExport::ToPixel( sal_uInt16 nVal ) return nVal; } - Size ScHTMLExport::MMToPixel( const Size& rSize ) { Size aSize( rSize ); @@ -316,7 +304,6 @@ Size ScHTMLExport::MMToPixel( const Size& rSize ) return aSize; } - sal_uLong ScHTMLExport::Write() { rStrm.WriteChar( '<' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype ).WriteChar( ' ' ).WriteCharPtr( OOO_STRING_SVTOOLS_HTML_doctype40 ).WriteChar( '>' ) @@ -331,7 +318,6 @@ sal_uLong ScHTMLExport::Write() return rStrm.GetError(); } - void ScHTMLExport::WriteHeader() { IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_head ); @@ -351,7 +337,6 @@ void ScHTMLExport::WriteHeader() sIndent, eDestEnc, &aNonConvertibleChars ); OUT_LF(); - if (!xDocProps->getPrintedBy().isEmpty()) { OUT_COMMENT( GLOBSTR( STR_DOC_INFO ) ); @@ -401,7 +386,6 @@ void ScHTMLExport::WriteHeader() IncIndent(-1); OUT_LF(); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head ); } - void ScHTMLExport::WriteOverview() { if ( nUsedTables > 1 ) @@ -435,7 +419,6 @@ void ScHTMLExport::WriteOverview() } } - const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) { SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); @@ -483,7 +466,6 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) return rSet; } - OString ScHTMLExport::BorderToStyle(const char* pBorderName, const SvxBorderLine* pLine, bool& bInsertSemicolon) { @@ -635,7 +617,6 @@ void ScHTMLExport::WriteBody() TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_body ); } - void ScHTMLExport::WriteTables() { const SCTAB nTabCount = pDoc->GetTableCount(); @@ -835,7 +816,6 @@ void ScHTMLExport::WriteTables() } } - void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) { const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab ); @@ -1070,7 +1050,6 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic ); if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline ); - if ( bSetFont ) { OStringBuffer aStr(OOO_STRING_SVTOOLS_HTML_font); @@ -1175,7 +1154,6 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_tabledata ); } - bool ScHTMLExport::WriteFieldText( const EditTextObject* pData ) { bool bFields = false; @@ -1238,7 +1216,6 @@ bool ScHTMLExport::WriteFieldText( const EditTextObject* pData ) return bFields; } - bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm, const OUString& rTargetNm, bool bFileToFile ) { @@ -1308,7 +1285,6 @@ bool ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm, return bRet; } - void ScHTMLExport::MakeCIdURL( OUString& rURL ) { if( aCId.isEmpty() ) @@ -1324,7 +1300,6 @@ void ScHTMLExport::MakeCIdURL( OUString& rURL ) rURL = "cid:" + aLastName + "." + aCId; } - void ScHTMLExport::IncIndent( short nVal ) { sIndent[nIndent] = '\t'; diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 5710afbc1cbb..5894fc6d563f 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -64,7 +64,6 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab, } } - void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { @@ -117,7 +116,6 @@ void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab, } } - void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) { SdrObject* pObject = pE->pObject; @@ -178,7 +176,6 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) } } - void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf, const OString& rImgOptions, sal_uLong nXOutFlags ) { @@ -235,5 +232,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 aae71d568564..9eec75befa74 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -42,7 +42,6 @@ #include "ftools.hxx" #include "tokenarray.hxx" - FltError ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc, ScRange& rRange, double nOutputFactor, bool bCalcWidthHeight, SvNumberFormatter* pFormatter, bool bConvertDate ) @@ -99,7 +98,6 @@ ScHTMLImport::ScHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const S mpParser = new ScHTMLQueryParser( mpEngine, pDocP ); } - ScHTMLImport::~ScHTMLImport() { // Reihenfolge wichtig, sonst knallt's irgendwann irgendwo in irgendeinem Dtor! @@ -107,7 +105,6 @@ ScHTMLImport::~ScHTMLImport() delete (ScHTMLParser*) mpParser; // vor EditEngine! } - void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const OUString& rName, const ScRange& rRange ) { ScComplexRefData aRefData; diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 40fb56e298e2..00ce6f1b7253 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <boost/shared_ptr.hpp> #include <comphelper/string.hxx> @@ -186,10 +185,8 @@ void ScHTMLStyles::insertProp( pProps->insert(PropsType::value_type(aProp, aValue)); } - // BASE class for HTML parser classes - ScHTMLParser::ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ) : ScEEParser( pEditEngine ), mpDoc( pDoc ) @@ -203,8 +200,6 @@ ScHTMLParser::~ScHTMLParser() { } - - ScHTMLLayoutParser::ScHTMLLayoutParser( EditEngine* pEditP, const OUString& rBaseURL, const Size& aPageSizeP, ScDocument* pDocP ) : @@ -234,7 +229,6 @@ ScHTMLLayoutParser::ScHTMLLayoutParser( MakeColNoRef( pColOffset, 0, 0, 0, 0 ); } - ScHTMLLayoutParser::~ScHTMLLayoutParser() { while ( !aTableStack.empty() ) @@ -267,7 +261,6 @@ ScHTMLLayoutParser::~ScHTMLLayoutParser() } } - sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL ) { Link aOldLink = pEdit->GetImportHdl(); @@ -315,13 +308,11 @@ sal_uLong ScHTMLLayoutParser::Read( SvStream& rStream, const OUString& rBaseURL return nErr; } - const ScHTMLTable* ScHTMLLayoutParser::GetGlobalTable() const { return 0; } - void ScHTMLLayoutParser::NewActEntry( ScEEParseEntry* pE ) { ScEEParser::NewActEntry( pE ); @@ -337,7 +328,6 @@ void ScHTMLLayoutParser::NewActEntry( ScEEParseEntry* pE ) pActEntry->aSel.nEndPos = pActEntry->aSel.nStartPos; } - void ScHTMLLayoutParser::EntryEnd( ScEEParseEntry* pE, const ESelection& rSel ) { if ( rSel.nEndPara >= pE->aSel.nStartPara ) @@ -354,7 +344,6 @@ void ScHTMLLayoutParser::EntryEnd( ScEEParseEntry* pE, const ESelection& rSel ) } } - void ScHTMLLayoutParser::NextRow( ImportInfo* pInfo ) { if ( bInCell ) @@ -366,7 +355,6 @@ void ScHTMLLayoutParser::NextRow( ImportInfo* pInfo ) bFirstRow = false; } - bool ScHTMLLayoutParser::SeekOffset( ScHTMLColOffset* pOffset, sal_uInt16 nOffset, SCCOL* pCol, sal_uInt16 nOffsetTol ) { @@ -392,7 +380,6 @@ bool ScHTMLLayoutParser::SeekOffset( ScHTMLColOffset* pOffset, sal_uInt16 nOffse return false; } - void ScHTMLLayoutParser::MakeCol( ScHTMLColOffset* pOffset, sal_uInt16& nOffset, sal_uInt16& nWidth, sal_uInt16 nOffsetTol, sal_uInt16 nWidthTol ) { @@ -411,7 +398,6 @@ void ScHTMLLayoutParser::MakeCol( ScHTMLColOffset* pOffset, sal_uInt16& nOffset, } } - void ScHTMLLayoutParser::MakeColNoRef( ScHTMLColOffset* pOffset, sal_uInt16 nOffset, sal_uInt16 nWidth, sal_uInt16 nOffsetTol, sal_uInt16 nWidthTol ) { @@ -428,7 +414,6 @@ void ScHTMLLayoutParser::MakeColNoRef( ScHTMLColOffset* pOffset, sal_uInt16 nOff } } - void ScHTMLLayoutParser::ModifyOffset( ScHTMLColOffset* pOffset, sal_uInt16& nOldOffset, sal_uInt16& nNewOffset, sal_uInt16 nOffsetTol ) { @@ -466,7 +451,6 @@ void ScHTMLLayoutParser::ModifyOffset( ScHTMLColOffset* pOffset, sal_uInt16& nOl } } - void ScHTMLLayoutParser::SkipLocked( ScEEParseEntry* pE, bool bJoin ) { if ( ValidCol(pE->nCol) ) @@ -502,7 +486,6 @@ void ScHTMLLayoutParser::SkipLocked( ScEEParseEntry* pE, bool bJoin ) } } - void ScHTMLLayoutParser::Adjust() { xLockedList->RemoveAll(); @@ -654,7 +637,6 @@ void ScHTMLLayoutParser::Adjust() } } - sal_uInt16 ScHTMLLayoutParser::GetWidth( ScEEParseEntry* pE ) { if ( pE->nWidth ) @@ -669,7 +651,6 @@ sal_uInt16 ScHTMLLayoutParser::GetWidth( ScEEParseEntry* pE ) return 0; } - void ScHTMLLayoutParser::SetWidths() { ScEEParseEntry* pE; @@ -820,7 +801,6 @@ void ScHTMLLayoutParser::SetWidths() } } - void ScHTMLLayoutParser::Colonize( ScEEParseEntry* pE ) { if ( pE->nCol == SCCOL_MAX ) @@ -849,7 +829,6 @@ void ScHTMLLayoutParser::Colonize( ScEEParseEntry* pE ) nTableWidth = nColOffset - nColOffsetStart; } - void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo ) { bInCell = false; @@ -901,7 +880,6 @@ void ScHTMLLayoutParser::CloseEntry( ImportInfo* pInfo ) NewActEntry( pActEntry ); // New free flying pActEntry } - IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo ) { switch ( pInfo->eState ) @@ -948,7 +926,6 @@ IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo ) return 0; } - // Greatest common divisor (Euclid) // Special case: 0 and something gives 1 static SCROW lcl_GGT( SCROW a, SCROW b ) @@ -965,7 +942,6 @@ static SCROW lcl_GGT( SCROW a, SCROW b ) return ((a != 0) ? a : b); } - // Lowest common multiple: a * b / GCD(a,b) static SCROW lcl_KGV( SCROW a, SCROW b ) { @@ -975,7 +951,6 @@ static SCROW lcl_KGV( SCROW a, SCROW b ) return (b / lcl_GGT(a,b)) * a; } - void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) { if ( bInCell ) @@ -1069,7 +1044,6 @@ void ScHTMLLayoutParser::TableDataOn( ImportInfo* pInfo ) SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY) ); } - void ScHTMLLayoutParser::TableRowOn( ImportInfo* pInfo ) { if ( nColCnt > nColCntStart ) @@ -1077,20 +1051,17 @@ void ScHTMLLayoutParser::TableRowOn( ImportInfo* pInfo ) nColOffset = nColOffsetStart; } - void ScHTMLLayoutParser::TableRowOff( ImportInfo* pInfo ) { NextRow( pInfo ); } - void ScHTMLLayoutParser::TableDataOff( ImportInfo* pInfo ) { if ( bInCell ) CloseEntry( pInfo ); // Only if it really was one } - void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) { OUString aTabName; @@ -1202,7 +1173,6 @@ void ScHTMLLayoutParser::TableOn( ImportInfo* pInfo ) MakeColNoRef( pLocalColOffset, nColOffsetStart, 0, 0, 0 ); } - void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) { if ( bInCell ) @@ -1362,7 +1332,6 @@ void ScHTMLLayoutParser::TableOff( ImportInfo* pInfo ) } } - void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) { ScHTMLImage* pImage = new ScHTMLImage; @@ -1457,7 +1426,6 @@ void ScHTMLLayoutParser::Image( ImportInfo* pInfo ) } } - void ScHTMLLayoutParser::ColOn( ImportInfo* pInfo ) { const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); @@ -1477,7 +1445,6 @@ void ScHTMLLayoutParser::ColOn( ImportInfo* pInfo ) } } - sal_uInt16 ScHTMLLayoutParser::GetWidthPixel( const HTMLOption& rOption ) { const OUString& rOptVal = rOption.GetString(); @@ -1498,7 +1465,6 @@ sal_uInt16 ScHTMLLayoutParser::GetWidthPixel( const HTMLOption& rOption ) } } - void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) { const HTMLOptions& rOptions = static_cast<HTMLParser*>(pInfo->pParser)->GetOptions(); @@ -1516,7 +1482,6 @@ void ScHTMLLayoutParser::AnchorOn( ImportInfo* pInfo ) } } - bool ScHTMLLayoutParser::IsAtBeginningOfText( ImportInfo* pInfo ) { ESelection& rSel = pActEntry->aSel; @@ -1525,7 +1490,6 @@ bool ScHTMLLayoutParser::IsAtBeginningOfText( ImportInfo* pInfo ) pEdit->GetTextLen( rSel.nStartPara ) == 0; } - void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo ) { if ( IsAtBeginningOfText( pInfo ) ) @@ -1580,7 +1544,6 @@ void ScHTMLLayoutParser::FontOn( ImportInfo* pInfo ) } } - void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) { bool bSetLastToken = true; @@ -1751,10 +1714,8 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo ) nLastToken = pInfo->nToken; } - // HTML DATA QUERY PARSER - template< typename Type > inline Type getLimitedValue( const Type& rValue, const Type& rMin, const Type& rMax ) { return ::std::max( ::std::min( rValue, rMax ), rMin ); } diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 7149ba3eb851..18b040952b7a 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -29,7 +29,6 @@ #include "ftools.hxx" #include "excrecds.hxx" - // XclExpUserBView - one UserBView record for each user class XclExpUserBView : public ExcRecord @@ -49,7 +48,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // XclExpUserBViewList - list of UserBView records class XclExpUserBViewList : public ExcEmptyRec @@ -76,7 +74,6 @@ public: virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; - // XclExpUsersViewBegin - begin of view block (one per sheet) class XclExpUsersViewBegin : public ExcRecord @@ -93,7 +90,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // XclExpUsersViewEnd - end of view block (one per sheet) class XclExpUsersViewEnd : public ExcRecord @@ -106,7 +102,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "User Names" stream class XclExpChTr0x0191 : public ExcRecord @@ -119,7 +114,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "User Names" stream class XclExpChTr0x0198 : public ExcRecord @@ -132,7 +126,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "User Names" stream class XclExpChTr0x0192 : public ExcRecord @@ -145,7 +138,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "User Names" stream class XclExpChTr0x0197 : public ExcRecord @@ -158,7 +150,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record without content class XclExpChTrEmpty : public ExcRecord @@ -174,7 +165,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "Revision Log" stream class XclExpChTr0x0195 : public ExcRecord @@ -189,7 +179,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // dummy record for "Revision Log" stream class XclExpChTr0x0194 : public ExcRecord @@ -214,7 +203,6 @@ inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) : { } - // XclExpChTrHeader - header record, includes action count class XclExpChTrHeader : public ExcRecord @@ -238,7 +226,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTrInfo - header of action group of a user class XclExpChTrInfo : public ExcRecord @@ -273,7 +260,6 @@ inline XclExpChTrInfo::XclExpChTrInfo( const OUString& rUsername, const DateTime memcpy( aGUID, pGUID, 16 ); } - // XclExpChTrTabIdBuffer - buffer for tab id's class XclExpChTrTabIdBuffer @@ -301,7 +287,6 @@ public: { memcpy( pDest, pBuffer, sizeof(sal_uInt16) * GetBufferCount() ); } }; - // XclExpChTrTabId - tab id record class XclExpChTrTabId : public ExcRecord @@ -329,7 +314,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTrAction - base class for action records class XclExpChTrAction : public ExcRecord @@ -425,7 +409,6 @@ inline void XclExpChTrAction::WriteTabId( XclExpStream& rStrm, SCTAB nTab ) cons rStrm << GetTabId( nTab ); } - // XclExpChTrData - cell content itself struct XclExpChTrData @@ -452,7 +435,6 @@ struct XclExpChTrData const XclExpChTrTabIdBuffer& rTabIdBuffer ); }; - // XclExpChTrCellContent - changed cell content class XclExpChTrCellContent : public XclExpChTrAction, protected XclExpRoot @@ -486,7 +468,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTrInsert - insert/delete columns/rows class XclExpChTrInsert : public XclExpChTrAction @@ -515,7 +496,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTrInsertTab - insert table class XclExpChTrInsertTab : public XclExpChTrAction, protected XclExpRoot @@ -539,7 +519,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTrMoveRange - move cell range class XclExpChTrMoveRange : public XclExpChTrAction @@ -566,7 +545,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChTr0x019A - additional data for delete action class XclExpChTr0x014A : public XclExpChTrInsert @@ -584,7 +562,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // XclExpChangeTrack - exports the "Revision Log" stream class XclExpChangeTrack : protected XclExpRoot diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index f39db6d338a5..0d1dc7003807 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -26,13 +26,11 @@ #include "excform.hxx" #include "imp_op.hxx" - struct ScCellValue; class ScChangeAction; class ScChangeTrack; class XclImpChTrFmlConverter; - struct XclImpChTrRecHeader { sal_uInt32 nSize; @@ -148,7 +146,6 @@ inline void XclImpChangeTrack::ReadString( OUString& rString ) rString = pStrm->ReadUniString(); } - // derived class for special 3D ref handling class XclImpChTrFmlConverter : public ExcelToSc8 diff --git a/sc/source/filter/inc/addressconverter.hxx b/sc/source/filter/inc/addressconverter.hxx index e0e2ad7dbd7c..d7919bc361bc 100644 --- a/sc/source/filter/inc/addressconverter.hxx +++ b/sc/source/filter/inc/addressconverter.hxx @@ -30,7 +30,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 > @@ -160,7 +159,6 @@ enum BiffTargetType BIFF_TARGETTYPE_UNKNOWN /// Unknown/unsupported target type. }; - /** Converter for cell addresses and cell ranges for OOXML and BIFF filters. */ class AddressConverter : public WorkbookHelper @@ -553,7 +551,6 @@ public: sal_Int16 nSheet, bool bTrackOverflow ); - private: void initializeMaxPos( sal_Int16 nMaxXlsTab, sal_Int32 nMaxXlsCol, sal_Int32 nMaxXlsRow ); diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx index f0879bdf3a32..088382e34d19 100644 --- a/sc/source/filter/inc/biff.hxx +++ b/sc/source/filter/inc/biff.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_FILTER_INC_BIFF_HXX #define INCLUDED_SC_SOURCE_FILTER_INC_BIFF_HXX diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index 53acf7dd8681..475e2eaf48ce 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -90,7 +90,6 @@ private: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; - /** Implementation of decryption of a memory block. */ virtual void implDecode( sal_uInt8* pnDestData, diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index 411f16da7e4b..c392cd149604 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -25,7 +25,6 @@ #include "biffhelper.hxx" #include "biffcodec.hxx" - namespace oox { namespace xls { @@ -281,7 +280,6 @@ public: */ OUString readUniString( bool bAllowNulChars = false ); - private: /** Initializes all members after base stream has been sought to new record. */ void setupRecord(); diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index 78e471d34103..7d973920844a 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -71,7 +71,6 @@ private: bool mbDirty; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index 08de8f9c9d22..e36ba5688a81 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -141,8 +141,6 @@ private: OUString maIconSetType; }; - - /** Represents a single rule in a conditional formatting. */ class CondFormatRule : public WorksheetHelper { diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 66c4a3d229e8..8ed3448ad60e 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -191,5 +191,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/drawingbase.hxx b/sc/source/filter/inc/drawingbase.hxx index 31c63cce7ca3..85f529af9ec6 100644 --- a/sc/source/filter/inc/drawingbase.hxx +++ b/sc/source/filter/inc/drawingbase.hxx @@ -105,7 +105,6 @@ private: private: - /** Specifies how cell positions from CellAnchorModel have to be processed. */ enum CellAnchorType { diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index 58ce0bafb0e5..1afd26f20f35 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -40,10 +40,8 @@ namespace oox { namespace ole { namespace oox { namespace xls { - // DrawingML - class ShapeMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: @@ -122,10 +120,8 @@ private: ShapeAnchorRef mxAnchor; /// Current anchor of top-level shape. }; - // VML - class VmlControlMacroAttacher : public ::oox::ole::VbaMacroAttacherBase { public: diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index a70c9fabd4d6..7c5868f9f6fa 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -35,10 +35,8 @@ namespace xls { const sal_uInt16 BIFF_OBJ_INVALID_ID = 0; - // Model structures for BIFF OBJ record data - /** This structure contains line formatting attributes from an OBJ record. */ struct BiffObjLineModel { @@ -61,10 +59,8 @@ struct BiffObjFillModel explicit BiffObjFillModel(); }; - // BIFF drawing objects - class BiffDrawingBase; class BiffDrawingObjectBase; typedef ::boost::shared_ptr< BiffDrawingObjectBase > BiffDrawingObjectRef; @@ -153,10 +149,8 @@ private: bool mbCustomDff; /// True = recreate UNO shape in DFF import (BIFF8 only). }; - // BIFF drawing page - /** Base class for a container for all objects on a drawing page (in a spreadsheet or in an embedded chart object). diff --git a/sc/source/filter/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index a0df62796766..ccd5e685d545 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -94,7 +94,6 @@ struct ScEEParseEntry } }; - class EditEngine; typedef std::map<SCCOL, sal_uInt16> ColWidthsMap; diff --git a/sc/source/filter/inc/excelhandlers.hxx b/sc/source/filter/inc/excelhandlers.hxx index 581b750f6131..094dca7905ef 100644 --- a/sc/source/filter/inc/excelhandlers.hxx +++ b/sc/source/filter/inc/excelhandlers.hxx @@ -26,7 +26,6 @@ namespace oox { namespace xls { - /** Context handler derived from the WorkbookHelper helper class. Used to import contexts in global workbook fragments. @@ -75,7 +74,6 @@ public: const OUString& rFragmentPath ); }; - /** Base class for all BIFF context handlers. Derived handlers have to implement the importRecord() function that has to diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 229f614f7375..e057420bff04 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -29,7 +29,6 @@ class ScFormulaCell; class ScRangeList; - class ExcelToSc : public ExcelConverterBase, protected XclImpRoot { protected: @@ -43,7 +42,6 @@ protected: XclFunctionProvider maFuncProv; const XclBiff meBiff; - void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs ); void ExcRelToScRel( sal_uInt16 nRow, sal_uInt8 nCol, ScSingleRefData&, const bool bName ); @@ -83,13 +81,11 @@ public: void ReadExtensionMemArea( XclImpStream& aIn ); }; - inline bool ExcelToSc::IsComplColRange( const sal_uInt16 nCol1, const sal_uInt16 nCol2 ) { return ( nCol1 == 0x00 ) && ( nCol2 == 0xFF ); } - inline bool ExcelToSc::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ) { return ( ( nRow1 & 0x3FFF ) == 0x0000 ) && ( ( nRow2 & 0x3FFF ) == 0x3FFF ); @@ -139,14 +135,11 @@ public: virtual bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ) SAL_OVERRIDE; }; - inline bool ExcelToSc8::IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ) { return ( nRow1 == 0x0000 ) && ( nRow2 == 0xFFFF ); } - - #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 160a0a563983..ef59b5fa89af 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -72,7 +72,6 @@ private: ExcScenarioList maScenList; }; - // classes AutoFilterData, AutoFilterBuffer class XclImpAutoFilterData : private ExcRoot @@ -113,7 +112,6 @@ public: void EnableRemoveFilter(); }; - class XclImpAutoFilterBuffer { public: diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 7017dc91ff12..292b83165926 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -27,7 +27,6 @@ #include <tools/color.hxx> #include <vcl/vclenum.hxx> - #include <vector> #include "olinetab.hxx" #include "filter.hxx" @@ -63,7 +62,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - //--------------------------------------------------------- class ExcEmptyRec - class ExcEmptyRec : public ExcRecord @@ -87,7 +85,6 @@ public: virtual const sal_uInt8* GetData() const = 0; // byte data must contain header and body }; - //------------------------------------------------------- class ExcBoolRecord - // stores bool as 16bit val ( 0x0000 | 0x0001 ) @@ -107,7 +104,6 @@ public: virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; - //--------------------------------------------------------- class ExcBof_Base - class ExcBof_Base : public ExcRecord @@ -122,7 +118,6 @@ public: ExcBof_Base( void ); }; - //-------------------------------------------------------------- class ExcBof - // Header Record fuer WORKSHEETS @@ -137,7 +132,6 @@ public: virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; - //------------------------------------------------------------- class ExcBofW - // Header Record fuer WORKBOOKS @@ -152,7 +146,6 @@ public: virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; - //-------------------------------------------------------------- class ExcEof - class ExcEof : public ExcRecord @@ -163,7 +156,6 @@ public: virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; - //--------------------------------------------------------- class ExcDummy_00 - // INTERFACEHDR to FNGROUPCOUNT (see excrecds.cxx) @@ -214,7 +206,6 @@ private: sal_uInt16 mnHash; }; - //-------------------------------------------------------- class ExcDummy_04x - // PASSWORD to BOOKBOOL (see excrecds.cxx), no 1904 @@ -238,7 +229,6 @@ public: virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; - //------------------------------------------------------------- class Exc1904 - class Exc1904 : public ExcBoolRecord @@ -252,7 +242,6 @@ private: bool bDateCompatibility; }; - //------------------------------------------------------ class ExcBundlesheet - class ExcBundlesheetBase : public ExcRecord @@ -299,7 +288,6 @@ public: virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; - /** This record contains the Windows country IDs for the UI and document language. */ class XclExpCountry : public XclExpRecord { @@ -314,7 +302,6 @@ private: virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; - // XclExpWsbool =============================================================== class XclExpWsbool : public XclExpUInt16Record @@ -341,7 +328,6 @@ private: Color maTabColor; }; - class XclExpFiltermode : public XclExpEmptyRecord { public: @@ -467,7 +453,6 @@ private: XclExpTabFilterMap maFilterMap; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index ef47a98b53bc..7c25852da455 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -24,13 +24,11 @@ #include "root.hxx" #include "xeroot.hxx" - class ScDocument; class ScPatternAttr; class ScFormulaCell; class ExcDocument; - class ExportTyp { protected: @@ -64,7 +62,6 @@ public: FltError Write() SAL_OVERRIDE; }; - class ExportBiff8 : public ExportBiff5 { public: @@ -72,8 +69,6 @@ public: virtual ~ExportBiff8(); }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 40e8ccbe5de1..4b67a319ac27 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -28,7 +28,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 diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index a94f1494471c..fd2fd85d24ff 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -194,7 +194,6 @@ public: @param rValues The related property values. */ void SetProperties( const css::uno::Sequence< OUString > & rPropNames, const css::uno::Sequence< css::uno::Any >& rValues ); - private: css::uno::Reference< css::beans::XPropertySet > mxPropSet; /// The mandatory property set interface. css::uno::Reference< css::beans::XMultiPropertySet > mxMultiPropSet; /// The optional multi property set interface. @@ -254,7 +253,6 @@ public: /** Writes all values to the passed property set. */ void WriteToPropertySet( ScfPropertySet& rPropSet ) const; - private: /** Returns a pointer to the next Any to be written to. */ css::uno::Any* GetNextAny(); diff --git a/sc/source/filter/inc/formulabuffer.hxx b/sc/source/filter/inc/formulabuffer.hxx index 44ff29936e66..26a76db99856 100644 --- a/sc/source/filter/inc/formulabuffer.hxx +++ b/sc/source/filter/inc/formulabuffer.hxx @@ -138,7 +138,6 @@ public: void SetSheetCount( SCTAB nSheets ); }; - }} #endif diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index d1ff1ebb008a..8f70b0d39486 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -88,7 +88,6 @@ struct ScHTMLGraphEntry {} }; - #define SC_HTML_FONTSIZES 7 const short nIndentMax = 23; diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 380928eb0b9a..1e320c91a7f2 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -40,7 +40,6 @@ public: static OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ); }; - #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 c572c3913ab4..b24ab983d6f8 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -38,10 +38,8 @@ const sal_uInt32 SC_HTML_FONTSIZES = 7; // wie Export, HTML-Options const sal_uInt16 SC_HTML_OFFSET_TOLERANCE_SMALL = 1; // single table const sal_uInt16 SC_HTML_OFFSET_TOLERANCE_LARGE = 10; // nested - // BASE class for HTML parser classes - class ScHTMLTable; /** @@ -97,7 +95,6 @@ public: virtual const ScHTMLTable* GetGlobalTable() const = 0; }; - typedef o3tl::sorted_vector<sal_uLong> ScHTMLColOffset; struct ScHTMLTableStackEntry @@ -148,7 +145,6 @@ struct ScHTMLAdjustStackEntry }; typedef ::std::stack< ScHTMLAdjustStackEntry* > ScHTMLAdjustStack; - class EditEngine; class ScDocument; class HTMLOption; @@ -226,10 +222,8 @@ public: virtual const ScHTMLTable* GetGlobalTable() const SAL_OVERRIDE; }; - // HTML DATA QUERY PARSER - /** Declares the orientation in or for a table: column or row. */ enum ScHTMLOrient { tdCol = 0 , tdRow = 1 }; @@ -647,7 +641,6 @@ private: bool mbTitleOn; /// true = Inside of <title> </title>. }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 0587fd0dfb53..f492390b37c7 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -43,7 +43,6 @@ class ScDocument; class ExcelToSc; - class ImportTyp { protected: @@ -190,7 +189,6 @@ protected: void Bof4( void ); // 0x0409 void Bof5( void ); // 0x0809 - void Formula( const XclAddress& rXclPos, sal_uInt16 nXF, sal_uInt16 nFormLen, double fCurVal, bool bShrFmla); // -> excform.cxx diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 9c810ea56c63..c356fcda32c0 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -56,7 +56,6 @@ enum FUNC_TYPE // fuer 'Problemfaelle' beim Import }; - class LotusToSc : public LotusConverterBase { private: @@ -98,7 +97,6 @@ private: using LotusConverterBase::Reset; }; - inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nRelBit ) { // erster Teil @@ -108,7 +106,6 @@ inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nRelBit ) ReadSRD( rCRD.Ref2, nRelBit >> 3 ); } - inline void LotusToSc::SetWK3( void ) { bWK3 = true; diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index 0116cd67259a..ab1aa6e2b287 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -31,7 +31,6 @@ class ScFormulaCell; class LotusFontBuffer; - class ImportLotus : public ImportTyp { private: @@ -57,7 +56,6 @@ private: void NamedSheet( void ); // 14000 void RowPresentation( sal_uInt16 nRecLen ); // 2007 - // in FM?-Datei void Font_Face( void ); // 174 void Font_Type( void ); // 176 @@ -86,7 +84,6 @@ public: FltError Read( SvStream& ); // special for *.fm3-Dateien }; - inline void ImportLotus::Read( ScAddress& rAddr ) { sal_uInt16 nRow; @@ -99,56 +96,47 @@ inline void ImportLotus::Read( ScAddress& rAddr ) rAddr.SetCol( static_cast<SCCOL>(nByte) ); } - inline void ImportLotus::Read( ScRange& rRange ) { Read( rRange.aStart ); Read( rRange.aEnd ); } - inline void ImportLotus::Read( sal_Char& r ) { pIn->ReadChar( r ); } - inline void ImportLotus::Read( sal_uInt8& r ) { pIn->ReadUChar( r ); } - inline void ImportLotus::Read( sal_uInt16& r ) { pIn->ReadUInt16( r ); } - inline void ImportLotus::Read( sal_Int16& r ) { pIn->ReadInt16( r ); } - inline void ImportLotus::Read( sal_uInt32& r ) { pIn->ReadUInt32( r ); } - inline void ImportLotus::Read( double& r ) { r = ScfTools::ReadLongDouble( *pIn ); } - inline void ImportLotus::Read( LotAttrWK3& r ) { pIn->ReadUChar( r.nFont ).ReadUChar( r.nFontCol ).ReadUChar( r.nBack ).ReadUChar( r.nLineStyle ); } - inline void ImportLotus::Skip( const sal_uInt16 n ) { pIn->SeekRel( n ); diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx index f7c42b078907..59d1012b11dd 100644 --- a/sc/source/filter/inc/lotrange.hxx +++ b/sc/source/filter/inc/lotrange.hxx @@ -142,5 +142,4 @@ inline void LotusRangeList::SetEing( const SCCOL nCol, const SCROW nRow ) #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 ef913123bff9..908e2703496c 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -34,7 +34,6 @@ class ScTokenArray; class NameBuffer; - class StringHashEntry { private: @@ -52,39 +51,33 @@ public: inline bool operator ==( const StringHashEntry& ) const; }; - inline StringHashEntry::StringHashEntry( void ) { } - inline StringHashEntry::StringHashEntry( const OUString& r ) : aString( r ) { nHash = MakeHashCode( r ); } - inline void StringHashEntry::operator =( const sal_Char* p ) { aString = OUString(p, strlen(p), RTL_TEXTENCODING_ASCII_US); nHash = MakeHashCode( aString ); } - inline void StringHashEntry::operator =( const OUString& r ) { aString = r; nHash = MakeHashCode( r ); } - inline void StringHashEntry::operator =( const StringHashEntry& r ) { nHash = r.nHash; aString = r.aString; } - inline bool StringHashEntry::operator ==( const StringHashEntry& r ) const { return ( nHash == r.nHash && aString == r.aString ); @@ -113,13 +106,11 @@ inline NameBuffer::NameBuffer( RootData* p ) : ExcRoot( p ) nBase = 0; } - inline NameBuffer::NameBuffer( RootData* p, sal_uInt16 nNewBase ) : ExcRoot( p ) { nBase = nNewBase; } - inline const OUString* NameBuffer::Get ( sal_uInt16 n ) const { if( n < nBase || n >= maHashes.size() ) @@ -128,7 +119,6 @@ inline const OUString* NameBuffer::Get ( sal_uInt16 n ) const return &(maHashes[n]->aString); } - inline sal_uInt16 NameBuffer::GetLastIndex () const { int size = maHashes.size() + nBase; @@ -138,7 +128,6 @@ inline sal_uInt16 NameBuffer::GetLastIndex () const return static_cast<sal_uInt16>( size ); } - inline void NameBuffer::SetBase( sal_uInt16 nNewBase ) { nBase = nNewBase; @@ -196,7 +185,6 @@ public: bool FindAbs( const OUString& rRef, sal_uInt16& rIndex ); }; - inline void RangeNameBufferWK3::Add( const OUString& rName, const ScRange& aScRange ) { ScComplexRefData aCRD; @@ -213,7 +201,6 @@ inline void RangeNameBufferWK3::Add( const OUString& rName, const ScRange& aScRa Add( rName, aCRD ); } - class ExtSheetBuffer : public ExcRoot { private: @@ -259,12 +246,10 @@ public: void Reset( void ); }; - inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) { } - struct ExtName { OUString aName; @@ -277,7 +262,6 @@ struct ExtName bool IsOLE( void ) const; }; - class ExtNameBuff : protected XclImpRoot { public: @@ -298,8 +282,6 @@ private: ExtNameMap maExtNames; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index 04a64ab0745c..6def209da0fd 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -88,7 +88,6 @@ private: bool mbInRecord; }; - class BiffPivotCacheFragment : public BiffWorkbookFragmentBase { public: diff --git a/sc/source/filter/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index 3fbed1749d10..27bad9f26c8d 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_FILTER_INC_QPROFORM_HXX #define INCLUDED_SC_SOURCE_FILTER_INC_QPROFORM_HXX diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx index 1559adb6848c..09aa5ffc7bd5 100644 --- a/sc/source/filter/inc/qprostyle.hxx +++ b/sc/source/filter/inc/qprostyle.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_FILTER_INC_QPROSTYLE_HXX #define INCLUDED_SC_SOURCE_FILTER_INC_QPROSTYLE_HXX diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx index fa5555c9abdf..e250b2c81b08 100644 --- a/sc/source/filter/inc/root.hxx +++ b/sc/source/filter/inc/root.hxx @@ -85,7 +85,6 @@ class LotusRangeList; class LotusFontBuffer; class LotAttrTable; - struct LOTUS_ROOT { ScDocument* pDoc; diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx index 0089675abe7b..32eb33299413 100644 --- a/sc/source/filter/inc/rtfexp.hxx +++ b/sc/source/filter/inc/rtfexp.hxx @@ -22,7 +22,6 @@ #include "expbase.hxx" - class ScRTFExport : public ScExportBase { sal_uLong* pCellX; // kumulierte Zellbreiten einer Tabelle @@ -39,7 +38,6 @@ public: sal_uLong Write(); }; - #endif // INCLUDED_SC_SOURCE_FILTER_INC_RTFEXP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/rtfimp.hxx b/sc/source/filter/inc/rtfimp.hxx index 5203dcbc0ef3..fd60b23af2e7 100644 --- a/sc/source/filter/inc/rtfimp.hxx +++ b/sc/source/filter/inc/rtfimp.hxx @@ -29,7 +29,6 @@ public: virtual ~ScRTFImport(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index 644a33150317..6d3b8c417c42 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -75,7 +75,6 @@ public: virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 157fb7b0e144..e117a5ff8389 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -591,7 +591,6 @@ struct Sc10ChartTypeData sal_Char Reserved[4646]; }; - // FontAttribut class Sc10FontData : public ScDataObject { @@ -614,7 +613,6 @@ public: virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10FontData(*this); } }; - // Font-Collection class Sc10FontCollection : public ScCollection { @@ -628,7 +626,6 @@ private: using ScCollection::At; }; - //BereichsDaten class Sc10NameData : public ScDataObject { @@ -650,7 +647,6 @@ public : virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10NameData(*this); } }; - // Bereichs-Collection class Sc10NameCollection : public ScCollection { @@ -664,7 +660,6 @@ private: using ScCollection::At; }; - // Vorlage-Daten class Sc10PatternData : public ScDataObject { @@ -703,7 +698,6 @@ public: virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10PatternData(*this); } }; - // Vorlage-Collection class Sc10PatternCollection : public ScCollection { @@ -717,7 +711,6 @@ private: using ScCollection::At; }; - // DatenBank-Daten class Sc10DataBaseData : public ScDataObject { @@ -733,7 +726,6 @@ public: virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10DataBaseData(*this); } }; - // DatenBank-Collection class Sc10DataBaseCollection : public ScCollection { @@ -748,7 +740,6 @@ private: using ScCollection::At; }; - class Sc10PageData : public ScDataObject { public: @@ -771,7 +762,6 @@ private: using ScCollection::At; }; - class ScfStreamProgressBar; // Import-Klasse diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx b/sc/source/filter/inc/sheetdatabuffer.hxx index 1a3ae9ad0177..c2e7550d4856 100644 --- a/sc/source/filter/inc/sheetdatabuffer.hxx +++ b/sc/source/filter/inc/sheetdatabuffer.hxx @@ -92,7 +92,6 @@ private: sal_Int32 mnCurrRow; /// Current row index used for buffered cell import. }; - /** Manages the cell contents and cell formatting of a sheet. */ class SheetDataBuffer : public WorksheetHelper @@ -147,7 +146,6 @@ public: @param nNumFmtId If set, overrides number format of the cell XF. */ void setCellFormat( const CellModel& rModel, sal_Int32 nNumFmtId = -1 ); - /** Final processing after the sheet has been imported. */ void finalizeImport(); @@ -183,7 +181,6 @@ private: typedef ::std::pair< ::com::sun::star::table::CellRangeAddress, DataTableModel > TableOperation; typedef ::std::list< TableOperation > TableOperationList; - /** Stores information about a range of rows with equal cell formatting. */ struct XfIdRowRange { diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index 15d5ca748d71..2d02f20ece7f 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -129,7 +129,6 @@ private: sal_Int32 mnCol; /// column index (0-based) }; - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 2121b628e4f8..95d6e6ddd08d 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -58,7 +58,6 @@ struct TokenId struct ScComplexRefData; class TokenStack; - enum E_TYPE { T_Id, // Id-Folge @@ -77,7 +76,6 @@ enum E_TYPE T_Error // fuer Abfrage im Fehlerfall }; - class TokenPool { // !ACHTUNG!: externe Id-Basis ist 1, interne 0! @@ -226,7 +224,6 @@ public: ScMatrix* GetMatrix( unsigned int n ) const; }; - class TokenStack // Stack fuer Token-Ids: Id 0 sollte reserviert bleiben als // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert @@ -247,7 +244,6 @@ class TokenStack inline const TokenId Get( void ); }; - inline const TokenId TokenStack::Get( void ) { OSL_ENSURE( nPos > 0, @@ -266,7 +262,6 @@ inline const TokenId TokenStack::Get( void ) return nRet; } - inline TokenStack &TokenStack::operator <<( const TokenId nNewId ) {// Element auf Stack OSL_ENSURE( nPos < nSize, "*TokenStack::<<(): Stack overflow" ); @@ -279,7 +274,6 @@ inline TokenStack &TokenStack::operator <<( const TokenId nNewId ) return *this; } - inline void TokenStack::operator >>( TokenId& rId ) {// Element von Stack OSL_ENSURE( nPos > 0, @@ -291,13 +285,11 @@ inline void TokenStack::operator >>( TokenId& rId ) } } - inline void TokenStack::Reset( void ) { nPos = 0; } - inline TokenPool& TokenPool::operator <<( const TokenId nId ) { // POST: nId's werden hintereinander im Pool unter einer neuen Id @@ -316,7 +308,6 @@ inline TokenPool& TokenPool::operator <<( const TokenId nId ) return *this; } - inline TokenPool& TokenPool::operator <<( const DefTokenId eId ) { OSL_ENSURE( ( sal_uInt32 ) eId + nScTokenOff < 0xFFFF, @@ -332,7 +323,6 @@ inline TokenPool& TokenPool::operator <<( const DefTokenId eId ) return *this; } - inline TokenPool& TokenPool::operator <<( TokenStack& rStack ) { if( nP_IdAkt >= nP_Id ) @@ -345,7 +335,6 @@ inline TokenPool& TokenPool::operator <<( TokenStack& rStack ) return *this; } - inline void TokenPool::operator >>( TokenStack& rStack ) { TokenId nId; @@ -353,7 +342,6 @@ inline void TokenPool::operator >>( TokenStack& rStack ) rStack << nId; } - inline const TokenId TokenPool::Store( void ) { TokenId nId; @@ -361,19 +349,16 @@ inline const TokenId TokenPool::Store( void ) return nId; } - inline const TokenId TokenPool::Store( const sal_Int16 nWert ) { return Store( ( double ) nWert ); } - inline const TokenId TokenPool::LastId( void ) const { return ( TokenId ) nElementAkt; // stimmt, da Ausgabe mit Offset 1! } - const inline ScTokenArray* TokenPool::operator []( const TokenId nId ) { pScToken->Clear(); @@ -389,7 +374,6 @@ const inline ScTokenArray* TokenPool::operator []( const TokenId nId ) return pScToken; } - inline E_TYPE TokenPool::GetType( const TokenId& rId ) const { E_TYPE nRet; @@ -404,7 +388,6 @@ inline E_TYPE TokenPool::GetType( const TokenId& rId ) const return nRet; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index 892992543912..510474b55383 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -267,7 +267,6 @@ public: bool importOoxFragment( const rtl::Reference<oox::core::FragmentHandler>& rxHandler, oox::core::FastParser& rParser ); - // BIFF2-BIFF8 specific (MUST NOT be called in OOXML/BIFF12 filter) ------- /** Returns the BIFF type in binary filter. */ diff --git a/sc/source/filter/inc/worksheethelper.hxx b/sc/source/filter/inc/worksheethelper.hxx index 26c69995f133..37179bb5b62d 100644 --- a/sc/source/filter/inc/worksheethelper.hxx +++ b/sc/source/filter/inc/worksheethelper.hxx @@ -163,7 +163,6 @@ struct ValidationModel void setBiffErrorStyle( sal_uInt8 nErrorStyle ); }; - class WorksheetGlobals; typedef ::boost::shared_ptr< WorksheetGlobals > WorksheetGlobalsRef; @@ -316,7 +315,6 @@ private: WorksheetGlobals& mrSheetGlob; }; - } // namespace xls } // namespace oox diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index cd3f53588ce5..795208c96f34 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -149,8 +149,6 @@ public: inline bool IsStackedGroup() const { return bStackedGroup; } }; - - // --- class XclEscherClientData ------------------------------------- class XclEscherClientData : public EscherExClientRecord_Base @@ -160,7 +158,6 @@ public: virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; }; - // --- class XclEscherClientTextbox ---------------------------------- class SdrTextObj; diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index e4be5e58df55..4cc35769d6fc 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -81,7 +81,6 @@ private: std::vector<XclObj*> maObjs; }; - // --- class XclObj -------------------------------------------------- class XclTxo; @@ -176,12 +175,10 @@ public: void ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle& rRect, SdrObject* pCaption, bool bVisible ); - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // --- class XclObjDropDown ------------------------------------------ class XclObjDropDown : public XclObj @@ -197,7 +194,6 @@ public: virtual ~XclObjDropDown(); }; - // --- class XclTxo -------------------------------------------------- class SdrTextObj; @@ -227,7 +223,6 @@ private: sal_uInt8 mnVerAlign; /// Vertical alignment. }; - // --- class XclObjOle ----------------------------------------------- class XclObjOle : public XclObj @@ -246,7 +241,6 @@ public: virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; - // --- class XclObjAny ----------------------------------------------- class XclObjAny : public XclObj @@ -262,7 +256,6 @@ public: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > GetShape() const { return mxShape; } - virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ); @@ -273,7 +266,6 @@ private: mxShape; }; - // --- class ExcBof8_Base -------------------------------------------- class ExcBof8_Base : public ExcBof_Base @@ -291,7 +283,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // --- class ExcBofW8 ------------------------------------------------ // Header Record fuer WORKBOOKS @@ -301,7 +292,6 @@ public: ExcBofW8(); }; - // --- class ExcBof8 ------------------------------------------------- // Header Record fuer WORKSHEETS @@ -311,7 +301,6 @@ public: ExcBof8(); }; - // --- class ExcBundlesheet8 ----------------------------------------- class ExcBundlesheet8 : public ExcBundlesheetBase @@ -331,7 +320,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - // --- class XclObproj ----------------------------------------------- class XclObproj : public ExcRecord @@ -341,7 +329,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // ---- class XclCodename -------------------------------------------- class XclCodename : public ExcRecord @@ -356,7 +343,6 @@ public: virtual sal_Size GetLen() const SAL_OVERRIDE; }; - // ---- Scenarios ---------------------------------------------------- // - ExcEScenarioCell a cell of a scenario range // - ExcEScenario all ranges of a scenario table @@ -443,7 +429,6 @@ private: sal_uInt16 mnOptions; /// Encoded sheet protection options. }; - /** Represents one EnhancedProtection feature in a FEAT record. To be written only if such feature exists. */ class XclExpSheetEnhancedProtection : public XclExpRecord @@ -474,7 +459,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - class XclIteration : public ExcRecord { private: @@ -490,7 +474,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - class XclDelta : public ExcRecord { private: @@ -506,7 +489,6 @@ public: virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; - class XclRefmode : public XclExpBoolRecord { public: @@ -609,7 +591,6 @@ public: explicit XclExpBookExt(); }; - #endif // _XCL97REC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 382653a440a5..b962e7699717 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -392,7 +392,6 @@ public: public: explicit XclExpChSourceLink( const XclExpChRoot& rRoot, sal_uInt8 nDestType ); - void ConvertString( const OUString& aString ); /** Converts the passed source link, returns the number of linked values. */ sal_uInt16 ConvertDataSequence( XDataSequenceRef xDataSeq, bool bSplitToColumns, sal_uInt16 nDefCount = 0 ); diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 599cc5eb7838..7171046ab0b7 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -171,7 +171,6 @@ protected: void ConvertSheetLinks( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); - /** Returns the Excel token array of the cell link, or 0, if no link present. */ inline const XclTokenArray* GetCellLinkTokArr() const { return mxCellLink.get(); } /** Returns the Excel token array of the source range, or 0, if no link present. */ diff --git a/sc/source/filter/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index fef451032b6b..f15a74acc23b 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -411,7 +411,6 @@ private: XclExpUrlHelper(); }; - class ScMatrix; /** Contains cached values in a 2-dimensional array. */ diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index 9c645d78498b..2be764ff6f8f 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -33,10 +33,8 @@ class ScDPSaveGroupDimension; class ScDPSaveNumGroupDimension; struct ScDPNumGroupInfo; - // Pivot cache - /** Represents a data item in a pivot cache containing data of any type. */ class XclExpPCItem : public XclExpRecord, public XclPCItem { @@ -235,10 +233,8 @@ private: bool mbValid; /// true = The cache is valid for export. }; - // Pivot table - class XclExpPivotTable; /** Data field position specifying the pivot table field index (first) and data info index (second). */ @@ -279,7 +275,6 @@ public: */ sal_uInt16 GetFieldIndex() const { return maFieldInfo.mnCacheIdx; } - /** Returns the index of the last inserted data info struct. */ sal_uInt16 GetLastDataInfoIndex() const; @@ -307,7 +302,6 @@ public: /** Writes the entire pivot table field. */ virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - private: /** Returns an item by its name. */ XclExpPTItem* GetItemAcc( const OUString& rName ); @@ -358,7 +352,6 @@ public: virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - private: /** Returns a pivot table field by its name. */ XclExpPTField* GetFieldAcc( const OUString& rName ); @@ -396,7 +389,6 @@ private: /** Writes the SX_AUTOFORMAT records with the autoformat id and header layout */ void WriteSxViewEx9( XclExpStream& rStrm ) const; - private: typedef XclExpRecordList< XclExpPTField > XclExpPTFieldList; typedef XclExpPTFieldList::RecordRefType XclExpPTFieldRef; diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index d5744f87f6de..e69e0c7d07f8 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -236,9 +236,6 @@ private: bool mbValid; }; - - - // `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 1b2735a04409..f5fba100f7b5 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -171,7 +171,6 @@ public: void WriteXml( XclExpXmlStream& rStrm ) const; - private: /** Returns true, if the flag field should be written. */ bool IsWriteFlags() const; diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 422810bc0c8c..081bdb4ae0f8 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -44,10 +44,8 @@ Export of cell tables including row and column description. - Merged cell ranges. ============================================================================ */ - // Helper records for cell records - /** Represents a STRING record that contains the result of a string formula. */ class XclExpStringRec : public XclExpRecord { @@ -273,10 +271,8 @@ private: XclExpTableopList maTableopList; /// List of all TABLEOP records. }; - // Cell records - /** The base class of all cell records. */ class XclExpCellBase : public XclExpRecord { @@ -587,10 +583,8 @@ private: ScfInt32Vec maRkValues; /// The cell values. }; - // Rows and Columns - class ScOutlineArray; /** Base class for buffers containing row or column outline data. */ @@ -958,10 +952,8 @@ private: XclExpDimensions maDimensions; /// DIMENSIONS record for used area. }; - // Cell Table - class XclExpNote; class XclExpMergedcells; class XclExpHyperlink; diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index 6d2bc2e2ec0e..76847ce5ea3c 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -1188,7 +1188,6 @@ private: /** Returns the size of the progress bar shown while processing all objects. */ sal_Size GetProgressSize() const; - private: typedef ::std::map< sal_uInt16, OUString > DefObjNameMap; typedef boost::shared_ptr< XclImpSheetDrawing > XclImpSheetDrawingRef; diff --git a/sc/source/filter/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index bd3ef177e369..affc88370b99 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -28,10 +28,8 @@ class ScDPSaveData; class ScDPSaveDimension; - // Pivot cache - /** Represents a data item in a pivot cache. */ class XclImpPCItem : public XclPCItem { @@ -109,7 +107,6 @@ public: /** Inserts grouping information of this field into the passed ScDPSaveData. */ void ConvertGroupField( ScDPSaveData& rSaveData, const ScfStringVec& rVisNames ) const; - private: /** Inserts standard grouping information of this field into the passed ScDPSaveData. */ void ConvertStdGroupField( ScDPSaveData& rSaveData, const ScfStringVec& rVisNames ) const; @@ -197,10 +194,8 @@ private: typedef boost::shared_ptr< XclImpPivotCache > XclImpPivotCacheRef; - // Pivot table - class XclImpPivotTable; class XclImpPTItem @@ -276,7 +271,6 @@ public: void AddDataFieldInfo( const XclPTDataFieldInfo& rDataInfo ); void ConvertDataField( ScDPSaveData& rSaveData ) const; - private: ScDPSaveDimension* ConvertRCPField( ScDPSaveData& rSaveData ) const; void ConvertFieldInfo( ScDPSaveDimension& rSaveDim ) const; @@ -347,7 +341,6 @@ public: void ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveData& rSaveData); - private: typedef ::std::vector< XclImpPTFieldRef > XclImpPTFieldVec; @@ -371,7 +364,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 diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 4e639449a237..bcc29bad8b0e 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -34,10 +34,8 @@ Input stream class for Excel import - Decryption ============================================================================ */ - // Decryption - class XclImpDecrypter; typedef boost::shared_ptr< XclImpDecrypter > XclImpDecrypterRef; @@ -153,10 +151,8 @@ private: ::std::vector< sal_uInt8 > maVerifierHash; }; - // Stream - /** This class represents an Excel stream position. @descr It contains the relevant data for a stream position inside of a record (including CONTINUE records). */ diff --git a/sc/source/filter/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx index a55f5134f478..b6ae8aa91502 100644 --- a/sc/source/filter/inc/xladdress.hxx +++ b/sc/source/filter/inc/xladdress.hxx @@ -161,7 +161,6 @@ public: @return true = Sheet index in nScTab is valid. */ bool CheckScTab( SCTAB nScTab, bool bWarn ); - protected: XclTracer& mrTracer; /// Tracer for invalid addresses. ScAddress maMaxPos; /// Default maximum position. diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index 15e417945b04..93e523f6e13e 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -737,10 +737,8 @@ const sal_uInt16 EXC_ID_CHPLOTGROWTH = 0x1064; const sal_uInt16 EXC_ID_CHSERINDEX = 0x1065; const sal_uInt16 EXC_ID_CHUNKNOWN = 0xFFFF; - // Structs and classes - // Common ===================================================================== struct XclChRectangle diff --git a/sc/source/filter/inc/xlcontent.hxx b/sc/source/filter/inc/xlcontent.hxx index 8b136c4022a8..6bb7b0b7475a 100644 --- a/sc/source/filter/inc/xlcontent.hxx +++ b/sc/source/filter/inc/xlcontent.hxx @@ -186,7 +186,6 @@ const sal_uInt16 EXC_ID_WQTABLES = 0x0804; const sal_uInt16 EXC_ID_EXTLST = 0x9988; /// it is just a random number - #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 3e990ba7b0e3..a97882d5be40 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -303,7 +303,6 @@ struct XclObjAnchor : public XclRange const Rectangle& rRect, MapUnit eMapUnit, bool bDffAnchor ); }; - inline SvStream& operator>>( SvStream& rStrm, XclObjAnchor& rAnchor ) { sal_uInt16 tmpFirstRow, tmpTY, tmpLastRow, tmpBY; diff --git a/sc/source/filter/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index 48711e9b31ae..1fb8317fd4e6 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -363,10 +363,8 @@ const sal_uInt16 EXC_SXFDBTYPE_DEFAULT = 0x0000; // (0x0810) SXVIEWEX9 --------------------------------------------------------- const sal_uInt16 EXC_ID_SXVIEWEX9 = 0x0810; - // Pivot cache - /** Represents a data item of any type in a pivot cache. Supposed as base class for import and export. */ class XclPCItem { @@ -538,10 +536,8 @@ struct XclPCInfo XclImpStream& operator>>( XclImpStream& rStrm, XclPCInfo& rInfo ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPCInfo& rInfo ); - // Pivot table - // cached name ================================================================ /** A name for various pivot table info structs. Includes 'use cache' state. */ @@ -763,7 +759,6 @@ struct XclPTViewEx9Info XclImpStream& operator>>( XclImpStream& rStrm, XclPTViewEx9Info& rInfo ); XclExpStream& operator<<( XclExpStream& rStrm, const XclPTViewEx9Info& rInfo ); - #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 0493ca2bd9ba..23aa9bf17c6d 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -231,7 +231,6 @@ public: /** Returns the Excel macro name from a full StarBasic macro URL. */ static OUString GetXclMacroName( const OUString& rSbMacroUrl ); - private: static const OUString maDefNamePrefix; /// Prefix for built-in defined names. static const OUString maDefNamePrefixXml; /// Prefix for built-in defined names for OOX diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index 62bf1e0d6d1c..8798597c65e9 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -69,7 +69,6 @@ struct XclTracerDetails const sal_Char* mpProblem; /// Description of problem }; - /** This class wraps an MSFilterTracer to create trace logs for import/export filters. */ class XclTracer { @@ -108,7 +107,6 @@ private: BoolVec maFirstTimes; }; - #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 79a74c815590..2fdb9e11353b 100644 --- a/sc/source/filter/lotus/filter.cxx +++ b/sc/source/filter/lotus/filter.cxx @@ -55,7 +55,6 @@ rtl_TextEncoding eCharVon; extern ScDocument* pDoc; // Aufhaenger zum Dokumentzugriff ScDocument* pDoc; - extern OPCODE_FKT pOpFkt[ FKT_LIMIT ]; // -> optab.cxx, Tabelle moeglicher Opcodes extern OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ]; @@ -63,7 +62,6 @@ extern OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ]; LOTUS_ROOT* pLotusRoot = NULL; - std::map<sal_uInt16, ScPatternAttr> aLotusPatternPool; static FltError @@ -223,5 +221,4 @@ FltError ScImportLotus123old( SvStream& aStream, ScDocument* pDocument, rtl_Text return generate_Opcodes( aStream, *pDoc, aPrgrsBar, eTyp ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index e78209bf7cbe..b309f6a3a50e 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "lotattr.hxx" #include <boost/bind.hpp> @@ -35,10 +34,8 @@ #include "root.hxx" #include "scitems.hxx" - using namespace ::com::sun::star; - LotAttrCache::ENTRY::ENTRY (ScPatternAttr* p) : pPattAttr(p) , nHash0(0) @@ -76,7 +73,6 @@ LotAttrCache::LotAttrCache (LOTUS_ROOT* pLotRoot): pWhite = new SvxColorItem( Color( COL_WHITE ), ATTR_FONT_COLOR ); } - LotAttrCache::~LotAttrCache() { for( sal_uInt16 nCnt = 0 ; nCnt < 6 ; nCnt++ ) @@ -88,7 +84,6 @@ LotAttrCache::~LotAttrCache() delete[] pColTab; } - const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) { sal_uInt32 nRefHash; @@ -157,7 +152,6 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) return *pNewPatt; } - void LotAttrCache::LotusToScBorderLine( sal_uInt8 nLine, ::editeng::SvxBorderLine& aBL ) { nLine &= 0x03; @@ -224,7 +218,6 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr ) } } - void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum ) { ScDocument* pDoc = pLotusRoot->pDoc; @@ -255,7 +248,6 @@ void LotAttrTable::SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const S pCols[ nColCnt ].SetAttr( nRow, rPattAttr ); } - void LotAttrTable::Apply( const SCTAB nTabNum ) { SCCOL nColCnt; diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index aeeff6e27aa5..59d8750d41f0 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -174,7 +174,6 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri } } - // Spezialfaelle... if( eOc == ocGetYear ) { @@ -269,7 +268,6 @@ void LotusToSc::LotusRelToScRel( sal_uInt16 nCol, sal_uInt16 nRow, ScSingleRefDa rSRD.SetAbsRow(static_cast<SCROW>(nRow)); } - void LotusToSc::ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nRelBit ) { sal_uInt8 nTab, nCol; @@ -289,28 +287,24 @@ void LotusToSc::ReadSRD( ScSingleRefData& rSRD, sal_uInt8 nRelBit ) rSRD.SetAddress(ScAddress(nCol, nRow, nTab), aEingPos); } - void LotusToSc::IncToken( TokenId &rParam ) { aPool << ocOpen << rParam << nAddToken; rParam = aPool.Store(); } - void LotusToSc::DecToken( TokenId &rParam ) { aPool << ocOpen << rParam << nSubToken; rParam = aPool.Store(); } - void LotusToSc::NegToken( TokenId &rParam ) { aPool << ocNegSub << ocOpen << rParam << ocClose; rParam = aPool.Store(); } - void LotusToSc::Reset( const ScAddress& rEingPos ) { LotusConverterBase::Reset( rEingPos ); @@ -326,7 +320,6 @@ void LotusToSc::Reset( const ScAddress& rEingPos ) n0Token = aPool.Store( 0.0 ); } - LotusToSc::LotusToSc( SvStream &rStream, svl::SharedStringPool& rSPool, rtl_TextEncoding e, bool b ) : LotusConverterBase(rStream, rSPool, 128) { @@ -335,11 +328,9 @@ LotusToSc::LotusToSc( SvStream &rStream, svl::SharedStringPool& rSPool, rtl_Text bWK123 = b; } - typedef FUNC_TYPE ( FuncType1 ) ( sal_uInt8 ); typedef DefTokenId ( FuncType2 ) ( sal_uInt8 ); - ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, const FORMULA_TYPE /*eFT*/ ) { @@ -625,7 +616,6 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, return ConvOK; } - FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex ) { static const FUNC_TYPE pType[ 256 ] = @@ -890,7 +880,6 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex ) return pType[ nIndex ]; } - DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex ) { static const DefTokenId pToken[ 256 ] = @@ -1156,7 +1145,6 @@ DefTokenId LotusToSc::IndexToToken( sal_uInt8 nIndex ) return pToken[ nIndex ]; } - FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex ) { static const FUNC_TYPE pType[ 256 ] = @@ -1421,7 +1409,6 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex ) return pType[ nIndex ]; } - DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) { static const DefTokenId pToken[ 256 ] = @@ -1687,7 +1674,6 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) return pToken[ nIndex ]; } - const sal_Char* GetAddInName( const sal_uInt8 n ) { static const sal_Char* pNames[ 256 ] = @@ -1953,7 +1939,6 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) return pNames[ n ]; } - static DefTokenId lcl_KnownAddIn( const OString& rTest ) { DefTokenId eId = ocNoName; diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index a17b94d4b8fa..60fa5a4880b0 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.cxx @@ -52,7 +52,6 @@ LOTUS_ROOT::LOTUS_ROOT( ScDocument* pDocP, rtl_TextEncoding eQ ) { } - LOTUS_ROOT::~LOTUS_ROOT() { delete pRangeNames; @@ -61,7 +60,6 @@ LOTUS_ROOT::~LOTUS_ROOT() delete pAttrTable; } - static osl::Mutex aLotImpSemaphore; ImportLotus::ImportLotus( SvStream& aStream, ScDocument* pDoc, rtl_TextEncoding eQ ) @@ -86,7 +84,6 @@ ImportLotus::~ImportLotus() aLotImpSemaphore.release(); } - void ImportLotus::Bof( void ) { sal_uInt16 nFileCode, nFileSub, nSaveCnt; @@ -114,7 +111,6 @@ void ImportLotus::Bof( void ) } } - bool ImportLotus::BofFm3( void ) { sal_uInt16 nFileCode, nFileSub; @@ -125,7 +121,6 @@ bool ImportLotus::BofFm3( void ) return ( nFileCode == 0x8007 && ( nFileSub == 0x0000 || nFileSub == 0x00001 ) ); } - void ImportLotus::Columnwidth( sal_uInt16 nRecLen ) { OSL_ENSURE( nRecLen >= 4, "*ImportLotus::Columnwidth(): Record zu kurz!" ); @@ -157,7 +152,6 @@ void ImportLotus::Columnwidth( sal_uInt16 nRecLen ) } } - void ImportLotus::Hiddencolumn( sal_uInt16 nRecLen ) { OSL_ENSURE( nRecLen >= 4, "*ImportLotus::Hiddencolumn(): Record zu kurz!" ); @@ -184,7 +178,6 @@ void ImportLotus::Hiddencolumn( sal_uInt16 nRecLen ) } } - void ImportLotus::Userrange( void ) { sal_uInt16 nRangeType; @@ -202,7 +195,6 @@ void ImportLotus::Userrange( void ) pLotusRoot->pRngNmBffWK3->Add( aName, aScRange ); } - void ImportLotus::Errcell( void ) { ScAddress aA; @@ -215,7 +207,6 @@ void ImportLotus::Errcell( void ) pD->SetString(aA, "#ERR!", &aParam); } - void ImportLotus::Nacell( void ) { ScAddress aA; @@ -228,7 +219,6 @@ void ImportLotus::Nacell( void ) pD->SetString(aA, "#NA!", &aParam); } - void ImportLotus::Labelcell( void ) { ScAddress aA; @@ -245,7 +235,6 @@ void ImportLotus::Labelcell( void ) pD->SetString(aA, aLabel, &aParam); } - void ImportLotus::Numbercell( void ) { ScAddress aAddr; @@ -258,7 +247,6 @@ void ImportLotus::Numbercell( void ) pD->SetValue(aAddr, fVal); } - void ImportLotus::Smallnumcell( void ) { ScAddress aAddr; @@ -271,7 +259,6 @@ void ImportLotus::Smallnumcell( void ) pD->SetValue(aAddr, SnumToDouble(nVal)); } - ScFormulaCell *ImportLotus::Formulacell( sal_uInt16 n ) { OSL_ENSURE( pIn, "-ImportLotus::Formulacell(): Null-Stream -> Rums!" ); @@ -298,13 +285,11 @@ ScFormulaCell *ImportLotus::Formulacell( sal_uInt16 n ) return NULL; } - void ImportLotus::Read( OUString &r ) { ScfTools::AppendCString( *pIn, r, eQuellChar ); } - void ImportLotus::RowPresentation( sal_uInt16 nRecLen ) { OSL_ENSURE( nRecLen > 4, "*ImportLotus::RowPresentation(): Record zu kurz!" ); @@ -339,7 +324,6 @@ void ImportLotus::RowPresentation( sal_uInt16 nRecLen ) } } - void ImportLotus::NamedSheet( void ) { sal_uInt16 nLTab; @@ -354,7 +338,6 @@ void ImportLotus::NamedSheet( void ) pD->InsertTab( static_cast<SCTAB> (nLTab), aName ); } - void ImportLotus::Font_Face( void ) { sal_uInt8 nNum; @@ -370,7 +353,6 @@ void ImportLotus::Font_Face( void ) pLotusRoot->pFontBuff->SetName( nNum, aName ); } - void ImportLotus::Font_Type( void ) { for( sal_uInt16 nCnt = 0 ; nCnt < LotusFontBuffer::nSize ; nCnt++ ) @@ -381,7 +363,6 @@ void ImportLotus::Font_Type( void ) } } - void ImportLotus::Font_Ysize( void ) { for( sal_uInt16 nCnt = 0 ; nCnt < LotusFontBuffer::nSize ; nCnt++ ) @@ -392,7 +373,6 @@ void ImportLotus::Font_Ysize( void ) } } - void ImportLotus::_Row( const sal_uInt16 nRecLen ) { OSL_ENSURE( nExtTab >= 0, "*ImportLotus::_Row(): Kann hier nicht sein!" ); diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 525ea505b48c..c690eb57df26 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -25,10 +25,8 @@ #include "lotattr.hxx" #include "fprogressbar.hxx" - class ScFormulaCell; - FltError ImportLotus::Read() { enum STATE @@ -227,7 +225,6 @@ FltError ImportLotus::Read() return eRet; } - FltError ImportLotus::Read( SvStream& rIn ) { pIn = &rIn; diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx index 921ebd176d92..28630b7419d2 100644 --- a/sc/source/filter/lotus/memory.cxx +++ b/sc/source/filter/lotus/memory.cxx @@ -20,7 +20,6 @@ // Bemerkung: Variablen nicht ueber Headerfile, Module muessen sich // selbst per extern ihre Sachen besorgen! - #include "scitems.hxx" #include "scmem.h" #include <svx/algitem.hxx> @@ -53,7 +52,6 @@ bool MemNew( void ) return true; } - void MemDelete( void ) { delete pValueFormCache; diff --git a/sc/source/filter/lotus/optab.cxx b/sc/source/filter/lotus/optab.cxx index d5af5b647b75..b5525d80799e 100644 --- a/sc/source/filter/lotus/optab.cxx +++ b/sc/source/filter/lotus/optab.cxx @@ -20,7 +20,6 @@ #include "op.h" #include "optab.h" - // Bearbeitungsfunktion sal_Char *X( sal_Char * ) OPCODE_FKT pOpFkt[ FKT_LIMIT ] = { // Code @@ -127,7 +126,6 @@ OPCODE_FKT pOpFkt[ FKT_LIMIT ] = OP_HiddenCols, // 100 }; - OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ] = { // Code OP_BOF123, // 0 @@ -233,5 +231,4 @@ OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ] = NI // 100 }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 3b403e76d026..20f4f74e2099 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -36,7 +36,6 @@ 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? @@ -68,7 +67,6 @@ const sal_Int16 BIFF8_MAXTAB = BIFF5_MAXTAB; } // namespace - CellAddress ApiCellRangeList::getBaseAddress() const { if( empty() ) diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 4b8fe421bb51..37fee41ef548 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - namespace { const sal_uInt8 BIFF12_TOP10FILTER_TOP = 0x01; diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index 944ee8a5d52e..5a6258799e9b 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -28,9 +28,6 @@ namespace oox { namespace xls { - - - namespace { const sal_Int32 BIFF_RK_100FLAG = 0x00000001; diff --git a/sc/source/filter/oox/biffinputstream.cxx b/sc/source/filter/oox/biffinputstream.cxx index b4b5cb977def..fd3f3853eba8 100644 --- a/sc/source/filter/oox/biffinputstream.cxx +++ b/sc/source/filter/oox/biffinputstream.cxx @@ -25,9 +25,6 @@ namespace oox { namespace xls { - - - namespace prv { BiffInputRecordBuffer::BiffInputRecordBuffer( BinaryInputStream& rInStrm ) : diff --git a/sc/source/filter/oox/chartsheetfragment.cxx b/sc/source/filter/oox/chartsheetfragment.cxx index dada65309dba..57e1685083c5 100644 --- a/sc/source/filter/oox/chartsheetfragment.cxx +++ b/sc/source/filter/oox/chartsheetfragment.cxx @@ -31,7 +31,6 @@ 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 dd24c4c46690..4aea74433b0b 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -50,7 +50,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; - static sal_Int32 lcl_ToHorizAlign( sal_Int32 nAlign ) { switch( nAlign ) diff --git a/sc/source/filter/oox/commentsfragment.cxx b/sc/source/filter/oox/commentsfragment.cxx index 2a8fa5159863..17ce2df5c13d 100644 --- a/sc/source/filter/oox/commentsfragment.cxx +++ b/sc/source/filter/oox/commentsfragment.cxx @@ -26,7 +26,6 @@ namespace xls { using namespace ::oox::core; - CommentsFragment::CommentsFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ) { diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index 3c3b45eec2f2..7dd7847d1483 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -63,7 +63,6 @@ using namespace ::com::sun::star::style; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - namespace { const sal_Int32 BIFF12_CFRULE_TYPE_CELLIS = 1; @@ -1192,7 +1191,6 @@ void ExtCfRule::importCfvo( const AttributeList& rAttribs ) maModel.maColorScaleType = rAttribs.getString( XML_type, OUString() ); } - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index e07459b9db13..d8e164b5f14c 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -27,7 +27,6 @@ namespace xls { using namespace ::com::sun::star::uno; - namespace { const sal_Int32 BIFF12_RECONNECT_AS_REQUIRED = 1; diff --git a/sc/source/filter/oox/connectionsfragment.cxx b/sc/source/filter/oox/connectionsfragment.cxx index 416cd9b26ab5..7391e4057597 100644 --- a/sc/source/filter/oox/connectionsfragment.cxx +++ b/sc/source/filter/oox/connectionsfragment.cxx @@ -28,7 +28,6 @@ namespace xls { using namespace ::oox::core; - ConnectionContext::ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection ) : WorkbookContextBase( rParent ), mrConnection( rConnection ) diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index d153dfe3df5f..73addbe5d6f7 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -45,7 +45,6 @@ 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; diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index 2caa532763ab..30e75e6cf464 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -32,7 +32,6 @@ 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. */ diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 147c0be65d6f..967b0ff24dd0 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -295,10 +295,8 @@ void DrawingFragment::onEndElement() } } - // VML - namespace { class VmlFindNoteFunc diff --git a/sc/source/filter/oox/drawingmanager.cxx b/sc/source/filter/oox/drawingmanager.cxx index 5ca80ac07d14..90b631052564 100644 --- a/sc/source/filter/oox/drawingmanager.cxx +++ b/sc/source/filter/oox/drawingmanager.cxx @@ -42,7 +42,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::oox::drawingml; - namespace { // OBJ record ----------------------------------------------------------------- @@ -86,10 +85,8 @@ const sal_uInt8 BIFF_OBJ_PATT_SOLID = 1; } // namespace - // Model structures for BIFF OBJ record data - BiffObjLineModel::BiffObjLineModel() : mnColorIdx( BIFF_OBJ_LINE_AUTOCOLOR ), mnStyle( BIFF_OBJ_LINE_SOLID ), @@ -108,7 +105,6 @@ BiffObjFillModel::BiffObjFillModel() : // BIFF drawing objects - BiffDrawingObjectContainer::BiffDrawingObjectContainer() { } @@ -364,10 +360,8 @@ void BiffDrawingObjectBase::convertFillProperties( ShapePropertyMap& rPropMap, c aFillProps.pushToPropMap( rPropMap, getBaseFilter().getGraphicHelper() ); } - // BIFF drawing page - BiffDrawingBase::BiffDrawingBase( const WorksheetHelper& rHelper, const Reference< XDrawPage >& rxDrawPage ) : WorksheetHelper( rHelper ), mxDrawPage( rxDrawPage ) diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 3da6f1ceda1e..60c031815945 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -169,7 +169,6 @@ GraphicHelper* ExcelFilter::implCreateGraphicHelper() const return new ExcelVbaProject( getComponentContext(), Reference< XSpreadsheetDocument >( getModel(), UNO_QUERY ) ); } - sal_Bool SAL_CALL ExcelFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { if ( XmlFilterBase::filter( rDescriptor ) ) diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index 42af3d1ed7c7..9e2c4261a7c0 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -28,7 +28,6 @@ namespace xls { using ::oox::core::FilterBase; using ::oox::core::FragmentHandler2; - WorkbookFragmentBase::WorkbookFragmentBase( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : FragmentHandler2( rHelper.getOoxFilter(), rFragmentPath ), @@ -43,7 +42,6 @@ WorksheetFragmentBase::WorksheetFragmentBase( { } - BiffContextHandler::~BiffContextHandler() { } diff --git a/sc/source/filter/oox/excelvbaproject.cxx b/sc/source/filter/oox/excelvbaproject.cxx index dbfaa3748d0a..c6ffb14f0e3a 100644 --- a/sc/source/filter/oox/excelvbaproject.cxx +++ b/sc/source/filter/oox/excelvbaproject.cxx @@ -43,7 +43,6 @@ using namespace ::com::sun::star::script; 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 ) diff --git a/sc/source/filter/oox/externallinkfragment.cxx b/sc/source/filter/oox/externallinkfragment.cxx index c31e13e661a2..31854efa4ab9 100644 --- a/sc/source/filter/oox/externallinkfragment.cxx +++ b/sc/source/filter/oox/externallinkfragment.cxx @@ -34,8 +34,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; - - ExternalSheetDataContext::ExternalSheetDataContext( WorkbookFragmentBase& rFragment, const Reference< XExternalSheetCache >& rxSheetCache ) : WorkbookContextBase(rFragment) diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 590384ce6e32..b866a7786fbc 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; - // reference helpers ========================================================== BinSingleRef2d::BinSingleRef2d() : @@ -921,7 +920,6 @@ static const FunctionData saFuncTableOOoLO[] = { "ORG.OPENOFFICE.CONVERT", "ORG.OPENOFFICE.CONVERT", NOID, NOID, 3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW } }; - const sal_Unicode API_TOKEN_OPEN = '('; const sal_Unicode API_TOKEN_CLOSE = ')'; const sal_Unicode API_TOKEN_SEP = ';'; diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 1a9efedbe904..41331fb55d82 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -43,7 +43,6 @@ 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 ) @@ -1907,7 +1906,6 @@ private: bool pushBiffFunction( sal_uInt16 nFuncId ); bool pushBiffFunction( sal_uInt16 nFuncId, sal_uInt8 nParamCount ); - private: typedef bool (BiffFormulaParserImpl::*ImportTokenFunc)( BiffInputStream& ); typedef bool (BiffFormulaParserImpl::*ImportRefTokenFunc)( BiffInputStream&, bool, bool ); diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index c0db303be969..0f072dcebd46 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -48,7 +48,6 @@ 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. */ diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 2f4d8bbdfb0d..b6f92d9b8b52 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -323,7 +323,6 @@ void PageSettings::importPictureData( const Relations& rRelations, const OUStrin maModel.maGraphicUrl = getBaseFilter().getGraphicHelper().importEmbeddedGraphicObject( aPicturePath ); } - enum HFPortionId { HF_LEFT, @@ -861,8 +860,6 @@ void HeaderFooterParser::setNewPortion( HFPortionId ePortion ) } } - - PageSettingsConverter::HFHelperData::HFHelperData( sal_Int32 nLeftPropId, sal_Int32 nRightPropId ) : mnLeftPropId( nLeftPropId ), mnRightPropId( nRightPropId ), diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index 9fc8ca27a34f..452fa14b298c 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -30,7 +30,6 @@ namespace xls { using namespace ::com::sun::star::uno; using namespace ::oox::core; - PivotCacheFieldContext::PivotCacheFieldContext( WorkbookFragmentBase& rFragment, PivotCacheField& rCacheField ) : WorkbookContextBase( rFragment ), mrCacheField( rCacheField ) @@ -315,7 +314,6 @@ void PivotCacheRecordsFragment::importPCRecordItem( sal_Int32 nRecId, SequenceIn } } - namespace { bool lclSeekToPCDField( BiffInputStream& rStrm ) diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index a1966560946b..0356e5bdaf71 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -58,7 +58,6 @@ using namespace ::com::sun::star::table; 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. diff --git a/sc/source/filter/oox/pivottablefragment.cxx b/sc/source/filter/oox/pivottablefragment.cxx index cbbeaecce827..9c2fa02dd06b 100644 --- a/sc/source/filter/oox/pivottablefragment.cxx +++ b/sc/source/filter/oox/pivottablefragment.cxx @@ -27,7 +27,6 @@ namespace xls { using namespace ::oox::core; - PivotTableFieldContext::PivotTableFieldContext( WorksheetFragmentBase& rFragment, PivotTableField& rTableField ) : WorksheetContextBase( rFragment ), mrTableField( rTableField ) diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 0b4fd9f07891..57c7c1894ba9 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -38,7 +38,6 @@ 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; diff --git a/sc/source/filter/oox/querytablefragment.cxx b/sc/source/filter/oox/querytablefragment.cxx index b7d6ac66f92b..32ae66291766 100644 --- a/sc/source/filter/oox/querytablefragment.cxx +++ b/sc/source/filter/oox/querytablefragment.cxx @@ -27,7 +27,6 @@ namespace xls { using namespace ::oox::core; - QueryTableFragment::QueryTableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mrQueryTable( getQueryTables().createQueryTable() ) @@ -69,7 +68,6 @@ const RecordInfo* QueryTableFragment::getRecordInfos() const return spRecInfos; } - } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 894974fdb84d..b3c3b29ec961 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -33,7 +33,6 @@ namespace xls { using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; - namespace { const sal_uInt8 BIFF12_STRINGFLAG_FONTS = 0x01; diff --git a/sc/source/filter/oox/sharedstringsfragment.cxx b/sc/source/filter/oox/sharedstringsfragment.cxx index 9d9b848ed84e..be2061e5ba9d 100644 --- a/sc/source/filter/oox/sharedstringsfragment.cxx +++ b/sc/source/filter/oox/sharedstringsfragment.cxx @@ -27,7 +27,6 @@ namespace xls { using namespace ::oox::core; - SharedStringsFragment::SharedStringsFragment( const WorkbookHelper& rHelper, const OUString& rFragmentPath ) : WorkbookFragmentBase( rHelper, rFragmentPath ) diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 434c07c6639d..446b9f80f66c 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -65,7 +65,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - CellModel::CellModel() : mnCellType( XML_TOKEN_INVALID ), mnXfId( -1 ), @@ -528,7 +527,6 @@ bool SheetDataBuffer::XfIdRowRange::tryExpand( sal_Int32 nRow, sal_Int32 nXfId ) return false; } - SheetDataBuffer::MergedRange::MergedRange( const CellRangeAddress& rRange ) : maRange( rRange ), mnHorAlign( XML_TOKEN_INVALID ) diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 29ae77008971..adead6da18ee 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -859,7 +859,6 @@ void Font::finalizeImport() } } - bool Font::needsRichTextFormat() const { return maApiData.mnEscapement != API_ESCAPE_NONE; @@ -1720,7 +1719,6 @@ bool Border::convertBorderLine( BorderLine2& rBorderLine, const BorderLineModel& return rModel.mbUsed; } - PatternFillModel::PatternFillModel( bool bDxf ) : mnPattern( XML_none ), mbPattColorUsed( !bDxf ), diff --git a/sc/source/filter/oox/stylesfragment.cxx b/sc/source/filter/oox/stylesfragment.cxx index b66b7555e742..10876fc98ab4 100644 --- a/sc/source/filter/oox/stylesfragment.cxx +++ b/sc/source/filter/oox/stylesfragment.cxx @@ -26,7 +26,6 @@ namespace xls { using namespace ::oox::core; - IndexedColorsContext::IndexedColorsContext( WorkbookFragmentBase& rFragment ) : WorkbookContextBase( rFragment ) { diff --git a/sc/source/filter/oox/tablebuffer.cxx b/sc/source/filter/oox/tablebuffer.cxx index 23c2ed7dddd9..4e59dbf53525 100644 --- a/sc/source/filter/oox/tablebuffer.cxx +++ b/sc/source/filter/oox/tablebuffer.cxx @@ -34,7 +34,6 @@ 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 ), diff --git a/sc/source/filter/oox/tablefragment.cxx b/sc/source/filter/oox/tablefragment.cxx index 92cf34aeff38..52039c716a74 100644 --- a/sc/source/filter/oox/tablefragment.cxx +++ b/sc/source/filter/oox/tablefragment.cxx @@ -28,7 +28,6 @@ namespace xls { using namespace ::oox::core; - TableFragment::TableFragment( const WorksheetHelper& rHelper, const OUString& rFragmentPath ) : WorksheetFragmentBase( rHelper, rFragmentPath ), mrTable( getTables().createTable() ) diff --git a/sc/source/filter/oox/threadpool.cxx b/sc/source/filter/oox/threadpool.cxx index 1055e5997de5..3fcfa755129c 100644 --- a/sc/source/filter/oox/threadpool.cxx +++ b/sc/source/filter/oox/threadpool.cxx @@ -11,7 +11,6 @@ #include <algorithm> - class ThreadPool::ThreadWorker : public salhelper::Thread { ThreadPool *mpPool; @@ -58,7 +57,6 @@ public: return pRet; } - // Why a condition per worker thread - you may ask. // // Unfortunately the Windows synchronisation API that we wrap diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index dd6f555ee9ed..359a76ac3b2a 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -38,7 +38,6 @@ 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; diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 2814ee79d778..088cebc54910 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -378,7 +378,6 @@ void WorkbookFragment::finalizeImport() importOoxFragment( new ConnectionsFragment( *this, aConnFragmentPath ) ); xGlobalSegment->setPosition( 1.0 ); - /* Create fragments for all sheets, before importing them. Needed to do some preprocessing in the fragment constructors, e.g. loading the table fragments for all sheets that are needed before the cell formulas are diff --git a/sc/source/filter/oox/worksheetbuffer.cxx b/sc/source/filter/oox/worksheetbuffer.cxx index 2655e10e070b..cc8147ecd502 100644 --- a/sc/source/filter/oox/worksheetbuffer.cxx +++ b/sc/source/filter/oox/worksheetbuffer.cxx @@ -41,7 +41,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::sheet; using namespace ::com::sun::star::uno; - SheetInfoModel::SheetInfoModel() : mnBiffHandle( -1 ), mnSheetId( -1 ), diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx index ab4aea79230c..f93d56ee629b 100644 --- a/sc/source/filter/oox/worksheetfragment.cxx +++ b/sc/source/filter/oox/worksheetfragment.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star::table; using namespace ::com::sun::star::uno; using namespace ::oox::core; - namespace { const sal_uInt16 BIFF_COLINFO_HIDDEN = 0x0001; @@ -129,7 +128,6 @@ void DataValidationsContext::onEndElement() } } - ContextHandlerRef DataValidationsContext::onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) { if( nRecId == BIFF12_ID_DATAVALIDATION ) diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 3c4cf1068c62..4417bbe6cb34 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -91,7 +91,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; - namespace { void lclUpdateProgressBar( const ISegmentProgressBarRef& rxProgressBar, double fPosition ) @@ -102,7 +101,6 @@ void lclUpdateProgressBar( const ISegmentProgressBarRef& rxProgressBar, double f } // namespace - ColumnModel::ColumnModel() : maRange( -1 ), mfWidth( 0.0 ), @@ -203,7 +201,6 @@ void ValidationModel::setBiffErrorStyle( sal_uInt8 nErrorStyle ) mnErrorStyle = STATIC_ARRAY_SELECT( spnErrorStyles, nErrorStyle, XML_stop ); } - class WorksheetGlobals : public WorkbookHelper, public IWorksheetProgress { public: @@ -915,7 +912,6 @@ void WorksheetGlobals::UpdateRowProgress( const CellRangeAddress& rUsedArea, sal } } - void WorksheetGlobals::initializeWorksheetImport() { // set default cell style for unused cells @@ -1359,7 +1355,6 @@ void WorksheetGlobals::finalizeDrawings() } } - WorksheetHelper::WorksheetHelper( WorksheetGlobals& rSheetGlob ) : WorkbookHelper( rSheetGlob ), mrSheetGlob( rSheetGlob ) @@ -1619,7 +1614,6 @@ void WorksheetHelper::createSharedFormulaMapEntry( getFormulaBuffer().createSharedFormulaMapEntry(rAddress, rRange, nSharedId, rTokens); } - } // namespace xls } // namespace oox diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx index d7f6a0f65c18..72811c63a3b3 100644 --- a/sc/source/filter/orcus/interface.cxx +++ b/sc/source/filter/orcus/interface.cxx @@ -472,7 +472,6 @@ size_t ScOrcusStyles::commit_font() return 0; } - // fill void ScOrcusStyles::set_fill_count(size_t /*n*/) @@ -497,7 +496,6 @@ size_t ScOrcusStyles::commit_fill() return 0; } - // border void ScOrcusStyles::set_border_count(size_t /*n*/) @@ -524,7 +522,6 @@ size_t ScOrcusStyles::commit_border() return 0; } - // cell protection void ScOrcusStyles::set_cell_hidden(bool /*b*/) { @@ -568,7 +565,6 @@ size_t ScOrcusStyles::commit_cell_style_xf() return 0; } - // cell xf void ScOrcusStyles::set_cell_xf_count(size_t /*n*/) @@ -581,7 +577,6 @@ size_t ScOrcusStyles::commit_cell_xf() return 0; } - // xf (cell format) - used both by cell xf and cell style xf. void ScOrcusStyles::set_xf_number_format(size_t /*index*/) @@ -621,7 +616,6 @@ void ScOrcusStyles::set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_ { } - // cell style entry // not needed for now for gnumeric diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index fa91fd389ec5..0ee24a8a4586 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -235,7 +235,6 @@ public: } }; - } bool ScOrcusXMLContextImpl::importXML(const ScOrcusImportXMLParam& rParam) diff --git a/sc/source/filter/qpro/biff.cxx b/sc/source/filter/qpro/biff.cxx index 333c7202ee8a..a23f578f4c9b 100644 --- a/sc/source/filter/qpro/biff.cxx +++ b/sc/source/filter/qpro/biff.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/config.h> #include <stdio.h> #include <sfx2/docfile.hxx> diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx index 73dbed891bd8..0d8829b5fb53 100644 --- a/sc/source/filter/qpro/qpro.cxx +++ b/sc/source/filter/qpro/qpro.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/config.h> #include <stdio.h> #include <sfx2/docfile.hxx> diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 7a3ebbd8ec6f..6be47b015577 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/strbuf.hxx> #include <sal/config.h> #include <sal/macros.h> diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index f26adcdb46c0..48e82e69edf5 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.cxx @@ -20,7 +20,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <editeng/adjustitem.hxx> #include <editeng/editobj.hxx> #include <editeng/editview.hxx> @@ -73,7 +72,6 @@ ScEEImport::ScEEImport( ScDocument* pDocP, const ScRange& rRange ) : mpEngine->EnableUndo( false ); } - ScEEImport::~ScEEImport() { // Sequence important, or else we crash in some dtor! @@ -81,7 +79,6 @@ ScEEImport::~ScEEImport() delete mpEngine; // After Parser! } - sal_uLong ScEEImport::Read( SvStream& rStream, const OUString& rBaseURL ) { sal_uLong nErr = mpParser->Read( rStream, rBaseURL ); @@ -110,7 +107,6 @@ sal_uLong ScEEImport::Read( SvStream& rStream, const OUString& rBaseURL ) return nErr; } - void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate ) { ScProgress* pProgress = new ScProgress( mpDoc->GetDocumentShell(), @@ -474,7 +470,6 @@ void ScEEImport::WriteToDocument( bool bSizeColsRows, double nOutputFactor, SvNu delete pProgress; } - bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/, ScEEParseEntry* pE ) { if ( !pE->maImageList.size() ) @@ -538,7 +533,6 @@ bool ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/, ScEEParseE return bHasGraphics; } - void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab, ScEEParseEntry* pE ) { @@ -606,7 +600,6 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab, } } - ScEEParser::ScEEParser( EditEngine* pEditP ) : pEdit( pEditP ), pPool( EditEngine::CreatePool() ), @@ -623,7 +616,6 @@ ScEEParser::ScEEParser( EditEngine* pEditP ) : NewActEntry( NULL ); } - ScEEParser::~ScEEParser() { delete pActEntry; @@ -635,7 +627,6 @@ ScEEParser::~ScEEParser() SfxItemPool::Free(pPool); } - void ScEEParser::NewActEntry( ScEEParseEntry* pE ) { // New free-flying pActEntry pActEntry = new ScEEParseEntry( pPool ); diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx index a9ae7b3ab4f6..6d0fb6452da4 100644 --- a/sc/source/filter/rtf/expbase.cxx +++ b/sc/source/filter/rtf/expbase.cxx @@ -21,7 +21,6 @@ #include "document.hxx" #include "editutil.hxx" - ScExportBase::ScExportBase( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rRangeP ) : @@ -33,13 +32,11 @@ ScExportBase::ScExportBase( SvStream& rStrmP, ScDocument* pDocP, { } - ScExportBase::~ScExportBase() { delete pEditEngine; } - bool ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol, SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const { @@ -48,7 +45,6 @@ bool ScExportBase::GetDataArea( SCTAB nTab, SCCOL& nStartCol, return TrimDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ); } - bool ScExportBase::TrimDataArea( SCTAB nTab, SCCOL& nStartCol, SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const { @@ -62,7 +58,6 @@ bool ScExportBase::TrimDataArea( SCTAB nTab, SCCOL& nStartCol, ::std::numeric_limits<SCROW>::max(); } - bool ScExportBase::IsEmptyTable( SCTAB nTab ) const { if ( !pDoc->HasTable( nTab ) || !pDoc->IsVisible( nTab ) ) @@ -72,7 +67,6 @@ bool ScExportBase::IsEmptyTable( SCTAB nTab ) const return !GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ); } - ScFieldEditEngine& ScExportBase::GetEditEngine() const { if ( !pEditEngine ) @@ -80,5 +74,4 @@ ScFieldEditEngine& ScExportBase::GetEditEngine() const return *pEditEngine; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index 356004a7b199..05032f2d41c9 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -20,7 +20,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <svx/algitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> @@ -49,7 +48,6 @@ FltError ScFormatFilterPluginImpl::ScExportRTF( SvStream& rStrm, ScDocument* pDo return aEx.Write(); } - ScRTFExport::ScRTFExport( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rRangeP ) : ScExportBase( rStrmP, pDocP, rRangeP ), @@ -57,13 +55,11 @@ ScRTFExport::ScRTFExport( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rR { } - ScRTFExport::~ScRTFExport() { delete [] pCellX; } - sal_uLong ScRTFExport::Write() { rStrm.WriteChar( '{' ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RTF ); @@ -81,7 +77,6 @@ sal_uLong ScRTFExport::Write() return rStrm.GetError(); } - void ScRTFExport::WriteTab( SCTAB nTab ) { rStrm.WriteChar( '{' ).WriteCharPtr( SAL_NEWLINE_STRING ); @@ -104,7 +99,6 @@ void ScRTFExport::WriteTab( SCTAB nTab ) rStrm.WriteChar( '}' ).WriteCharPtr( SAL_NEWLINE_STRING ); } - void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) { rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TROWD ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRGAPH ).WriteCharPtr( "30" ).WriteCharPtr( OOO_STRING_SVTOOLS_RTF_TRLEFT ).WriteCharPtr( "-30" ); @@ -158,7 +152,6 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) rStrm.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_ROW ).WriteCharPtr( SAL_NEWLINE_STRING ); } - void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ) { const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab ); diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx index ec97bf84b404..d70ceada788a 100644 --- a/sc/source/filter/rtf/rtfimp.cxx +++ b/sc/source/filter/rtf/rtfimp.cxx @@ -25,7 +25,6 @@ #include "rtfparse.hxx" #include "ftools.hxx" - FltError ScFormatFilterPluginImpl::ScImportRTF( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc, ScRange& rRange ) { ScRTFImport aImp( pDoc, rRange ); @@ -41,14 +40,12 @@ ScEEAbsImport *ScFormatFilterPluginImpl::CreateRTFImport( ScDocument* pDoc, cons return new ScRTFImport( pDoc, rRange ); } - ScRTFImport::ScRTFImport( ScDocument* pDocP, const ScRange& rRange ) : ScEEImport( pDocP, rRange ) { mpParser = new ScRTFParser( mpEngine ); } - ScRTFImport::~ScRTFImport() { // Reihenfolge wichtig, sonst knallt's irgendwann irgendwo in irgendeinem Dtor! diff --git a/sc/source/filter/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index f8df0288812e..6a44a09c16ae 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.cxx @@ -32,7 +32,6 @@ #define SC_RTFTWIPTOL 10 // 10 Twips tolerance when determining columns - ScRTFParser::ScRTFParser( EditEngine* pEditP ) : ScEEParser( pEditP ), mnCurPos(0), @@ -50,7 +49,6 @@ ScRTFParser::ScRTFParser( EditEngine* pEditP ) : pInsDefault = new ScRTFCellDefault( pPool ); } - ScRTFParser::~ScRTFParser() { delete pInsDefault; @@ -58,7 +56,6 @@ ScRTFParser::~ScRTFParser() maDefaultList.clear(); } - sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL ) { Link aOldLink = pEdit->GetImportHdl(); @@ -90,7 +87,6 @@ sal_uLong ScRTFParser::Read( SvStream& rStream, const OUString& rBaseURL ) return nErr; } - void ScRTFParser::EntryEnd( ScEEParseEntry* pE, const ESelection& aSel ) { // Paragraph -2 strips the attached empty paragraph @@ -99,14 +95,12 @@ void ScRTFParser::EntryEnd( ScEEParseEntry* pE, const ESelection& aSel ) pE->aSel.nEndPos = pEdit->GetTextLen( aSel.nEndPara - 1 ); } - inline void ScRTFParser::NextRow() { if ( nRowMax < ++nRowCnt ) nRowMax = nRowCnt; } - bool ScRTFParser::SeekTwips( sal_uInt16 nTwips, SCCOL* pCol ) { ScRTFColTwips::const_iterator it = pColTwips->find( nTwips ); @@ -131,7 +125,6 @@ bool ScRTFParser::SeekTwips( sal_uInt16 nTwips, SCCOL* pCol ) return false; } - void ScRTFParser::ColAdjust() { if ( nStartAdjust != (sal_uLong)~0 ) @@ -161,7 +154,6 @@ void ScRTFParser::ColAdjust() } } - IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo*, pInfo ) { switch ( pInfo->eState ) @@ -245,7 +237,6 @@ void ScRTFParser::NewCellRow( ImportInfo* /*pInfo*/ ) OSL_ENSURE( pActDefault, "NewCellRow: pActDefault==0" ); } - /* SW: ~~~ diff --git a/sc/source/filter/starcalc/collect.cxx b/sc/source/filter/starcalc/collect.cxx index 6d8da1aa6de6..54b9f15027aa 100644 --- a/sc/source/filter/starcalc/collect.cxx +++ b/sc/source/filter/starcalc/collect.cxx @@ -28,10 +28,8 @@ ScDataObject::~ScDataObject() { } - // Collection - static void lcl_DeleteScDataObjects( ScDataObject** p, sal_uInt16 nCount ) { if ( p ) @@ -74,8 +72,6 @@ ScCollection::~ScCollection() lcl_DeleteScDataObjects( pItems, nCount ); } - - bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject) { if ((nCount < MAXCOLLECTIONSIZE) && (nIndex <= nCount) && pItems) @@ -112,7 +108,6 @@ ScDataObject* ScCollection::At(sal_uInt16 nIndex) const return NULL; } - ScCollection& ScCollection::operator=( const ScCollection& r ) { // Check for self-assignment diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 4bb7f17c620e..af897be2b700 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -78,7 +78,6 @@ using namespace com::sun::star; const SCCOL SC10MAXCOL = 255; // #i85906# don't try to load more columns than there are in the file - /** Those strings are used with SC10TOSTRING() and strcmp() and such, hence need to be 0-terminated. */ static void lcl_ReadFixedString( SvStream& rStream, void* pData, size_t nLen ) @@ -93,7 +92,6 @@ static void lcl_ReadFixedString( SvStream& rStream, void* pData, size_t nLen ) } } - static void lcl_ReadFileHeader(SvStream& rStream, Sc10FileHeader& rFileHeader) { lcl_ReadFixedString( rStream, &rFileHeader.CopyRight, sizeof(rFileHeader.CopyRight)); @@ -101,7 +99,6 @@ static void lcl_ReadFileHeader(SvStream& rStream, Sc10FileHeader& rFileHeader) rStream.Read(&rFileHeader.Reserved, sizeof(rFileHeader.Reserved)); } - static void lcl_ReadTabProtect(SvStream& rStream, Sc10TableProtect& rProtect) { lcl_ReadFixedString( rStream, &rProtect.PassWord, sizeof(rProtect.PassWord)); @@ -109,7 +106,6 @@ static void lcl_ReadTabProtect(SvStream& rStream, Sc10TableProtect& rProtect) rStream.ReadUChar( rProtect.Protect ); } - static void lcl_ReadSheetProtect(SvStream& rStream, Sc10SheetProtect& rProtect) { lcl_ReadFixedString( rStream, &rProtect.PassWord, sizeof(rProtect.PassWord)); @@ -117,7 +113,6 @@ static void lcl_ReadSheetProtect(SvStream& rStream, Sc10SheetProtect& rProtect) rStream.ReadUChar( rProtect.Protect ); } - static void lcl_ReadRGB(SvStream& rStream, Sc10Color& rColor) { rStream.ReadUChar( rColor.Dummy ); @@ -126,21 +121,18 @@ static void lcl_ReadRGB(SvStream& rStream, Sc10Color& rColor) rStream.ReadUChar( rColor.Red ); } - static void lcl_ReadPalette(SvStream& rStream, Sc10Color* pPalette) { for (sal_uInt16 i = 0; i < 16; i++) lcl_ReadRGB(rStream, pPalette[i]); } - static void lcl_ReadValueFormat(SvStream& rStream, Sc10ValueFormat& rFormat) { rStream.ReadUChar( rFormat.Format ); rStream.ReadUChar( rFormat.Info ); } - static void lcl_ReadLogFont(SvStream& rStream, Sc10LogFont& rFont) { rStream.ReadInt16( rFont.lfHeight ); @@ -159,7 +151,6 @@ static void lcl_ReadLogFont(SvStream& rStream, Sc10LogFont& rFont) lcl_ReadFixedString( rStream, &rFont.lfFaceName, sizeof(rFont.lfFaceName)); } - static void lcl_ReadBlockRect(SvStream& rStream, Sc10BlockRect& rBlock) { rStream.ReadInt16( rBlock.x1 ); @@ -168,7 +159,6 @@ static void lcl_ReadBlockRect(SvStream& rStream, Sc10BlockRect& rBlock) rStream.ReadInt16( rBlock.y2 ); } - static void lcl_ReadHeadFootLine(SvStream& rStream, Sc10HeadFootLine& rLine) { lcl_ReadFixedString( rStream, &rLine.Title, sizeof(rLine.Title)); @@ -184,7 +174,6 @@ static void lcl_ReadHeadFootLine(SvStream& rStream, Sc10HeadFootLine& rLine) rStream.ReadUInt16( rLine.Reserved ); } - static void lcl_ReadPageFormat(SvStream& rStream, Sc10PageFormat& rFormat) { lcl_ReadHeadFootLine(rStream, rFormat.HeadLine); @@ -217,7 +206,6 @@ static void lcl_ReadPageFormat(SvStream& rStream, Sc10PageFormat& rFormat) rStream.Read(&rFormat.Reserved, sizeof(rFormat.Reserved)); } - static void lcl_ReadGraphHeader(SvStream& rStream, Sc10GraphHeader& rHeader) { rStream.ReadUChar( rHeader.Typ ); @@ -237,7 +225,6 @@ static void lcl_ReadGraphHeader(SvStream& rStream, Sc10GraphHeader& rHeader) rStream.Read(&rHeader.Reserved, sizeof(rHeader.Reserved)); } - static void lcl_ReadImageHeaer(SvStream& rStream, Sc10ImageHeader& rHeader) { lcl_ReadFixedString( rStream, &rHeader.FileName, sizeof(rHeader.FileName)); @@ -250,7 +237,6 @@ static void lcl_ReadImageHeaer(SvStream& rStream, Sc10ImageHeader& rHeader) rStream.ReadUInt32( rHeader.Size ); } - static void lcl_ReadChartHeader(SvStream& rStream, Sc10ChartHeader& rHeader) { rStream.ReadInt16( rHeader.MM ); @@ -259,7 +245,6 @@ static void lcl_ReadChartHeader(SvStream& rStream, Sc10ChartHeader& rHeader) rStream.ReadUInt32( rHeader.Size ); } - static void lcl_ReadChartSheetData(SvStream& rStream, Sc10ChartSheetData& rSheetData) { rStream.ReadUChar( rSheetData.HasTitle ); @@ -288,7 +273,6 @@ static void lcl_ReadChartSheetData(SvStream& rStream, Sc10ChartSheetData& rSheet rStream.Read(&rSheetData.Reserved, sizeof(rSheetData.Reserved)); } - static void lcl_ReadChartTypeData(SvStream& rStream, Sc10ChartTypeData& rTypeData) { rStream.ReadInt16( rTypeData.NumSets ); @@ -351,7 +335,6 @@ static double lcl_PascalToDouble(sal_Char* tp6) ldexp ((s ? -1.0 : 1.0), be - (129+39))); } - static void lcl_ChangeColor( sal_uInt16 nIndex, Color& rColor ) { ColorData aCol; @@ -385,7 +368,6 @@ static OUString lcl_MakeOldPageStyleFormatName( sal_uInt16 i ) return aName; } - template < typename T > sal_uLong insert_new( ScCollection* pCollection, SvStream& rStream ) { T* pData = new (::std::nothrow) T( rStream); @@ -402,10 +384,8 @@ template < typename T > sal_uLong insert_new( ScCollection* pCollection, SvStrea return nError; } - // Font - Sc10FontData::Sc10FontData(SvStream& rStream) : Height(0) , CharSet(0) @@ -444,10 +424,8 @@ Sc10FontCollection::Sc10FontCollection(SvStream& rStream) } } - // Benannte-Bereiche - Sc10NameData::Sc10NameData(SvStream& rStream) { sal_uInt8 nLen; @@ -465,7 +443,6 @@ Sc10NameData::Sc10NameData(SvStream& rStream) rStream.Read(Reserved, sizeof(Reserved)); } - Sc10NameCollection::Sc10NameCollection(SvStream& rStream) : ScCollection (4, 4), nError (0) @@ -488,7 +465,6 @@ Sc10NameCollection::Sc10NameCollection(SvStream& rStream) : } } - // Vorlagen Sc10PatternData::Sc10PatternData(SvStream& rStream) : Attr(0) @@ -539,10 +515,8 @@ Sc10PatternCollection::Sc10PatternCollection(SvStream& rStream) : } } - // Datenbank - Sc10DataBaseData::Sc10DataBaseData(SvStream& rStream) { lcl_ReadFixedString( rStream, &DataBaseRec.Name, sizeof(DataBaseRec.Name)); @@ -578,7 +552,6 @@ Sc10DataBaseData::Sc10DataBaseData(SvStream& rStream) DataBaseRec.QueryValue2 = ScfTools::ReadLongDouble(rStream); } - Sc10DataBaseCollection::Sc10DataBaseCollection(SvStream& rStream) : ScCollection (4, 4), nError (0) @@ -602,7 +575,6 @@ Sc10DataBaseCollection::Sc10DataBaseCollection(SvStream& rStream) : } } - bool Sc10LogFont::operator==( const Sc10LogFont& rData ) const { return !strcmp( lfFaceName, rData.lfFaceName ) @@ -621,13 +593,11 @@ bool Sc10LogFont::operator==( const Sc10LogFont& rData ) const && lfPitchAndFamily == rData.lfPitchAndFamily; } - bool Sc10Color::operator==( const Sc10Color& rColor ) const { return ((Red == rColor.Red) && (Green == rColor.Green) && (Blue == rColor.Blue)); } - bool Sc10HeadFootLine::operator==( const Sc10HeadFootLine& rData ) const { return !strcmp(Title, rData.Title) @@ -643,7 +613,6 @@ bool Sc10HeadFootLine::operator==( const Sc10HeadFootLine& rData ) const && Reserved == rData.Reserved; } - bool Sc10PageFormat::operator==( const Sc10PageFormat& rData ) const { return !strcmp(PrintAreaName, rData.PrintAreaName) @@ -675,7 +644,6 @@ bool Sc10PageFormat::operator==( const Sc10PageFormat& rData ) const && !memcmp( &PrintArea, &rData.PrintArea, sizeof(PrintArea) ); } - sal_uInt16 Sc10PageCollection::InsertFormat( const Sc10PageFormat& rData ) { for (sal_uInt16 i=0; i<nCount; i++) @@ -687,7 +655,6 @@ sal_uInt16 Sc10PageCollection::InsertFormat( const Sc10PageFormat& rData ) return nCount-1; } - static inline sal_uInt8 GetMixedCol( const sal_uInt8 nB, const sal_uInt8 nF, const sal_uInt16 nFak ) { sal_Int32 nT = nB - nF; @@ -703,7 +670,6 @@ static inline Color GetMixedColor( const Color& rFore, const Color& rBack, sal_u GetMixedCol( rBack.GetBlue(), rFore.GetBlue(), nFact ) ); } - void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) { ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); @@ -907,7 +873,6 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) pSet->Put(SfxBoolItem( ATTR_PAGE_HORCENTER, pPage->HorCenter )); pSet->Put(SfxBoolItem( ATTR_PAGE_VERCENTER, pPage->VerCenter )); - // Area-Parameter: { @@ -919,7 +884,6 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) if ( pPage->RowRepeatStart >= 0 ) pRepeatRow = new ScRange( 0, static_cast<SCROW> (pPage->RowRepeatStart), 0 ); - if ( pRepeatRow || pRepeatCol ) { @@ -936,7 +900,6 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) delete pRepeatCol; } - // Table-Parameter: pSet->Put( SfxBoolItem( ATTR_PAGE_NOTES, pPage->PrintNote ) ); @@ -956,7 +919,6 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) delete pEmptyObject; } - ScDataObject* Sc10PageData::Clone() const { return new Sc10PageData(aPageFormat); @@ -977,7 +939,6 @@ Sc10Import::Sc10Import(SvStream& rStr, ScDocument* pDocument ) : pPrgrsBar = NULL; } - Sc10Import::~Sc10Import() { pDoc->CalcAfterLoad(); @@ -992,7 +953,6 @@ Sc10Import::~Sc10Import() "*Sc10Import::Sc10Import(): Progressbar lebt noch!?" ); } - sal_uLong Sc10Import::Import() { pPrgrsBar = new ScfStreamProgressBar( rStream, pDoc->GetDocumentShell() ); @@ -1034,7 +994,6 @@ sal_uLong Sc10Import::Import() return nError; } - void Sc10Import::LoadFileHeader() { Sc10FileHeader FileHeader; @@ -1055,7 +1014,6 @@ void Sc10Import::LoadFileHeader() } } - void Sc10Import::LoadFileInfo() { Sc10FileInfo FileInfo; @@ -1075,7 +1033,6 @@ void Sc10Import::LoadEditStateInfo() // Achtung Cursorposition und Offset der Tabelle Uebertragen (soll man das machen??) } - void Sc10Import::LoadProtect() { lcl_ReadSheetProtect(rStream, SheetProtect); @@ -1087,7 +1044,6 @@ void Sc10Import::LoadProtect() pDoc->SetDocProtection(&aProtection); } - void Sc10Import::LoadViewColRowBar() { bool bViewColRowBar; @@ -1096,7 +1052,6 @@ void Sc10Import::LoadViewColRowBar() aSc30ViewOpt.SetOption( VOPT_HEADER, bViewColRowBar ); } - void Sc10Import::LoadScrZoom() { // Achtung Zoom ist leider eine 6Byte TP real Zahl (keine Ahnung wie die Umzusetzen ist) @@ -1105,7 +1060,6 @@ void Sc10Import::LoadScrZoom() nError = rStream.GetError(); } - void Sc10Import::LoadPalette() { lcl_ReadPalette(rStream, TextPalette); @@ -1116,7 +1070,6 @@ void Sc10Import::LoadPalette() nError = rStream.GetError(); } - void Sc10Import::LoadFontCollection() { pFontCollection = new Sc10FontCollection(rStream); @@ -1124,7 +1077,6 @@ void Sc10Import::LoadFontCollection() nError = pFontCollection->GetError(); } - void Sc10Import::LoadNameCollection() { pNameCollection = new Sc10NameCollection(rStream); @@ -1132,7 +1084,6 @@ void Sc10Import::LoadNameCollection() nError = pNameCollection->GetError(); } - void Sc10Import::ImportNameCollection() { ScRangeName* pRN = pDoc->GetRangeName(); @@ -1146,7 +1097,6 @@ void Sc10Import::ImportNameCollection() } } - void Sc10Import::LoadPatternCollection() { pPatternCollection = new Sc10PatternCollection( rStream ); @@ -1380,7 +1330,6 @@ void Sc10Import::LoadPatternCollection() } // for (i = 0; i < GetCount() } - void Sc10Import::LoadDataBaseCollection() { pDataBaseCollection = new Sc10DataBaseCollection(rStream); @@ -1405,7 +1354,6 @@ void Sc10Import::LoadDataBaseCollection() } } - void Sc10Import::LoadTables() { Sc10PageCollection aPageCollection; @@ -1454,7 +1402,6 @@ void Sc10Import::LoadTables() nLen = sizeof(TabName) - 1; TabName[nLen] = 0; - rStream.ReadUInt16( Display ); if ( Tab == (sal_Int16)nShowTab ) @@ -1485,7 +1432,6 @@ void Sc10Import::LoadTables() aSc30ViewOpt.SetObjMode( VOBJ_TYPE_DRAW, eObjMode ); } - rStream.ReadUChar( Visible ); nError = rStream.GetError(); @@ -1621,7 +1567,6 @@ void Sc10Import::LoadTables() aPageCollection.PutToDoc( pDoc ); } - void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab) { LoadColAttr(Col, Tab); @@ -1706,7 +1651,6 @@ void Sc10Import::LoadCol(SCCOL Col, SCTAB Tab) } } - void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) { Sc10ColAttr aFont; @@ -2157,7 +2101,6 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) } } - void Sc10Import::LoadAttr(Sc10ColAttr& rAttr) { // rAttr is not reused, otherwise we'd have to delete [] rAttr.pData; @@ -2182,7 +2125,6 @@ void Sc10Import::LoadAttr(Sc10ColAttr& rAttr) } } - void Sc10Import::ChangeFormat(sal_uInt16 nFormat, sal_uInt16 nInfo, sal_uLong& nKey) { // Achtung: Die Formate werden nur auf die StarCalc 3.0 internen Formate gemappt @@ -2325,7 +2267,6 @@ void Sc10Import::ChangeFormat(sal_uInt16 nFormat, sal_uInt16 nInfo, sal_uLong& n } } - void Sc10Import::LoadObjects() { sal_uInt16 ID; diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index d086d727e5c3..08e7416f7f6f 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/embed/XVisualObject.hpp> #include <com/sun/star/embed/Aspects.hpp> - using namespace com::sun::star; #include <unotools/moduleoptions.hxx> @@ -39,10 +38,8 @@ using namespace com::sun::star; #include "drwlayer.hxx" #include "chartarr.hxx" - // 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 ) { diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 8eef7b78501f..bb47f2aa6434 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include <stdio.h> #include <sot/storage.hxx> #include "XclExpChangeTrack.hxx" @@ -55,7 +53,6 @@ static OString lcl_DateTimeToOString( const DateTime& rDateTime ) return OString( sBuf ); } - // local functions static void lcl_WriteDateTime( XclExpStream& rStrm, const DateTime& rDateTime ) diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index b5a6d722bb5e..b6e4180fc76b 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XclImpChangeTrack.hxx" #include <sot/storage.hxx> #include <svl/zforlist.hxx> @@ -30,7 +29,6 @@ #include "externalrefmgr.hxx" #include "document.hxx" - // class XclImpChangeTrack XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStream& rBookStrm ) : @@ -497,7 +495,6 @@ void XclImpChangeTrack::Apply() } } - // class XclImpChTrFmlConverter XclImpChTrFmlConverter::XclImpChTrFmlConverter( diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 3e7f6ee29edf..b378c4a1b3e2 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/embed/XClassifiedObject.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> @@ -108,7 +107,6 @@ XclEscherEx::XclEscherEx( const XclExpRoot& rRoot, XclExpObjectManager& rObjMgr, InsertPersistOffset( mnNextKey, 0 ); } - XclEscherEx::~XclEscherEx() { OSL_ENSURE( !aStack.empty(), "~XclEscherEx: stack not empty" ); @@ -116,7 +114,6 @@ XclEscherEx::~XclEscherEx() delete pTheClientData; } - sal_uInt32 XclEscherEx::InitNextDffFragment() { /* Current value of mnNextKey will be used by caller to refer to the @@ -347,7 +344,6 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape return pCurrAppData; } - void XclEscherEx::EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) { // own escher data created? -> never delete such objects @@ -395,7 +391,6 @@ void XclEscherEx::EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) nAdditionalText = 0; } - EscherExHostAppData* XclEscherEx::EnterAdditionalTextGroup() { nAdditionalText = 1; @@ -530,7 +525,6 @@ void XclEscherClientData::WriteData( EscherEx& rEx ) const rEx.AddAtom( 0, ESCHER_ClientData ); } - // --- class XclEscherClientTextbox ------------------------------------- XclEscherClientTextbox::XclEscherClientTextbox( const XclExpRoot& rRoot, @@ -542,7 +536,6 @@ XclEscherClientTextbox::XclEscherClientTextbox( const XclExpRoot& rRoot, { } - void XclEscherClientTextbox::WriteData( EscherEx& /*rEx*/ ) const { pXclObj->SetText( GetRoot(), rTextObj ); diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 17fda19b1ad1..e28bccf69353 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdpool.hxx> #include <svx/sdtaitm.hxx> #include <svx/svdotext.hxx> @@ -175,7 +174,6 @@ static bool IsVmlObject( const XclObj *rObj ) } } - static sal_Int32 GetVmlObjectCount( XclExpObjList& rList ) { sal_Int32 nNumVml = 0; @@ -188,7 +186,6 @@ static sal_Int32 GetVmlObjectCount( XclExpObjList& rList ) return nNumVml; } - static void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32& nDrawingMLCount ) { sal_Int32 nVmlObjects = GetVmlObjectCount( rList ); @@ -229,7 +226,6 @@ static void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, rStrm.PopStream(); } - static void SaveVmlObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32& nVmlCount ) { if( GetVmlObjectCount( rList ) == 0 ) @@ -270,7 +266,6 @@ static void SaveVmlObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_In rStrm.PopStream(); } - void XclExpObjList::SaveXml( XclExpXmlStream& rStrm ) { if( pSolverContainer ) @@ -283,7 +278,6 @@ void XclExpObjList::SaveXml( XclExpXmlStream& rStrm ) SaveVmlObjects( *this, rStrm, mnVmlCount ); } - void XclExpObjList::ResetCounters() { mnDrawingMLCount = 0; @@ -496,7 +490,6 @@ void XclObjComment::ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle& { EscherPropertyContainer aPropOpt; - lcl_FillProps( aPropOpt, pCaption, bVisible ); nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked @@ -545,7 +538,6 @@ protected: virtual void EndShape( sal_Int32 nShapeElement ) SAL_OVERRIDE; }; - VmlCommentExporter::VmlCommentExporter( sax_fastparser::FSHelperPtr p, ScAddress aScPos, SdrCaptionObj* pCaption, bool bVisible, Rectangle &aFrom, Rectangle &aTo ) : VMLExport( p ) @@ -617,7 +609,6 @@ void XclObjComment::SaveXml( XclExpXmlStream& rStrm ) aCommentExporter.AddSdrObject( *mpCaption ); } - // --- class XclObjDropDown ------------------------------------------ XclObjDropDown::XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, bool bFilt ) : @@ -963,7 +954,6 @@ void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const Reference< XShape >& aRange.aEnd.Col()-1, aRange.aEnd.Row()-1, nTab ); - pDrawing->startElement( FSNS( XML_xdr, XML_from ), FSEND ); XclXmlUtils::WriteElement( pDrawing, FSNS( XML_xdr, XML_col ), (sal_Int32) aRange.aStart.Col() ); @@ -1005,7 +995,6 @@ GetEditAs( XclObjAny& rObj ) return "absolute"; } - void XclObjAny::SaveXml( XclExpXmlStream& rStrm ) { // ignore group shapes at the moment, we don't process them correctly @@ -1041,19 +1030,16 @@ void ExcBof8_Base::SaveCont( XclExpStream& rStrm ) << nFileHistory << nLowestBiffVer; } - sal_uInt16 ExcBof8_Base::GetNum() const { return 0x0809; } - sal_Size ExcBof8_Base::GetLen() const { return 16; } - // --- class ExcBof8 ------------------------------------------------- ExcBof8::ExcBof8() @@ -1061,7 +1047,6 @@ ExcBof8::ExcBof8() nDocType = 0x0010; } - // --- class ExcBofW8 ------------------------------------------------ ExcBofW8::ExcBofW8() @@ -1069,7 +1054,6 @@ ExcBofW8::ExcBofW8() nDocType = 0x0005; } - // --- class ExcBundlesheet8 ----------------------------------------- ExcBundlesheet8::ExcBundlesheet8( RootData& rRootData, SCTAB _nTab ) : @@ -1078,16 +1062,12 @@ ExcBundlesheet8::ExcBundlesheet8( RootData& rRootData, SCTAB _nTab ) : { } - ExcBundlesheet8::ExcBundlesheet8( const OUString& rString ) : ExcBundlesheetBase(), sUnicodeName( rString ) { } - - - void ExcBundlesheet8::SaveCont( XclExpStream& rStrm ) { m_nOwnPos = rStrm.GetSvStreamPos(); @@ -1098,13 +1078,11 @@ void ExcBundlesheet8::SaveCont( XclExpStream& rStrm ) rStrm << nGrbit << GetName(); } - sal_Size ExcBundlesheet8::GetLen() const { // Text max 255 chars return 8 + GetName().GetBufferSize(); } - void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm ) { OUString sId; @@ -1131,32 +1109,27 @@ sal_uInt16 XclObproj::GetNum() const return 0x00D3; } - sal_Size XclObproj::GetLen() const { return 0; } - // ---- class XclCodename -------------------------------------------- XclCodename::XclCodename( const OUString& r ) : aName( r ) { } - void XclCodename::SaveCont( XclExpStream& rStrm ) { rStrm << aName; } - sal_uInt16 XclCodename::GetNum() const { return 0x01BA; } - sal_Size XclCodename::GetLen() const { return aName.GetSize(); @@ -1192,7 +1165,6 @@ void ExcEScenarioCell::SaveXml( XclExpXmlStream& rStrm ) const FSEND ); } - ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) { OUString sTmpName; @@ -1321,7 +1293,6 @@ void ExcEScenario::SaveXml( XclExpXmlStream& rStrm ) rWorkbook->endElement( XML_scenario ); } - ExcEScenarioManager::ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ) : nActive( 0 ) { @@ -1506,25 +1477,21 @@ void XclCalccount::SaveCont( XclExpStream& rStrm ) rStrm << nCount; } - XclCalccount::XclCalccount( const ScDocument& rDoc ) { nCount = rDoc.GetDocOptions().GetIterCount(); } - sal_uInt16 XclCalccount::GetNum() const { return 0x000C; } - sal_Size XclCalccount::GetLen() const { return 2; } - void XclCalccount::SaveXml( XclExpXmlStream& rStrm ) { rStrm.WriteAttributes( @@ -1532,31 +1499,26 @@ void XclCalccount::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - void XclIteration::SaveCont( XclExpStream& rStrm ) { rStrm << nIter; } - XclIteration::XclIteration( const ScDocument& rDoc ) { nIter = rDoc.GetDocOptions().IsIter()? 1 : 0; } - sal_uInt16 XclIteration::GetNum() const { return 0x0011; } - sal_Size XclIteration::GetLen() const { return 2; } - void XclIteration::SaveXml( XclExpXmlStream& rStrm ) { rStrm.WriteAttributes( @@ -1564,7 +1526,6 @@ void XclIteration::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } - void XclDelta::SaveCont( XclExpStream& rStrm ) { rStrm << fDelta; @@ -1575,19 +1536,16 @@ XclDelta::XclDelta( const ScDocument& rDoc ) fDelta = rDoc.GetDocOptions().GetIterEps(); } - sal_uInt16 XclDelta::GetNum() const { return 0x0010; } - sal_Size XclDelta::GetLen() const { return 8; } - void XclDelta::SaveXml( XclExpXmlStream& rStrm ) { rStrm.WriteAttributes( diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index 5a2d35f089a7..5fbbf75e2565 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include "XMLCellRangeSourceContext.hxx" #include <sax/tools/converter.hxx> @@ -28,7 +26,6 @@ using namespace ::com::sun::star; - ScMyImpCellRangeSource::ScMyImpCellRangeSource() : nColumns( 0 ), nRows( 0 ), @@ -36,7 +33,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 5b6191c726df..95a93c17cf5c 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -24,7 +24,6 @@ class ScXMLImport; - struct ScMyImpCellRangeSource { OUString sSourceStr; @@ -38,7 +37,6 @@ struct ScMyImpCellRangeSource ScMyImpCellRangeSource(); }; - class ScXMLCellRangeSourceContext : public SvXMLImportContext { private: @@ -63,7 +61,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 78a56e400838..76cfdc1cc195 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx @@ -279,7 +279,6 @@ void ScChangeTrackingExportHelper::SetValueAttributes(const double& fValue, cons } } - void ScChangeTrackingExportHelper::WriteValueCell(const ScCellValue& rCell, const OUString& sValue) { OSL_ASSERT(rCell.meType == CELLTYPE_VALUE); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index 9fb21cb029d7..ee54d244c099 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx @@ -152,7 +152,6 @@ ScMyMoveAction::~ScMyMoveAction() delete pMoveRanges; } - ScMyContentAction::ScMyContentAction() : ScMyBaseAction(SC_CAT_CONTENT), pCellInfo(NULL) diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index e86f5349cac5..dfc677ed4778 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx @@ -22,7 +22,6 @@ using namespace com::sun::star; - bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, OUString& rCodeName ) { uno::Sequence<beans::PropertyValue> aProps; @@ -47,7 +46,6 @@ bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, OUString& rCodeNam return false; } - XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) : mpDoc( pDoc ), msDocName( "*doc*" ), diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index 5c53643a6abc..e211505ca80b 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include "XMLConsolidationContext.hxx" #include "document.hxx" #include "rangeutl.hxx" @@ -30,7 +28,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 3f2f7e2306b0..ba53c2f4af38 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -26,7 +26,6 @@ class ScXMLImport; - class ScXMLConsolidationContext : public SvXMLImportContext { private: @@ -58,7 +57,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index b2ff92a0c1fa..7f08774cdd75 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XMLConverter.hxx" #include <com/sun/star/util/DateTime.hpp> #include <tools/datetime.hxx> @@ -33,7 +32,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel ) { if (xModel.is()) @@ -100,7 +98,6 @@ ScSubTotalFunc ScXMLConverter::GetSubTotalFuncFromString( const OUString& sFunct return SUBTOTAL_FUNC_NONE; } - void ScXMLConverter::GetStringFromFunction( OUString& rString, const sheet::GeneralFunction eFunction, @@ -157,7 +154,6 @@ void ScXMLConverter::GetStringFromFunction( ScRangeStringConverter::AssignString( rString, sFuncStr, bAppendStr ); } - sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString( const OUString& rString ) { @@ -172,7 +168,6 @@ sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString( return sheet::DataPilotFieldOrientation_HIDDEN; } - void ScXMLConverter::GetStringFromOrientation( OUString& rString, const sheet::DataPilotFieldOrientation eOrientation, @@ -204,7 +199,6 @@ void ScXMLConverter::GetStringFromOrientation( ScRangeStringConverter::AssignString( rString, sOrientStr, bAppendStr ); } - ScDetectiveObjType ScXMLConverter::GetDetObjTypeFromString( const OUString& rString ) { if( IsXMLToken(rString, XML_FROM_SAME_TABLE ) ) @@ -233,7 +227,6 @@ bool ScXMLConverter::GetDetOpTypeFromString( ScDetOpType& rDetOpType, const OUSt return true; } - void ScXMLConverter::GetStringFromDetObjType( OUString& rString, const ScDetectiveObjType eObjType, @@ -286,7 +279,6 @@ void ScXMLConverter::GetStringFromDetOpType( ScRangeStringConverter::AssignString( rString, sTypeStr, bAppendStr ); } - void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) { OUStringBuffer sBuffer(sFormula.getLength()); @@ -318,7 +310,6 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) sFormula = sBuffer.makeStringAndClear(); } - void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate) { util::DateTime aAPIDateTime; diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index f96a403005bf..f9891cd4ff43 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -34,7 +34,6 @@ class ScDocument; class DateTime; - class ScXMLConverter { public: diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index f9996a6d98ae..8dba4945fccb 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -30,7 +30,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 6db5bc1f10a2..c01c7cb9643c 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #include "XMLDetectiveContext.hxx" #include <sax/tools/converter.hxx> @@ -34,7 +32,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - ScMyImpDetectiveObj::ScMyImpDetectiveObj() : aSourceRange(), eObjType( SC_DETOBJ_NONE ), @@ -62,7 +59,6 @@ bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp ) return true; } - ScXMLDetectiveContext::ScXMLDetectiveContext( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -104,7 +100,6 @@ void ScXMLDetectiveContext::EndElement() { } - ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -183,7 +178,6 @@ void ScXMLDetectiveHighlightedContext::EndElement() pDetectiveObjVec->push_back( aDetectiveObj ); } - ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 023220424e60..12b0265abc10 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -29,7 +29,6 @@ class ScXMLImport; - struct ScMyImpDetectiveObj { ScRange aSourceRange; @@ -41,7 +40,6 @@ struct ScMyImpDetectiveObj typedef ::std::vector< ScMyImpDetectiveObj > ScMyImpDetectiveObjVec; - struct ScMyImpDetectiveOp { ScAddress aPosition; @@ -75,7 +73,6 @@ public: bool GetFirstOp( ScMyImpDetectiveOp& rDetOp ); }; - class ScXMLDetectiveContext : public SvXMLImportContext { private: @@ -101,7 +98,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - class ScXMLDetectiveHighlightedContext : public SvXMLImportContext { private: @@ -130,7 +126,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - class ScXMLDetectiveOperationContext : public SvXMLImportContext { private: @@ -157,7 +152,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx index 6cb8755d4825..9e6d77464e15 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.hxx +++ b/sc/source/filter/xml/XMLExportDDELinks.hxx @@ -39,5 +39,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index a863e58424f0..9f9307e2acc5 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -55,7 +55,6 @@ void ScMyIteratorBase::UpdateAddress( table::CellAddress& rCellAddress ) } } - bool ScMyShape::operator<(const ScMyShape& aShape) const { if( aAddress.Tab() != aShape.aAddress.Tab() ) @@ -183,7 +182,6 @@ bool ScMyMergedRange::operator<(const ScMyMergedRange& aRange) const return (aCellRange.StartColumn < aRange.aCellRange.StartColumn); } - ScMyMergedRangesContainer::ScMyMergedRangesContainer() : aRangeList() { @@ -693,7 +691,6 @@ void ScMyNotEmptyCellsIterator::HasAnnotation(ScMyCell& aCell) } } - void ScMyNotEmptyCellsIterator::SetCurrentTable(const SCTAB nTable, uno::Reference<sheet::XSpreadsheet>& rxTable) { diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 31566c85b396..fa3f6e81ce86 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -678,13 +678,11 @@ sal_Int32 ScRowFormatRanges::GetMaxRows() const return nMaxRows; } - void ScRowFormatRanges::Sort() { aRowFormatRanges.sort(); } - ScMyFormatRange::ScMyFormatRange() : nStyleNameIndex(-1) , nValidationIndex(-1) diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index 6d48a61585c8..f88bf6e516b2 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx @@ -33,7 +33,6 @@ using namespace ::com::sun::star::text; using namespace ::com::sun::star::beans; using namespace xmloff::token; - TYPEINIT1( XMLTableHeaderFooterContext, SvXMLImportContext ); XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index 2ad8d9b8539c..abcc4687cecd 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLEHEADERFOOTERCONTEXT_HXX #define INCLUDED_SC_SOURCE_FILTER_XML_XMLTABLEHEADERFOOTERCONTEXT_HXX - #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> #include <com/sun/star/sheet/XHeaderFooterContent.hpp> @@ -101,7 +100,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx index 9700b5d03ff1..a541d3ed819b 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx @@ -53,7 +53,6 @@ public: virtual ~XMLTableMasterPageExport(); }; - #endif // _XMLOFF_XMLTABLEMASTERPAGEEXPORT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 4d3010a5c584..32a9fe0b761e 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx @@ -40,7 +40,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - XMLTableShapeImportHelper::XMLTableShapeImportHelper( ScXMLImport& rImp, SvXMLImportPropertyMapper *pImpMapper ) : XMLShapeImportHelper(rImp, rImp.GetModel(), pImpMapper ), diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index 497aa1a694d2..de9ac029d0b3 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -42,7 +42,6 @@ public: const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) SAL_OVERRIDE; - void SetCell (const ::com::sun::star::table::CellAddress& rAddress) { aStartCell = rAddress; } void SetOnTable (const bool bTempOnTable) { bOnTable = bTempOnTable; } void SetAnnotation(ScXMLAnnotationContext* pAnnotation) { pAnnotationContext = pAnnotation; } @@ -50,7 +49,6 @@ public: ScXMLAnnotationContext* GetAnnotationContext() const { return pAnnotationContext; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index fb13ac11702e..90e3b9cc9c98 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "XMLTrackedChangesContext.hxx" #include "xmlimprt.hxx" #include "xmlconti.hxx" @@ -39,7 +38,6 @@ using namespace com::sun::star; using namespace xmloff::token; - class ScXMLChangeInfoContext : public SvXMLImportContext { ScMyActionInfo aInfo; diff --git a/sc/source/filter/xml/cachedattraccess.cxx b/sc/source/filter/xml/cachedattraccess.cxx index cf69ec00595a..334e154b2f13 100644 --- a/sc/source/filter/xml/cachedattraccess.cxx +++ b/sc/source/filter/xml/cachedattraccess.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "cachedattraccess.hxx" #include "document.hxx" diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 74ac1deefdbc..4d78337b996a 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -255,7 +255,6 @@ bool ScSheetSaveData::AddLoadedNamespaces( SvXMLNamespaceMap& rNamespaces ) cons return true; // success } - void ScSheetSaveData::SetInSupportedSave( bool bSet ) { mbInSupportedSave = bSet; diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index 35d05c9e386e..d107b132d1e4 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -106,7 +106,6 @@ private: ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 56dba8c2d2af..1b074b99123a 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -52,7 +52,6 @@ #include <boost/scoped_ptr.hpp> - using namespace com::sun::star; using namespace xmloff::token; diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index def27a91e78f..8ad56505672a 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -1500,7 +1500,6 @@ bool ScXMLTableRowCellContext::IsPossibleErrorString() const return mbPossibleErrorCell || ( mbCheckWithCompilerForError && GetScImport().IsFormulaErrorConstant(*maStringValue) ); } - void ScXMLTableRowCellContext::EndElement() { HasSpecialCaseFormulaText(); diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx index 548b07678a9b..8ddb53751982 100644 --- a/sc/source/filter/xml/xmlcondformat.cxx +++ b/sc/source/filter/xml/xmlcondformat.cxx @@ -20,7 +20,6 @@ #include "XMLConverter.hxx" #include "stylehelper.hxx" - ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName): SvXMLImportContext( rImport, nPrfx, rLName ) diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index 4b54272cefce..26d83fab318d 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -75,7 +75,6 @@ public: virtual ~ScXMLColorScaleFormatContext() {} - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< @@ -98,7 +97,6 @@ public: virtual ~ScXMLDataBarFormatContext() {} - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< @@ -126,7 +124,6 @@ public: virtual ~ScXMLIconSetFormatContext() {} - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 3840a78e281e..d1e181c2776a 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -54,7 +54,6 @@ using namespace xmloff::token; 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/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 828cd99d1a19..60630518b6da 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -427,7 +427,6 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInsta return (cppu::OWeakObject*)new ScXMLExport(comphelper::getComponentContext(rSMgr), ScXMLOasisExport_Settings_getImplementationName(), EXPORT_SETTINGS|EXPORT_OASIS); } - class ScXMLShapeExport : public XMLShapeExport { public: @@ -460,7 +459,6 @@ sal_Int16 ScXMLExport::GetFieldUnit() return xProperties->getMetric(); } - // #110680# ScXMLExport::ScXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, @@ -552,7 +550,6 @@ ScXMLExport::ScXMLExport( } } - ScXMLExport::~ScXMLExport() { delete pGroupColumns; @@ -4888,7 +4885,6 @@ void ScXMLExport::GetViewSettings(uno::Sequence<beans::PropertyValue>& rProps) GetChangeTrackViewSettings(rProps); } - void ScXMLExport::GetConfigurationSettings(uno::Sequence<beans::PropertyValue>& rProps) { if (GetModel().is()) diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 40f7c6bcefe3..ef42111b0bc3 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -211,7 +211,6 @@ class ScXMLExport : public SvXMLExport void WriteExternalRefCaches(); void WriteConsolidation(); // core implementation - void CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uInt16 nAttrib); void AddStyleFromCells( diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index acc062027607..5c817fa929d1 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -230,16 +230,6 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap() return *pTableRowCellAttrTokenMap; } - - - - - - - - - - // NB: virtually inherit so we can multiply inherit properly // in ScXMLFlatDocContext_Impl class ScXMLDocContext_Impl : public virtual SvXMLImportContext @@ -302,7 +292,6 @@ SvXMLMetaDocumentContext(i_rImport, i_nPrefix, i_rLName, ScXMLFlatDocContext_Impl::~ScXMLFlatDocContext_Impl() { } - SvXMLImportContext *ScXMLFlatDocContext_Impl::CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) @@ -427,7 +416,6 @@ const SvXMLTokenMap& ScXMLImport::GetDocElemTokenMap() return *pDocElemTokenMap; } - const SvXMLTokenMap& ScXMLImport::GetBodyElemTokenMap() { if( !pBodyElemTokenMap ) @@ -1944,7 +1932,6 @@ void ScXMLImport::SetPostProcessData( sc::ImportPostProcessData* p ) mpPostProcessData = p; } - sc::PivotTableSources& ScXMLImport::GetPivotTableSources() { if (!mpPivotSources) @@ -3326,7 +3313,6 @@ void ScXMLImport::LockSolarMutex() ++nSolarMutexLocked; } - void ScXMLImport::UnlockSolarMutex() { if (nSolarMutexLocked > 0) diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 8f28ea9c648d..68851fe45bad 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -968,7 +968,6 @@ class ScXMLImport: public SvXMLImport, boost::noncopyable bool mbImportStyles; bool mbHasNewCondFormatData; - protected: // This method is called after the namespace map has been updated, but diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 4b53ea791549..82cc26d23c4c 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "xmllabri.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> @@ -26,7 +25,6 @@ using namespace ::com::sun::star; using namespace xmloff::token; - ScXMLLabelRangesContext::ScXMLLabelRangesContext( ScXMLImport& rImport, sal_uInt16 nPrefix, @@ -66,7 +64,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 5eec7c6f3b32..c384e9960538 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -23,7 +23,6 @@ class ScXMLImport; - class ScXMLLabelRangesContext : public SvXMLImportContext { private: @@ -47,7 +46,6 @@ public: virtual void EndElement() SAL_OVERRIDE; }; - class ScXMLLabelRangeContext : public SvXMLImportContext { private: diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index 02d30df74d28..9e44757cee16 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.cxx @@ -34,7 +34,6 @@ using namespace com::sun::star; using namespace xmloff::token; - ScXMLTableScenarioContext::ScXMLTableScenarioContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index b73cddab22de..905719034495 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.cxx @@ -808,7 +808,6 @@ ScXMLAutoStylePoolP::~ScXMLAutoStylePoolP() { } - void ScXMLStyleExport::exportStyleAttributes( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & rStyle ) @@ -1160,7 +1159,6 @@ bool XmlScPropHdl_PrintContent::exportXML( return bRetval; } - XmlScPropHdl_JustifyMethod::~XmlScPropHdl_JustifyMethod() { } diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 5ccdf9bcf50b..b9fead1a393a 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -541,7 +541,6 @@ void XMLTableStyleContext::ApplyCondFormat( const uno::Sequence<table::CellRange mbDeleteCondFormat = false; } - } void XMLTableStyleContext::FillPropertySet( @@ -926,7 +925,6 @@ sal_Int32 XMLTableStylesContext::GetIndex(const sal_Int16 nContextID) return -1; } - TYPEINIT1( ScXMLMasterStylesContext, SvXMLStylesContext ); bool ScXMLMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 065e47e453b0..1b59c8ea18ab 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -272,7 +272,6 @@ public: ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index 40cea682b691..e3f159b08f7e 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -53,7 +53,6 @@ using namespace com::sun::star; - ScXMLTabProtectionData::ScXMLTabProtectionData() : meHash1(PASSHASH_SHA1), meHash2(PASSHASH_UNSPECIFIED), diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index e51fc51b658a..ee158d57b5e5 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -75,7 +75,6 @@ using namespace com::sun::star; - ScXMLImportWrapper::ScXMLImportWrapper( ScDocShell& rDocSh, SfxMedium* pM, const uno::Reference < embed::XStorage >& xStor ) : mrDocShell(rDocSh), rDoc(rDocSh.GetDocument()), @@ -986,6 +985,4 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly) return false; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxx index e20d234819a7..5dd4f22784fb 100644 --- a/sc/source/ui/Accessibility/AccessibilityHints.cxx +++ b/sc/source/ui/Accessibility/AccessibilityHints.cxx @@ -23,10 +23,8 @@ using namespace ::com::sun::star; TYPEINIT1(ScAccWinFocusLostHint, SfxHint); - // ScAccWinFocusLostHint - the current window lost its focus (to another application, view or document) - ScAccWinFocusLostHint::ScAccWinFocusLostHint( const uno::Reference< uno::XInterface >& xOld ) : @@ -40,10 +38,8 @@ ScAccWinFocusLostHint::~ScAccWinFocusLostHint() TYPEINIT1(ScAccWinFocusGotHint, SfxHint); - // ScAccWinFocusGotHint - the window got the focus (from another application, view or document) - ScAccWinFocusGotHint::ScAccWinFocusGotHint( const uno::Reference< uno::XInterface >& xNew ) : @@ -55,13 +51,10 @@ ScAccWinFocusGotHint::~ScAccWinFocusGotHint() { } - TYPEINIT1(ScAccGridWinFocusLostHint, SfxHint); - // ScAccGridWinFocusLostHint - the current grid window lost its focus (to another application, view or document) - ScAccGridWinFocusLostHint::ScAccGridWinFocusLostHint(ScSplitPos eOld, const uno::Reference< uno::XInterface >& xOld ) : @@ -76,10 +69,8 @@ ScAccGridWinFocusLostHint::~ScAccGridWinFocusLostHint() TYPEINIT1(ScAccGridWinFocusGotHint, SfxHint); - // ScAccGridWinFocusGotHint - the grid window got the focus (from another application, view or document) - ScAccGridWinFocusGotHint::ScAccGridWinFocusGotHint(ScSplitPos eNew, const uno::Reference< uno::XInterface >& xNew ) : diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 8022fa6d6893..9fd32a04e7ca 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -21,7 +21,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include "AccessibleText.hxx" #include "AccessibleDocument.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index b8f90b2adb51..1ad86a414267 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -50,7 +50,6 @@ ScAccessibleContextBase::ScAccessibleContextBase( { } - ScAccessibleContextBase::~ScAccessibleContextBase(void) { if (!IsDefunc() && !rBHelper.bInDispose) diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 335d69708bb4..3aa3fbb818f5 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -62,7 +62,6 @@ using ::com::sun::star::lang::IllegalArgumentException; 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; @@ -98,7 +97,6 @@ void SAL_CALL ScAccessibleCsvControl::disposing() ScAccessibleContextBase::disposing(); } - // XAccessibleComponent ------------------------------------------------------- Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint( const AwtPoint& /* rPoint */ ) @@ -122,7 +120,6 @@ void SAL_CALL ScAccessibleCsvControl::grabFocus() throw( RuntimeException, std:: implGetControl().GrabFocus(); } - // events --------------------------------------------------------------------- void ScAccessibleCsvControl::SendFocusEvent( bool bFocused ) @@ -169,7 +166,6 @@ void ScAccessibleCsvControl::SendRemoveColumnEvent( sal_uInt32 /* nFirstColumn * OSL_FAIL( "ScAccessibleCsvControl::SendRemoveColumnEvent - Illegal call" ); } - // helpers -------------------------------------------------------------------- Rectangle ScAccessibleCsvControl::GetBoundingBoxOnScreen() const throw( RuntimeException, std::exception ) @@ -260,7 +256,6 @@ Point ScAccessibleCsvControl::implGetAbsPos( const Point& rPos ) const return rPos + implGetControl().GetWindowExtentsRelative( NULL ).TopLeft(); } - // Ruler ====================================================================== /** Converts a ruler cursor position to API text index. */ @@ -404,7 +399,6 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleSta return pStateSet; } - // XAccessibleText ------------------------------------------------------------ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeException, std::exception ) @@ -702,7 +696,6 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::copyText( sal_Int32 /* nStartIndex */, s return false; } - // XInterface ----------------------------------------------------------------- Any SAL_CALL ScAccessibleCsvRuler::queryInterface( const ::com::sun::star::uno::Type& rType ) @@ -722,7 +715,6 @@ void SAL_CALL ScAccessibleCsvRuler::release() throw () ScAccessibleCsvControl::release(); } - // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeException, std::exception ) @@ -730,7 +722,6 @@ OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeEx return OUString( RULER_IMPL_NAME ); } - // XTypeProvider -------------------------------------------------------------- Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception ) @@ -745,7 +736,6 @@ Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId() throw( return css::uno::Sequence<sal_Int8>(); } - // events --------------------------------------------------------------------- void ScAccessibleCsvRuler::SendCaretEvent() @@ -761,7 +751,6 @@ void ScAccessibleCsvRuler::SendCaretEvent() } } - // helpers -------------------------------------------------------------------- OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName() throw( RuntimeException, std::exception ) @@ -848,7 +837,6 @@ sal_Int32 ScAccessibleCsvRuler::implGetLastEqualFormatted( sal_Int32 nApiPos ) return nApiPos; } - // Grid ======================================================================= /** Converts a grid columnm index to an API column index. */ @@ -873,7 +861,6 @@ ScAccessibleCsvGrid::~ScAccessibleCsvGrid() implDispose(); } - // XAccessibleComponent ------------------------------------------------------- Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( const AwtPoint& rPoint ) @@ -964,7 +951,6 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStat return pStateSet; } - // XAccessibleTable ----------------------------------------------------------- sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowCount() throw( RuntimeException, std::exception ) @@ -1126,7 +1112,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildInd return implGetColumn( nChildIndex ); } - // XAccessibleSelection ------------------------------------------------------- void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex ) @@ -1200,7 +1185,6 @@ void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedC implSelectColumn( nColumn, false ); } - // XInterface ----------------------------------------------------------------- Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const ::com::sun::star::uno::Type& rType ) @@ -1220,7 +1204,6 @@ void SAL_CALL ScAccessibleCsvGrid::release() throw () ScAccessibleCsvControl::release(); } - // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeException, std::exception ) @@ -1228,7 +1211,6 @@ OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeExc return OUString( GRID_IMPL_NAME ); } - // XTypeProvider -------------------------------------------------------------- Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception ) @@ -1244,7 +1226,6 @@ Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId() throw( return css::uno::Sequence<sal_Int8>(); } - // events --------------------------------------------------------------------- void ScAccessibleCsvGrid::SendFocusEvent( bool bFocused ) @@ -1304,7 +1285,6 @@ void ScAccessibleCsvGrid::SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uI } } - // helpers -------------------------------------------------------------------- OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName() throw( RuntimeException, std::exception ) @@ -1393,7 +1373,6 @@ OUString ScAccessibleCsvGrid::implGetCellText( sal_Int32 nRow, sal_Int32 nColumn return aCellStr; } - ScAccessibleCsvControl* ScAccessibleCsvGrid::implCreateCellObj( sal_Int32 nRow, sal_Int32 nColumn ) const { return new ScAccessibleCsvCell( implGetGrid(), implGetCellText( nRow, nColumn ), nRow, nColumn ); @@ -1424,7 +1403,6 @@ void SAL_CALL ScAccessibleCsvCell::disposing() ScAccessibleCsvControl::disposing(); } - // XAccessibleComponent ------------------------------------------------------- void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException, std::exception ) diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 981822210371..262eff3314bb 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -884,7 +884,6 @@ void ScChildrenShapes::Deselect(sal_Int32 nChildIndex) } } - SdrPage* ScChildrenShapes::GetDrawPage() const { SCTAB nTab(mpAccessibleDocument->getVisibleTable()); @@ -1268,7 +1267,6 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, b } } - if (!xSelectionSupplier.is()) throw uno::RuntimeException(); @@ -1885,7 +1883,6 @@ OUString SAL_CALL if (aFileName.isEmpty()) aFileName = pObjSh->GetTitle(SFX_TITLE_APINAME); - if (!aFileName.isEmpty()) { OUString aReadOnly; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 8c24d1dd4659..ffa2ba401caa 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleDocumentPagePreview.hxx" #include "AccessiblePreviewTable.hxx" #include "AccessiblePageHeader.hxx" @@ -64,7 +63,6 @@ using namespace ::com::sun::star::accessibility; typedef std::list< uno::Reference< XAccessible > > ScXAccList; - struct ScAccNote { OUString maNoteText; @@ -212,7 +210,6 @@ void ScNotesChildren::Init(const Rectangle& rVisRect, sal_Int32 nOffset) } } - struct ScParaFound { sal_Int32 mnIndex; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index b2397905bcdc..cefd8621a1f0 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleGlobal.hxx" #include "AccessibleFilterMenu.hxx" #include "AccessibleFilterMenuItem.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index be6e36117580..0aa168eb9f45 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleGlobal.hxx" #include "AccessibleFilterMenuItem.hxx" #include "checklistmenu.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index 69208b601dad..93809679fbcd 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleFilterTopWindow.hxx" #include "AccessibleFilterMenu.hxx" #include "checklistmenu.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleGlobal.cxx b/sc/source/ui/Accessibility/AccessibleGlobal.cxx index 69c91d22f285..16bcb15cffad 100644 --- a/sc/source/ui/Accessibility/AccessibleGlobal.cxx +++ b/sc/source/ui/Accessibility/AccessibleGlobal.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleGlobal.hxx" using ::com::sun::star::uno::RuntimeException; diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index b2828b781832..cd202683ba61 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessiblePageHeader.hxx" #include "AccessiblePageHeaderArea.hxx" #include "AccessibilityHints.hxx" diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 78f1b3af1fca..f8e0e99726a8 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include "AccessiblePreviewTable.hxx" #include "AccessiblePreviewCell.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 246e09ac0876..be6ab391cb72 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -31,7 +31,6 @@ #include <comphelper/servicehelper.hxx> #include <vcl/svapp.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index a1c28d3b07ab..a6bf37e629f8 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <editeng/eeitem.hxx> @@ -44,7 +43,6 @@ #include <svx/algitem.hxx> #include <vcl/svapp.hxx> - class ScViewForwarder : public SvxViewForwarder { ScTabViewShell* mpViewShell; @@ -963,7 +961,6 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell) return pDocSh; } - ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, bool isClone) : mpViewForwarder(NULL), @@ -1237,7 +1234,6 @@ void ScAccessibleEditLineTextData::EndEdit() mpEditView = NULL; } - // ScAccessiblePreviewCellTextData: shared data between sub objects of a accessible cell text object ScAccessiblePreviewCellTextData::ScAccessiblePreviewCellTextData(ScPreviewShell* pViewShell, @@ -1312,7 +1308,6 @@ ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewSh return pDocSh; } - // ScAccessiblePreviewHeaderCellTextData: shared data between sub objects of a accessible cell text object ScAccessiblePreviewHeaderCellTextData::ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell, @@ -1644,7 +1639,6 @@ SvxViewForwarder* ScAccessibleNoteTextData::GetViewForwarder() return mpViewForwarder; } - // CSV import ================================================================= class ScCsvViewForwarder : public SvxViewForwarder diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 35b72f8aed2a..f3e14e7ebb34 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -313,7 +313,6 @@ IMPL_LINK( ScRandomNumberGeneratorDialog, OkClicked, PushButton*, /*pButton*/ ) return 0; } - IMPL_LINK( ScRandomNumberGeneratorDialog, ApplyClicked, PushButton*, /*pButton*/ ) { SelectGeneratorAndGenerateNumbers(); diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 4c2529b42a24..afe5d64a8081 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -322,5 +322,4 @@ IMPL_LINK_NOARG(ScSamplingDialog, ToggleSamplingMethod) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx index 144be46f57b5..07a61c8c0fa6 100644 --- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx @@ -80,7 +80,6 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell) aTemplate.autoReplaceRange(strWildcardVariable1Range, pVariable1Iterator->get()); aTemplate.autoReplaceRange(strWildcardVariable2Range, pVariable2Iterator->get()); - aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_UNDO_NAME)); aOutput.newLine(); diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 426763a9b8b7..4195ff60c850 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -71,15 +71,12 @@ #include <editeng/fhgtitem.hxx> #include <vcl/svapp.hxx> - 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 ), @@ -97,7 +94,6 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain // check what kind of objects are contained - SdrPage* pPage = pModel->GetPage(0); if (pPage) { @@ -108,7 +104,6 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain // OLE object - sal_uInt16 nSdrObjKind = pObject->GetObjIdentifier(); if (nSdrObjKind == OBJ_OLE2) { @@ -124,10 +119,8 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain // aOleData is initialized later } - // Graphic object - if (nSdrObjKind == OBJ_GRAF) { bGraphic = true; @@ -135,10 +128,8 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain bGrIsBit = true; } - // URL button - SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObject); if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) { @@ -199,10 +190,8 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain } } - // get size for object descriptor - // #i71538# use complete SdrViews // SdrExchangeView aView(pModel); SdrView aView(pModel); @@ -220,7 +209,6 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain aObjDesc.maSize = aSrcSize; PrepareOLE( aObjDesc ); - // remember a unique ID of the source document if ( pContainerShell ) @@ -729,10 +717,8 @@ void ScDrawTransferObj::CreateOLEData() aOleData = TransferableDataHelper(pEmbedTransfer); } - // initialize aDocShellRef with a live document from the ClipDoc - void ScDrawTransferObj::InitDocShell() { if ( !aDocShellRef.Is() ) @@ -812,5 +798,4 @@ sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const com::sun::star::uno::S return nRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 819e580e733e..a28ddc76ebb9 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -702,10 +702,8 @@ void ScInputHandler::UpdateSpellSettings( bool bFromStartTab ) } } - // Function/Range names etc. as Tip help - // The other types are defined in ScDocument::GetFormulaEntries void ScInputHandler::GetFormulaData() { @@ -1196,7 +1194,6 @@ void ScInputHandler::PasteFunctionData() pActiveView->ShowCursor(); } - // Calculate selection and display as tip help static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const ScAddress &rPos ) { @@ -1397,7 +1394,6 @@ void ScInputHandler::SkipClosingPar() --nAutoPar; } - // Auto input void ScInputHandler::GetColData() @@ -1552,7 +1548,6 @@ void ScInputHandler::NextAutoEntry( bool bBack ) pActiveView->ShowCursor(); } - // Highlight parentheses void ScInputHandler::UpdateParenthesis() { @@ -2244,10 +2239,8 @@ void ScInputHandler::InvalidateAttribs() } } - // --------------- public methods -------------------------------------------- - void ScInputHandler::SetMode( ScInputMode eNewMode, const OUString* pInitText ) { if ( eMode == eNewMode ) @@ -3653,7 +3646,6 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine ) return bRet; } - /** * Methods for FunctionAutoPilot: * InputGetSelection, InputSetSelection, InputReplaceSelection, InputGetFormulaStr @@ -3755,7 +3747,6 @@ void ScInputHandler::InputTurnOffWinEngine() bInOwnChange = false; } - /** * ScInputHdlState */ diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 12fd5728b3ae..57e5bec06e35 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include "scitems.hxx" @@ -91,7 +90,6 @@ using com::sun::star::frame::XFrame; using com::sun::star::frame::XController; using com::sun::star::beans::XPropertySet; - enum ScNameInputType { SC_NAME_INPUT_CELL, @@ -106,7 +104,6 @@ enum ScNameInputType SC_MANAGE_NAMES }; - ScTextWndBase::ScTextWndBase( Window* pParent, WinBits nStyle ) : Window ( pParent, nStyle ) { @@ -117,10 +114,8 @@ ScTextWndBase::ScTextWndBase( Window* pParent, WinBits nStyle ) } } - // class ScInputWindowWrapper - SFX_IMPL_CHILDWINDOW_WITHID(ScInputWindowWrapper,FID_INPUTLINE_STATUS) ScInputWindowWrapper::ScInputWindowWrapper( Window* pParentP, @@ -157,10 +152,8 @@ static bool lcl_isExperimentalMode() return true; } - // class ScInputWindow - static ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind ) { ScTabViewShell* pViewSh = NULL; @@ -902,8 +895,6 @@ void ScInputWindow::MouseButtonUp( const MouseEvent& rMEvt ) ToolBox::MouseButtonUp( rMEvt ); } - - ScInputBarGroup::ScInputBarGroup(Window* pParent, ScTabViewShell* pViewSh) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_TABSTOP ) ), aMultiTextWnd ( this, pViewSh ), @@ -1026,13 +1017,11 @@ void ScInputBarGroup::StartEditEngine() aMultiTextWnd.StartEditEngine(); } - void ScInputBarGroup::MakeDialogEditView() { aMultiTextWnd.MakeDialogEditView(); } - EditView* ScInputBarGroup::GetEditView() { return aMultiTextWnd.GetEditView(); @@ -1152,9 +1141,6 @@ void ScInputBarGroup::TextGrabFocus() aMultiTextWnd.TextGrabFocus(); } - - - ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, ScTabViewShell* pViewSh ) : ScTextWnd( pParen, pViewSh ), @@ -1349,7 +1335,6 @@ static void lcl_ModifyRTLVisArea( EditView* pEditView ) pEditView->SetVisArea(aVisArea); } - void ScMultiTextWnd::InitEditEngine() { ScFieldEditEngine* pNew; @@ -1451,8 +1436,6 @@ void ScMultiTextWnd::SetTextString( const OUString& rNewString ) DoScroll(); } - - ScTextWnd::ScTextWnd( Window* pParent, ScTabViewShell* pViewSh ) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_BORDER) ), DragSourceHelper( this ), @@ -1720,7 +1703,6 @@ void ScTextWnd::UpdateAutoCorrFlag() } } - void ScTextWnd::StartEditEngine() { // Don't activate if we're a modal ourselves (Doc modal Dialog) @@ -2065,10 +2047,8 @@ void ScTextWnd::TextGrabFocus() GrabFocus(); } - // Position window - ScPosWnd::ScPosWnd( Window* pParent ) : ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ), pAccel ( NULL ), diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index 69a5cbe1d4a8..a386cd0bd886 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.cxx @@ -78,5 +78,4 @@ void ScLinkTransferObj::DragFinished( sal_Int8 nDropAction ) TransferableHelper::DragFinished( nDropAction ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index 8e4f43f6a43a..9e87642c6f7f 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -75,7 +75,6 @@ ScMessagePool::ScMessagePool() SetSecondaryPool( pDocPool ); } - ScMessagePool::~ScMessagePool() { Delete(); @@ -89,7 +88,6 @@ ScMessagePool::~ScMessagePool() SfxItemPool::Free(pDocPool); } - SfxMapUnit ScMessagePool::GetMetric( sal_uInt16 nWhich ) const { // Own attributes: Twips, everything else 1/100 mm diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 7436253dbab9..58da2499be3f 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -19,7 +19,6 @@ #include <editeng/eeitem.hxx> - #include <svx/fmobjfac.hxx> #include <svx/objfac3d.hxx> #include <svx/tbxcolor.hxx> @@ -108,9 +107,6 @@ #include "dwfunctr.hxx" #include "acredlin.hxx" - - - ScResId::ScResId( sal_uInt16 nId ) : ResId( nId, *SC_MOD()->GetResMgr() ) { diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index cfaa93ca15a5..5cd585106fc0 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -207,7 +207,6 @@ ScModule::~ScModule() DeleteCfg(); // Called from Exit() } - void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 ) { if ( p == pColorConfig || p == pAccessOptions ) @@ -615,7 +614,6 @@ void ScModule::GetState( SfxItemSet& rSet ) } } - void ScModule::HideDisabledSlots( SfxItemSet& rSet ) { if( SfxViewFrame* pViewFrm = SfxViewFrame::Current() ) @@ -631,7 +629,6 @@ void ScModule::HideDisabledSlots( SfxItemSet& rSet ) } } - void ScModule::ResetDragObject() { mpDragData->pCellTransfer = NULL; @@ -644,7 +641,6 @@ void ScModule::ResetDragObject() mpDragData->aJumpText = OUString(); } - void ScModule::SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) { ResetDragObject(); @@ -671,7 +667,6 @@ void ScModule::SetDragJump( mpDragData->aJumpText = rText; } - void ScModule::SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) { OSL_ENSURE( !pCellObj || !pDrawObj, "SetClipObject: not allowed to set both objects" ); @@ -1012,7 +1007,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - // DefaultsOptions if (rOptSet.HasItem(SID_SCDEFAULTSOPTIONS, &pItem)) { @@ -1020,7 +1014,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) SetDefaultsOptions( rOpt ); } - // FormulaOptions if (rOptSet.HasItem(SID_SCFORMULAOPTIONS, &pItem)) { @@ -1050,7 +1043,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - // ViewOptions if (rOptSet.HasItem(SID_SCVIEWOPTIONS, &pItem)) { @@ -1082,7 +1074,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - // GridOptions // Evaluate after ViewOptions, as GridOptions is a member of ViewOptions if ( rOptSet.HasItem(SID_ATTR_GRID_OPTIONS,&pItem) ) @@ -1196,7 +1187,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pBindings->Invalidate( SID_AUTOSPELL_CHECK ); } - // InputOptions if ( rOptSet.HasItem(SID_SC_INPUT_SELECTIONPOS,&pItem) ) { @@ -1256,7 +1246,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) bSaveInputOptions = true; } - // PrintOptions if ( rOptSet.HasItem(SID_SCPRINTOPTIONS,&pItem) ) { @@ -1460,8 +1449,6 @@ void ScModule::SetRefInputHdl( ScInputHandler* pNew ) pRefInputHandler = pNew; } - - void ScModule::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd ) { ScInputHandler* pHdl = GetInputHdl(); @@ -2053,7 +2040,6 @@ SfxItemSet* ScModule::CreateItemSet( sal_uInt16 nId ) pRet->Put( SfxBoolItem( SID_SC_INPUT_LEGACY_CELL_SELECTION, rInpOpt.GetLegacyCellSelection() ) ); - // RID_SC_TP_PRINT pRet->Put( ScTpPrintItem( SID_SCPRINTOPTIONS, GetPrintOptions() ) ); diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 04c32072217d..813935134cdc 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -67,7 +67,6 @@ static bool lcl_IsURLButton( SdrObject* pObject ) return bRet; } - ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView ) { ScSelectionTransferObj* pRet = NULL; @@ -140,7 +139,6 @@ ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView return pRet; } - ScSelectionTransferObj::ScSelectionTransferObj( ScTabView* pSource, ScSelectionTransferMode eNewMode ) : pView( pSource ), eMode( eNewMode ), @@ -338,7 +336,6 @@ void ScSelectionTransferObj::CreateDrawData() const SdrMarkList& rMarkList = pDrawView->GetMarkedObjectList(); ScDrawView::CheckOle( rMarkList, bAnyOle, bOneOle ); - ScDocShellRef aDragShellRef; if (bAnyOle) { @@ -346,7 +343,6 @@ void ScSelectionTransferObj::CreateDrawData() aDragShellRef->DoInitNew(NULL); } - ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); SdrModel* pModel = pDrawView->GetMarkedObjModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); @@ -437,5 +433,4 @@ void ScSelectionTransferObj::ObjectReleased() TransferableHelper::ObjectReleased(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index f0c6c73e20bf..36759531bfbd 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -21,7 +21,6 @@ #include <editeng/eeitem.hxx> #include <editeng/justifyitem.hxx> - #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/embed/XTransactedObject.hpp> @@ -124,10 +123,8 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc { OSL_ENSURE(pDoc->IsClipboard(), "wrong document"); - // get aBlock from clipboard doc - SCCOL nCol1; SCROW nRow1; SCCOL nCol2; @@ -580,7 +577,6 @@ ScMarkData ScTransferObj::GetSourceMarkData() return aMarkData; } - // initialize aDocShellRef with a live document from the ClipDoc // #i123405# added parameter to allow size calculation without limitation @@ -694,7 +690,6 @@ void ScTransferObj::InitDocShell(bool bLimitToPageSize) nPosX = (long) ( nPosX * HMM_PER_TWIPS ); nPosY = (long) ( nPosY * HMM_PER_TWIPS ); - aPaperSize.Width() *= 2; // limit OLE object to double of page size aPaperSize.Height() *= 2; @@ -860,5 +855,4 @@ sal_Int64 SAL_CALL ScTransferObj::getSomething( const com::sun::star::uno::Seque return nRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index c011a673a13f..6a7e0887e5bf 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -41,7 +41,6 @@ TYPEINIT1(ScTablesHint, SfxHint); TYPEINIT1(ScEditViewHint, SfxHint); TYPEINIT1(ScIndexHint, SfxHint); - /** * Status update for entry field */ @@ -100,8 +99,6 @@ void ScInputStatusItem::SetMisspellRanges( const std::vector<editeng::MisspellRa mpMisspellRanges = pRanges; } - - // ScPaintHint was moved to schints.cxx /** @@ -141,7 +138,6 @@ ScEditViewHint::~ScEditViewHint() { } - /** * Data for the sorting dialog */ @@ -200,7 +196,6 @@ bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMembe return true; } - /** * Data for the Filter dialog */ @@ -288,7 +283,6 @@ SfxPoolItem* ScQueryItem::Clone( SfxItemPool * ) const return new ScQueryItem( *this ); } - /** * Data for the SubTotal dialog */ @@ -347,7 +341,6 @@ bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nM return true; } - /** * Transporter for the UserLIst dialog */ @@ -391,7 +384,6 @@ bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const return bEqual; } - SfxPoolItem* ScUserListItem::Clone( SfxItemPool * ) const { return new ScUserListItem( *this ); @@ -403,7 +395,6 @@ void ScUserListItem::SetUserList( const ScUserList& rUserList ) pUserList = new ScUserList( rUserList ); } - /** * Data for the Consolidate dialog */ @@ -534,7 +525,6 @@ SfxPoolItem* ScSolveItem::Clone( SfxItemPool * ) const return new ScSolveItem( *this ); } - /** * Data for the TabOp dialog */ diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 6dbe9a593f33..797916315f7a 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scitems.hxx" @@ -96,5 +95,4 @@ IMPL_LINK_NOARG(ScAttrDlg, OkHandler) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index 5da68976143e..0717705b77fa 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -24,7 +24,6 @@ #include <osl/module.hxx> #include <rtl/ustrbuf.hxx> - typedef ScAbstractDialogFactory* (SAL_CALL *ScFuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 8e60fd943664..70c90006f78f 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -387,7 +387,6 @@ class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog virtual OUString GetText() const SAL_OVERRIDE; }; - //AbstractDialogFactory_Impl implementations class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory { diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx index 8d93952ba22b..f3e026f24ff2 100644 --- a/sc/source/ui/attrdlg/scuiexp.cxx +++ b/sc/source/ui/attrdlg/scuiexp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scdlgfact.hxx" diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 8c728c512d19..88814f3fdfb1 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - #include "global.hxx" #include "document.hxx" #include "attrib.hxx" @@ -38,10 +36,8 @@ static const sal_uInt16 pProtectionRanges[] = 0 }; - // Zellschutz-Tabpage: - ScTabPageProtection::ScTabPageProtection(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "CellProtectionPage", "modules/scalc/ui/cellprotectionpage.ui", &rCoreAttrs) diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx index 6fa60e56684b..08c278482ead 100644 --- a/sc/source/ui/cctrl/cbuttonw.cxx +++ b/sc/source/ui/cctrl/cbuttonw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/outdev.hxx> #include <vcl/window.hxx> #include <vcl/decoview.hxx> @@ -25,10 +24,8 @@ #include <vcl/settings.hxx> #include "cbutton.hxx" - // class ScDDComboBoxButton - ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice ) : pOut( pOutputDevice ) { @@ -81,7 +78,6 @@ void ScDDComboBoxButton::Draw( const Point& rAt, aInnerRect=aDecoView.DrawButton( aBtnRect, nButtonStyle ); - aInnerRect.Left() += 1; aInnerRect.Top() += 1; aInnerRect.Right() -= 1; @@ -95,7 +91,6 @@ void ScDDComboBoxButton::Draw( const Point& rAt, ImpDrawArrow( aInnerRect, bState ); - // restore old state pOut->EnableMapMode( bOldEnable ); if (bHadLine) @@ -152,6 +147,4 @@ void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect, Point( aCenter.X() + aSize3.Width(), aPos1.Y()+1 ) ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 2e2413b367f6..99ca3a6c0630 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -428,7 +428,6 @@ void ScMenuFloatingWindow::drawAllMenuItems() } } - void ScMenuFloatingWindow::executeMenuItem(size_t nPos) { if (nPos >= maMenuItems.size()) @@ -472,7 +471,6 @@ void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, fireMenuHighlightedEvent(); } - void ScMenuFloatingWindow::handleMenuTimeout(SubMenuItemData* pTimer) { if (pTimer == &maOpenTimer) @@ -652,7 +650,6 @@ void ScMenuFloatingWindow::setName(const OUString& rName) maName = rName; } - void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected) { if (nPos == MENU_NOT_SELECTED) @@ -729,7 +726,6 @@ void ScMenuFloatingWindow::getMenuItemPosSize(size_t nPos, Point& rPos, Size& rS rSize = Size(aWndSize.Width() - nLeftMargin*2, nH); } - size_t ScMenuFloatingWindow::getEnclosingMenuItem(const Point& rPos) const { size_t n = maMenuItems.size(); @@ -834,7 +830,6 @@ void ScMenuFloatingWindow::terminateAllPopupMenus() mpParentMenu->terminateAllPopupMenus(); } - ScCheckListMenuWindow::Config::Config() : mbAllowEmptySet(true), mbRTL(false) { diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index 5c1d41563b7e..6cb40c185ed4 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -27,7 +27,6 @@ #include "docpool.hxx" #include "patattr.hxx" - ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX, const Fraction* pZoomY, ScDocument* pDoc) : mpDoc(pDoc), mpOutDev(pOutDev), diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index d784d51d85d8..6c8755cfe4fd 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef SC_DLLIMPLEMENTATION #undef SC_DLLIMPLEMENTATION #endif diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index a4250caed0a2..ac679ef4edb1 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -115,5 +115,4 @@ void ScTbxInsertCtrl::Select( sal_Bool /* bMod1 */ ) pDispatch->Execute(nLastSlotId); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 260edebbc265..9cd27838a2fe 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -35,10 +35,8 @@ #include "scitems.hxx" #include "printfun.hxx" - // class ScZoomSliderControl --------------------------------------- - SFX_IMPL_TOOLBOX_CONTROL( ScZoomSliderControl, SvxZoomSliderItem ); ScZoomSliderControl::ScZoomSliderControl( @@ -133,7 +131,6 @@ const long nSliderXOffset = 20; 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(); @@ -219,7 +216,6 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const return nRect; } - 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 ), diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 9c0a6d9de25a..fd4efc5c42ca 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -390,10 +390,8 @@ IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl ) return 0; } - //ScCondFormatDlg - ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 0810ea2bbb41..9065ff4ff9d0 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -124,7 +124,6 @@ void ScCondFrmtEntry::Deselect() SetHeight(); } - IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) { OUString aFormula = pEdit->GetText(); @@ -142,7 +141,6 @@ IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) return 0; } - //condition namespace { diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 888d7e4c810a..92e2bca67baa 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -146,7 +146,6 @@ ScConditionalFormatList* ScCondFormatManagerDlg::GetConditionalFormatList() return pList; } - IMPL_LINK_NOARG(ScCondFormatManagerDlg, RemoveBtnHdl) { m_pCtrlManager->DeleteSelection(); diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index de2f4a623faf..1a4954cffca6 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -596,7 +596,6 @@ ScDPLabelData* ScPivotLayoutDialog::GetLabelData(SCCOL nColumn) return &maPivotParameters.maLabelArray[nColumn]; } - void ScPivotLayoutDialog::PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames) { return mpListBoxData->PushDataFieldNames(rDataFieldNames); diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index ef39fdf1d3de..b4a72d10d5fe 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -31,7 +31,6 @@ static const sal_Char pStrFix[] = "FIX"; static const sal_Char pStrMrg[] = "MRG"; - ScAsciiOptions::ScAsciiOptions() : bFixedLen ( false ), aFieldSeps ( OUString(';') ), @@ -49,7 +48,6 @@ ScAsciiOptions::ScAsciiOptions() : { } - ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) : bFixedLen ( rOpt.bFixedLen ), aFieldSeps ( rOpt.aFieldSeps ), @@ -80,14 +78,12 @@ ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) : } } - ScAsciiOptions::~ScAsciiOptions() { delete[] pColStart; delete[] pColFormat; } - void ScAsciiOptions::SetColInfo( sal_uInt16 nCount, const sal_Int32* pStart, const sal_uInt8* pFormat ) { delete[] pColStart; @@ -112,7 +108,6 @@ void ScAsciiOptions::SetColInfo( sal_uInt16 nCount, const sal_Int32* pStart, con } } - void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec ) { delete[] pColStart; @@ -133,7 +128,6 @@ void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec ) } } - ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) { SetColInfo( rCpy.nInfoCount, rCpy.pColStart, rCpy.pColFormat ); @@ -150,7 +144,6 @@ ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) return *this; } - bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const { if ( bFixedLen == rCmp.bFixedLen && @@ -288,7 +281,6 @@ void ScAsciiOptions::ReadFromString( const OUString& rString ) // 10th token is used for "Save cell formulas" in export options } - OUString ScAsciiOptions::WriteToString() const { OUString aOutStr; diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 67a973255831..fc70a15d9c93 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -36,7 +36,6 @@ #define INFOBOX(id) InfoBox(this, ScGlobal::GetRscString(id)).Execute() - class ScAreaData { public: @@ -59,7 +58,6 @@ public: bool bIsDbArea; }; - ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, const SfxItemSet& rArgSet ) @@ -177,7 +175,6 @@ void ScConsolidateDlg::Init() else pEdDestArea->SetText(OUString()); - // Use the ScAreaData helper class to save those range names from the // RangeNames and database ranges that appear in the ListBoxes. @@ -237,7 +234,6 @@ void ScConsolidateDlg::FillAreaLists() } } - // Handover of a range within a table that has been selected by the mouse. // This range is then shown in the reference window as new selection. @@ -265,13 +261,11 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - bool ScConsolidateDlg::Close() { return DoClose( ScConsolidateDlgWrapper::GetChildWindowId() ); } - void ScConsolidateDlg::SetActive() { if ( bDlgLostFocus ) @@ -290,13 +284,11 @@ void ScConsolidateDlg::SetActive() RefInputDone(); } - void ScConsolidateDlg::Deactivate() { bDlgLostFocus = true; } - bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) { if ( !pRangeUtil || !pDoc || @@ -328,7 +320,6 @@ bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) return bEditOk; } - // Handler: IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) @@ -349,7 +340,6 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) return 0; } - IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) { sal_uInt16 nDataAreaCount = pLbConsAreas->GetEntryCount(); @@ -409,7 +399,6 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) return 0; } - IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) { if ( pBtn == pBtnCancel ) @@ -475,7 +464,6 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) return 0; } - IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) { if ( pLb == pLbConsAreas ) @@ -518,7 +506,6 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd ) { if ( pEd == pEdDataArea ) @@ -538,7 +525,6 @@ IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd ) return 0; } - // TODO: generalize! // Resource of the ListBox and these two conversion methods are also in // tpsubt and everywhere, where StarCalc functions are selectable. diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 2df46a9e00cb..381309dd7efd 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -22,7 +22,6 @@ #include <vcl/settings.hxx> #include "AccessibleCsvControl.hxx" - ScCsvLayoutData::ScCsvLayoutData() : mnPosCount( 1 ), mnPosOffset( 0 ), @@ -57,7 +56,6 @@ ScCsvDiff ScCsvLayoutData::GetDiff( const ScCsvLayoutData& rData ) const return nRet; } - ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : Control( &rParent, WB_TABSTOP | WB_NODIALOGCONTROL ), mrData( rParent.GetLayoutData() ), @@ -80,7 +78,6 @@ ScCsvControl::~ScCsvControl() mpAccessible->dispose(); } - // event handling ------------------------------------------------------------- void ScCsvControl::GetFocus() @@ -137,7 +134,6 @@ void ScCsvControl::AccSendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 mpAccessible->SendRemoveColumnEvent( nFirstColumn, nLastColumn ); } - // repaint helpers ------------------------------------------------------------ void ScCsvControl::Repaint( bool bInvalidate ) @@ -160,7 +156,6 @@ void ScCsvControl::EnableRepaint( bool bInvalidate ) Repaint( bInvalidate ); } - // command handling ----------------------------------------------------------- void ScCsvControl::Execute( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 ) @@ -169,7 +164,6 @@ void ScCsvControl::Execute( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPa maCmdHdl.Call( this ); } - // layout helpers ------------------------------------------------------------- sal_Int32 ScCsvControl::GetVisPosCount() const @@ -252,7 +246,6 @@ sal_Int32 ScCsvControl::GetLineFromY( sal_Int32 nY ) const return (nY - GetHdrHeight()) / GetLineHeight() + GetFirstVisLine(); } - // static helpers ------------------------------------------------------------- void ScCsvControl::ImplInvertRect( OutputDevice& rOutDev, const Rectangle& rRect ) @@ -297,7 +290,6 @@ ScMoveMode ScCsvControl::GetVertDirection( sal_uInt16 nCode, bool bHomeEnd ) return MOVE_NONE; } - // accessibility -------------------------------------------------------------- ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible() @@ -307,5 +299,4 @@ ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible() return mxAccessible; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 3bd16a9f74c5..5b2cbc6a0b52 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -44,7 +44,6 @@ #include "editutil.hxx" // *** edit engine *** - struct Func_SetType { sal_Int32 mnType; @@ -61,7 +60,6 @@ struct Func_Select { rState.Select( mbSelect ); } }; - ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : ScCsvControl( rParent ), mpColorConfig( 0 ), @@ -264,7 +262,6 @@ void ScCsvGrid::InitSizeData() InvalidateGfx(); } - // split handling ------------------------------------------------------------- void ScCsvGrid::InsertSplit( sal_Int32 nPos ) @@ -571,7 +568,6 @@ void ScCsvGrid::ExecutePopup( const Point& rPos ) Execute( CSVCMD_SETCOLUMNTYPE, maPopup.GetItemPos( nItemId ) ); } - // selection handling --------------------------------------------------------- bool ScCsvGrid::IsSelected( sal_uInt32 nColIndex ) const @@ -711,7 +707,6 @@ void ScCsvGrid::DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier ) Execute( CSVCMD_MOVEGRIDCURSOR, GetColumnPos( nColIndex ) ); } - // cell contents -------------------------------------------------------------- void ScCsvGrid::ImplSetTextLineSep( @@ -815,7 +810,6 @@ const OUString& ScCsvGrid::GetCellText( sal_uInt32 nColIndex, sal_Int32 nLine ) return rStrVec[ nColIndex ]; } - // event handling ------------------------------------------------------------- void ScCsvGrid::Resize() @@ -1004,7 +998,6 @@ void ScCsvGrid::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 Repaint(); } - // painting ------------------------------------------------------------------- void ScCsvGrid::Paint( const Rectangle& ) @@ -1352,7 +1345,6 @@ void ScCsvGrid::ImplDrawTrackingRect( sal_uInt32 nColIndex ) } } - // accessibility ============================================================== ScAccessibleCsvControl* ScCsvGrid::ImplCreateAccessible() @@ -1362,5 +1354,4 @@ ScAccessibleCsvControl* ScCsvGrid::ImplCreateAccessible() return pControl.release(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index bf0b6d7fcb0f..060b03405638 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -20,7 +20,6 @@ #include "csvruler.hxx" #include "AccessibleCsvControl.hxx" - #include <optutil.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -30,12 +29,9 @@ 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; @@ -108,7 +104,6 @@ ScCsvRuler::~ScCsvRuler() save_FixedWidthList( maSplits ); } - // common ruler handling ------------------------------------------------------ void ScCsvRuler::setPosSizePixel( @@ -247,7 +242,6 @@ void ScCsvRuler::ScrollVertRel( ScMoveMode eDir ) Execute( CSVCMD_SETLINEOFFSET, nLine ); } - // split handling ------------------------------------------------------------- sal_Int32 ScCsvRuler::GetNoScrollPos( sal_Int32 nPos ) const @@ -351,7 +345,6 @@ void ScCsvRuler::MoveCurrSplitRel( ScMoveMode eDir ) } } - // event handling ------------------------------------------------------------- void ScCsvRuler::Resize() @@ -517,7 +510,6 @@ void ScCsvRuler::EndMouseTracking( bool bApply ) mnPosMTStart = CSV_POS_INVALID; } - // painting ------------------------------------------------------------------- void ScCsvRuler::Paint( const Rectangle& ) @@ -654,7 +646,6 @@ void ScCsvRuler::ImplSetMousePointer( sal_Int32 nPos ) SetPointer( Pointer( HasSplit( nPos ) ? POINTER_HSPLIT : POINTER_ARROW ) ); } - // accessibility ============================================================== ScAccessibleCsvControl* ScCsvRuler::ImplCreateAccessible() @@ -662,5 +653,4 @@ ScAccessibleCsvControl* ScCsvRuler::ImplCreateAccessible() return new ScAccessibleCsvRuler( *this ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx index eb8a348c3fca..11ed0bae12a7 100644 --- a/sc/source/ui/dbgui/csvsplits.cxx +++ b/sc/source/ui/dbgui/csvsplits.cxx @@ -21,7 +21,6 @@ #include <algorithm> - bool ScCsvSplits::Insert( sal_Int32 nPos ) { bool bValid = (nPos >= 0); @@ -62,7 +61,6 @@ bool ScCsvSplits::HasSplit( sal_Int32 nPos ) const return GetIndex( nPos ) != CSV_VEC_NOTFOUND; } - sal_uInt32 ScCsvSplits::GetIndex( sal_Int32 nPos ) const { const_iterator aIter = ::std::lower_bound( maVec.begin(), maVec.end(), nPos ); @@ -89,11 +87,9 @@ sal_Int32 ScCsvSplits::GetPos( sal_uInt32 nIndex ) const return (nIndex < Count()) ? maVec[ nIndex ] : CSV_POS_INVALID; } - 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 31e9fc96e414..f65704846918 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -183,7 +183,6 @@ void ScCsvTableBox::MakePosVisible( sal_Int32 nPos ) } } - // cell contents -------------------------------------------------------------- void ScCsvTableBox::SetUniStrings( @@ -205,7 +204,6 @@ void ScCsvTableBox::SetUniStrings( EnableRepaint(); } - // column settings ------------------------------------------------------------ void ScCsvTableBox::InitTypes( const ListBox& rListBox ) @@ -225,7 +223,6 @@ void ScCsvTableBox::FillColumnData( ScAsciiOptions& rOptions ) const maGrid.FillColumnDataSep( rOptions ); } - // event handling ------------------------------------------------------------- void ScCsvTableBox::Resize() @@ -409,7 +406,6 @@ IMPL_LINK( ScCsvTableBox, ScrollEndHdl, ScrollBar*, pScrollBar ) return 0; } - // accessibility -------------------------------------------------------------- ScCsvTableBox::XAccessibleRef ScCsvTableBox::CreateAccessible() @@ -423,5 +419,4 @@ ScAccessibleCsvControl* ScCsvTableBox::ImplCreateAccessible() return NULL; // not used, see CreateAccessible() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 0bf9ae87f2a1..a8e4765c49f1 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include <vcl/waitobj.hxx> #include <comphelper/processfactory.hxx> @@ -42,7 +39,6 @@ using namespace com::sun::star; #include "miscuno.hxx" #include "dpsdbtab.hxx" - // entries in the "type" ListBox #define DP_TYPELIST_TABLE 0 #define DP_TYPELIST_QUERY 1 @@ -185,5 +181,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 894a56d54945..29c418d0cb30 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "dapitype.hxx" #include "scresid.hxx" #include "sc.hrc" diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index f4c0eb05c2ba..b49a148ecc63 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -32,7 +32,6 @@ #include "globalnames.hxx" #include "dbnamdlg.hxx" - #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ @@ -45,7 +44,6 @@ static DBSaveData* pSaveObj = NULL; #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() - // class DBSaveData class DBSaveData @@ -85,8 +83,6 @@ private: bool bDirty:1; }; - - void DBSaveData::Save() { aArea = rCurArea; @@ -98,7 +94,6 @@ void DBSaveData::Save() bDirty = true; } - void DBSaveData::Restore() { if ( bDirty ) @@ -164,13 +159,11 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, SynFocusTimer.Start(); } - ScDbNameDlg::~ScDbNameDlg() { DELETEZ( pSaveObj ); } - void ScDbNameDlg::Init() { m_pBtnHeader->Check( true ); // Default: mit Spaltenkoepfen @@ -248,7 +241,6 @@ void ScDbNameDlg::Init() NameModifyHdl( 0 ); } - void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData ) { OUStringBuffer aBuf; @@ -269,7 +261,6 @@ void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData ) m_pFTOperations->SetText(aBuf.makeStringAndClear()); } - // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Fenster angezeigt wird. @@ -291,7 +282,6 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - bool ScDbNameDlg::Close() { return DoClose( ScDbNameDlgWrapper::GetChildWindowId() ); @@ -368,16 +358,13 @@ void ScDbNameDlg::UpdateDBData( const OUString& rStrName ) m_pOptions->Enable(); } - bool ScDbNameDlg::IsRefInputMode() const { return bRefInputMode; } - // Handler: - IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) { AddBtnHdl( 0 ); diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 9d82cd9ca963..ce688274b838 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -17,12 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef SC_DLLIMPLEMENTATION #undef SC_DLLIMPLEMENTATION #endif - #include "dpgroupdlg.hxx" #include "scresid.hxx" #include "sc.hrc" @@ -148,7 +146,6 @@ void ScDPDateGroupEditHelper::ImplSetValue( double fValue ) mpEdValue->SetDate( aDate ); } - ScDPNumGroupDlg::ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ) : ModalDialog ( pParent, "PivotTableGroupByNumber", "modules/scalc/ui/groupbynumber.ui" ), mpRbAutoStart ( get<RadioButton>("auto_start") ), diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 7824f09de579..572e07e6b79d 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -41,7 +41,6 @@ #include <limits> - #define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString(rid) ).Execute() @@ -160,7 +159,6 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, } - ScFilterDlg::~ScFilterDlg() { delete pOptionsMgr; @@ -171,7 +169,6 @@ ScFilterDlg::~ScFilterDlg() delete pTimer; } - void ScFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryItem& rQueryItem = (const ScQueryItem&) @@ -382,7 +379,6 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) // SFX_APPWINDOW->Disable(false); //! general method in ScAnyRefDlg } - bool ScFilterDlg::Close() { if (pViewData) @@ -405,7 +401,6 @@ void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - void ScFilterDlg::SetActive() { if ( bRefInputMode ) @@ -609,7 +604,6 @@ void ScFilterDlg::ClearValueList( size_t nList ) } } - size_t ScFilterDlg::GetFieldSelPos( SCCOL nField ) { if ( nField >= theQueryData.nCol1 && nField <= theQueryData.nCol2 ) @@ -661,7 +655,6 @@ ScQueryItem* ScFilterDlg::GetOutputItem() return pOutItem; } - bool ScFilterDlg::IsRefInputMode() const { return bRefInputMode; @@ -669,7 +662,6 @@ bool ScFilterDlg::IsRefInputMode() const // Handler: - IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) { if ( pBtn == pBtnOk ) @@ -734,7 +726,6 @@ IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) return 0; } - IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { /* @@ -989,7 +980,6 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { // Column headers: @@ -1028,7 +1018,6 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) return 0; } - IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) { size_t nOffset = GetSliderPos(); @@ -1113,7 +1102,6 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) return 0; } - IMPL_LINK_NOARG(ScFilterDlg, ScrollHdl) { SliderMoved(); diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 3035cd8632c8..4ae721f66544 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -29,10 +29,8 @@ #include "foptmgr.hxx" - // ScFilterOptionsMgr (.ui's option helper) - ScFilterOptionsMgr::ScFilterOptionsMgr( ScViewData* ptrViewData, const ScQueryParam& refQueryData, @@ -68,7 +66,6 @@ ScFilterOptionsMgr::ScFilterOptionsMgr( Init(); } - ScFilterOptionsMgr::~ScFilterOptionsMgr() { sal_uInt16 nEntries = pLbCopyArea->GetEntryCount(); @@ -78,7 +75,6 @@ ScFilterOptionsMgr::~ScFilterOptionsMgr() delete (OUString*)pLbCopyArea->GetEntryData( i ); } - void ScFilterOptionsMgr::Init() { //moggi:TODO @@ -167,7 +163,6 @@ void ScFilterOptionsMgr::Init() pFtDbArea->SetText( OUString() ); } - // Kopierposition: if ( !rQueryData.bInplace ) @@ -213,7 +208,6 @@ bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const return ( SCA_VALID == (nResult & SCA_VALID) ); } - // Handler: IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) @@ -232,7 +226,6 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) { if ( pEd == pEdCopyArea ) @@ -265,7 +258,6 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) return 0; } - 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 39c44a3d702b..1f4c7ddf9e49 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -26,11 +26,9 @@ static const sal_Char pStrFix[] = "FIX"; - // Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) // darum ab Version 336 Komma stattdessen - ScImportOptions::ScImportOptions( const OUString& rStr ) { // Use the same string format as ScAsciiOptions, diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 2133fc05f1b8..5ffa9fabadd5 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <vcl/waitobj.hxx> @@ -408,10 +407,8 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() return *pOutItem; } - // Handler: - IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb ) { /* @@ -551,5 +548,4 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) 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 b253b28d9a78..0d7de73194fd 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scitems.hxx" diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 9d6cb86a753e..512cc5578e3d 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "global.hxx" @@ -40,10 +39,8 @@ //! TODO make dynamic const SCSIZE ASCIIDLG_MAXROWS = MAXROWCOUNT; - using namespace com::sun::star::uno; - // Defines - CSV Import Preserve Options #define FIXED_WIDTH "FixedWidth" #define FROM_ROW "FromRow" @@ -452,13 +449,11 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent, const OUString& aDatName, } } - ScImportAsciiDlg::~ScImportAsciiDlg() { delete[] mpRowPosArray; } - bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) { if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream) @@ -527,7 +522,6 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) return bRet; } - void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt ) { rOpt.SetCharSet( meCharSet ); @@ -623,7 +617,6 @@ void ScImportAsciiDlg::UpdateVertical() mpDatStream->SetStreamCharSet(meCharSet); } - 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 6333016fc1b9..b7d682a40211 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scuiimoptdlg.hxx" @@ -28,10 +27,8 @@ #include <osl/thread.h> #include <rtl/tencinfo.h> - // ScDelimiterTable - class ScDelimiterTable { public: @@ -99,10 +96,8 @@ OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const return aStrDel; } - // ScImportOptionsDlg - ScImportOptionsDlg::ScImportOptionsDlg( Window* pParent, bool bAscii, diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 98aa0b8f6733..620b54c1658e 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -48,7 +48,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi : ScAnyRefDlg ( pB, pCW, pParent, "AdvancedFilterDialog", "modules/scalc/ui/advancedfilterdialog.ui" ), - aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ), pOptionsMgr ( NULL ), nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), @@ -96,7 +95,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi pEdCopyArea->SetAccessibleName(pBtnCopyResult->GetText()); } - ScSpecialFilterDlg::~ScSpecialFilterDlg() { sal_uInt16 nEntries = pLbFilterArea->GetEntryCount(); @@ -115,7 +113,6 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg() delete pTimer; } - void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryItem& rQueryItem = (const ScQueryItem&) @@ -195,7 +192,6 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) //SFX_APPWINDOW->Disable(false); //! allgemeine Methode im ScAnyRefDlg } - bool ScSpecialFilterDlg::Close() { if (pViewData) @@ -226,7 +222,6 @@ void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - void ScSpecialFilterDlg::SetActive() { if ( bRefInputMode ) @@ -249,7 +244,6 @@ void ScSpecialFilterDlg::SetActive() RefInputDone(); } - ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, const ScRange& rSource ) { @@ -260,7 +254,6 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, return pOutItem; } - bool ScSpecialFilterDlg::IsRefInputMode() const { return bRefInputMode; @@ -268,7 +261,6 @@ bool ScSpecialFilterDlg::IsRefInputMode() const // Handler: - IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) { OSL_ENSURE( pDoc && pViewData, "Document or ViewData not found. :-/" ); @@ -385,7 +377,6 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) return 0; } - IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) { // alle 50ms nachschauen, ob RefInputMode noch stimmt @@ -414,7 +405,6 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) return 0; } - IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) { if ( pLb == pLbFilterArea ) @@ -431,7 +421,6 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) { if ( pEd == pEdFilterArea ) diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 3bc234fbe93c..8129dc42cd0d 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - #include <vcl/msgbox.hxx> #include "tpsort.hxx" #include "sortdlg.hxx" @@ -35,7 +33,6 @@ ScSortDlg::ScSortDlg(Window* pParent, const SfxItemSet* pArgSet) AddTabPage("options", ScTabPageSortOptions::Create, 0); } - ScSortWarningDlg::ScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText) : ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui") @@ -66,5 +63,4 @@ IMPL_LINK( ScSortWarningDlg, BtnHdl, PushButton*, pBtn ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index b5c9900930c2..b1fe324f3dca 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #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) diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index b9b35823185a..485dc48cbee1 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "textimportoptions.hxx" diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index d10ed8ae545f..5b805a505962 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <vcl/msgbox.hxx> @@ -206,7 +205,6 @@ void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ ) for ( sal_uInt16 i=0; i<nSortKeyCount; i++ ) maSortKeyItems[i].m_pBtnUp->Check(); - maSortKeyItems[0].EnableField(); maSortKeyItems[1].EnableField(); for ( sal_uInt16 i=2; i<nSortKeyCount; i++ ) @@ -433,10 +431,8 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem ) maSortKeyItems[nItem].m_pLbSort->SelectEntryPos( 0 ); } - // Handler: - IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) { OUString aSelEntry = pLb->GetSelectEntry(); @@ -479,10 +475,8 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) return 0; } - // Sort option Tab Page: - ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, "SortOptionsPage", @@ -554,7 +548,6 @@ void ScTabPageSortOptions::Init() OSL_ENSURE( pViewData, "ViewData not found! :-/" ); - if ( pViewData && pDoc ) { ScDBCollection* pDBColl = pDoc->GetDBCollection(); @@ -825,7 +818,6 @@ void ScTabPageSortOptions::FillUserSortListBox() } } - // Handler: IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox ) @@ -949,5 +941,4 @@ IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index d1e7d10c5d17..264c61fe86ed 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -171,7 +171,6 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, && (mpLbFunctions->GetEntryCount() > 0), "Non-initialized Lists" ); - if ( (nGroupNo > 3) || (nGroupNo == 0) || (mpLbGroup->GetEntryCount() == 0) || (mpLbColumns->GetEntryCount() == 0) @@ -334,10 +333,8 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) } } - // Handler: - IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) { if ( (mpLbColumns->GetEntryCount() > 0) @@ -379,7 +376,6 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) return 0; } - // Derived Group TabPages: SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, @@ -406,7 +402,6 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS ScTpSubTotalGroup( pParent, rArgSet ) {} - #define RESET(i) (ScTpSubTotalGroup::DoReset( (i), *rArgSet )) void ScTpSubTotalGroup1::Reset( const SfxItemSet* rArgSet ) { RESET(1); } void ScTpSubTotalGroup2::Reset( const SfxItemSet* rArgSet ) { RESET(2); } @@ -419,7 +414,6 @@ bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(2); bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(3); } #undef FILL - // Optionen-Tabpage: ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, @@ -540,7 +534,6 @@ void ScTpSubTotalOptions::FillUserSortListBox() } } - // Handler: IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 99b757d5b541..92e8f6848cfb 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef SC_DLLIMPLEMENTATION #undef SC_DLLIMPLEMENTATION #endif @@ -72,7 +71,6 @@ #define SC_VALIDDLG_DATA_VALIDRANGE 6 #define SC_VALIDDLG_DATA_INVALIDRANGE 7 - static const sal_uInt16 pValueRanges[] = { FID_VALID_MODE, FID_VALID_ERRTEXT, @@ -80,7 +78,6 @@ static const sal_uInt16 pValueRanges[] = 0 }; - ScValidationDlg::ScValidationDlg(Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/) : ScValidationDlgBase(pParent ? pParent : SFX_APP()->GetTopWindow(), @@ -273,7 +270,6 @@ void lclGetFormulaFromStringList( OUString& rFmlaStr, const OUString& rStringLis rFmlaStr = "\"\""; } - /** Converts formula with strings separated by semicolons to line feed separated string. @descr Keeps all empty strings. Ignores all empty tokens (multiple semicolons). Example: "abc";;;"def";"";"ghi" -> abc\ndef\n\nghi. @@ -644,7 +640,6 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) return 0; } - // Input Help Page ScTPValidationHelp::ScTPValidationHelp( Window* pParent, diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 6bfb499821ae..7239ad0bf9e4 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -482,7 +482,6 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, return bCanDo; } - IMPL_LINK_NOARG(ScAreaLink, RefreshHdl) { return long( diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 5c9bdd8b2672..7873310fd4c5 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <time.h> #include "attrib.hxx" @@ -216,5 +215,4 @@ IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 84f4db54704f..5a196d406248 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -377,8 +377,6 @@ ScRange DataStream::GetRange() const return aRange; } - - void DataStream::Decode(const OUString& rURL, const ScRange& rRange, sal_Int32 nLimit, MoveType eMove, const sal_uInt32 nSettings) { diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index d6c9a0df990a..0c8e5d1dc63c 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -485,7 +485,6 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, return false; } - // ausfuehren WaitObject aWait( rDocShell.GetActiveDialogParent() ); @@ -990,7 +989,6 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, pOld, bDoSize, pAdvSource ) ); } - if (bCopy) { SCCOL nEndX = aLocalParam.nCol2; @@ -1739,5 +1737,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 8aec5c0c9feb..702b239da276 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> - #include "dbdocfun.hxx" #include "docsh.hxx" #include "globstr.hrc" @@ -189,10 +188,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, ScDocument* pImportDoc = new ScDocument( SCDOCMODE_UNDO ); pImportDoc->InitUndo( &rDoc, nTab, nTab ); - // get data from database into import document - try { // progress bar @@ -216,7 +213,6 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, // set source parameters - sal_Int32 nType = rParam.bSql ? sdb::CommandType::COMMAND : ( (rParam.nType == ScDbQuery) ? sdb::CommandType::QUERY : sdb::CommandType::TABLE ); @@ -251,7 +247,6 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, // get column descriptions - long nColCount = 0; uno::Reference<sdbc::XResultSetMetaData> xMeta; uno::Reference<sdbc::XResultSetMetaDataSupplier> xMetaSupp( xRowSet, uno::UNO_QUERY ); @@ -398,10 +393,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, OSL_FAIL("Unexpected exception in database"); } - // test for cell protection - bool bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt(); bool bMoveCells = !bAddrInsert && pDBData->IsDoSize(); SCCOL nFormulaCols = 0; // columns to be filled with formulas @@ -446,10 +439,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - // copy data from import doc into real document - if ( bSuccess ) { if (bKeepFormat) @@ -486,10 +477,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, pImportDoc->ApplyPatternAreaTab( 0,0,MAXCOL,MAXROW, nTab, aPattern ); } - // copy old data for undo - SCCOL nUndoEndCol = std::max( nEndCol, rParam.nCol2 ); // rParam = old end SCROW nUndoEndRow = std::max( nEndRow, rParam.nRow2 ); @@ -526,10 +515,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nCopyFlags, false, pUndoDoc ); } - // move new data - if (bMoveCells) { // clear only the range without the formulas, @@ -660,5 +647,4 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, return bSuccess; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index fbac2b51c6ef..f45db67ef0b9 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -96,7 +96,6 @@ using namespace com::sun::star; using ::com::sun::star::uno::Sequence; using ::std::vector; - // STATIC DATA ----------------------------------------------------------- IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) @@ -162,7 +161,6 @@ bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, bool bPaint ) return bChanged; } - bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos) { ScDocShellModificator aModificator( rDocShell ); @@ -1113,7 +1111,6 @@ bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, return bRet; } - static ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( const OUString& rText, const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) { ScTokenArray* pCode = new ScTokenArray; @@ -1341,7 +1338,6 @@ bool ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& r return true; } - bool ScDocFunc::ApplyStyle( const ScMarkData& rMark, const OUString& rStyleName, bool bRecord, bool bApi ) { @@ -2275,10 +2271,8 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, } } - // ausfuehren - WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference ScDocument* pUndoDoc = NULL; @@ -2639,10 +2633,8 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, sal_uInt16 nDestExt = 0; rDocShell.UpdatePaintExt( nDestExt, nDestCol,nDestRow,nDestTab, nDestEndCol,nDestEndRow,nDestEndTab ); - // ausfuehren - ScDocument* pUndoDoc = NULL; ScDocument* pRefUndoDoc = NULL; ScRefUndoData* pUndoData = NULL; @@ -2728,7 +2720,6 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, rDoc.CopyFromClip( aPasteDest, aDestMark, IDF_ALL & ~(IDF_OBJECTS), NULL, pClipDoc, true, false, bIncludeFiltered ); - // skipped rows and merged cells don't mix if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() ) UnmergeCells( aPasteDest, false ); @@ -2855,7 +2846,6 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, return true; } - uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, OUString& sCodeName ) { uno::Reference< lang::XMultiServiceFactory> xSF(rDocSh.GetModel(), uno::UNO_QUERY); @@ -2954,7 +2944,6 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ) } } - bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, bool bRecord, bool bApi ) { bool bSuccess = false; @@ -2964,7 +2953,6 @@ bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, bool bRecord, bo ScDocument& rDoc = rDocShell.GetDocument(); - // Strange loop, also basic is loaded too early ( InsertTable ) // is called via the xml import for sheets in described in ODF bool bInsertDocModule = false; @@ -3514,7 +3502,6 @@ bool ScDocFunc::SetWidthOrHeight( return bSuccess; } - bool ScDocFunc::InsertPageBreak( bool bColumn, const ScAddress& rPos, bool bRecord, bool bSetModified, bool /* bApi */ ) { @@ -4520,7 +4507,6 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e ScRange aSourceArea = rRange; ScRange aDestArea = rRange; - switch (eDir) { case FILL_TO_BOTTOM: diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 8c1ea5b0b2db..1e5e4486c6c2 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -169,7 +169,6 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)"; #define ScDocShell #include "scslots.hxx" - SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell, ScResId(SCSTR_DOCSHELL)) void ScDocShell::InitInterface_Impl() @@ -315,7 +314,6 @@ void ScDocShell::AfterXMLLoading(bool bRet) ++pNameBuffer; } - if( *pNameBuffer == SC_COMPILER_FILE_TAB_SEP ) // after the last quote of the docname should be the # char { sal_Int32 nIndex = nNameLength - nLinkTabNameLength; @@ -1503,7 +1501,6 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } FinishedLoading( SFX_LOADED_MAINDOCUMENT | SFX_LOADED_IMAGES ); - // invalidate eventually temporary table areas if ( bRet ) aDocument.InvalidateTableArea(); @@ -1554,7 +1551,6 @@ bool ScDocShell::LoadExternal( SfxMedium& rMed ) return false; } - ScDocShell::PrepareSaveGuard::PrepareSaveGuard( ScDocShell& rDocShell ) : mrDocShell( rDocShell) { @@ -1592,7 +1588,6 @@ ScDocShell::PrepareSaveGuard::~PrepareSaveGuard() } } - bool ScDocShell::Save() { ScRefreshTimerProtector aProt( aDocument.GetRefreshTimerControlAddress() ); @@ -1672,7 +1667,6 @@ bool ScDocShell::SaveAs( SfxMedium& rMedium ) return false; } - ScRefreshTimerProtector aProt( aDocument.GetRefreshTimerControlAddress() ); PrepareSaveGuard aPrepareGuard( *this); @@ -1696,7 +1690,6 @@ bool ScDocShell::SaveAs( SfxMedium& rMedium ) return bRet; } - bool ScDocShell::IsInformationLost() { //FIXME: If we have time build a correct own way how to handle this @@ -1717,7 +1710,6 @@ sal_Int32 lcl_ScDocShell_GetColWidthInChars( sal_uInt16 nWidth ) return sal_Int32( f ); } - void lcl_ScDocShell_GetFixedWidthString( OUString& rStr, const ScDocument& rDoc, SCTAB nTab, SCCOL nCol, bool bValue, SvxCellHorJustify eHorJust ) { @@ -1771,7 +1763,6 @@ void lcl_ScDocShell_GetFixedWidthString( OUString& rStr, const ScDocument& rDoc, rStr = aString; } - void lcl_ScDocShell_WriteEmptyFixedWidthString( SvStream& rStream, const ScDocument& rDoc, SCTAB nTab, SCCOL nCol ) { @@ -2452,7 +2443,6 @@ bool ScDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor return SfxObjectShell::SaveCompleted( xStor ); } - bool ScDocShell::DoSaveCompleted( SfxMedium * pNewStor ) { bool bRet = SfxObjectShell::DoSaveCompleted( pNewStor ); @@ -2462,7 +2452,6 @@ bool ScDocShell::DoSaveCompleted( SfxMedium * pNewStor ) return bRet; } - bool ScDocShell::QuerySlotExecutable( sal_uInt16 nSlotId ) { // #i112634# ask VBA event handlers whether to save or print the document @@ -2501,7 +2490,6 @@ bool ScDocShell::QuerySlotExecutable( sal_uInt16 nSlotId ) return bSlotExecutable; } - bool ScDocShell::PrepareClose( bool bUI ) { if(SC_MOD()->GetCurRefDlgId()>0) @@ -2568,7 +2556,6 @@ void ScDocShell::PrepareReload() aDocument.GetDocLinkManager().disconnectDdeLinks(); } - OUString ScDocShell::GetOwnFilterName() { return OUString(pFilterSc50); @@ -2777,7 +2764,6 @@ void ScDocShell::SetModified( bool bModified ) } } - void ScDocShell::SetDocumentModified( bool bIsModified /* = true */ ) { // BroadcastUno must also happen right away with pPaintLockData @@ -2880,7 +2866,6 @@ void ScDocShell::SetInUndo(bool bSet) bIsInUndo = bSet; } - void ScDocShell::GetDocStat( ScDocStat& rDocStat ) { SfxPrinter* pPrinter = GetPrinter(); @@ -2894,7 +2879,6 @@ void ScDocShell::GetDocStat( ScDocStat& rDocStat ) (sal_uInt16) ScPrintFunc( this, pPrinter, i ).GetTotalPages() ); } - SfxDocumentInfoDialog* ScDocShell::CreateDocumentInfoDialog( Window *pParent, const SfxItemSet &rSet ) { @@ -3077,7 +3061,6 @@ ScDocShellModificator::ScDocShellModificator( ScDocShell& rDS ) rDoc.EnableIdle(false); } - ScDocShellModificator::~ScDocShellModificator() { ScDocument& rDoc = rDocShell.GetDocument(); @@ -3087,7 +3070,6 @@ ScDocShellModificator::~ScDocShellModificator() rDoc.EnableIdle(bIdleEnabled); } - void ScDocShellModificator::SetDocumentModified() { ScDocument& rDoc = rDocShell.GetDocument(); @@ -3114,7 +3096,6 @@ bool ScDocShell::IsChangeRecording() const return pChangeTrack != NULL; } - bool ScDocShell::HasChangeRecordProtection() const { bool bRes = false; @@ -3124,7 +3105,6 @@ bool ScDocShell::HasChangeRecordProtection() const return bRes; } - void ScDocShell::SetChangeRecording( bool bActivate ) { bool bOldChangeRecording = IsChangeRecording(); @@ -3152,7 +3132,6 @@ void ScDocShell::SetChangeRecording( bool bActivate ) } } - bool ScDocShell::SetProtectionPassword( const OUString &rNewPassword ) { bool bRes = false; @@ -3186,7 +3165,6 @@ bool ScDocShell::SetProtectionPassword( const OUString &rNewPassword ) return bRes; } - bool ScDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) { bool bRes = false; diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 216599f8c43b..a7047fa504f3 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -60,8 +60,6 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) return bRet; } - - void ScDocShell::SetEmpty(bool bSet) { bIsEmpty = bSet; @@ -146,12 +144,10 @@ void ScDocShell::Activate() { } - 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 d7862d17195e..e3eb97b3ecf5 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -127,7 +127,6 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, sal_uInt16 nPart, sal_uI continue; } - if (nExtFlags & SC_PF_LINES) // Platz fuer Linien beruecksichtigen { //! Abfrage auf versteckte Spalten/Zeilen! @@ -802,7 +801,6 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck //! Abfrage, ob die Dokumente vor dem Change-Tracking gleich waren !!! - const ScChangeAction* pFirstMergeAction = pSourceAction; const ScChangeAction* pFirstSearchAction = pThisAction; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 04751134d07b..0f5a9cffdab5 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -112,7 +112,6 @@ using namespace ::com::sun::star; #define SC_PREVIEW_SIZE_X 10000 #define SC_PREVIEW_SIZE_Y 12400 - void ScDocShell::Execute( SfxRequest& rReq ) { // SID_SC_RANGE (Range), @@ -542,7 +541,6 @@ void ScDocShell::Execute( SfxRequest& rReq ) } break; - case SID_AUTO_STYLE: OSL_FAIL("use ScAutoStyleHint instead of SID_AUTO_STYLE"); break; @@ -1105,7 +1103,6 @@ void ScDocShell::Execute( SfxRequest& rReq ) } } - void UpdateAcceptChangesDialog() { // update "accept changes" dialog @@ -1182,7 +1179,6 @@ bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQuer return bDone; } - void ScDocShell::DoRecalc( bool bApi ) { bool bDone = false; @@ -1849,11 +1845,9 @@ void ScDocShell::GetSbxState( SfxItemSet &rSet ) // SID_TABLES_GET (Tables), // SID_PIVOT_GET (DataPilotTables) - removed (old Basic) - // Wenn hier Slots von der View-Shell executed werden, muss auch der // GetState weitergeleitet werden! - ScTabViewShell* pVisibleSh = GetBestViewShell(); // sichtbare View if ( pVisibleSh ) pVisibleSh->GetState( rSet ); @@ -1998,7 +1992,6 @@ void SnapVer( const ScDocument& rDoc, SCTAB nTab, long& rVal, SCROW& rStartRow ) rStartRow = nRow; } - } void ScDocShell::SnapVisArea( Rectangle& rRect ) const diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 88cab9572471..d9ba6d37c5e8 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -66,10 +66,8 @@ using com::sun::star::uno::UNO_QUERY; using ::std::auto_ptr; using ::std::vector; - // former viewfunc/dbfunc methods - void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId ) { //! StopMarking an der (aktiven) View? @@ -367,7 +365,6 @@ void ScDocShell::CancelAutoDBRange() } } - // Hoehen anpassen //! mit docfunc zusammenfassen @@ -986,7 +983,6 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec return true; } - IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) { ScDBDocFunc aFunc(*this); diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 1e21b7541ea7..c6b3dc600c20 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -66,10 +66,8 @@ struct ScStylePair // STATIC DATA ----------------------------------------------------------- - // Ole - void ScDocShell::SetVisArea( const Rectangle & rVisArea ) { // with the SnapVisArea call in SetVisAreaOrSize, it's safe to always @@ -214,16 +212,13 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, bool bSnapSize ) SetVisAreaOrSize( aNewArea, true ); // hier muss auch der Start angepasst werden } - // Style-Krempel fuer Organizer etc. - SfxStyleSheetBasePool* ScDocShell::GetStyleSheetPool() { return (SfxStyleSheetBasePool*)aDocument.GetStyleSheetPool(); } - // nach dem Laden von Vorlagen aus einem anderen Dokment (LoadStyles, Insert) // muessen die SetItems (ATTR_PAGE_HEADERSET, ATTR_PAGE_FOOTERSET) auf den richtigen // Pool umgesetzt werden, bevor der Quell-Pool geloescht wird. @@ -336,7 +331,6 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellS PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_LEFT ); // Paint } - void ScDocShell::ReconnectDdeLink(SfxObjectShell& rServer) { ::sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager(); diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index a37f78fdbc30..570e0d605dc0 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -152,7 +152,6 @@ namespace #endif // HAVE_FEATURE_DBCONNECTIVITY - // MoveFile/KillFile/IsDocument: similar to SfxContentHelper bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& rDestObj ) @@ -199,7 +198,6 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& return bRet; } - bool ScDocShell::KillFile( const INetURLObject& rURL ) { bool bRet = true; diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 5269d78b58c4..f251164af674 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -274,7 +274,6 @@ void ScExternalRefCache::Table::setReferenced( bool bReferenced ) meReferenced = (bReferenced ? REFERENCED_MARKED : UNREFERENCED); } - bool ScExternalRefCache::Table::isReferenced() const { return meReferenced != UNREFERENCED; @@ -1103,7 +1102,6 @@ void ScExternalRefCache::addCacheDocToReferenced( sal_uInt16 nFileId ) } } - void ScExternalRefCache::getAllCachedDataSpans( sal_uInt16 nFileId, sc::ColumnSpanSet& rSet ) const { const DocItem* pDocItem = getDocItem(nFileId); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 9882966a1992..4b252823c549 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2140,7 +2140,6 @@ bool ScImportExport::RTF2Doc( SvStream& rStrm, const OUString& rBaseURL ) return bOk; } - bool ScImportExport::HTML2Doc( SvStream& rStrm, const OUString& rBaseURL ) { ScEEAbsImport *pImp = ScFormatFilter::Get().CreateHTMLImport( pDoc, rBaseURL, aRange, true); diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index b4e0e336d82c..c17c0b7563f9 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -89,7 +89,6 @@ private: ModuleCellMap maCells; }; - 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 3aa5cf6b0c64..9def268ed97a 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -27,7 +27,6 @@ #include "globstr.hrc" #include "sc.hrc" - static void lcl_InvalidateOutliner( SfxBindings* pBindings ) { if ( pBindings ) @@ -752,6 +751,4 @@ bool ScOutlineDocFunc::HideOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel return true; //! immer ??? } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx index 58a31495fbfa..81813b71567e 100644 --- a/sc/source/ui/docshell/pntlock.cxx +++ b/sc/source/ui/docshell/pntlock.cxx @@ -40,5 +40,4 @@ void ScPaintLockData::AddRange( const ScRange& rRange, sal_uInt16 nP ) nParts |= 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 416e6359311e..b23f9c751930 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -254,6 +254,4 @@ void ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SvLinkSource::NotifyDataChanged(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index a13a09fa0527..892cc1d2008f 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "document.hxx" @@ -28,7 +27,6 @@ // Dokumentinfo-Tabpage: - SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet* rSet ) { return new ScDocStatPage( pParent, *rSet ); @@ -69,5 +67,4 @@ 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 3cc796f5e057..aec10e8b2905 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> @@ -182,7 +181,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) break; } - return; } @@ -291,7 +289,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) } } - } else pView->SetGeoAttrToMarked( *pArgs ); @@ -417,7 +414,6 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage ) if( bHasMarked ) pView->MergeAttrFromMarked( aNewAttr, false ); - SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); boost::scoped_ptr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog( pViewData->GetDialogParent(), &aNewAttr, diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index afc1ecde5308..311c1f129865 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -51,12 +51,10 @@ #include <boost/bind.hpp> - sal_uInt16 ScGetFontWorkId(); // in drtxtob using namespace com::sun::star; - ScDrawShell::ScDrawShell( ScViewData* pData ) : SfxShell(pData->GetViewShell()), pViewData( pData ), @@ -281,10 +279,8 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl svx::FontworkBar::getState( pView, rSet ); } - // Attribute fuer Drawing-Objekte - void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) { Point aMousePos = pViewData->GetMousePosPixel(); @@ -396,7 +392,6 @@ void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet ) } } - void ScDrawShell::Activate (const bool bMDI) { (void)bMDI; @@ -407,7 +402,6 @@ void ScDrawShell::Activate (const bool bMDI) GetSidebarContextName())); } - ::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 16976c0b2489..0f59e0597951 100644 --- a/sc/source/ui/drawfunc/drawsh4.cxx +++ b/sc/source/ui/drawfunc/drawsh4.cxx @@ -31,7 +31,6 @@ #include "tabvwsh.hxx" #include "sc.hrc" - void ScDrawShell::GetFormTextState(SfxItemSet& rSet) { const SdrObject* pObj = NULL; diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 62417f593359..77058fa448c3 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -241,10 +241,8 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) sal_uInt16 ScGetFontWorkId(); - // Funktionen auf Drawing-Objekten - void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) { SfxBindings& rBindings = pViewData->GetBindings(); @@ -700,5 +698,4 @@ ScDrawView* ScDrawShell::GetDrawView() return pViewData->GetView()->GetScDrawView(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index 6842f494f750..8c93b92a417c 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -40,7 +40,6 @@ #define ScDrawFormShell #include "scslots.hxx" - SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell, ScResId(SCSTR_DRAWFORMSHELL)) void ScDrawFormShell::InitInterface_Impl() diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index a437078f74f8..b88b982fce42 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -41,7 +41,6 @@ #include "scabstdlg.hxx" #include <boost/scoped_ptr.hpp> - bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet , sal_uInt16 nSlot) { @@ -135,5 +134,4 @@ void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest & /* rReq */ ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index dc9d1ba1179e..1aaebbfc58ac 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <editeng/adjustitem.hxx> #include <svx/drawitem.hxx> @@ -265,5 +264,4 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index 7d602becbe51..1ded6ea6741d 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconarc.hxx" #include "sc.hrc" #include "tabvwsh.hxx" @@ -217,5 +216,4 @@ SdrObject* FuConstArc::CreateDefaultObject(const sal_uInt16 nID, const Rectangle return pObj; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 8be1cc551d81..9acf314744d7 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconcustomshape.hxx" #include <editeng/svxenum.hxx> #include <svx/gallery.hxx> diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index 12183dd164bf..250e54cc6322 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconpol.hxx" #include "tabvwsh.hxx" #include "sc.hrc" diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 0ece581285ef..7d08431a6145 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconrec.hxx" #include "tabvwsh.hxx" #include "sc.hrc" @@ -32,7 +31,6 @@ #include "scresid.hxx" - /************************************************************************* |* |* Konstruktor diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 2aff287c54b2..4d7f695cd499 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> #include <svx/svdotext.hxx> @@ -364,5 +363,4 @@ void FuConstruct::Deactivate() FuDraw::Deactivate(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index d9bb3a57fb8f..94419c60eb51 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconuno.hxx" #include "tabvwsh.hxx" #include "sc.hrc" @@ -184,5 +183,4 @@ SdrObject* FuConstUnoControl::CreateDefaultObject(const sal_uInt16 /* nID */, co return pObj; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 1c44ded93288..df225de294d3 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/opengrf.hxx> #include <svx/svdograf.hxx> #include <svx/svdomedia.hxx> @@ -42,7 +41,6 @@ #include "sc.hrc" #include "globstr.hrc" - using namespace ::com::sun::star; void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage ) diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index f91725ff81f1..306500176f09 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -212,7 +212,6 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie OUString aIconMediaType; uno::Reference< io::XInputStream > xIconMetaFile; - sal_uInt16 nSlot = rReq.GetSlot(); SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, false ); if ( nSlot == SID_INSERT_OBJECT && pNameItem ) @@ -485,7 +484,6 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewSh->GetViewData().GetView()->Unmark(); } - // adapted old code pView->UnmarkAll(); @@ -838,5 +836,4 @@ void FuInsertChartFromFile::Deactivate() FuPoor::Deactivate(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 07ce80ef9831..5d5b4ebd8867 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/outliner.hxx> #include <svx/svditer.hxx> #include <svx/svdobj.hxx> diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 904ef4e301fb..c2e87ef4dc7e 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -519,10 +519,8 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); - // OLE: aktivieren - if (nSdrObjKind == OBJ_OLE2) { if (!bOle) @@ -534,7 +532,6 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) } } - // Edit text // not in UNO controls // #i32352# not in media objects @@ -613,7 +610,6 @@ bool FuSelection::KeyInput(const KeyEvent& rKEvt) return FuDraw::KeyInput(rKEvt); } - /************************************************************************* |* |* Function aktivieren diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index 75efe90b36ab..82cb880c0ab9 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -161,7 +161,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 8afd5210c215..d191218ccb5a 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svddef.hxx> #include <svx/svdoutl.hxx> #include <editeng/outlobj.hxx> @@ -344,7 +343,6 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) } } - if (!bIsInDragMode) { pWindow->CaptureMouse(); @@ -616,7 +614,6 @@ void FuText::Activate() FuConstruct::Activate(); } - /************************************************************************* |* |* Function deaktivieren @@ -630,7 +627,6 @@ void FuText::Deactivate() StopEditMode(); } - /************************************************************************* |* |* Selektion hat sich geaendert diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index 884d89fbf965..02bce31804f2 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/editeng.hxx> #include <editeng/outlobj.hxx> #include <svx/svdocapt.hxx> @@ -44,13 +43,11 @@ #include "drawview.hxx" #include "undocell.hxx" - // Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden, // damit die Aenderungen ins Dokument uebernommen werden! // (Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte) // bTextDirection=sal_True means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx). - void FuText::StopEditMode(bool /*bTextDirection*/) { SdrObject* pObject = pView->GetTextEditObject(); diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index ac8ef7f6ebd5..a7c4e22546ab 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index 99d9f03dec1d..86212211291e 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -40,7 +40,6 @@ #define ScOleObjectShell #include "scslots.hxx" - SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell, ScResId(SCSTR_OLEOBJECTSHELL)) void ScOleObjectShell::InitInterface_Impl() diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 7099fa37ea14..cfa8ee599ceb 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/string.hxx> #include <editeng/editview.hxx> #include <sfx2/bindings.hxx> @@ -193,7 +192,6 @@ void ScFunctionDockWin::InitLRUList() ScFunctionMgr* pFuncMgr = ScGlobal::GetStarCalcFunctionMgr(); pFuncMgr->fillLastRecentlyUsedFunctions(aLRUList); - sal_Int32 nSelPos = aCatBox.GetSelectEntryPos(); if(nSelPos == 0) @@ -223,7 +221,6 @@ void ScFunctionDockWin::UpdateLRUList() } } - /************************************************************************* #* Member: SetSize #*------------------------------------------------------------------------ @@ -253,7 +250,6 @@ void ScFunctionDockWin::SetSize() case SFX_ALIGN_TOOLBOXTOP: case SFX_ALIGN_TOOLBOXBOTTOM: - nNewDockMode=1; if(nDockMode!=nNewDockMode) { @@ -334,7 +330,6 @@ void ScFunctionDockWin::SetLeftRightSize() GetOutputSizePixel().Height()-2*aTxtSize.Height()); aPrivatSplit.SetYRange(aYRange); - if(aOldSize.Width()!=aNewSize.Width()) SetMyWidthLeRi(aNewSize); @@ -642,7 +637,6 @@ bool ScFunctionDockWin::Close() return true; } - /************************************************************************* #* Member: CheckAlignment #*------------------------------------------------------------------------ @@ -723,7 +717,6 @@ void ScFunctionDockWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ ) { } - /************************************************************************* #* Member: Resize #*------------------------------------------------------------------------ @@ -928,7 +921,6 @@ void ScFunctionDockWin::DoEnter() pShellWnd->GrabFocus(); } - } /************************************************************************* @@ -959,7 +951,6 @@ IMPL_LINK( ScFunctionDockWin, SelHdl, ListBox*, pLb ) SetDescription(); } - //SetSize(); return 0; } @@ -987,7 +978,6 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl ) DoEnter(); // Uebernimmt die Eingabe } - return 0; } @@ -1023,7 +1013,6 @@ IMPL_LINK( ScFunctionDockWin, SetSplitHdl, ScPrivatSplit*, pCtrl ) aFiFuncDesc.SetSizePixel(aFDSize); } - return 0; } @@ -1122,5 +1111,4 @@ void ScFunctionDockWin::StateChanged( StateChangedType nStateChange ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 3dbe12584259..e12f796451e4 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -55,17 +55,14 @@ #include <com/sun/star/table/CellAddress.hpp> - using namespace formula; using namespace com::sun::star; ScDocument* ScFormulaDlg::pDoc = NULL; ScAddress ScFormulaDlg::aCursorPos; - // Initialisierung / gemeinsame Funktionen fuer Dialog - ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* pViewData,formula::IFunctionManager* _pFunctionMgr ) : formula::FormulaDlg( pB, pCW, pParent, true,true,true, _pFunctionMgr,this) @@ -292,18 +289,15 @@ ScInputHandler* ScFormulaDlg::GetNextInputHandler(ScDocShell* pDocShell,PtrTabVi pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ); } - return pHdl; } - bool ScFormulaDlg::Close() { DoEnter(false); return true; } - // Funktionen fuer rechte Seite bool ScFormulaDlg::calculateValue( const OUString& rStrExp, OUString& rStrResult ) diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index 2b8e5ab61d2f..b61c2af24842 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -65,7 +65,6 @@ ScPrivatSplit::ScPrivatSplit(Window* pParent, const ResId& rResId, SetPointer(aWinPointer); } - /************************************************************************* #* Member: MouseButtonDown #*------------------------------------------------------------------------ @@ -336,7 +335,6 @@ void ScPrivatSplit::MoveSplitTo(Point aPos) CtrModified(); } - void ScPrivatSplit::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -403,5 +401,4 @@ void ScPrivatSplit::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 540f8231ffc9..01cfd99f858b 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECELL_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECELL_HXX @@ -186,7 +185,6 @@ private: bool IsDropdown(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 8445a52ea116..09781152d7c2 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECELLBASE_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECELLBASE_HXX diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 8fa0a696525b..04d867e227e3 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECONTEXTBASE_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECONTEXTBASE_HXX @@ -36,7 +35,6 @@ #include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.h> - #include <svl/lstner.hxx> #include <cppuhelper/compbase5.hxx> #include <cppuhelper/implbase1.hxx> @@ -326,7 +324,6 @@ private: sal_Int16 maRole; }; - #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 1c95dfbf2155..fc0b6ce0244c 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -31,7 +31,6 @@ #include <comphelper/uno3.hxx> #include "AccessibleContextBase.hxx" - class ScCsvControl; namespace utl { class AccessibleStateSetHelper; } @@ -121,7 +120,6 @@ protected: Point implGetAbsPos( const Point& rPos ) const; }; - class ScCsvRuler; typedef ::cppu::ImplHelper1< @@ -292,7 +290,6 @@ private: sal_Int32 implGetLastEqualFormatted( sal_Int32 nApiPos ); }; - class ScCsvGrid; typedef ::cppu::ImplHelper2< @@ -535,7 +532,6 @@ private: ScAccessibleCsvControl* implCreateCellObj( sal_Int32 nRow, sal_Int32 nColumn ) const; }; - /** Accessible class representing a cell of the CSV grid control. */ class ScAccessibleCsvCell : public ScAccessibleCsvControl, public accessibility::AccessibleStaticTextBase { @@ -637,7 +633,6 @@ private: ::std::auto_ptr< SvxEditSource > implCreateEditSource(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index f1da4604a879..8865fcf8ec9f 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENT_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENT_HXX @@ -66,7 +65,6 @@ public: virtual void Init() SAL_OVERRIDE; - DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); protected: virtual ~ScAccessibleDocument(void); @@ -338,7 +336,6 @@ protected: void SwitchViewFireFocus() SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx index 1162f2ab5116..7ab210daf913 100644 --- a/sc/source/ui/inc/AccessibleDocumentBase.hxx +++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENTBASE_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENTBASE_HXX @@ -36,7 +35,6 @@ protected: virtual ~ScAccessibleDocumentBase (void); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 5c90451eacef..6aa038504325 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENTPAGEPREVIEW_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENTPAGEPREVIEW_HXX @@ -144,7 +143,6 @@ private: ScShapeChildren* GetShapeChildren(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index afe5c93a4b7c..2339a7b35d4a 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEEDITOBJECT_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEEDITOBJECT_HXX @@ -201,7 +200,6 @@ private: ScDocument *m_pScDoc; ScAddress m_curCellAddress; - ///===== XAccessibleComponent ============================================ virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -212,7 +210,6 @@ private: sal_Int32 GetFgBgColor( const rtl::OUString &strPropColor) ; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index 2a744f7bc3a9..2e1739db3757 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPAGEHEADER_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPAGEHEADER_HXX @@ -99,7 +98,6 @@ private: void AddChild(const EditTextObject* pArea, sal_uInt32 nIndex, SvxAdjust eAdjust); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 05a5db06f65a..91f955e75f36 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPAGEHEADERAREA_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPAGEHEADERAREA_HXX @@ -123,7 +122,6 @@ private: void CreateTextHelper(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index f9d4e59a1b09..cc0d8ca15b44 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWCELL_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWCELL_HXX diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 6357a12c41c9..c399e4ebb098 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWHEADERCELL_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWHEADERCELL_HXX @@ -140,7 +139,6 @@ private: void FillTableInfo() const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index aadece14dd7b..ba281afb8867 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWTABLE_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWTABLE_HXX @@ -191,7 +190,6 @@ private: void FillTableInfo() const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 7264baac0f17..55983fcf0be8 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLESPREADSHEET_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLESPREADSHEET_HXX diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 32eb852c92ac..d506b75660d9 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLETABLEBASE_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLETABLEBASE_HXX @@ -317,7 +316,6 @@ protected: void CommitTableModelChange(sal_Int32 nStartRow, sal_Int32 nStartCol, sal_Int32 nEndRow, sal_Int32 nEndCol, sal_uInt16 nId); }; - #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 2658cd5d8ffe..923187da0f55 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -38,7 +38,6 @@ class EditTextObject; class ScCsvViewForwarder; class ScAccessibleCell; - class ScAccessibleTextData : public SfxListener { public: @@ -65,7 +64,6 @@ private: ScCellEditSource* GetOriginalSource() { return NULL; } }; - class ScAccessibleCellBaseTextData : public ScAccessibleTextData, public ScCellTextData { @@ -81,7 +79,6 @@ public: virtual bool IsDirty() const SAL_OVERRIDE { return ScCellTextData::IsDirty(); } }; - // ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object class ScAccessibleCellTextData : public ScAccessibleCellBaseTextData @@ -116,7 +113,6 @@ private: ScDocShell* GetDocShell(ScTabViewShell* pViewShell); }; - class ScAccessibleEditObjectTextData : public ScAccessibleTextData { public: @@ -147,7 +143,6 @@ protected: bool mbIsCloned; }; - class ScAccessibleEditLineTextData : public ScAccessibleEditObjectTextData { public: @@ -169,7 +164,6 @@ private: bool mbEditEngineCreated; }; - class ScAccessiblePreviewCellTextData : public ScAccessibleCellBaseTextData { public: @@ -196,7 +190,6 @@ private: ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; - class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextData { public: @@ -226,7 +219,6 @@ private: ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; - class ScAccessibleHeaderTextData : public ScAccessibleTextData { public: @@ -257,7 +249,6 @@ private: SvxAdjust meAdjust; }; - class ScAccessibleNoteTextData : public ScAccessibleTextData { public: @@ -288,7 +279,6 @@ private: bool mbDataValid; }; - class ScAccessibleCsvTextData : public ScAccessibleTextData { private: @@ -325,7 +315,6 @@ public: virtual bool IsDirty() const SAL_OVERRIDE { return false; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index 48ddafd9fc01..e033be5f0dd1 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -65,5 +65,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/CorrelationDialog.hxx b/sc/source/ui/inc/CorrelationDialog.hxx index 492e9ed9e8c9..42747a31ba14 100644 --- a/sc/source/ui/inc/CorrelationDialog.hxx +++ b/sc/source/ui/inc/CorrelationDialog.hxx @@ -27,8 +27,6 @@ protected: virtual const OUString getTemplate() SAL_OVERRIDE; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx index 4f154cee694b..6d97dfdab752 100644 --- a/sc/source/ui/inc/CovarianceDialog.hxx +++ b/sc/source/ui/inc/CovarianceDialog.hxx @@ -30,5 +30,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx index 5a2b117cdf69..380a75719e0f 100644 --- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx +++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx @@ -39,5 +39,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index 18d50e48a76d..847dff59fa4a 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_DRAWMODELBROADCASTER_HXX #define INCLUDED_SC_SOURCE_UI_INC_DRAWMODELBROADCASTER_HXX - #include <svl/lstner.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/implbase1.hxx> diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx index 8416c7fda530..4572ac3e14f1 100644 --- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx +++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx @@ -42,5 +42,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx index 1f1dbda47830..1dce57264dd3 100644 --- a/sc/source/ui/inc/FTestDialog.hxx +++ b/sc/source/ui/inc/FTestDialog.hxx @@ -31,5 +31,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx index d1ccdf884cac..b6819102c502 100644 --- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx +++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx @@ -41,5 +41,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/MovingAverageDialog.hxx b/sc/source/ui/inc/MovingAverageDialog.hxx index a703817d53bc..7183453925d3 100644 --- a/sc/source/ui/inc/MovingAverageDialog.hxx +++ b/sc/source/ui/inc/MovingAverageDialog.hxx @@ -42,5 +42,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 290773a317ff..e3e8e747fca7 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -131,7 +131,6 @@ public: void PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames); }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ #endif diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index ffb95d57bdfa..66163925a37f 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -84,5 +84,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_RANDOMNUMBERGENERATORDIALOG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 9cebb6cba546..8e4269f004d7 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -80,5 +80,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index d54ac00afb2f..ee879f584b4d 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -86,5 +86,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 87c1d6bec1c7..99d0f98b46cb 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -89,5 +89,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx index b296999648f2..d90519c4ca98 100644 --- a/sc/source/ui/inc/TTestDialog.hxx +++ b/sc/source/ui/inc/TTestDialog.hxx @@ -31,5 +31,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index d45e3a9446dd..8a80bb201bee 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -160,5 +160,4 @@ 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 a3511e729795..4f2041931ed9 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -44,7 +44,6 @@ class ScDocument; #define FLT_DATE_BETWEEN 4 #define FLT_DATE_SAVE 5 - class ScViewEntryPtr { private: @@ -92,7 +91,6 @@ typedef long LExpNum; //@ Expand entrys are ambiguous and therefore removed //DECLARE_TABLE( ScChgTrackExps, LExpNum) - class ScAcceptChgDlg : public SfxModelessDialog { private: @@ -218,7 +216,6 @@ public: }; - #endif // INCLUDED_SC_SOURCE_UI_INC_ACREDLIN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index dcdbc7936c90..18d19a3ae3d7 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -126,7 +126,6 @@ private: DECL_LINK( UpdateFocusHdl, void* ); - protected: virtual bool DoClose( sal_uInt16 nId ); @@ -171,7 +170,6 @@ public: inline bool CanInputDone( bool bForced ); }; - class ScRefHdlModalImpl : public ModalDialog, public ScRefHandler { public: @@ -246,7 +244,6 @@ ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, { } - template<class TWindow, bool bBindRef > ScRefHdlrImplBase<TWindow,bBindRef>::~ScRefHdlrImplBase(){} @@ -271,7 +268,6 @@ public: const OUString& rUIXMLDescription); }; - template<class TDerived, class TBase, bool bBindRef = true> struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef > { @@ -312,7 +308,6 @@ struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog> } }; - inline bool ScRefHandler::CanInputStart( const formula::RefEdit *pEdit ) { return m_aHelper.CanInputStart( pEdit ); diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index 89d4094f19ec..7448b7aa6560 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -27,7 +27,6 @@ class ScDocument; class ScAreaLink; - class ScAreaLinkSaver { private: @@ -50,7 +49,6 @@ public: void InsertNewLink( ScDocument* pDoc ); }; - class ScAreaLinkSaveCollection { typedef ::boost::ptr_vector<ScAreaLinkSaver> DataType; @@ -60,7 +58,6 @@ public: ScAreaLinkSaveCollection( const ScAreaLinkSaveCollection& r ); ~ScAreaLinkSaveCollection(); - bool IsEqual( const ScDocument* pDoc ) const; void Restore( ScDocument* pDoc ); @@ -73,7 +70,6 @@ public: void push_back(ScAreaLinkSaver* p); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index d7c6789865bb..430c1d8a2733 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -30,7 +30,6 @@ class ScDocument; class ScViewData; - class ScPrintAreasDlg : public ScAnyRefDlg { public: diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index ef6e380a4604..852685349be7 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -45,5 +45,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_ATTRDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx index 7e0945130e08..9081f7df0ebe 100644 --- a/sc/source/ui/inc/auditsh.hxx +++ b/sc/source/ui/inc/auditsh.hxx @@ -51,5 +51,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 614c2c0d4643..e0903ee60fdf 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -113,5 +113,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_AUTOFMT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx index b89439bfdb86..f6b15a68ccea 100644 --- a/sc/source/ui/inc/cbutton.hxx +++ b/sc/source/ui/inc/cbutton.hxx @@ -25,7 +25,6 @@ class OutputDevice; - class ScDDComboBoxButton { public: @@ -66,8 +65,6 @@ protected: Size aBtnSize; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_CBUTTON_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/cellmergeoption.hxx b/sc/source/ui/inc/cellmergeoption.hxx index fc2c0ec94808..b838ddf03772 100644 --- a/sc/source/ui/inc/cellmergeoption.hxx +++ b/sc/source/ui/inc/cellmergeoption.hxx @@ -35,7 +35,6 @@ struct ScCellMergeOption ScRange getFirstSingleRange() const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index b23da9aab1a3..d319d86f7d67 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -186,7 +186,6 @@ private: ScMenuFloatingWindow* mpParentMenu; }; - class ScCheckListBox : public SvTreeListBox { SvLBoxButtonData* mpCheckButton; diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index 1054ff769419..e52c6fd03b65 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -58,7 +58,6 @@ public: bool UseNumericHeader() const; }; - class ScRowBar : public ScHeaderControl { ScViewData* pViewData; diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 12b522ff67c9..123d9ea3ad1b 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -110,7 +110,6 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; - public: SC_DLLPUBLIC ScCondFormatDlg(Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 84bd2e6a57aa..6123dbc79c62 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -31,7 +31,6 @@ class ScViewData; - enum ScConflictAction { SC_CONFLICT_ACTION_NONE, @@ -43,7 +42,6 @@ typedef ::std::vector< sal_uLong > ScChangeActionList; // struct ScConflictsListEntry - struct ScConflictsListEntry { ScConflictAction meConflictAction; @@ -54,12 +52,10 @@ struct ScConflictsListEntry bool HasOwnAction( sal_uLong nOwnAction ) const; }; - typedef ::std::vector< ScConflictsListEntry > ScConflictsList; // class ScConflictsListHelper - class ScConflictsListHelper { private: @@ -77,7 +73,6 @@ public: // class ScConflictsFinder - class ScConflictsFinder { private: @@ -102,7 +97,6 @@ public: // class ScConflictsResolver - class ScConflictsResolver { private: @@ -119,7 +113,6 @@ public: // class ScConflictsDlg - class ScConflictsDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 95bae7849df9..80b862cf9be7 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -33,7 +33,6 @@ class ScDocument; class ScRangeUtil; class ScAreaData; - class ScConsolidateDlg : public ScAnyRefDlg { public: diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index caa5dd973605..20aaab6f5fdb 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -158,7 +158,6 @@ public: static bool IsInDrag() { return bIsInDrag; } }; - #endif // INCLUDED_SC_SOURCE_UI_INC_CONTENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index e09ebd4207ab..488d9a48930b 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_CRDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_CRDLG_HXX - #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/layout.hxx> diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 5337886961ce..8bdeda1442af 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -30,7 +30,6 @@ class ScViewData; class ScDocument; - class ScColRowNameRangesDlg : public ScAnyRefDlg { public: diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 0e17900a6c84..f8db0c894928 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -27,13 +27,11 @@ #include "csvsplits.hxx" #include <com/sun/star/uno/Reference.hxx> - class ScAccessibleCsvControl; namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } - /** Minimum character count for a column in separators mode. */ const sal_Int32 CSV_MINCOLWIDTH = 8; /** Maximum length of a cell string. */ @@ -64,7 +62,6 @@ const sal_uInt8 SC_COL_YMD = 5; 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 { @@ -78,7 +75,6 @@ struct ScCsvExpData typedef ::std::vector< ScCsvExpData > ScCsvExpDataVec; - /** Specifies which element should be used to perform an action. */ enum ScMoveMode { @@ -91,7 +87,6 @@ enum ScMoveMode MOVE_NEXTPAGE /// Next page relative to current context. }; - /** Flags for comparison of old and new control layout data. */ typedef sal_uInt32 ScCsvDiff; @@ -111,7 +106,6 @@ const ScCsvDiff CSV_DIFF_HORIZONTAL = CSV_DIFF_POSCOUNT | CSV_DIFF_POSOFFSET const ScCsvDiff CSV_DIFF_VERTICAL = CSV_DIFF_LINECOUNT | CSV_DIFF_LINEOFFSET | CSV_DIFF_HDRHEIGHT | CSV_DIFF_LINEHEIGHT; 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 @@ -156,7 +150,6 @@ inline bool operator!=( const ScCsvLayoutData& rData1, const ScCsvLayoutData& rD return !(rData1 == rData2); } - /** 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. @@ -200,7 +193,6 @@ enum ScCsvCmdType CSVCMD_REMOVEALLSPLITS /// Remove all splits. [-] }; - /** 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 @@ -226,7 +218,6 @@ inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPar meType = eType; mnParam1 = nParam1; mnParam2 = nParam2; } - /** Base class for the CSV ruler and the data grid control. Implements command handling. */ class SC_DLLPUBLIC ScCsvControl : public Control { @@ -246,7 +237,6 @@ private: ScAccessibleCsvControl* mpAccessible; /// Pointer to the accessible implementation object. bool mbValidGfx; /// Content of virtual devices valid? - public: explicit ScCsvControl( ScCsvControl& rParent ); explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ); @@ -398,7 +388,6 @@ protected: virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0; }; - #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 79a4a0455a0d..d01f5f0a0b37 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -30,20 +30,17 @@ #include "csvcontrol.hxx" #include "csvsplits.hxx" - namespace svtools { class ColorConfig; } class EditEngine; class ScEditEngineDefaulter; 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 { @@ -69,10 +66,8 @@ inline void ScCsvColState::Select( bool bSel ) if( bSel ) mnFlags |= CSV_COLFLAG_SELECT; else mnFlags &= ~CSV_COLFLAG_SELECT; } - 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 @@ -111,7 +106,6 @@ private: sal_uInt32 mnMTCurrCol; /// Current column of mouse tracking. bool mbMTSelecting; /// Mouse tracking: true = select, false = deselect. - public: explicit ScCsvGrid( ScCsvControl& rParent ); virtual ~ScCsvGrid(); @@ -334,7 +328,6 @@ protected: virtual ScAccessibleCsvControl* ImplCreateAccessible() SAL_OVERRIDE; }; - #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 afa63d211e5b..ef73cae674c4 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -27,7 +27,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 @@ -53,7 +52,6 @@ private: Rectangle maActiveRect; /// The active area of the ruler. sal_Int32 mnSplitSize; /// Size of a split circle. - public: explicit ScCsvRuler( ScCsvControl& rParent ); virtual ~ScCsvRuler(); @@ -180,7 +178,6 @@ protected: virtual ScAccessibleCsvControl* ImplCreateAccessible() SAL_OVERRIDE; }; - #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 2d9979b54f5c..a53be066543f 100644 --- a/sc/source/ui/inc/csvsplits.hxx +++ b/sc/source/ui/inc/csvsplits.hxx @@ -24,13 +24,11 @@ #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 { @@ -82,7 +80,6 @@ private: sal_uInt32 GetIterIndex( const_iterator aIter ) const; }; - #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 602e854676d4..789f7c234e58 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -27,11 +27,9 @@ #include "csvruler.hxx" #include "csvgrid.hxx" - class ListBox; class ScAsciiOptions; - /* ============================================================================ Position: Positions between the characters (the dots in the ruler). Character: The characters (the range from one position to the next). @@ -62,7 +60,6 @@ private: bool mbFixedMode; /// false = Separators, true = Fixed width. - public: explicit ScCsvTableBox( Window* pParent, WinBits nBits ); @@ -141,7 +138,6 @@ protected: virtual ScAccessibleCsvControl* ImplCreateAccessible() SAL_OVERRIDE; }; - #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 0fd03ec60546..2ab44ba0d661 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -50,7 +50,6 @@ private: DECL_LINK( RadioClickHdl, RadioButton * ); }; - class ScDataPilotServiceDlg : public ModalDialog { private: @@ -81,8 +80,6 @@ public: OUString GetParPass() const; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 6450bb579d2b..753cae67774f 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -34,7 +34,6 @@ namespace datastreams { class ReaderThread; } - class DataStream : boost::noncopyable { public: diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 58dba0e851c3..5dd4ab1885bd 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -32,7 +32,6 @@ class ScViewData; class ScDocument; - class ScDbNameDlg : public ScAnyRefDlg { public: diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index 8da41e241a3b..2898be599fe9 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.hxx @@ -20,12 +20,10 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_DELCLDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_DELCLDLG_HXX - #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> - #include "global.hxx" class ScDeleteCellDlg : public ModalDialog @@ -42,8 +40,6 @@ public: DelCellCmd GetDelCellCmd() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_DELCLDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index 548f4a15241a..fcc4acb9ecbc 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -54,7 +54,6 @@ public: sal_uInt16 GetDelContentsCmdBits() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_DELCODLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index dc0a0f2d3117..e603841e5b33 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -231,7 +231,6 @@ public: virtual ~ScDocFuncDirect() {} }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 2f8c1ee40870..36731fedb73c 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_DOCSH_HXX #define INCLUDED_SC_SOURCE_UI_INC_DOCSH_HXX - #include <sfx2/objsh.hxx> #include <sfx2/docfac.hxx> @@ -436,11 +435,9 @@ public: virtual bool SetProtectionPassword( const OUString &rPassword ) SAL_OVERRIDE; virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) SAL_OVERRIDE; - void SnapVisArea( Rectangle& rRect ) const; }; - void UpdateAcceptChangesDialog(); class ScDocShell; @@ -509,8 +506,6 @@ namespace HelperNotifyChanges } }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 3d7b6a16d02f..dd5c6dbe2b2b 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -42,7 +42,6 @@ public: protected: ~ScDPGroupEditHelper() {} - private: virtual bool ImplGetValue( double& rfValue ) const = 0; virtual void ImplSetValue( double fValue ) = 0; @@ -90,7 +89,6 @@ private: Date maNullDate; }; - class ScDPNumGroupDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 61eb936cafb5..713cd21fbd48 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -93,5 +93,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index d7df9a196f15..21c785aff16d 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -164,7 +164,6 @@ public: virtual void SyncForGrid( SdrObject* pObj ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index efca06767e1c..a74d4ae3a673 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -29,7 +29,6 @@ #include "charthelper.hxx" #include "rangelst.hxx" - class SdrModel; class ScDocShell; class INetBookmark; diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 52d639c04245..34e173d2eb0a 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -95,7 +95,6 @@ protected: virtual void ToggleFloatingMode() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual SfxChildAlignment CheckAlignment(SfxChildAlignment, SfxChildAlignment eAlign) SAL_OVERRIDE; @@ -118,5 +117,4 @@ public: #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 cc8710d91f7d..a1df80ebc9d0 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -30,7 +30,6 @@ class ScDocument; #include "scui_def.hxx" - class ScFillSeriesDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 2a8f9e12cf44..fae7f16a8520 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -82,7 +82,6 @@ private: DECL_LINK( BtnCopyResultHdl, CheckBox* ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_FOPTMGR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index 1057a077c50b..a87ec89872c2 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.hxx @@ -36,14 +36,12 @@ public: void SetInputHandler(ScInputHandler* pHdl) { pInputHandler=pHdl;} void SetDocShell(ScDocShell* pSds) { pScDocShell=pSds;} - virtual void SaveValues() SAL_OVERRIDE; private: ScFormEditData( const ScFormEditData& ); // const ScFormEditData& operator=( const ScFormEditData& r ); - ScInputHandler* pInputHandler; ScDocShell* pScDocShell; }; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index b5ad534c91e3..70d795968d4a 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -40,10 +40,8 @@ class ScInputHandler; class ScDocShell; class ScFormulaCell; - typedef ScTabViewShell* PtrTabViewShell; - class ScFormulaDlg : public formula::FormulaDlg, public IAnyRefDialog { diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index ed58368d9e04..0051ed185e60 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -45,7 +45,6 @@ class FuConstPolygon : public FuConstruct virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; - #endif // _FUCONPOL_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 1d135afb29e0..60c6d6472aa8 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -22,7 +22,6 @@ #include "fudraw.hxx" - /** Draw rectangle */ class FuConstruct : public FuDraw { diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 926e4b2ae5fa..407c9b593e69 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -22,7 +22,6 @@ #include "fuconstr.hxx" - /** Draw Control */ class FuConstUnoControl : public FuConstruct { diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index 2d89091d8710..a93dd0495dea 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_FUINSERT_HXX #define INCLUDED_SC_SOURCE_UI_INC_FUINSERT_HXX diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 59106821be5e..1226d1b5ef85 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -37,7 +37,6 @@ class ScFuncDesc; #define LRU_MAX 10 - class ScListBox : public ListBox { protected: @@ -49,8 +48,6 @@ public: ScListBox( Window* pParent, const ResId& rResId ); }; - - class ScFuncPage : public TabPage { private: @@ -65,7 +62,6 @@ private: const ScFuncDesc* aLRUList[LRU_MAX]; - DECL_LINK( SelHdl, ListBox* ); DECL_LINK( DblClkHdl, ListBox* ); @@ -74,7 +70,6 @@ protected: void UpdateFunctionList(); void InitLRUList(); - public: ScFuncPage( Window* pParent); @@ -98,7 +93,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx index 8f7a00cb716f..f98d76fd8982 100644 --- a/sc/source/ui/inc/gridmerg.hxx +++ b/sc/source/ui/inc/gridmerg.hxx @@ -49,5 +49,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index 6b7d44904d4a..5d1f64574c5b 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -23,10 +23,8 @@ #include <sfx2/tabdlg.hxx> #include <svx/pageitem.hxx> - #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 991542261b09..9dae49bc8e10 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -73,7 +73,6 @@ private: DECL_LINK(HighlightHandle, CheckBox*); DECL_LINK(OKBtnHdl, PushButton*); - protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; @@ -91,7 +90,6 @@ public: }; - #endif // INCLUDED_SC_SOURCE_UI_INC_HIGHRED_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx index ecea01ea75e8..60e38877ef40 100644 --- a/sc/source/ui/inc/hiranges.hxx +++ b/sc/source/ui/inc/hiranges.hxx @@ -33,8 +33,6 @@ struct ScHighlightEntry aRef(rR), aColor(rC) {} }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx index 93c24b2fe63c..261b3c4ea78a 100644 --- a/sc/source/ui/inc/imoptdlg.hxx +++ b/sc/source/ui/inc/imoptdlg.hxx @@ -99,7 +99,6 @@ public: bool bSaveFormulas; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_IMOPTDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 9faa1a69ac52..7bd391456d49 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -159,7 +159,6 @@ public: void SetExportTextOptions( const ScExportTextOptions& options ) { mExportTextOptions = options; } }; - inline bool ScImportExport::IsEndianSwap( const SvStream& rStrm ) { #ifdef OSL_BIGENDIAN @@ -178,7 +177,6 @@ inline void ScImportExport::SetNoEndianSwap( SvStream& rStrm ) #endif } - // Helper class for importing clipboard strings as streams. class ScImportStringStream : public SvMemoryStream { diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 70e455443e90..c34d7629a3c7 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -49,10 +49,8 @@ class CommandEvent; struct ESelection; - // ScInputHandler - class ScInputHandler : boost::noncopyable { private: @@ -266,7 +264,6 @@ public: static void SetAutoComplete(bool bSet) { bAutoComplete = bSet; } }; - // ScInputHdlState class ScInputHdlState @@ -303,5 +300,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 68d39e422676..0463eb3bc21f 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -160,7 +160,6 @@ private: void ReleaseFocus_Impl(); }; - class ScInputBarGroup; class ScMultiTextWnd : public ScTextWnd @@ -234,7 +233,6 @@ private: }; - class ScInputWindow : public ToolBox // Parent toolbox { public: @@ -311,7 +309,6 @@ public: SFX_DECL_CHILDWINDOW_WITHID(ScInputWindowWrapper); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index cd7a4b59b549..8ce7449a5cc9 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -24,7 +24,6 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> - #include "global.hxx" class ScInsertCellDlg : public ModalDialog @@ -42,8 +41,6 @@ public: InsCellCmd GetInsCellCmd() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_INSCLDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 0fe1a5a2a28f..3fd40080c94b 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -25,7 +25,6 @@ #include <vcl/fixed.hxx> #include "global.hxx" - #include "scui_def.hxx" class ScInsertContentsDlg : public ModalDialog @@ -92,8 +91,6 @@ private: DECL_LINK( LinkBtnHdl, void* ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_INSCODLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/invmerge.hxx b/sc/source/ui/inc/invmerge.hxx index 4efc564d6681..952b8d7d58af 100644 --- a/sc/source/ui/inc/invmerge.hxx +++ b/sc/source/ui/inc/invmerge.hxx @@ -44,5 +44,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index cc51394fac6b..5b09058cc091 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -20,13 +20,11 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX - #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/button.hxx> - #include <vcl/dialog.hxx> class ScSelEntryDlg : public ModalDialog @@ -42,8 +40,6 @@ public: OUString GetSelectEntry() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 81f885422ca2..85376ac273c3 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -23,14 +23,12 @@ #include "scitems.hxx" #include <svl/srchitem.hxx> - #include <svl/itempool.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> #include "uiitems.hxx" - class ScDocumentPool; class ScMessagePool: public SfxItemPool diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index fa9eb5ab4cf4..0337f9dfcc11 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -25,7 +25,6 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> - class ScMetricInputDlg : public ModalDialog { public: @@ -54,6 +53,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_MTRINDLG_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 9a59e93b5832..2b703ec612bb 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX - #include "address.hxx" #include <vcl/dialog.hxx> #include <vcl/button.hxx> @@ -74,7 +73,6 @@ private: bool bRenameTable:1; bool mbEverEdited:1; - void Init (); void InitBtnRename (); void InitDocListBox (); @@ -86,5 +84,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx index d664267a9d9e..7757bf265bcd 100644 --- a/sc/source/ui/inc/namecrea.hxx +++ b/sc/source/ui/inc/namecrea.hxx @@ -38,7 +38,6 @@ public: sal_uInt16 GetFlags() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_NAMECREA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index c0ad147f789d..63c749778afb 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -39,7 +39,6 @@ class ScViewData; class ScDocument; - //logic behind the manage names dialog class ScNameDlg : public ScAnyRefDlg, public ScRangeManagerTable::InitListener { diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 2ece360fbd35..44910754d2f0 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -54,7 +54,6 @@ public: bool IsAllSelected() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_NAMEPAST_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 a2fdb3222f79..f2ca715191b1 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_NAVCITEM_HXX #define INCLUDED_SC_SOURCE_UI_INC_NAVCITEM_HXX - #include <sfx2/ctrlitem.hxx> - class ScNavigatorDlg; class ScNavigatorControllerItem : public SfxControllerItem @@ -40,7 +38,6 @@ private: ScNavigatorDlg& rNavigatorDlg; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_NAVCITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index e3d20201373f..4cc39795b60c 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -31,7 +31,6 @@ #include "content.hxx" #include <svtools/svmedit.hxx> - class ScTabViewShell; class ScViewData; class ScArea; @@ -51,10 +50,8 @@ enum NavListMode { NAV_LMODE_NONE = 0x4000, NAV_LMODE_DOCS = 0x800, NAV_LMODE_SCENARIOS = 0x400 }; - // class ScScenarioListBox ----------------------------------------------- - class ScScenarioListBox : public ListBox { public: @@ -92,7 +89,6 @@ private: ScenarioList maEntries; }; - // class ScScenarioWindow ------------------------------------------------ class ScScenarioWindow : public Window @@ -116,7 +112,6 @@ private: MultiLineEdit aEdComment; }; - // class ColumnEdit class ColumnEdit : public SpinField @@ -208,10 +203,8 @@ private: ScNavigatorDlg& rDlg; }; - // class ScNavigatorDlg - class ScNavigatorDlg : public Window, public SfxListener { friend class ScNavigatorControllerItem; diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx index 4049347fcd83..66d307af759b 100644 --- a/sc/source/ui/inc/navsett.hxx +++ b/sc/source/ui/inc/navsett.hxx @@ -46,7 +46,6 @@ public: inline sal_uLong GetChildSelected() const { return mnChildSelected; } }; - #endif // INCLUDED_SC_SOURCE_UI_INC_NAVSETT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx index c1f08fc3d4c8..3695934b4ee2 100644 --- a/sc/source/ui/inc/olinefun.hxx +++ b/sc/source/ui/inc/olinefun.hxx @@ -25,7 +25,6 @@ class ScDocShell; class ScRange; - class ScOutlineDocFunc { private: diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index 891b4f67dbe9..ecc83948550c 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -25,10 +25,8 @@ 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 @@ -224,7 +222,6 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 5cbb52f234e6..56129165239e 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -43,7 +43,6 @@ class ScRedlineOptionsTabPage : public SfxTabPage OUString aAuthorStr; DECL_LINK(ColorHdl, void *); - public: ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); @@ -56,5 +55,4 @@ 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 769bb1998292..1ae4aa78d913 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -47,7 +47,6 @@ protected: virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; - /// The dialog's content for a row, not yet parsed struct ScOptConditionRow { @@ -201,7 +200,6 @@ private: DECL_LINK( SelectHdl, void* ); }; - class ScSolverProgressDialog : public ModelessDialog { FixedText* m_pFtTime; @@ -233,7 +231,6 @@ public: ScSolverSuccessDialog( Window* pParent, const OUString& rSolution ); }; - #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 7dfe935b7fe4..8651c8f1384b 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -95,7 +95,6 @@ private: DECL_LINK( CheckBoxHdl, CheckBox* ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx index 05d829a807c0..7e43372fd795 100644 --- a/sc/source/ui/inc/pfuncache.hxx +++ b/sc/source/ui/inc/pfuncache.hxx @@ -28,7 +28,6 @@ class ScDocShell; class ScMarkData; - /** Possible types of selection for print functions */ enum ScPrintSelectionMode @@ -40,7 +39,6 @@ enum ScPrintSelectionMode SC_PRINTSEL_RANGE_EXCLUSIVELY_OLE_AND_DRAW_OBJECTS }; - /** Stores the selection in the ScPrintFuncCache so it is only used for the same selection again. */ @@ -65,7 +63,6 @@ public: const ScPrintOptions& GetOptions() const { return aOptions; } }; - /** The range that is printed on a page (excluding repeated columns/rows), and its position on the page, used to find hyperlink targets. */ @@ -82,7 +79,6 @@ struct ScPrintPageLocation nPage(nP), aCellRange(rRange), aRectangle(rRect) {} }; - /** Stores the data for printing that is needed from several sheets, so it doesn't have to be calculated for rendering each page. */ diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx index a519171c9a08..7d80511679fa 100644 --- a/sc/source/ui/inc/pivotsh.hxx +++ b/sc/source/ui/inc/pivotsh.hxx @@ -53,5 +53,4 @@ private: #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 bb5c79874979..4a57af5759bc 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_PREVIEW_HXX #define INCLUDED_SC_SOURCE_UI_INC_PREVIEW_HXX - #include <vcl/window.hxx> #include "printfun.hxx" #include "markdata.hxx" @@ -135,7 +134,6 @@ public: void DrawInvert( long nDragPos, sal_uInt16 nFlags ); void DragMove( long nDragMovePos, sal_uInt16 nFlags ); - const ScPreviewLocationData& GetLocationData(); OUString GetPosString(); diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx index ff8ca2fd4a8e..3a4b5bbbefee 100644 --- a/sc/source/ui/inc/prevloc.hxx +++ b/sc/source/ui/inc/prevloc.hxx @@ -80,7 +80,6 @@ public: void LimitToArea( const Rectangle& rPixelArea ); }; - class ScPreviewLocationData { OutputDevice* pWindow; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index a28c2f18f4a2..4ae03f6ef50e 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -36,7 +36,6 @@ struct ScHeaderFieldData; class ScPreviewLocationData; class CommandEvent; - class ScPreviewShell: public SfxViewShell { ScDocShell* pDocShell; diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index c83a234c9898..264ee8d9c367 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_PRINTFUN_HXX #define INCLUDED_SC_SOURCE_UI_INC_PRINTFUN_HXX - #include "pagepar.hxx" #include "editutil.hxx" @@ -49,7 +48,6 @@ class FmFormView; #define PRINT_HEADER_HEIGHT (12.8 * TWIPS_PER_POINT) #define PRINT_HEADER_FONTHEIGHT 200 - // Settings for headers/footers struct ScPrintHFParam { @@ -68,7 +66,6 @@ struct ScPrintHFParam const SvxShadowItem* pShadow; }; - struct ScPrintState // Save Variables from ScPrintFunc { SCTAB nPrintTab; diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index ddef1ad02303..c4e53a92203f 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -70,7 +70,6 @@ class ScPrivatSplit : public Control const Link& GetCtrModifiedHdl() const { return aCtrModifiedLink; } }; - #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 2625a7b20358..f2f23effa63e 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -170,7 +170,6 @@ public: void Show( sal_uInt16 nFlags ) SAL_OVERRIDE { if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); } }; - #endif // INCLUDED_SC_SOURCE_UI_INC_REFFACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx index b0b10125ef19..7159b108f6b1 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.hxx @@ -60,5 +60,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 8812a148bb3e..80b22a5b284c 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX - #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> @@ -55,8 +54,6 @@ private: DECL_LINK( EnableHdl, CheckBox * ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 23de9df7cd98..1fff0a436b4b 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_SCUIASCIIOPT_HXX #define INCLUDED_SC_SOURCE_UI_INC_SCUIASCIIOPT_HXX - #include "asciiopt.hxx" #include <svx/langbox.hxx> @@ -96,7 +95,6 @@ private: /** Enables or disables all separator checkboxes and edit fields. */ void SetupSeparatorCtrls(); - bool GetLine( sal_uLong nLine, OUString &rText ); void UpdateVertical(); inline bool Seek( sal_uLong nPos ); // synced to and from mnStreamPos @@ -110,7 +108,6 @@ private: DECL_LINK( ColTypeHdl, ScCsvTableBox* ); }; - inline bool ScImportAsciiDlg::Seek(sal_uLong nPos) { bool bSuccess = true; diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 495ec50c8005..66508e84fae4 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -52,7 +52,6 @@ private: OUString aStrDelMsg; OUString aStrRename; - ScAutoFormat* pFormat; const ScAutoFormatData* pSelFmtData; sal_uInt16 nIndex; diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 271d183adcd9..4ab267d299bd 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -23,7 +23,6 @@ #include <vcl/layout.hxx> #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 f66414175b94..f3720363e2c1 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -22,7 +22,6 @@ #include "tphfedit.hxx" - enum ScHFEntryId { eNoneEntry , diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index 9d98904fc5ad..4f2988436c8b 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -27,7 +27,6 @@ class ScTabView; class ScViewData; - class ScViewSelectionEngine : public SelectionEngine { private: @@ -40,7 +39,6 @@ public: void SetWhich(ScSplitPos eNew) { eWhich = eNew; } }; - class ScViewFunctionSet : public FunctionSet // View (Gridwin / keyboard) { private: @@ -75,8 +73,6 @@ public: bool SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, bool bScroll ); }; - - class ScHeaderFunctionSet : public FunctionSet // Column / row headers { private: @@ -104,7 +100,6 @@ public: void SetAnchorFlag(bool bSet) { bAnchor = bSet; } }; - class ScHeaderSelectionEngine : public SelectionEngine { public: diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index ad2121c6108a..cb4c6b27c480 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -30,7 +30,6 @@ class ScDocShell; // class ScShareDocumentDlg - class ScShareDocumentDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 2346f0dac2d1..75e56b1afea7 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -49,8 +49,6 @@ public: sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 50669e33c6de..a45de80bcd6a 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -33,7 +33,6 @@ class ScViewData; class ScDocument; - class ScSimpleRefDlg: public ScAnyRefDlg { private: @@ -63,7 +62,6 @@ private: DECL_LINK( CancelBtnHdl, void * ); DECL_LINK( OkBtnHdl, void * ); - protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 5b041b5062a5..b2db7ac5a709 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -67,7 +67,6 @@ public: const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties(); }; - class ScSolverIntegerDialog : public ModalDialog { VclFrame* m_pFrame; diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx index 7f910c640f4d..37107d04e1e7 100644 --- a/sc/source/ui/inc/solverutil.hxx +++ b/sc/source/ui/inc/solverutil.hxx @@ -28,7 +28,6 @@ namespace com { namespace sun { namespace star { namespace sheet { class XSolver; } } } } - class ScSolverUtil { public: diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index e0a728791f6d..5c6ff014b2b6 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -24,7 +24,6 @@ #include "address.hxx" #include "anyrefdg.hxx" - #include <vcl/fixed.hxx> #include <vcl/group.hxx> @@ -36,7 +35,6 @@ enum ScSolverErr SOLVERR_INVALID_TARGETVALUE }; - class ScSolverDlg : public ScAnyRefDlg { public: @@ -88,5 +86,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_SOLVRDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index a62e62e201ef..2b4703de824f 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -45,5 +45,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_STRINDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index 43e0f3ebfb9d..d49365b62060 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -52,8 +52,6 @@ private: sal_uInt16 m_nSheetId; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_STYLEDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 738e5f94c9d9..4c08dad42737 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -33,8 +33,6 @@ private: DECL_LINK( RemoveHdl, PushButton * ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_SUBTDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index 644a2f9a8750..02ce3e0cb221 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -24,13 +24,11 @@ #include <svtools/tabbar.hxx> #include <svtools/transfer.hxx> - class ScViewData; // initial size #define SC_TABBAR_DEFWIDTH 270 - class ScTabControl : public TabBar, public DropTargetHelper, public DragSourceHelper { private: diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index eed62e4d5f59..3b6cf707babd 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -26,7 +26,6 @@ #include "address.hxx" #include "anyrefdg.hxx" - enum ScTabOpErr { TABOPERR_NOFORMULA = 1, diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index 8e29dc29b7f1..ee889bdec6d4 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_TABSPLIT_HXX #define INCLUDED_SC_SOURCE_UI_INC_TABSPLIT_HXX - #include <vcl/split.hxx> class ScViewData; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index b44db7012d11..a5d739289099 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -62,7 +62,6 @@ namespace chart2 { namespace data { #define SC_FORCEMODE_NONE 0xff - // Help - Window class ScCornerButton : public Window @@ -83,7 +82,6 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; - class ScTabView : boost::noncopyable { private: @@ -246,7 +244,6 @@ public: void RemoveHintWindow(); void TestHintWindow(); - DECL_LINK( TabBarResize, void* ); /** Sets an absolute tab bar width (in pixels). */ void SetTabBarWidth( long nNewWidth ); @@ -463,7 +460,6 @@ public: void KillEditView( bool bNoPaint ); void UpdateEditView(); - // Blocks void SelectAll( bool bContinue = false ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index aa22c2ffabb9..346f66fcef65 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -89,7 +89,6 @@ enum ObjectSelectionType OST_Media }; - class ScTabViewShell: public SfxViewShell, public ScDBFunc { private: @@ -152,7 +151,6 @@ private: bool bFormShellAtTop; // does the FormShell need to be on top? - bool bDontSwitch; // Don't turn off EditShell bool bInFormatDialog; // for GetSelectionText bool bPrintSelected; // for result of SvxPrtQryBox @@ -315,7 +313,6 @@ public: bool GetDontSwitch(){return bDontSwitch;} void SetDontSwitch(bool bFlag){bDontSwitch=bFlag;} - void SetAuditShell( bool bActive ); void SetDrawFormShell( bool bActive ); void SetEditShell(EditView* pView, bool bActive ); @@ -324,7 +321,6 @@ public: void SetGraphicShell( bool bActive ); void SetMediaShell( bool bActive ); - void SetDrawShellOrSub(); void SetCurSubShell( ObjectSelectionType eOST, bool bForce = false ); @@ -424,7 +420,6 @@ public: void SetForceFocusOnCurCell(bool bFlag) { bForceFocusOnCurCell=bFlag; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 1d93da4cb2f8..83c3b4bef254 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <svx/zoomslideritem.hxx> - class ScZoomSliderControl: public SfxToolBoxControl { public: diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 0fd2f39a2b38..3cdfa31dcada 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -55,7 +55,6 @@ private: DECL_LINK( RadioHdl, RadioButton* ); }; - #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 7ca20de74cd3..2b47c7869ff4 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_TPCALC_HXX #define INCLUDED_SC_SOURCE_UI_INC_TPCALC_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> @@ -73,13 +72,11 @@ private: private: void Init(); - // Handler: DECL_LINK( RadioClickHdl, RadioButton* ); DECL_LINK( CheckClickHdl, CheckBox* ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index a9bbd9ac5c92..fac10841d727 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -81,7 +81,6 @@ private: sal_Unicode mnDecSep; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 995ab4524140..15acb7d8b256 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -77,7 +77,6 @@ private: ScFooterPage( Window* pParent, const SfxItemSet& rSet ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_TPHF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 3e60f12636da..9f0f28d0d91a 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -96,7 +96,6 @@ private: Link aObjectSelectLink; }; - class SC_DLLPUBLIC ScExtIButton : public ImageButton { private: diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 8f6c794c2aee..7a900e70aec3 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -42,7 +42,6 @@ class ScViewData; class ScSortDlg; struct ScSortParam; - // Sort Criteria class ScTabPageSortFields : public SfxTabPage @@ -98,7 +97,6 @@ private: DECL_LINK( SelectHdl, ListBox * ); }; - // Sort Options class ScDocument; diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index b91179e1c88a..b661f85321e9 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -20,13 +20,10 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_TPSTAT_HXX #define INCLUDED_SC_SOURCE_UI_INC_TPSTAT_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <svtools/stdctrl.hxx> - - class ScDocStatPage: public SfxTabPage { public: diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 41248196d03b..b5560e258616 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -78,7 +78,6 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - }; class ScDocument; @@ -130,7 +129,6 @@ public: }; - #endif // INCLUDED_SC_SOURCE_UI_INC_TPVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 976d54b30f20..0cbbbb221204 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -86,7 +86,6 @@ public: const std::vector<editeng::MisspellRanges>* GetMisspellRanges() const { return mpMisspellRanges;} }; - #define SC_TAB_INSERTED 1 #define SC_TAB_DELETED 2 #define SC_TAB_MOVED 3 @@ -144,7 +143,6 @@ public: sal_uInt16 GetIndex() const { return nIndex; } }; - // Parameter item for the sort dialog: class SC_DLLPUBLIC ScSortItem : public SfxPoolItem diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 85726c8a2b1e..845d1978434c 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -192,7 +192,6 @@ public: virtual sal_uInt16 GetId() const SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 257c470e5615..3444eb895404 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -73,7 +73,6 @@ private: void SetChangeTrack(); }; - class ScUndoDeleteCells: public ScMoveUndo { public: @@ -103,7 +102,6 @@ private: void SetChangeTrack(); }; - class ScUndoDeleteMulti: public ScMoveUndo { public: @@ -135,7 +133,6 @@ private: void SetChangeTrack(); }; - class ScUndoCut: public ScBlockUndo { public: @@ -165,7 +162,6 @@ private: void SetChangeTrack(); }; - struct ScUndoPasteOptions { sal_uInt16 nFunction; @@ -219,7 +215,6 @@ private: void SetChangeTrack(); }; - class ScUndoDragDrop: public ScMoveUndo { public: @@ -254,7 +249,6 @@ private: void SetChangeTrack(); }; - class ScUndoDeleteContents: public ScSimpleUndo { public: @@ -291,7 +285,6 @@ private: void SetChangeTrack(); }; - class ScUndoFillTable: public ScSimpleUndo { public: @@ -328,7 +321,6 @@ private: void SetChangeTrack(); }; - class ScUndoSelectionAttr: public ScSimpleUndo { public: @@ -365,7 +357,6 @@ private: void ChangeEditData( const bool bUndo ); }; - class ScUndoWidthOrHeight: public ScSimpleUndo { public: @@ -403,7 +394,6 @@ private: SdrUndoAction* pDrawUndo; }; - class ScUndoAutoFill: public ScBlockUndo { public: @@ -439,7 +429,6 @@ private: void SetChangeTrack(); }; - class ScUndoMerge: public ScSimpleUndo { public: @@ -464,7 +453,6 @@ private: void DoChange( bool bUndo ) const; }; - class ScUndoAutoFormat: public ScBlockUndo { public: @@ -489,7 +477,6 @@ private: sal_uInt16 nFormatNo; }; - class ScUndoReplace: public ScSimpleUndo { public: @@ -520,7 +507,6 @@ private: void SetChangeTrack(); }; - class ScUndoTabOp: public ScSimpleUndo { public: @@ -553,7 +539,6 @@ private: ScTabOpParam::Mode meMode; }; - class ScUndoConversion : public ScSimpleUndo { public: @@ -661,7 +646,6 @@ private: ScRange maRange; }; - class ScUndoUseScenario: public ScSimpleUndo { public: @@ -686,7 +670,6 @@ private: OUString aName; }; - class ScUndoSelectionStyle: public ScSimpleUndo { public: @@ -715,7 +698,6 @@ private: void DoChange( const bool bUndo ); }; - class ScUndoRefreshLink: public ScSimpleUndo { public: @@ -736,7 +718,6 @@ private: ScDocument* pRedoDoc; }; - class ScUndoEnterMatrix: public ScBlockUndo { public: @@ -763,7 +744,6 @@ private: void SetChangeTrack(); }; - class ScUndoInsertAreaLink : public ScSimpleUndo { public: @@ -791,7 +771,6 @@ private: sal_uLong nRefreshDelay; }; - class ScUndoRemoveAreaLink : public ScSimpleUndo { public: @@ -819,7 +798,6 @@ private: sal_uLong nRefreshDelay; }; - class ScUndoUpdateAreaLink : public ScSimpleUndo //! also change BlockUndo? { public: @@ -864,7 +842,6 @@ private: void DoChange( const bool bUndo ) const; }; - class ScUndoIndent: public ScBlockUndo { public: @@ -886,7 +863,6 @@ private: bool bIsIncrement; }; - class ScUndoTransliterate: public ScBlockUndo { public: @@ -908,7 +884,6 @@ private: sal_Int32 nTransliterationType; }; - class ScUndoClearItems: public ScBlockUndo { public: @@ -930,7 +905,6 @@ private: sal_uInt16* pWhich; }; - class ScUndoRemoveBreaks: public ScSimpleUndo { public: @@ -951,7 +925,6 @@ private: ScDocument* pUndoDoc; }; - class ScUndoRemoveMerge: public ScBlockUndo { public: @@ -975,7 +948,6 @@ private: ScDocument* pUndoDoc; }; - class ScUndoBorder: public ScBlockUndo { public: @@ -1001,7 +973,6 @@ private: SvxBoxInfoItem* pInner; }; - #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 6995bf3ef325..edce6bc1f22b 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -79,7 +79,6 @@ private: void DoChange( const ScPatternAttr* pWhichPattern, const ::boost::shared_ptr<EditTextObject>& pEditData ) const; }; - class ScUndoEnterData: public ScSimpleUndo { public: @@ -122,7 +121,6 @@ private: void SetChangeTrack(); }; - class ScUndoEnterValue: public ScSimpleUndo { public: @@ -340,7 +338,6 @@ private: SdrUndoAction* pDrawUndo; }; - class ScUndoRangeNames: public ScSimpleUndo { public: diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 1830c055d2f3..00388d71b6a3 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -68,7 +68,6 @@ private: bool bShow; }; - class ScUndoMakeOutline: public ScSimpleUndo { public: @@ -95,7 +94,6 @@ private: bool bMake; }; - class ScUndoOutlineLevel: public ScSimpleUndo { public: @@ -123,7 +121,6 @@ private: sal_uInt16 nLevel; }; - class ScUndoOutlineBlock: public ScSimpleUndo { public: @@ -150,7 +147,6 @@ private: bool bShow; }; - class ScUndoRemoveAllOutlines: public ScSimpleUndo { public: @@ -175,7 +171,6 @@ private: ScOutlineTable* pUndoTable; }; - class ScUndoAutoOutline: public ScSimpleUndo { public: @@ -200,7 +195,6 @@ private: ScOutlineTable* pUndoTable; }; - class ScUndoSubTotals: public ScDBFuncUndo { public: @@ -230,7 +224,6 @@ private: ScDBCollection* pUndoDB; }; - class ScUndoSort: public ScDBFuncUndo { public: @@ -257,7 +250,6 @@ private: ScRange aDestRange; }; - class ScUndoQuery: public ScDBFuncUndo { public: @@ -288,7 +280,6 @@ private: bool bDoSize; }; - class ScUndoAutoFilter: public ScDBFuncUndo { private: @@ -311,7 +302,6 @@ public: virtual OUString GetComment() const SAL_OVERRIDE; }; - class ScUndoDBData: public ScSimpleUndo { public: @@ -332,7 +322,6 @@ private: ScDBCollection* pRedoColl; }; - class ScUndoImportData: public ScSimpleUndo { public: @@ -364,7 +353,6 @@ private: bool bRedoFilled; }; - class ScUndoRepeatDB: public ScSimpleUndo { public: @@ -398,7 +386,6 @@ private: bool bQuerySize; }; - class ScUndoDataPilot: public ScSimpleUndo { public: @@ -424,7 +411,6 @@ private: bool bAllowMove; }; - class ScUndoConsolidate: public ScSimpleUndo { public: @@ -453,7 +439,6 @@ private: ScDBData* pUndoData; }; - class ScUndoChartData: public ScSimpleUndo { public: @@ -524,7 +509,6 @@ private: void SetChangeTrack(); }; - #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 b0bc9202a7d6..7487f9076838 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -102,7 +102,6 @@ private: OUString maNewStyle; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 515e46c54574..b9f573b3955b 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -98,7 +98,6 @@ private: void SetChangeTrack(); }; - class ScUndoDeleteTab: public ScMoveUndo { public: @@ -125,7 +124,6 @@ private: void SetChangeTrack(); }; - class ScUndoRenameTab: public ScSimpleUndo { public: @@ -152,7 +150,6 @@ private: void DoChange( SCTAB nTab, const OUString& rName ) const; }; - class ScUndoMoveTab: public ScSimpleUndo { public: @@ -182,7 +179,6 @@ private: void DoChange( bool bUndo ) const; }; - class ScUndoCopyTab: public ScSimpleUndo { public: @@ -268,7 +264,6 @@ private: SdrUndoAction* pDrawUndo; }; - class ScUndoImportTab : public ScSimpleUndo { public: @@ -294,7 +289,6 @@ private: void DoChange() const; }; - class ScUndoRemoveLink : public ScSimpleUndo { public: @@ -324,7 +318,6 @@ private: void DoChange( bool bLink ) const; }; - class ScUndoShowHideTab : public ScSimpleUndo { public: @@ -401,7 +394,6 @@ private: void DoProtect(bool bProtect); }; - class ScUndoPrintRange : public ScSimpleUndo { public: @@ -425,7 +417,6 @@ private: void DoChange( bool bUndo ); }; - class ScUndoScenarioFlags: public ScSimpleUndo { public: @@ -458,7 +449,6 @@ private: sal_uInt16 nNewFlags; }; - class ScUndoRenameObject: public ScSimpleUndo { public: @@ -484,7 +474,6 @@ private: SdrObject* GetObject(); }; - class ScUndoLayoutRTL : public ScSimpleUndo { public: diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 76f00c0b49a8..edda7dc26bad 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -172,7 +172,6 @@ public: bool Close() SAL_OVERRIDE; }; - /** The tab page "Criteria" from the Validation dialog. */ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage { @@ -258,7 +257,6 @@ public: void RemoveRefDlg(); }; - class ScTPValidationHelp : public SfxTabPage { private: diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 34c62927bc87..bcbca5620004 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -495,7 +495,6 @@ public: const ScDocument * pDoc, SCTAB nTabNo ); }; - inline long ScViewData::ToPixel( sal_uInt16 nTwips, double nFactor ) { long nRet = (long)( nTwips * nFactor ); diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 6cf382509c19..28b7a2e8bf29 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -255,7 +255,6 @@ public: bool InsertTable( const OUString& rName, SCTAB nTabNr, bool bRecord = true ); bool InsertTables(std::vector<OUString>& aNames, SCTAB nTab, SCTAB nCount, bool bRecord = true); - bool AppendTable( const OUString& rName, bool bRecord = true ); bool DeleteTable( SCTAB nTabNr, bool bRecord = true ); @@ -345,7 +344,6 @@ protected: const ::editeng::SvxBorderLine* pSrcLine, bool bColor ); - private: void PasteRTF( SCCOL nCol, SCROW nStartRow, const ::com::sun::star::uno::Reference< diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index 641f4a0c7e3a..3111fa511cad 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -22,7 +22,6 @@ #include <vcl/msgbox.hxx> - /** Message box with warning image and "Do not show again" checkbox. */ class ScCbWarningBox : public WarningBox { @@ -42,7 +41,6 @@ public: virtual void DisableDialog(); }; - /** Warning box for "Replace cell contents?". */ class ScReplaceWarnBox : public ScCbWarningBox { @@ -55,7 +53,6 @@ public: virtual void DisableDialog() SAL_OVERRIDE; }; - #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 34c80387222a..bfbd4f53fd5e 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/string.hxx> #include <svl/undo.hxx> #include <unotools/textsearch.hxx> @@ -52,7 +51,6 @@ #define RD_SPECIAL_CONTENT 1 #define RD_SPECIAL_VISCONTENT 2 - // class ScRedlinData ScRedlinData::ScRedlinData() @@ -79,7 +77,6 @@ ScRedlinData::~ScRedlinData() bIsAcceptable=false; } - // class ScAcceptChgDlg ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, @@ -291,7 +288,6 @@ OUString* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType) return pStr; } - bool ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) { if(pScChangeAction==NULL) return false; @@ -761,7 +757,6 @@ bool ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt ) return SfxModelessDialog::PreNotify(rNEvt); } - void ScAcceptChgDlg::UpdateView() { bNeedsUpdate=false; @@ -1410,7 +1405,6 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable ) return (sal_uLong) true; } - void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction, sal_uLong nEndAction, sal_uLong /* nPos */) { @@ -1435,7 +1429,6 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartActio pScChangeAction=pChanges->GetAction(i); if(pScChangeAction==NULL) continue; - switch(pScChangeAction->GetState()) { case SC_CAS_VIRGIN: @@ -1524,7 +1517,6 @@ void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction) if(nStartAction<=nAction && nAction<=nEndAction) bRemove=true; - } SvTreeListEntry* pPrevEntry = pTheView->Prev(pEntry); @@ -1749,7 +1741,6 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl) sal_uInt16 nCommand=aPopup.Execute( this, GetPointerPosPixel() ); - if(nCommand) { if(nCommand==SC_CHANGES_COMMENT) @@ -1951,7 +1942,6 @@ IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData ) } } - } return nCompare; } diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 7e9a2f40ba29..4d284152d3ec 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -206,7 +206,6 @@ void ScFormulaReferenceHelper::ShowFormulaReference(const OUString& rStr) { bool bDoubleRef=(pToken->GetType()==formula::svDoubleRef); - if(pToken->GetType()==formula::svSingleRef || bDoubleRef) { ScRange aRange; @@ -444,7 +443,6 @@ namespace } } - void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) { if (!pRefEdit) @@ -716,8 +714,6 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren) } } - - static void lcl_InvalidateWindows() { TypeId aType(TYPE(ScDocShell)); @@ -750,7 +746,6 @@ static void lcl_InvalidateWindows() } } - static void lcl_HideAllReferences() { TypeId aScType = TYPE(ScTabViewShell); @@ -762,11 +757,9 @@ static void lcl_HideAllReferences() } } - //The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker // class ScRefHandler - ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ): m_rWindow( rWindow ), m_bInRefMode( false ), @@ -937,7 +930,6 @@ void ScRefHandler::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* p m_aHelper.RefInputStart( pEdit, pButton ); } - void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton ) { m_aHelper.ToggleCollapsed( pEdit, pButton ); diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 239efd81f79d..653663f9e1c0 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -187,7 +187,6 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) // Ausgabe des Zelltextes: - OUString cellString; bool bNumFormat = pCurData->GetIncludeValueFormat(); sal_uLong nNum; @@ -252,7 +251,6 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) SvxHorJustifyItem aHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY ); SvxCellHorJustify eJustification; - // Ausrichtung: eJustification = mbRTL ? SVX_HOR_JUSTIFY_RIGHT : bJustify ? @@ -305,12 +303,10 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) - aStrSize.Width() - FRAME_OFFSET ); - // vertikal (immer zentrieren): aPos.Y() += (mnRowHeight - (sal_uInt16)aStrSize.Height()) / 2; - // horizontal if ( eJustification != SVX_HOR_JUSTIFY_STANDARD ) @@ -354,7 +350,6 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) } } - aScriptedText.DrawText( aPos ); } diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 7c10fab2cb87..63a6fd02036b 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -28,7 +28,6 @@ // struct ScConflictsListEntry - bool ScConflictsListEntry::HasSharedAction( sal_uLong nSharedAction ) const { ScChangeActionList::const_iterator aEnd = maSharedActions.end(); @@ -59,7 +58,6 @@ bool ScConflictsListEntry::HasOwnAction( sal_uLong nOwnAction ) const // class ScConflictsListHelper - bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, sal_uLong nOwnAction ) { ScConflictsList::const_iterator aEnd = rConflictsList.end(); @@ -145,7 +143,6 @@ void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsL // class ScConflictsFinder - ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared, sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList ) :mpTrack( pTrack ) @@ -278,10 +275,8 @@ bool ScConflictsFinder::Find() return bReturn; } - // class ScConflictsResolver - ScConflictsResolver::ScConflictsResolver( ScChangeTrack* pTrack, ScConflictsList& rConflictsList ) :mpTrack ( pTrack ) ,mrConflictsList ( rConflictsList ) @@ -374,10 +369,8 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA } } - // class ScConflictsDlg - ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ) :ModalDialog( pParent, ScResId( RID_SCDLG_CONFLICTS ) ) ,maFtConflicts ( this, ScResId( FT_CONFLICTS ) ) diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index ea118ed27f8e..dc4a3b83eea4 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -35,7 +35,6 @@ const sal_uLong nEntryDataDelim = 2; // class ScColRowNameRangesDlg - /************************************************************************* #* Member: ScColRowNameRangesDlg #*------------------------------------------------------------------------ @@ -91,7 +90,6 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, Init(); } - /************************************************************************* #* Member: ~ScColRowNameRangesDlg #*------------------------------------------------------------------------ @@ -110,7 +108,6 @@ ScColRowNameRangesDlg::~ScColRowNameRangesDlg() { } - /************************************************************************* #* Member: Init #*------------------------------------------------------------------------ @@ -188,7 +185,6 @@ void ScColRowNameRangesDlg::Init() Range1SelectHdl( 0 ); } - /************************************************************************* #* Member: SetColRowData #*------------------------------------------------------------------------ @@ -288,7 +284,6 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange, bool bRef } } - /************************************************************************* #* Member: AdjustColRowData #*------------------------------------------------------------------------ @@ -363,7 +358,6 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange, bool bR pEdAssign2->SetSelection( Selection( SELECTION_MAX, SELECTION_MAX ) ); } - /************************************************************************* #* Member: SetReference #*------------------------------------------------------------------------ @@ -399,7 +393,6 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD } } - /************************************************************************* #* Member: Close #*------------------------------------------------------------------------ @@ -419,7 +412,6 @@ bool ScColRowNameRangesDlg::Close() return DoClose( ScColRowNameRangesDlgWrapper::GetChildWindowId() ); } - /************************************************************************* #* Member: SetActive #*------------------------------------------------------------------------ @@ -453,7 +445,6 @@ void ScColRowNameRangesDlg::SetActive() RefInputDone(); } - /************************************************************************* #* Member: UpdateNames #*------------------------------------------------------------------------ @@ -580,7 +571,6 @@ void ScColRowNameRangesDlg::UpdateNames() pLbRange->Invalidate(); } - /************************************************************************* #* Member: UpdateRangeData #*------------------------------------------------------------------------ @@ -630,7 +620,6 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, bool bColNam pRbAssign2->Enable(); } - /************************************************************************* #* Member: IsRefInputMode #*------------------------------------------------------------------------ @@ -651,10 +640,8 @@ bool ScColRowNameRangesDlg::IsRefInputMode() const return (pEdActive != NULL); } - // Handler: - /************************************************************************* #* Handler: OkBtnHdl #*------------------------------------------------------------------------ @@ -688,7 +675,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl) return 0; } - /************************************************************************* #* Handler: CancelBtnHdl #*------------------------------------------------------------------------ @@ -710,7 +696,6 @@ IMPL_LINK_NOARG_INLINE_START(ScColRowNameRangesDlg, CancelBtnHdl) } IMPL_LINK_NOARG_INLINE_END(ScColRowNameRangesDlg, CancelBtnHdl) - /************************************************************************* #* Handler: AddBtnHdl #*------------------------------------------------------------------------ @@ -783,7 +768,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl) return 0; } - /************************************************************************* #* Handler: RemoveBtnHdl #*------------------------------------------------------------------------ @@ -860,7 +844,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl) return 0; } - /************************************************************************* #* Handler: Range1SelectHdl #*------------------------------------------------------------------------ @@ -946,7 +929,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl) return 0; } - /************************************************************************* #* Handler: Range1DataModifyHdl #*------------------------------------------------------------------------ @@ -995,7 +977,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl) return 0; } - /************************************************************************* #* Handler: Range2DataModifyHdl #*------------------------------------------------------------------------ @@ -1032,7 +1013,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl) return 0; } - /************************************************************************* #* Handler: ColClickHdl #*------------------------------------------------------------------------ @@ -1069,7 +1049,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl) return 0; } - /************************************************************************* #* Handler: RowClickHdl #*------------------------------------------------------------------------ @@ -1106,7 +1085,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl) return 0; } - IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control*, pCtrl ) { if( (pCtrl == (Control*)pEdAssign) || (pCtrl == (Control*)pRbAssign) ) @@ -1122,7 +1100,6 @@ IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control*, pCtrl ) return 0; } - IMPL_LINK_NOARG(ScColRowNameRangesDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 433d1946a306..3c91496db987 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -20,7 +20,6 @@ #define HDL(hdl) LINK( this, ScDataFormDlg, hdl ) - ScDataFormDlg::ScDataFormDlg(Window* pParent, ScTabViewShell* pTabViewShellOri) : ModalDialog(pParent, "DataFormDialog", "modules/scalc/ui/dataform.ui") , pTabViewShell(pTabViewShellOri) diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index 1bcc3532b31a..e63c58cc142b 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "delcldlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - static sal_uInt8 nDelItemChecked=0; ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index dd1d0cdc38ce..d0da98af6339 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -23,7 +23,6 @@ #include "scresid.hxx" #include "miscdlgs.hrc" - bool ScDeleteContentsDlg::bPreviousAllCheck = false; sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index c9b51ad81d86..3b057dab871f 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -74,7 +74,6 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, Init( nPossDir ); } - ScFillSeriesDlg::~ScFillSeriesDlg() { } @@ -180,7 +179,6 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) bStartValFlag = false; } - bool ScFillSeriesDlg::CheckStartVal() { bool bValOk = false; @@ -199,7 +197,6 @@ bool ScFillSeriesDlg::CheckStartVal() return bValOk; } - bool ScFillSeriesDlg::CheckIncrementVal() { sal_uInt32 nKey = 0; @@ -208,7 +205,6 @@ bool ScFillSeriesDlg::CheckIncrementVal() return rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fIncrement ); } - bool ScFillSeriesDlg::CheckEndVal() { bool bValOk = false; @@ -229,7 +225,6 @@ bool ScFillSeriesDlg::CheckEndVal() // Handler: - IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) { if ( pBtn == m_pBtnDate ) @@ -266,7 +261,6 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) return 0; } - IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) { if ( m_pBtnLeft->IsChecked() ) theFillDir = FILL_TO_LEFT; @@ -315,5 +309,4 @@ IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 43ddb4e9f7b9..31dff0c2f333 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -17,15 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "groupdlg.hxx" #include "scresid.hxx" - ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) : ModalDialog(pParent, bUngroup ? diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 6cd7829128e1..631e8bb5d348 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -36,10 +36,8 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D - // class ScHighlightChgDlg - ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, "ShowChangesDialog", @@ -92,7 +90,6 @@ void ScHighlightChgDlg::Init() m_pFilterCtr->InsertAuthor(*it); } - ScChangeViewSettings* pViewSettings=pDoc->GetChangeViewSettings(); if(pViewSettings!=NULL) @@ -133,7 +130,6 @@ void ScHighlightChgDlg::Init() HighlightHandle(m_pHighlightBox); } - // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Edit angezeigt wird. @@ -149,7 +145,6 @@ void ScHighlightChgDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - bool ScHighlightChgDlg::Close() { return DoClose( ScHighlightChgDlgWrapper::GetChildWindowId() ); diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index 3a44f7b264af..3d1f338cd75c 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "inscldlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - static sal_uInt8 nInsItemChecked=0; ScInsertCellDlg::ScInsertCellDlg( Window* pParent,bool bDisallowCellMove) : diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 0e967b4b5ccb..18426b0da703 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #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; @@ -112,7 +108,6 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, DisableChecks( mpBtnInsAll->IsChecked() ); - mpBtnInsAll->SetClickHdl( LINK( this, ScInsertContentsDlg, InsAllHdl ) ); mpBtnLink->SetClickHdl( LINK( this, ScInsertContentsDlg, LinkBtnHdl ) ); @@ -272,7 +267,6 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) } } - IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl) { DisableChecks( mpBtnInsAll->IsChecked() ); diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 22e2c47d82b8..f48035515bf6 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -227,7 +227,6 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) // Handler: - IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) { nTableCount = static_cast<SCTAB>(m_pNfCount->GetValue()); @@ -250,7 +249,6 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) return 0; } - IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) { if ( m_pBtnNew->IsChecked() ) diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 88be94c04b74..69ef6f032c1e 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include <vcl/msgbox.hxx> #include "lbseldlg.hxx" diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 8d413077173d..1228a3f51f1b 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <comphelper/string.hxx> diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 359230d5cc64..bfa3eff1e350 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "mtrindlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - ScMetricInputDlg::ScMetricInputDlg( Window* pParent, const OString& sDialogName, long nCurrent, @@ -86,7 +82,6 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const return sal::static_int_cast<long>( m_pEdValue->Denormalize( m_pEdValue->GetValue( eUnit ) ) ); } - // Handler: IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 46311bdb201b..65dc45acd880 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include <vcl/msgbox.hxx> #include "mvtabdlg.hxx" @@ -70,10 +67,6 @@ ScMoveTableDlg::~ScMoveTableDlg() { } - - - - void ScMoveTableDlg::GetTabNameString( OUString& rString ) const { rString = pEdTabName->GetText(); @@ -255,7 +248,6 @@ void ScMoveTableDlg::InitDocListBox() pLbDoc->SelectEntryPos( nSelPos ); } - // Handler: IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, void *, pBtn ) diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx index 722a39500ca7..72308b838371 100644 --- a/sc/source/ui/miscdlgs/namecrea.cxx +++ b/sc/source/ui/miscdlgs/namecrea.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "namecrea.hxx" diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 7844e5ef49d1..db7d9f103f08 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -143,10 +143,8 @@ ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bM { } - // class ScOptSolverDlg - ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocShell* pDocSh, ScAddress aCursorPos ) @@ -511,7 +509,6 @@ bool ScOptSolverDlg::IsRefInputMode() const return mpEdActive != NULL; } - // Handler: IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index 8e8245509ec2..f82217514d79 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "protectiondlg.hxx" #include "scresid.hxx" #include "tabprotection.hxx" @@ -25,7 +24,6 @@ #include <sal/macros.h> #include <vcl/msgbox.hxx> - // The order must match that of the list box. static const ScTableProtection::Option aOptions[] = { ScTableProtection::SELECT_LOCKED_CELLS, @@ -33,7 +31,6 @@ static const ScTableProtection::Option aOptions[] = { }; static const sal_uInt16 nOptionCount = sizeof(aOptions) / sizeof (aOptions[0]); - ScTableProtectionDlg::ScTableProtectionDlg(Window* pParent) : ModalDialog( pParent, "ProtectSheetDialog", "modules/scalc/ui/protectsheetdlg.ui" ) { diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 2a69e4ba013a..158376a8be8b 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -26,7 +26,6 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> - ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet, ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext) : pChangeAction(NULL) diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index f2d16f32c478..164e413c4be8 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "retypepassdlg.hxx" #include "retypepassdlg.hrc" #include "scresid.hxx" diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 1b7f9f3db5b6..381ce874b72c 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> @@ -52,7 +49,6 @@ #include "document.hxx" #include <boost/scoped_ptr.hpp> - // AutoFormat-Dialog: ScAutoFormatDlg::ScAutoFormatDlg(Window* pParent, @@ -143,10 +139,8 @@ void ScAutoFormatDlg::UpdateChecks() m_pBtnAdjust->Check( pData->GetIncludeWidthHeight() ); } - // Handler: - IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) { if (pBtn == m_pBtnOk || pBtn == m_pBtnCancel) @@ -368,7 +362,6 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) bCoreDataChanged = true; } - SelFmtHdl( 0 ); bOk = true; bFmtRenamed = true; diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index ca0e15810a2d..ef79599353a4 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -27,12 +27,10 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> - #include "sharedocdlg.hxx" #include "scresid.hxx" #include "viewdata.hxx" - using namespace ::com::sun::star; class ScShareTable : public SvSimpleTable @@ -69,10 +67,8 @@ public: } }; - // class ScShareDocumentDlg - ScShareDocumentDlg::ScShareDocumentDlg( Window* pParent, ScViewData* pViewData ) : ModalDialog(pParent, "ShareDocumentDialog", "modules/scalc/ui/sharedocumentdlg.ui") , mpViewData(pViewData) diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index e144a7ae3263..72db862fd30c 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -17,18 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include <vcl/msgbox.hxx> #include "shtabdlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - ScShowTabDlg::ScShowTabDlg(Window* pParent) : ModalDialog(pParent, "ShowSheetDialog", "modules/scalc/ui/showsheetdialog.ui") { diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index b99ba1d67c67..35c33486ead2 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -59,26 +59,22 @@ ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pPa SetDispatcherLock( true ); // Modal-Modus einschalten } - ScSimpleRefDlg::~ScSimpleRefDlg() { SetDispatcherLock( false ); // Modal-Modus einschalten } - void ScSimpleRefDlg::FillInfo(SfxChildWinInfo& rWinInfo) const { ScAnyRefDlg::FillInfo(rWinInfo); rWinInfo.bVisible=bAutoReOpen; } - void ScSimpleRefDlg::SetRefString(const OUString &rStr) { m_pEdAssign->SetText(rStr); } - void ScSimpleRefDlg::Init() { m_pBtnOk->SetClickHdl ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) ); @@ -86,7 +82,6 @@ void ScSimpleRefDlg::Init() bCloseFlag=false; } - // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Fenster angezeigt wird. void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) @@ -129,7 +124,6 @@ bool ScSimpleRefDlg::Close() return true; } - void ScSimpleRefDlg::SetActive() { m_pEdAssign->GrabFocus(); @@ -198,7 +192,6 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) return 0; } - IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) { bAutoReOpen=false; @@ -210,6 +203,4 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index d6cae3ac54a7..0e93c2f9337c 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -181,7 +181,6 @@ bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal ) return pDoc->GetFormatTable()->IsNumberFormat( rStrVal, n1, n2 ); } - // Handler: IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) @@ -266,5 +265,4 @@ IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index d3214ce7ec5d..1953b79225e9 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "tabbgcolordlg.hxx" diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index cd1b77c19953..c651e6155473 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -32,7 +32,6 @@ // class ScTabOpDlg - ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDocument, const ScRefAddress& rCursorPos ) @@ -224,7 +223,6 @@ static bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab, return bRet; } - // Handler: IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) @@ -330,6 +328,4 @@ IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index a6f301f38803..1cfb3cfbb7e7 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -31,7 +31,6 @@ #include <svl/intitem.hxx> #include <svx/flagsdef.hxx> - ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : SfxTabDialog(pParent, "CharDialog", diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 41e75b7c87c4..6a5863182d37 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -24,7 +24,6 @@ #include "scresid.hxx" #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 ) { @@ -55,7 +54,6 @@ void ScCbWarningBox::DisableDialog() { } - ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : ScCbWarningBox( pParent, OUString( ScResId( STR_REPLCELLSWARN ) ), true ) { @@ -75,5 +73,4 @@ void ScReplaceWarnBox::DisableDialog() pScMod->SetInputOptions( aInputOpt ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 4a0d4a11ab94..daa5cf3005bb 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -208,7 +208,6 @@ void ScNameDlg::CheckForEmptyTable() m_pEdName->Enable(); m_pLbScope->Enable(); - m_pBtnCriteria->Enable(); m_pBtnPrintArea->Enable(); m_pBtnColHeader->Enable(); @@ -316,7 +315,6 @@ void ScNameDlg::ShowOptions(const ScRangeNameLine& rLine) } } - bool ScNameDlg::AddPushed() { mbCloseWithoutUndo = true; diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 98d7653e4614..a024b72cb7fd 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -26,7 +26,6 @@ #define MINSIZE 80 - static OUString createEntryString(const ScRangeNameLine& rLine) { OUString aRet = rLine.aName + "\t" + rLine.aExpression + "\t" + rLine.aScope; @@ -304,5 +303,4 @@ IMPL_LINK_NOARG(ScRangeManagerTable, ScrollHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 85cb1e55d8ef..b03ccf4dfa26 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "namepast.hxx" #include "scresid.hxx" #include "docsh.hxx" @@ -29,7 +26,6 @@ #include "rangenam.hxx" #include "viewdata.hxx" - ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) : ModalDialog( pParent, "InsertNameDialog", "modules/scalc/ui/insertname.ui" ) { @@ -105,5 +101,4 @@ bool ScNamePasteDlg::IsAllSelected() const return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 3441da2dcce4..ee6d14a1cb1a 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -80,7 +80,6 @@ static const sal_uInt16 pTypeList[SC_CONTENT_COUNT] = bool ScContentTree::bIsInDrag = false; - ScDocShell* ScContentTree::GetManualOrCurrent() { ScDocShell* pSh = NULL; @@ -111,10 +110,8 @@ ScDocShell* ScContentTree::GetManualOrCurrent() return pSh; } - // ScContentTree - ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) : SvTreeListBox ( pParent, rResId ), aEntryImages ( ScResId( RID_IMAGELIST_NAVCONT ) ), diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index 9481a26ac91a..12dd5994acf6 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -27,7 +27,6 @@ // STATIC DATA ----------------------------------------------------------- - ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16 nIdP, ScNavigatorDlg& rDlg, SfxBindings& rBindings ) @@ -90,7 +89,6 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat break; - case SID_SELECT_SCENARIO: rNavigatorDlg.aWndScenarios.NotifyState( pItem ); break; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 7d0696b5b2ed..9da736c2c130 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -76,10 +76,8 @@ void ScNavigatorDlg::ReleaseFocus() } } - // class ColumnEdit - ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ) : SpinField ( pParent, rResId ), rDlg ( *pParent ), @@ -128,7 +126,6 @@ void ColumnEdit::LoseFocus() EvalText(); } - void ColumnEdit::Up() { nCol++; @@ -158,7 +155,6 @@ void ColumnEdit::Last() SetText( aStr ); } - void ColumnEdit::EvalText() { OUString aStrCol = GetText(); @@ -253,10 +249,8 @@ SCCOL ColumnEdit::NumToAlpha( SCCOL nColNo, OUString& rStr ) return nColNo; } - // class RowEdit - RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ) : NumericField( pParent, rResId ), rDlg ( *pParent ) @@ -301,10 +295,8 @@ void RowEdit::ExecuteRow() rDlg.SetCurrentCell( nCol-1, nRow-1 ); } - // class ScDocListBox - ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId ) : ListBox ( pParent, rResId ), rDlg ( *pParent ) @@ -323,10 +315,8 @@ void ScDocListBox::Select() rDlg.aLbEntries.SelectDoc( aDocName ); } - // class CommandToolBox - CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId ) : ToolBox ( pParent, rResId ), rDlg ( *pParent ) @@ -476,10 +466,8 @@ void CommandToolBox::DataChanged( const DataChangedEvent& rDCEvt ) ToolBox::DataChanged( rDCEvt ); } - // class ScNavigatorSettings - ScNavigatorSettings::ScNavigatorSettings() : maExpandedVec( SC_CONTENT_COUNT, false ), mnRootSelected( SC_CONTENT_ROOT ), @@ -487,10 +475,8 @@ ScNavigatorSettings::ScNavigatorSettings() : { } - // class ScNavigatorDlgWrapper - SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR ) ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( @@ -559,10 +545,8 @@ void ScNavigatorDialogWrapper::Resizing( Size& rSize ) ((ScNavigatorDlg*)GetWindow())->Resizing(rSize); } - // class ScNavigatorPI - #define CTRL_ITEMS 4 #define REGISTER_SLOT(i,id) \ @@ -1211,7 +1195,6 @@ void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize ) } } - // Dokumente fuer Dropdown-Listbox void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index c8a6b02395b7..e415d09d48ec 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -31,10 +31,8 @@ #include "sc.hrc" #include "globstr.hrc" - // class ScScenarioWindow ------------------------------------------------ - ScScenarioListBox::ScScenarioListBox( ScScenarioWindow& rParent ) : ListBox( &rParent, WB_BORDER | WB_TABSTOP ), mrParent( rParent ) @@ -194,10 +192,8 @@ void ScScenarioListBox::DeleteScenario( bool bQueryBox ) ExecuteScenarioSlot( SID_DELETE_SCENARIO ); } - // class ScScenarioWindow ------------------------------------------------ - ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment) : Window ( pParent, WB_TABSTOP | WB_DIALOGCONTROL ), @@ -283,5 +279,4 @@ void ScScenarioWindow::SetSizePixel( const Size& rNewSize ) aEdComment.SetPosSizePixel( Point( 0, nHeight+4 ), aSize ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 0a996e54b574..7a433dfe3a5b 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -188,7 +188,6 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rC ScCalcOptionsDialog::~ScCalcOptionsDialog() {} - SvTreeListEntry *ScCalcOptionsDialog::createBoolItem(const OUString &rCaption, bool bValue) const { SvTreeListEntry* pEntry = new SvTreeListEntry; @@ -261,7 +260,6 @@ void ScCalcOptionsDialog::fillOpenclList() #endif - namespace { void addOption( SvTreeList* pModel, OptionString* pItem ) { @@ -631,5 +629,4 @@ IMPL_LINK_NOARG(ScCalcOptionsDialog, DeviceSelHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 42c259d03581..a8080ef5ee70 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <svx/dlgutil.hxx> @@ -157,7 +156,6 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ ) m_pInsertColorLB->SetUpdateMode( true ); m_pRemoveColorLB->SetUpdateMode( true ); - ScAppOptions aAppOptions=SC_MOD()->GetAppOptions(); sal_uLong nColor = aAppOptions.GetTrackContentColor(); @@ -172,14 +170,12 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ ) else m_pMoveColorLB->SelectEntry(Color(nColor)); - nColor = aAppOptions.GetTrackInsertColor(); if (nColor == COL_TRANSPARENT) m_pInsertColorLB->SelectEntryPos(0); else m_pInsertColorLB->SelectEntry(Color(nColor)); - nColor = aAppOptions.GetTrackDeleteColor(); if (nColor == COL_TRANSPARENT) m_pRemoveColorLB->SelectEntryPos(0); @@ -188,7 +184,6 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ ) } - IMPL_LINK_NOARG(ScRedlineOptionsTabPage, ColorHdl) { return 0; diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 85edefbe3805..68d2952d0525 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -132,7 +132,6 @@ void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ ) CheckClickHdl(m_pBtnIterate); } - bool ScTpCalcOptions::FillItemSet( SfxItemSet* rCoreAttrs ) { // alle weiteren Optionen werden in den Handlern aktualisiert @@ -184,7 +183,6 @@ int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) return nReturn; } - // Handler: IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn ) @@ -239,5 +237,4 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 1d7fd90c2324..5e7c302965bd 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #undef SC_DLLIMPLEMENTATION #include "tpdefaults.hxx" @@ -17,7 +16,6 @@ #include "defaultsoptions.hxx" #include "document.hxx" - ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet &rCoreSet) : SfxTabPage(pParent, "OptDefaultPage", "modules/scalc/ui/optdefaultpage.ui", &rCoreSet) @@ -47,7 +45,6 @@ bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet) SCTAB nTabCount = static_cast<SCTAB>(m_pEdNSheets->GetValue()); OUString aSheetPrefix = m_pEdSheetPrefix->GetText(); - if ( m_pEdNSheets->IsValueChangedFromSaved() || m_pEdSheetPrefix->GetSavedValue() != aSheetPrefix ) { @@ -117,7 +114,6 @@ void ScTpDefaultsOptions::OnFocusPrefixInput(Edit* pEdit) maOldPrefixValue = pEdit->GetText(); } - IMPL_LINK_NOARG(ScTpDefaultsOptions, NumModifiedHdl) { CheckNumSheets(); @@ -136,5 +132,4 @@ IMPL_LINK( ScTpDefaultsOptions, PrefixEditOnFocusHdl, Edit*, pEdit ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 015165530dc1..e7b7a8c5e4e3 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <svl/eitem.hxx> diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index b1d78151b3ad..1713aa0c75bf 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -42,10 +42,8 @@ static const sal_Unicode cDelimiter = ','; - // Benutzerdefinierte Listen: - ScTpUserLists::ScTpUserLists( Window* pParent, const SfxItemSet& rCoreAttrs ) @@ -439,10 +437,8 @@ void ScTpUserLists::RemoveList( size_t nList ) } } - // Handler: - IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb ) { if ( pLb == mpLbLists ) @@ -608,7 +604,6 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) aMsg += mpLbLists->GetEntry( nRemovePos ); aMsg += aStrQueryRemove.getToken( 1, '#' ); - if ( RET_YES == QueryBox( this, WinBits( WB_YES_NO | WB_DEF_YES ), aMsg diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 9d8a16370b5c..8e50d5d535fb 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scitems.hxx" @@ -36,7 +35,6 @@ #include <svx/drawitem.hxx> #include <svx/xtable.hxx> - // STATIC DATA ----------------------------------------------------------- ScTpContentOptions::ScTpContentOptions( Window* pParent, @@ -144,7 +142,6 @@ bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet ) bRet = true; } - return bRet; } @@ -257,7 +254,6 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn ) pLocalOptions->SetOption( eOption, bChecked ); - return 0; } @@ -380,7 +376,6 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, m_pAlignCB->SetClickHdl(LINK(this, ScTpLayoutOptions, AlignHdl)); - for ( sal_uInt16 i = 0; i < aUnitArr.Count(); ++i ) { OUString sMetric = aUnitArr.GetStringByPos( i ); @@ -487,7 +482,6 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet ) bRet = true; } - if(m_pExpRefCB->IsValueChangedFromSaved()) { rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, m_pExpRefCB->IsChecked())); @@ -584,7 +578,6 @@ void ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet ) if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_FMT_EXPAND, false, &pItem)) m_pFormatCB->Check(((const SfxBoolItem*)pItem)->GetValue()); - if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_REF_EXPAND, false, &pItem)) m_pExpRefCB->Check(((const SfxBoolItem*)pItem)->GetValue()); @@ -600,7 +593,6 @@ void ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet ) if( SFX_ITEM_SET == rCoreSet->GetItemState( SID_SC_INPUT_LEGACY_CELL_SELECTION, false, &pItem ) ) m_pLegacyCellSelectionCB->Check( ( (const SfxBoolItem*)pItem)->GetValue() ); - m_pAlignCB ->SaveValue(); m_pAlignLB ->SaveValue(); m_pEditModeCB ->SaveValue(); @@ -652,5 +644,4 @@ IMPL_LINK( ScTpLayoutOptions, AlignHdl, CheckBox*, pBox ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 88f652c98732..fe7a88e4ee1f 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -49,7 +49,6 @@ const sal_uInt16 SC_AREASDLG_RR_NONE = 0; 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() @@ -86,7 +85,6 @@ static void printAddressFlags(sal_uInt16 nFlag) } #endif - // class ScPrintAreasDlg ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ) @@ -137,7 +135,6 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* //SFX_APPWINDOW->Enable(); } - ScPrintAreasDlg::~ScPrintAreasDlg() { // Extra-Data an ListBox-Entries abraeumen @@ -151,13 +148,11 @@ ScPrintAreasDlg::~ScPrintAreasDlg() } } - bool ScPrintAreasDlg::Close() { return DoClose( ScPrintAreasDlgWrapper::GetChildWindowId() ); } - bool ScPrintAreasDlg::IsTableLocked() const { // Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn, @@ -166,7 +161,6 @@ bool ScPrintAreasDlg::IsTableLocked() const return true; } - void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ ) { if ( pRefInputEdit ) @@ -198,7 +192,6 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ } } - void ScPrintAreasDlg::AddRefEntry() { if ( pRefInputEdit == pEdPrintArea ) @@ -215,13 +208,11 @@ void ScPrintAreasDlg::AddRefEntry() } } - void ScPrintAreasDlg::Deactivate() { bDlgLostFocus = true; } - void ScPrintAreasDlg::SetActive() { if ( bDlgLostFocus ) @@ -240,7 +231,6 @@ void ScPrintAreasDlg::SetActive() RefInputDone(); } - void ScPrintAreasDlg::Impl_Reset() { OUString aStrRange; @@ -264,7 +254,6 @@ void ScPrintAreasDlg::Impl_Reset() Impl_FillLists(); - // Druckbereich aStrRange = ""; @@ -285,13 +274,11 @@ void ScPrintAreasDlg::Impl_Reset() } pEdPrintArea->SetText( aStrRange ); - // Wiederholungszeile lcl_GetRepeatRangeString(pRepeatRowRange, pDoc, true, aStrRange); pEdRepeatRow->SetText( aStrRange ); - // Wiederholungsspalte lcl_GetRepeatRangeString(pRepeatColRange, pDoc, false, aStrRange); @@ -308,7 +295,6 @@ void ScPrintAreasDlg::Impl_Reset() pEdRepeatCol->SaveValue(); } - bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) { OUString aRangeStr = pEd->GetText(); @@ -327,7 +313,6 @@ bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) return bDataChanged; } - bool ScPrintAreasDlg::Impl_CheckRefStrings() { bool bOk = false; @@ -390,7 +375,6 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings() return bOk; } - void ScPrintAreasDlg::Impl_FillLists() { @@ -416,7 +400,6 @@ void ScPrintAreasDlg::Impl_FillLists() pLbPrintArea->SetEntryData( SC_AREASDLG_PR_SELECT, new OUString( aStrRange ) ); - // Ranges holen und in ListBoxen merken ScRangeName* pRangeNames = pDoc->GetRangeName(); @@ -465,7 +448,6 @@ void ScPrintAreasDlg::Impl_FillLists() // Handler: - IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) { if ( pBtnOk == pBtn ) @@ -477,10 +459,8 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) SfxStringItem aRepeatRow( FN_PARAM_2, aStr ); SfxStringItem aRepeatCol( FN_PARAM_3, aStr ); - // Druckbereich veraendert? - // first try the list box, if "Entite sheet" is selected bool bEntireSheet = (pLbPrintArea->GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE); SfxBoolItem aEntireSheet( FN_PARAM_4, bEntireSheet ); @@ -492,12 +472,10 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) bDataChanged |= Impl_GetItem( pEdPrintArea, aPrintArea ); } - // Wiederholungszeile veraendert? bDataChanged |= Impl_GetItem( pEdRepeatRow, aRepeatRow ); - // Wiederholungsspalte veraendert? bDataChanged |= Impl_GetItem( pEdRepeatCol, aRepeatCol ); @@ -520,7 +498,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) return 0; } - IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) { if ( pCtr ==(Control *) pEdPrintArea || @@ -545,7 +522,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) return 0; } - IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) { sal_uInt16 nSelPos = pLb->GetSelectEntryPos(); @@ -582,7 +558,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) { ListBox* pLb = NULL; diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 567f7e1435ad..07d835cb649d 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <svl/eitem.hxx> @@ -31,7 +28,6 @@ #include "scresid.hxx" #include "scuitphfedit.hxx" - // macros from docsh4.cxx //! use SIDs? @@ -204,5 +200,4 @@ void ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage ) ((ScHFEditPage&)rPage).SetNumType(eNumType); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 70eaac6545f0..6feb8f595fe2 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scitems.hxx" @@ -54,10 +53,8 @@ static ScEditWindow* pActiveEdWnd = NULL; - // class ScHFEditPage - ScHFEditPage::ScHFEditPage( Window* pParent, const SfxItemSet& rCoreAttrs, sal_uInt16 nWhichId, @@ -91,7 +88,6 @@ ScHFEditPage::ScHFEditPage( Window* pParent, get(m_pFtCreatedBy,"labelSTR_HF_CREATED_BY"); get(m_pFtCustomized,"labelSTR_HF_CUSTOMIZED"); - //! use default style from current document? //! if font color is used, header/footer background color must be set @@ -348,7 +344,6 @@ void ScHFEditPage::SetSelectDefinedList() } break; - //TODO case ePagesEntry: { @@ -745,10 +740,8 @@ void ScHFEditPage::ClearTextAreas() m_pWndRight->Invalidate(); } - // Handler: - IMPL_LINK( ScHFEditPage, ListHdl_Impl, ListBox*, pList ) { if ( pList && pList == m_pLbDefined ) @@ -832,10 +825,8 @@ IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) return 0; } - // class ScRightHeaderEditPage - ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, @@ -846,10 +837,8 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScRightHeaderEditPage( pParent, *rCoreSet ) ); }; - // class ScLeftHeaderEditPage - ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, @@ -860,10 +849,8 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScLeftHeaderEditPage( pParent, *rCoreSet ) ); }; - // class ScRightFooterEditPage - ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, @@ -874,10 +861,8 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScRightFooterEditPage( pParent, *rCoreSet ) ); }; - // class ScLeftFooterEditPage - ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 3e8ac5cd7724..d5e80c0c5399 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -40,7 +40,6 @@ // class ScHFPage - ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : SvxHFPage ( pParent, rSet, nSetId ), @@ -138,10 +137,8 @@ void ScHFPage::DeactivatePage() { } - // Handler: - IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) { SvxHFPage::TurnOnHdl( m_pTurnOnBox ); @@ -154,7 +151,6 @@ IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) return 0; } - IMPL_LINK_NOARG(ScHFPage, BtnHdl) { // When the Edit-Dialog is directly called from the Button's Click-Handler, @@ -182,7 +178,6 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl) ? RID_SCDLG_HFED_HEADER : RID_SCDLG_HFED_FOOTER; - ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); @@ -237,10 +232,8 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl) return 0; } - // class ScHeaderPage - ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_HEADERSET ) { @@ -256,10 +249,8 @@ const sal_uInt16* ScHeaderPage::GetRanges() return SvxHeaderPage::GetRanges(); } - // class ScFooterPage - ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_FOOTERSET ) { @@ -275,5 +266,4 @@ const 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 faf5c4eb18ba..da94badf402e 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -20,7 +20,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <editeng/editobj.hxx> #include <editeng/editstat.hxx> #include <editeng/editview.hxx> @@ -47,7 +46,6 @@ #include "scabstdlg.hxx" #include <boost/scoped_ptr.hpp> - // STATIC DATA ----------------------------------------------------------- static ScEditWindow* pActiveEdWnd = NULL; @@ -68,10 +66,8 @@ static void lcl_GetFieldData( ScHeaderFieldData& rData ) } } - // class ScEditWindow - ScEditWindow::ScEditWindow( Window* pParent, WinBits nBits, ScEditWindowLocation eLoc ) : Control( pParent, nBits ), eLocation(eLoc), @@ -189,7 +185,6 @@ void ScEditWindow::SetCharAttriutes() ScTabViewShell* pTabViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); - OSL_ENSURE( pDocSh, "Current DocShell not found" ); OSL_ENSURE( pViewSh, "Current ViewShell not found" ); @@ -350,8 +345,6 @@ void ScExtIButton::SetPopupMenu(PopupMenu* pPopUp) pPopupMenu=pPopUp; } - - void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt ) { if(!aTimer.IsActive()) @@ -418,5 +411,4 @@ IMPL_LINK_NOARG(ScExtIButton, TimerHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 51ad4c9e3110..fa74838e152c 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -30,7 +30,6 @@ #include "sc.hrc" #include "pagedlg.hrc" - // Static Data static const sal_uInt16 pPageTableRanges[] = @@ -66,7 +65,6 @@ static bool lcl_PutBoolItem( sal_uInt16 nWhich, bool bIsChecked, bool bSavedValue ); - #define PAGENO_HDL LINK(this,ScTablePage,PageNoHdl) #define PAGEDIR_HDL LINK(this,ScTablePage,PageDirHdl) #define SCALE_HDL LINK(this,ScTablePage,ScaleHdl) @@ -81,7 +79,6 @@ static bool lcl_PutBoolItem( sal_uInt16 nWhich, #define SC_TPTABLE_SCALE_TO 1 #define SC_TPTABLE_SCALE_TO_PAGES 2 - ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, "SheetPrintPage","modules/scalc/ui/sheetprintpage.ui", &rCoreAttrs ) @@ -433,7 +430,6 @@ static bool lcl_PutScaleItem( sal_uInt16 nWhich, return bDataChanged; } - static bool lcl_PutScaleItem2( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 5545c03d1131..8c612976c80b 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -372,7 +372,6 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } } - void AlignmentPropertyPanel::FormatDegrees(double& dTmp) { while(dTmp<0) diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index d6c091448a80..2a1a3374881f 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -52,7 +52,6 @@ const char UNO_SETBORDERSTYLE[] = ".uno:SetBorderStyle"; const char UNO_LINESTYLE[] = ".uno:LineStyle"; const char UNO_FRAMELINECOLOR[] = ".uno:FrameLineColor"; - // helpers namespace @@ -63,7 +62,6 @@ namespace } } // end of anonymous namespace - // namespace open namespace sc { namespace sidebar { @@ -656,7 +654,6 @@ void CellAppearancePropertyPanel::NotifyItemUpdate( } } - void CellAppearancePropertyPanel::SetStyleIcon() { const sal_uInt16 nIdBorderLineStyle = mpTBLineStyle->GetItemId( UNO_LINESTYLE ); @@ -786,7 +783,6 @@ void CellAppearancePropertyPanel::UpdateControlState() } } - // namespace close }} // end of namespace ::sc::sidebar diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 6fda69ac8b7d..724413f91414 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -316,7 +316,6 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( } } - }} // end of namespace ::sc::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index c9d247946892..04b0bb97bb91 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -36,24 +36,20 @@ #include <boost/bind.hpp> - using namespace css; using namespace cssu; using ::rtl::OUString; - namespace sc { namespace sidebar { #define IMPLEMENTATION_NAME "org.apache.openoffice.comp.sc.sidebar.ScPanelFactory" #define SERVICE_NAME "com.sun.star.ui.UIElementFactory" - ::rtl::OUString SAL_CALL ScPanelFactory::getImplementationName (void) { return OUString(IMPLEMENTATION_NAME); } - cssu::Reference<cssu::XInterface> SAL_CALL ScPanelFactory::createInstance( const uno::Reference<lang::XMultiServiceFactory>& ) { @@ -62,7 +58,6 @@ cssu::Reference<cssu::XInterface> SAL_CALL ScPanelFactory::createInstance( return xService; } - cssu::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames (void) { cssu::Sequence<OUString> aServiceNames (1); @@ -71,18 +66,15 @@ cssu::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames (void } - ScPanelFactory::ScPanelFactory (void) : PanelFactoryInterfaceBase(m_aMutex) { } - ScPanelFactory::~ScPanelFactory (void) { } - Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 89e52dfad3cc..0722fc818f56 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <svx/numinf.hxx> #include <sfx2/objsh.hxx> @@ -42,7 +39,6 @@ #include <svl/aeitem.hxx> #include <svx/flagsdef.hxx> - ScStyleDlg::ScStyleDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId ) @@ -177,7 +173,6 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } } - const SfxItemSet* ScStyleDlg::GetRefreshedSet() { SfxItemSet* pItemSet = GetInputSetImpl(); diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 55d80ad42a7c..8740c6b31077 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -34,7 +34,6 @@ #include <rowheightcontext.hxx> #include <column.hxx> - TYPEINIT1(ScSimpleUndo, SfxUndoAction); TYPEINIT1(ScBlockUndo, ScSimpleUndo); TYPEINIT1(ScMultiBlockUndo, ScSimpleUndo); diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 65e4875b97d7..71281465b35a 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -324,7 +324,6 @@ bool ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const return rTarget.ISA(ScTabViewTarget); } - ScUndoDeleteCells::ScUndoDeleteCells( ScDocShell* pNewDocShell, const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios, DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData ) : @@ -738,7 +737,6 @@ bool ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const return rTarget.ISA(ScTabViewTarget); } - ScUndoCut::ScUndoCut( ScDocShell* pNewDocShell, ScRange aRange, ScAddress aOldEnd, const ScMarkData& rMark, ScDocument* pNewUndoDoc ) : @@ -1498,7 +1496,6 @@ bool ScUndoConditionalFormat::CanRepeat(SfxRepeatTarget& ) const return false; } - ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell, const ScMarkData& rMark, /*C*/ const ScArea& rDestArea, diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index aa8497870598..8e6c7cfb391a 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -325,7 +325,6 @@ bool ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const return rTarget.ISA(ScTabViewTarget); } - ScUndoEnterValue::ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos, const ScCellValue& rUndoCell, double nVal ) : diff --git a/sc/source/ui/undo/undocell2.cxx b/sc/source/ui/undo/undocell2.cxx index 0aa39a56fa01..125b9a767f38 100644 --- a/sc/source/ui/undo/undocell2.cxx +++ b/sc/source/ui/undo/undocell2.cxx @@ -54,7 +54,6 @@ OUString UndoSetCells::GetComment() const return ScGlobal::GetRscString(STR_UNDO_ENTERDATA); } - void UndoSetCells::SetNewValues( const std::vector<double>& rVals ) { maNewValues.assign(rVals); diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 94c0df4a5598..4d6111befdae 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -660,7 +660,6 @@ void ScUndoSubTotals::Undo() rDoc.InsertRow( 0,nTab, MAXCOL,nTab, nNewEndRow+1, static_cast<SCSIZE>(aParam.nRow2-nNewEndRow) ); } - // Original Outline table rDoc.SetOutlineTable( nTab, pUndoTable ); @@ -1380,7 +1379,6 @@ bool ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const return false; // Address book } - ScUndoRepeatDB::ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, SCROW nResultEndRow, SCCOL nCurX, SCROW nCurY, diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx index 13da03bd9200..4c06b2948b4c 100644 --- a/sc/source/ui/undo/undorangename.cxx +++ b/sc/source/ui/undo/undorangename.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "undorangename.hxx" #include "globstr.hrc" #include "global.hxx" diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 68d3510d7bd8..f09971fcd820 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -34,7 +34,6 @@ TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo); // modify style (cell or page style) - ScStyleSaveData::ScStyleSaveData() : pItems( NULL ) { @@ -284,5 +283,4 @@ bool ScUndoApplyPageStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 1a3b9f6c276b..67772dc5d1a0 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -723,7 +723,6 @@ bool ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; } - ScUndoTabColor::ScUndoTabColor( ScDocShell* pNewDocShell, SCTAB nT, const Color& aOTabBgColor, const Color& aNTabBgColor) : ScSimpleUndo( pNewDocShell ) diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index 0e0891cb29b8..806e8eda77a0 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -51,7 +51,6 @@ void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, } } - void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, const ScAddress& rBlockStart, const ScAddress& rBlockEnd ) @@ -60,7 +59,6 @@ void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, rBlockEnd.Col(), rBlockEnd.Row(), rBlockEnd.Tab() ); } - void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, const ScRange& rRange ) { @@ -97,7 +95,6 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB return pRet; } - void ScUndoUtil::PaintMore( ScDocShell* pDocShell, const ScRange& rRange ) { diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx index 23fa617affcc..d46429204041 100644 --- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx +++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartRangeSelectionListener.hxx" #include <com/sun/star/chart2/data/XRangeHighlighter.hpp> diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index e08e22519477..17b0a2f69361 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -840,6 +840,4 @@ uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPrope 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 efddd0ad354f..4d165df38136 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "appluno.hxx" #include <sal/types.h> #include <osl/diagnose.h> @@ -684,7 +683,6 @@ uno::Sequence<OUString> ScFunctionListObj::getSupportedServiceNames_Static() return aRet; } - static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, const ScFuncDesc& rDesc ) { rDesc.initArgumentInfo(); // full argument info is needed @@ -897,7 +895,4 @@ sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) return false; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 4b41c4e92119..574cfdaa6ad3 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -27,11 +27,9 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <cppuhelper/supportsservice.hxx> - namespace calc { - #define PROP_HANDLE_RANGE_ADDRESS 1 using namespace ::com::sun::star::uno; @@ -60,7 +58,6 @@ namespace calc } #endif - OCellListSource::OCellListSource( const Reference< XSpreadsheetDocument >& _rxDocument ) :OCellListSource_Base( m_aMutex ) ,OCellListSource_PBase( OCellListSource_Base::rBHelper ) @@ -81,7 +78,6 @@ namespace calc ); } - OCellListSource::~OCellListSource( ) { if ( !OCellListSource_Base::rBHelper.bDisposed ) @@ -91,13 +87,10 @@ namespace calc } } - IMPLEMENT_FORWARD_XINTERFACE2( OCellListSource, OCellListSource_Base, OCellListSource_PBase ) - IMPLEMENT_FORWARD_XTYPEPROVIDER2( OCellListSource, OCellListSource_Base, OCellListSource_PBase ) - void SAL_CALL OCellListSource::disposing() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -116,19 +109,16 @@ namespace calc // TODO: clean up here whatever you need to clean up (e.g. revoking listeners etc.) } - Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return createPropertySetInfo( getInfoHelper() ) ; } - ::cppu::IPropertyArrayHelper& SAL_CALL OCellListSource::getInfoHelper() { return *OCellListSource_PABase::getArrayHelper(); } - ::cppu::IPropertyArrayHelper* OCellListSource::createArrayHelper( ) const { Sequence< Property > aProps; @@ -136,7 +126,6 @@ namespace calc return new ::cppu::OPropertyArrayHelper(aProps); } - void SAL_CALL OCellListSource::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { OSL_ENSURE( _nHandle == PROP_HANDLE_RANGE_ADDRESS, "OCellListSource::getFastPropertyValue: invalid handle!" ); @@ -146,7 +135,6 @@ namespace calc _rValue <<= getRangeAddress( ); } - void OCellListSource::checkDisposed( ) const { if ( OCellListSource_Base::rBHelper.bInDispose || OCellListSource_Base::rBHelper.bDisposed ) @@ -190,7 +178,6 @@ namespace calc return aAddress; } - OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow ) { OSL_PRECOND( m_xRange.is(), "OCellListSource::getRangeAddress: invalid range!" ); @@ -204,7 +191,6 @@ namespace calc return sText; } - sal_Int32 SAL_CALL OCellListSource::getListEntryCount( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -215,7 +201,6 @@ namespace calc return aAddress.EndRow - aAddress.StartRow + 1; } - OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -228,7 +213,6 @@ namespace calc return getCellTextContent_noCheck( 0, _nPosition ); } - Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -245,7 +229,6 @@ namespace calc return aAllEntries; } - void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -258,7 +241,6 @@ namespace calc m_aListEntryListeners.addInterface( _rxListener ); } - void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -271,13 +253,11 @@ namespace calc m_aListEntryListeners.removeInterface( _rxListener ); } - void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception) { notifyModified(); } - void OCellListSource::notifyModified() { EventObject aEvent; @@ -302,7 +282,6 @@ namespace calc } - void SAL_CALL OCellListSource::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) { Reference<XInterface> xRangeInt( m_xRange, UNO_QUERY ); @@ -313,7 +292,6 @@ namespace calc } } - void SAL_CALL OCellListSource::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) { if ( m_bInitialized ) @@ -374,7 +352,6 @@ namespace calc OSL_FAIL( "OCellListSource::initialize: caught an exception while retrieving the cell object!" ); } - if ( !m_xRange.is() ) throw Exception(); // TODO error message @@ -401,8 +378,6 @@ namespace calc m_bInitialized = true; } - } // namespace calc - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 558a5b7c4b15..fc8a1a90a34f 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -154,10 +154,8 @@ namespace calc #endif }; - } // namespace calc - #endif // INCLUDED_SC_SOURCE_UI_UNOOBJ_CELLLISTSOURCE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 77321977bf36..3a94df0175ab 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -953,7 +953,6 @@ const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine( return lcl_getBorderLine( rLine, rStruct); } - namespace { template<typename TableBorderType> void lcl_fillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const TableBorderType& rBorder ) @@ -987,7 +986,6 @@ void ScHelperFunctions::FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner lcl_fillBoxItems( rOuter, rInner, rBorder); } - void ScHelperFunctions::FillBorderLine( table::BorderLine& rStruct, const ::editeng::SvxBorderLine* pLine ) { // Convert from Twips to 1/100mm. @@ -1000,7 +998,6 @@ void ScHelperFunctions::FillBorderLine( table::BorderLine2& rStruct, const ::edi rStruct = SvxBoxItem::SvxLineToLine( pLine, true); } - namespace { template<typename TableBorderItem> void lcl_fillTableBorder( TableBorderItem& rBorder, const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner, @@ -5636,10 +5633,8 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe if (xPropSet.is()) lcl_CopyProperties( aImpl, *(beans::XPropertySet*)xPropSet.get() ); - // ausfuehren... - if (pDocSh) { ScQueryParam aParam = aImpl.GetParam(); @@ -9438,10 +9433,8 @@ void ScUniqueCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - // Fill the list of formats from the document - // hash code to access the range lists by ScPatternAttr pointer struct ScPatternHashCode { diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 3aee78f04be6..b2f60843e4c2 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -31,11 +31,9 @@ #include <com/sun/star/util/NumberFormat.hpp> #include <cppuhelper/supportsservice.hxx> - namespace calc { - #define PROP_HANDLE_BOUND_CELL 1 using namespace ::com::sun::star::uno; @@ -67,7 +65,6 @@ namespace calc } #endif - OCellValueBinding::OCellValueBinding( const Reference< XSpreadsheetDocument >& _rxDocument, bool _bListPos ) :OCellValueBinding_Base( m_aMutex ) ,OCellValueBinding_PBase( OCellValueBinding_Base::rBHelper ) @@ -90,7 +87,6 @@ namespace calc // which probably maps to the cell being locked } - OCellValueBinding::~OCellValueBinding( ) { if ( !OCellValueBinding_Base::rBHelper.bDisposed ) @@ -100,13 +96,10 @@ namespace calc } } - IMPLEMENT_FORWARD_XINTERFACE2( OCellValueBinding, OCellValueBinding_Base, OCellValueBinding_PBase ) - IMPLEMENT_FORWARD_XTYPEPROVIDER2( OCellValueBinding, OCellValueBinding_Base, OCellValueBinding_PBase ) - void SAL_CALL OCellValueBinding::disposing() { Reference<XModifyBroadcaster> xBroadcaster( m_xCell, UNO_QUERY ); @@ -121,19 +114,16 @@ namespace calc // for the cell) } - Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return createPropertySetInfo( getInfoHelper() ) ; } - ::cppu::IPropertyArrayHelper& SAL_CALL OCellValueBinding::getInfoHelper() { return *OCellValueBinding_PABase::getArrayHelper(); } - ::cppu::IPropertyArrayHelper* OCellValueBinding::createArrayHelper( ) const { Sequence< Property > aProps; @@ -141,7 +131,6 @@ namespace calc return new ::cppu::OPropertyArrayHelper(aProps); } - void SAL_CALL OCellValueBinding::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { OSL_ENSURE( _nHandle == PROP_HANDLE_BOUND_CELL, "OCellValueBinding::getFastPropertyValue: invalid handle!" ); @@ -154,7 +143,6 @@ namespace calc _rValue <<= xCellAddress->getCellAddress( ); } - Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes( ) throw (RuntimeException, std::exception) { checkDisposed( ); @@ -185,7 +173,6 @@ namespace calc return aTypes; } - sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) throw (RuntimeException, std::exception) { checkDisposed( ); @@ -202,7 +189,6 @@ namespace calc return false; } - Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) throw (IncompatibleTypesException, RuntimeException, std::exception) { checkDisposed( ); @@ -288,7 +274,6 @@ namespace calc return aReturn; } - void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) throw (IncompatibleTypesException, NoSupportException, RuntimeException, std::exception) { checkDisposed( ); @@ -418,7 +403,6 @@ namespace calc } } - void OCellValueBinding::checkDisposed( ) const { if ( OCellValueBinding_Base::rBHelper.bInDispose || OCellValueBinding_Base::rBHelper.bDisposed ) @@ -426,7 +410,6 @@ namespace calc // TODO: is it worth having an error message here? } - void OCellValueBinding::checkInitialized() { if ( !m_bInitialized ) @@ -434,7 +417,6 @@ namespace calc // TODO: error message } - void OCellValueBinding::checkValueType( const Type& _rType ) const { OCellValueBinding* pNonConstThis = const_cast< OCellValueBinding* >( this ); @@ -476,14 +458,12 @@ namespace calc m_aModifyListeners.addInterface( _rxListener ); } - void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception) { if ( _rxListener.is() ) m_aModifyListeners.removeInterface( _rxListener ); } - void OCellValueBinding::notifyModified() { EventObject aEvent; @@ -507,13 +487,11 @@ namespace calc } } - void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception) { notifyModified(); } - void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) { Reference<XInterface> xCellInt( m_xCell, UNO_QUERY ); @@ -525,7 +503,6 @@ namespace calc } } - void SAL_CALL OCellValueBinding::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) { if ( m_bInitialized ) @@ -611,5 +588,4 @@ namespace calc } // namespace calc - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 9a3c34b4a8c6..2e19ac9e2f69 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -149,10 +149,8 @@ namespace calc #endif }; - } // namespace calc - #endif // INCLUDED_SC_SOURCE_UI_UNOOBJ_CELLVALUEBINDING_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index ed9c2dc8d9e9..41a18192d53c 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "chart2uno.hxx" #include "miscuno.hxx" #include "document.hxx" @@ -1016,7 +1015,6 @@ ScChart2DataProvider::~ScChart2DataProvider() m_pDocument->RemoveUnoObject( *this); } - void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { if ( rHint.ISA( SfxSimpleHint ) && @@ -1088,7 +1086,6 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createLabeledDataSequenceFro } SAL_WNODEPRECATED_DECLARATIONS_POP - /** * Check the current list of reference tokens, and add the upper left * corner of the minimum range that encloses all ranges if certain @@ -2325,7 +2322,6 @@ ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException, std::ex return aRef; } - void SAL_CALL ScChart2DataProvider::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, @@ -2342,7 +2338,6 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue( throw beans::UnknownPropertyException(); } - uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( const OUString& rPropertyName) throw( beans::UnknownPropertyException, @@ -2361,7 +2356,6 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( return aRet; } - void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) @@ -2371,7 +2365,6 @@ void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) @@ -2381,7 +2374,6 @@ void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) @@ -2391,7 +2383,6 @@ void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataProvider::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/ ) @@ -2410,14 +2401,12 @@ ScChart2DataSource::ScChart2DataSource( ScDocument* pDoc) m_pDocument->AddUnoObject( *this); } - ScChart2DataSource::~ScChart2DataSource() { if ( m_pDocument ) m_pDocument->RemoveUnoObject( *this); } - void ScChart2DataSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { if ( rHint.ISA( SfxSimpleHint ) && @@ -2427,7 +2416,6 @@ void ScChart2DataSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint) } } - uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence> > SAL_CALL ScChart2DataSource::getDataSequences() throw ( uno::RuntimeException, std::exception) { @@ -2956,7 +2944,6 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint } } - IMPL_LINK( ScChart2DataSequence, ValueListenerHdl, SfxHint*, pHint ) { if ( m_pDocument && pHint && pHint->ISA( SfxSimpleHint ) && @@ -3016,7 +3003,6 @@ void ScChart2DataSequence::ExternalRefListener::removeFileId(sal_uInt16 nFileId) maFileIds.erase(nFileId); } - uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() throw (uno::RuntimeException, std::exception) { @@ -3475,7 +3461,6 @@ ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException, std::ex return aRef; } - void SAL_CALL ScChart2DataSequence::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, @@ -3507,7 +3492,6 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue( // TODO: support optional properties } - uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rPropertyName) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -3548,7 +3532,6 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rProper return aRet; } - void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) @@ -3559,7 +3542,6 @@ void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) @@ -3570,7 +3552,6 @@ void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) @@ -3581,7 +3562,6 @@ void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index a0c70540f14d..e5d73213f71d 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -789,6 +789,4 @@ uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() throw return createPropertySetInfo( getInfoHelper() ) ; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 4f849aec5df3..9b838fe8b2a0 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star; #define SCSAVEVERSION "SaveVersionOnClose" - static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() { static const SfxItemPropertyMapEntry aConfigPropertyMap_Impl[] = diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index bd203db8ecf9..3031a13f4136 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -481,5 +481,4 @@ uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() return aTotalSeq; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index ff3d54b1f3e2..5cc6f06a6a12 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <svl/smplhint.hxx> #include <vcl/svapp.hxx> @@ -57,7 +56,6 @@ using namespace com::sun::star; using namespace com::sun::star::sheet; - using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; @@ -1140,7 +1138,6 @@ Sequence<sal_Int8> SAL_CALL ScDataPilotTableObj::getImplementationId() return css::uno::Sequence<sal_Int8>(); } - ScDPObject* ScDataPilotTableObj::GetDPObject() const { return lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -3504,7 +3501,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 d1afe899dd3c..ac260c732b2b 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -126,8 +126,6 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() return aDBRangePropertyMap_Impl; } - - 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" ) @@ -2253,7 +2251,6 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const OUString& aN return NULL; } - void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, const table::CellRangeAddress& aRange ) throw(uno::RuntimeException, std::exception) @@ -2480,5 +2477,4 @@ sal_Bool ScUnnamedDatabaseRangesObj::hasByTable( sal_Int32 nTab ) return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 1a2527d6b5ea..155f24f54e72 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -346,5 +346,4 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropert return aRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx index 21edc1b21774..cc4941a992f7 100644 --- a/sc/source/ui/unoobj/detreg.cxx +++ b/sc/source/ui/unoobj/detreg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scdetect.hxx" #include "exceldetect.hxx" #include <cppuhelper/implementationentry.hxx> diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index b87ad9be3358..c1c178ad8397 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -50,7 +50,6 @@ static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxVie return uno::Reference<view::XSelectionSupplier>(); } - ScDispatchProviderInterceptor::ScDispatchProviderInterceptor(ScTabViewShell* pViewSh) : pViewShell( pViewSh ) { diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 131f9b7db07d..16d50edfff07 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -923,7 +923,6 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, return bDone; } - sal_Int32 SAL_CALL ScModelObj::getRendererCount(const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) @@ -2376,7 +2375,6 @@ uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms() return aRet; } - ScDrawPagesObj::ScDrawPagesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -3824,6 +3822,4 @@ sal_Bool SAL_CALL ScScenariosObj::hasByName( const OUString& aName ) return GetScenarioIndex_Impl( aName, nIndex ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx index b382b17da612..1604dc437ef7 100644 --- a/sc/source/ui/unoobj/drdefuno.cxx +++ b/sc/source/ui/unoobj/drdefuno.cxx @@ -73,5 +73,4 @@ SfxItemPool* ScDrawDefaultsObj::getModelPool( bool bReadOnly ) throw() return pRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index 85ab77eb3e02..2f6e9a955b1d 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "editsrc.hxx" #include "scitems.hxx" diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 14a7af9eaf8e..ab62b5397a50 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "eventuno.hxx" #include "miscuno.hxx" #include "docsh.hxx" diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index a43e5448e7e1..1eb650134bda 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -31,7 +31,6 @@ #include <svl/smplhint.hxx> #include <vcl/svapp.hxx> - #include <editeng/eeitem.hxx> #include <editeng/editeng.hxx> @@ -145,7 +144,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" ) @@ -1187,7 +1185,6 @@ SvxFieldItem ScEditFieldObj::CreateFieldItem() return SvxFieldItem(*getData(), EE_FEATURE_FIELD); } - void ScEditFieldObj::DeleteField() { if (mpEditSource) diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index ee29b0f41649..6c42c814b9e5 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -32,7 +32,6 @@ #include "docsh.hxx" #include "globstr.hrc" - #include "sc.hrc" #include "scabstdlg.hxx" #include <i18nlangtag/lang.h> @@ -42,7 +41,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <boost/scoped_ptr.hpp> - using namespace ::com::sun::star; using namespace rtl; using namespace com::sun::star::uno; @@ -57,7 +55,6 @@ SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTE #define SC_UNONAME_FILTEROPTIONS "FilterOptions" #define SC_UNONAME_INPUTSTREAM "InputStream" - #define DBF_CHAR_SET "CharSet" #define DBF_SEP_PATH_IMPORT "Office.Calc/Dialogs/DBFImport" #define DBF_SEP_PATH_EXPORT "Office.Calc/Dialogs/DBFExport" diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 2ffacb4c7888..3120b284a672 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <boost/bind.hpp> #include <vcl/svapp.hxx> @@ -1027,7 +1026,4 @@ ScTableValidationObj* ScTableValidationObj::getImplementation( return pRet; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index c5a2e4805c84..b171bf69a637 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -498,10 +498,8 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, ScCompiler aCompiler(pDoc,aAdr); aCompiler.SetGrammar(pDoc->GetGrammar()); - // find function - ScTokenArray aTokenArr; if ( !lcl_AddFunctionToken( aTokenArr, aName,aCompiler ) ) { @@ -509,17 +507,13 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, throw container::NoSuchElementException(); } - // set options (null date, etc.) - if ( pOptions ) pDoc->SetDocOptions( *pOptions ); - // add arguments to token array - bool bArgErr = false; bool bOverflow = false; long nDocRow = 0; @@ -621,10 +615,8 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, aTokenArr.AddOpCode(ocClose); aTokenArr.AddOpCode(ocStop); - // execute formula - uno::Any aRet; if ( !bArgErr && !bOverflow && nDocRow <= MAXROWCOUNT ) { @@ -683,5 +675,4 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, return aRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index b5d18a97ad1c..d73c00f4402d 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -239,8 +239,6 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceNa return aRet; } - - ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess>& rNameObj ) : xNameAccess( rNameObj ) @@ -289,6 +287,4 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::u return getCount() > 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index edceecf35013..cc6fdeaa92bf 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; - #include "nameuno.hxx" #include "miscuno.hxx" #include "cellsuno.hxx" @@ -208,7 +207,6 @@ void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray* } } - OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -346,7 +344,6 @@ void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToke } } - // XCellRangeSource uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells() @@ -442,7 +439,6 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() return aRet; } - // XUnoTunnel sal_Int64 SAL_CALL ScNamedRangeObj::getSomething( @@ -491,7 +487,6 @@ void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - // sheet::XNamedRanges void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, @@ -1210,6 +1205,4 @@ sal_Bool SAL_CALL ScLabelRangesObj::hasElements() throw(uno::RuntimeException, s return ( getCount() != 0 ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index d8dcbcec9679..ca70be593a2a 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -90,7 +90,6 @@ void ScAnnotationObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - // XChild uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index cab74069f1a2..c7734966d1cc 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -28,7 +28,6 @@ using namespace com::sun::star; - const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() { static const SfxItemPropertyMapEntry aMap[] = diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 83075860c2ea..63ff9a642d44 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -48,7 +48,6 @@ const sal_Char pFilterSylk[] = "SYLK"; // 0x02nn: ein Byte aus 0xnn Alternativen folgt // 0x8000: Erkennung abgeschlossen - #define M_DC 0x0100 #define M_ALT(ANZ) (0x0200+(ANZ)) #define M_ENDE 0x8000 diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index 1b78f7244ce6..097e4d2febf5 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } }}} - class ScFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > { public: @@ -57,7 +56,6 @@ public: impl_createInstance( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ) throw (com::sun::star::uno::Exception); - // XExtendedFilterDetect virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index e9bf1d5d158b..d4836851eefa 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/macros.h> #include <svtools/unoimap.hxx> #include <svx/unofill.hxx> @@ -308,11 +307,9 @@ static const ProvNamesId_Type aProvNamesId[] = { "ooo.vba.VBAGlobals", SC_SERVICE_VBAGLOBALS }, }; - // old service names that were in 567 still work in createInstance, // in case some macro is still using them - static const sal_Char* aOldNames[SC_SERVICE_COUNT] = { "", // SC_SERVICE_SHEET @@ -364,12 +361,8 @@ static const sal_Char* aOldNames[SC_SERVICE_COUNT] = "", // SC_SERVICE_EXT_TIMEFIELD }; - - - // alles static - sal_uInt16 ScServiceProvider::GetProviderType(const OUString& rServiceName) { if (!rServiceName.isEmpty()) @@ -650,5 +643,4 @@ uno::Sequence<OUString> ScServiceProvider::GetAllServiceNames() return aRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 84f686b8f3e9..d9d800660d96 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -241,7 +241,4 @@ ScCellSearchObj* ScCellSearchObj::getImplementation( return pRet; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 357d06dbf51e..a694d1c8c68f 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -365,7 +365,6 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() return &aFooterStyleMap; } - // Index-Access auf die Style-Typen: 0 = Cell, 1 = Page #define SC_STYLE_FAMILY_COUNT 2 @@ -1992,5 +1991,4 @@ uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() return aRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 48238e41bd5d..4bbf90522451 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -174,7 +174,6 @@ ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation( return pRet; } - ScHeaderFooterTextData::ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : mpTextObj(pTextObj ? pTextObj->Clone() : NULL), @@ -253,7 +252,6 @@ void ScHeaderFooterTextData::UpdateData(EditEngine& rEditEngine) bDataValid = false; } - ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : aTextData(rContent, nP, pTextObj) diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 738d33d8a5be..f739a5ef4d14 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tokenuno.hxx" #include <sal/macros.h> diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index db9d9a00fc79..2da8ce21016b 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -52,5 +52,4 @@ uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance( return uno::Reference< uno::XInterface >( pShell->GetModel() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 65dcffabfedc..b2c825786e76 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/drawing/ShapeCollection.hpp> #include <com/sun/star/script/vba/VBAEventId.hpp> @@ -713,7 +712,6 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) if (bRet) return bRet; - ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xInterface ); uno::Reference<drawing::XShapes> xShapeColl( xInterface, uno::UNO_QUERY ); uno::Reference<drawing::XShape> xShapeSel( xInterface, uno::UNO_QUERY ); @@ -1792,7 +1790,6 @@ void ScTabViewObj::SelectionChanged() } } - // XPropertySet (View-Optionen) //! auch an der Applikation anbieten? diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx index df022b2b4330..02e59aef4184 100644 --- a/sc/source/ui/unoobj/warnpassword.cxx +++ b/sc/source/ui/unoobj/warnpassword.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/ucb/XContent.hpp> #include <svx/svxerr.hxx> - using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 96c76a725612..5c379294f6fe 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -156,7 +156,6 @@ implnPaste( const uno::Reference< frame::XModel>& xModel ) } } - void implnCopy( const uno::Reference< frame::XModel>& xModel ) { diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 6e08ea20b829..cd6590c5402a 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -79,7 +79,6 @@ template < typename ImplObject > return pObj; } - } // namespace excel } // namespace vba } // namespace ooo diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index 1187ce82c82e..64222f5acf7a 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <comphelper/servicedecl.hxx> - // component exports using namespace ::com::sun::star; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index c050f1153c53..81aafa2bc0a7 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -502,7 +502,6 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep return uno::Any( xNames->Item( aIndex, uno::Any() ) ); } - uno::Reference< excel::XWorksheet > SAL_CALL ScVbaApplication::getActiveSheet() throw (uno::RuntimeException, std::exception) { @@ -923,7 +922,6 @@ ScVbaApplication::getPathSeparator() throw (uno::RuntimeException, std::exceptio return OUString( (sal_Unicode) SAL_PATHDELIMITER ); } - // Helpers for Intersect and Union namespace { diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 14e39a812849..0e69474248e9 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAAPPLICATION_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAAPPLICATION_HXX - #include <ooo/vba/excel/XWorksheetFunction.hpp> #include <ooo/vba/excel/XApplication.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index e8d02fd3c741..efd90a35f2b6 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -23,7 +23,6 @@ #include"vbaassistant.hxx" - using namespace com::sun::star; using namespace ooo::vba; @@ -62,7 +61,6 @@ void SAL_CALL ScVbaAssistant::setOn( sal_Bool bOn ) throw (uno::RuntimeException setVisible( bOn ); } - ::sal_Int32 SAL_CALL ScVbaAssistant::getTop() throw (css::uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 999a7ee49bde..9d3624925b31 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -58,7 +58,6 @@ public: } }; - uno::Reference< excel::XAxis > ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( uno::RuntimeException, script::BasicErrorException ) { diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 939bc1493ac9..8ed9bfe398d3 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -466,7 +466,6 @@ ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) throw (script: } } - sal_Bool SAL_CALL ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx index 4715d8e8e409..42813da67025 100644 --- a/sc/source/ui/vba/vbaaxistitle.cxx +++ b/sc/source/ui/vba/vbaaxistitle.cxx @@ -46,5 +46,4 @@ ScVbaAxisTitle::getServiceNames() return aServiceNames; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index dd363406b387..8d76d3915b55 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel; - typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base; typedef InheritedHelperInterfaceImpl1<excel::XBorder > ScVbaBorder_Base; @@ -404,7 +403,6 @@ ScVbaBorders::getItemByIntIndex( const sal_Int32 nIndex ) throw (uno::RuntimeEx return createCollectionObject( m_xIndexAccess->getByIndex( nIndex ) ); } - uno::Any SAL_CALL ScVbaBorders::getColor() throw (uno::RuntimeException, std::exception) { sal_Int32 count = getCount(); @@ -545,7 +543,6 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run } } - OUString ScVbaBorders::getServiceImplName() { diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index e1c4a4a75047..fe8f7ed08fb2 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/beans/XPropertySet.hpp> - #include <vbahelper/vbacollectionimpl.hxx> typedef CollTestImplHelper< ov::excel::XBorders > ScVbaBorders_BASE; @@ -45,7 +44,6 @@ public: virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - // XBorders // ScVbaCollectionBaseImpl diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index 5eb7b9f1caef..0a0ad615135e 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -21,7 +21,6 @@ #include "vbaglobals.hxx" #include "vbafont.hxx" - using namespace ::ooo::vba; using namespace ::com::sun::star; @@ -90,7 +89,6 @@ ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) thro throw uno::RuntimeException("Not Implemented" ); } - // Methods void SAL_CALL ScVbaCharacters::Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception) @@ -106,7 +104,6 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException, std::exception) m_xSimpleText->setString(OUString()); } - OUString ScVbaCharacters::getServiceImplName() { diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 147d493e6ebb..7548a96a0afc 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -56,7 +56,6 @@ public: virtual void SAL_CALL Insert( const OUString& String ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 18214850e401..4f495e669da3 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -380,7 +380,6 @@ try break; } - switch (_nChartType) { case xlConeColClustered: @@ -953,7 +952,6 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _ } } - sal_Int32 ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (script::BasicErrorException) { @@ -1014,7 +1012,6 @@ ScVbaChart::assignDiagramAttributes() xTwoAxisYSupplier.set( mxDiagramPropertySet, uno::UNO_QUERY_THROW ); } - uno::Reference< beans::XPropertySet > ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException, uno::RuntimeException ) { @@ -1047,7 +1044,6 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro return xAxisProps; } - OUString ScVbaChart::getServiceImplName() { diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 863233ed8063..a4a39e67581f 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -83,7 +83,6 @@ ScVbaChartObject::setName( const OUString& sName ) throw (css::uno::RuntimeExcep xNamedShape->setName(sName); } - OUString SAL_CALL ScVbaChartObject::getName() throw (css::uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index 935ddbaf2e9e..cdb300e84fb6 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <ooo/vba/excel/XlChartType.hpp> - #include "vbachartobjects.hxx" #include "vbachartobject.hxx" #include "vbaglobals.hxx" @@ -35,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - class ChartObjectEnumerationImpl : public EnumerationHelperImpl { uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier; @@ -51,7 +49,6 @@ public: } }; - ScVbaChartObjects::ScVbaChartObjects( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableCharts >& _xTableCharts, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjects_BASE(_xParent, _xContext, css::uno::Reference< css::container::XIndexAccess >( _xTableCharts, css::uno::UNO_QUERY ) ), xTableCharts( _xTableCharts ) , xDrawPageSupplier( _xDrawPageSupplier ) { diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx index d0def76e4f4d..7b4f64fc49ef 100644 --- a/sc/source/ui/vba/vbacharttitle.cxx +++ b/sc/source/ui/vba/vbacharttitle.cxx @@ -46,5 +46,4 @@ ScVbaChartTitle::getServiceNames() return aServiceNames; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx index 084e2c3333c5..95bb635e985e 100644 --- a/sc/source/ui/vba/vbacharttitle.hxx +++ b/sc/source/ui/vba/vbacharttitle.hxx @@ -22,7 +22,6 @@ #include <cppuhelper/implbase1.hxx> #include <ooo/vba/excel/XChartTitle.hpp> - typedef TitleImpl< cppu::WeakImplHelper1< ov::excel::XChartTitle > > ChartTitleBase; class ScVbaChartTitle : public ChartTitleBase diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index c4c42a1c30f8..a0cb6d060a67 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; 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. diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 72dabbe69a15..873650bd3642 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -58,7 +58,6 @@ ScVbaFont::~ScVbaFont() { } - static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf ) throw ( uno::RuntimeException ) { uno::Reference< text::XTextRange > xTxtRange( xIf, uno::UNO_QUERY_THROW ); @@ -243,7 +242,6 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep ScVbaFont_BASE::setColorIndex( _colorindex ); } - uno::Any SAL_CALL ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) { @@ -253,7 +251,6 @@ ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) return ScVbaFont_BASE::getColorIndex(); } - void SAL_CALL ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception ) { @@ -263,7 +260,6 @@ ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::Runtime "setStandardFontSize not supported" ); } - uno::Any SAL_CALL ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException, std::exception ) { @@ -272,7 +268,6 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException, std::exception ) // return uno::Any(); } - void SAL_CALL ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception ) { @@ -280,7 +275,6 @@ ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeExce throw uno::RuntimeException("setStandardFont not supported" ); } - uno::Any SAL_CALL ScVbaFont::getStandardFont() throw ( uno::RuntimeException, std::exception ) { @@ -320,7 +314,6 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException, setItalic( uno::makeAny( bItalic ) ); } - uno::Any SAL_CALL ScVbaFont::getFontStyle() throw ( uno::RuntimeException, std::exception ) { diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 90bd2ca71dab..b914ab6b735e 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -807,9 +807,7 @@ ScVbaFormat<Ifc1>::getCurrentDataSet( ) throw ( uno::RuntimeException ) return pDataSet; } - template class ScVbaFormat< excel::XStyle >; template class ScVbaFormat< excel::XRange >; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 28e5e30aeea4..623d6ea7e265 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -48,7 +48,6 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterfa msStyleName = mxStyle->getName(); } - void SAL_CALL ScVbaFormatCondition::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { @@ -132,7 +131,6 @@ ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::Runtime return nReturnType; } - ::sal_Int32 ScVbaFormatCondition::Operator( sal_Bool bVal ) throw (script::BasicErrorException ) { diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 54323da6eb58..0aca5596c18f 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -66,7 +66,6 @@ ScVbaFormatConditions::getElementType() throw (css::uno::RuntimeException) return cppu::UnoType<excel::XFormatCondition>::get(); } - uno::Any xSheetConditionToFormatCondition( const uno::Reference< XHelperInterface >& xRangeParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XStyles >& xStyles, const uno::Reference< excel::XFormatConditions >& xFormatConditions, const uno::Reference< beans::XPropertySet >& xRangeProps, const uno::Any& aObject ) { uno::Reference< sheet::XSheetConditionalEntry > xSheetConditionalEntry; @@ -190,14 +189,12 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons return xFormatCondition; } - uno::Reference< container::XEnumeration > SAL_CALL ScVbaFormatConditions::createEnumeration() throw (uno::RuntimeException) { return new EnumWrapper( m_xIndexAccess, mxRangeParent, mxContext, mxStyles, this, mxParentRangePropertySet ); } - void ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) { diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 70055e15543d..f6477be468c9 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -34,10 +34,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::ooo::vba; - // ScVbaGlobals - //ScVbaGlobals::ScVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext, ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext ) ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "ExcelDocumentContext" ) @@ -58,7 +56,6 @@ ScVbaGlobals::~ScVbaGlobals() OSL_TRACE("ScVbaGlobals::~ScVbaGlobals"); } - // XGlobals uno::Reference<excel::XApplication > @@ -70,7 +67,6 @@ ScVbaGlobals::getApplication() throw (uno::RuntimeException) return mxApplication; } - uno::Reference<excel::XApplication > SAL_CALL ScVbaGlobals::getExcel() throw (uno::RuntimeException, std::exception) { @@ -90,7 +86,6 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception) throw uno::RuntimeException( "No activeWorkbook available" ); } - uno::Reference< excel::XWindow > SAL_CALL ScVbaGlobals::getActiveWindow() throw (uno::RuntimeException, std::exception) { @@ -215,7 +210,6 @@ ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException, std:: } - uno::Any SAL_CALL ScVbaGlobals::getDebug() throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 11b5e0cab891..3510b90c729c 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -32,7 +32,6 @@ // class ScVbaGlobals - typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE; class ScVbaGlobals : public ScVbaGlobals_BASE @@ -78,7 +77,6 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc virtual css::uno::Any SAL_CALL getDebug() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XMultiServiceFactory virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index 039d767358cf..662ffec00358 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XURLTransformer.hpp> - #include <comphelper/processfactory.hxx> #include <sfx2/objsh.hxx> @@ -59,7 +58,6 @@ using namespace ::ooo::vba; #define POINTTO100THMILLIMETERFACTOR 35.27778 - namespace ooo { namespace vba @@ -180,7 +178,6 @@ implnPaste() } } - void implnCopy() { @@ -255,7 +252,6 @@ getCurrentDocument() throw (uno::RuntimeException) basicChosen = pParent; } - uno::Any aModel; SbxVariable *pCompVar = basicChosen->Find( "ThisComponent", SbxCLASS_OBJECT ); @@ -520,7 +516,6 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti return sString; } - OUString ContainerUtilities::getUniqueName( const uno::Sequence< OUString >& _slist, const OUString& _sElementName, const OUString& _sSuffixSeparator) { diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 5387427533e1..265f9a1d7e84 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -13,7 +13,6 @@ using namespace com::sun::star; using namespace ooo::vba; - typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuBarEnumeration_BASE; class MenuBarEnumeration : public MenuBarEnumeration_BASE diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index 20a13b98625e..2d6c20a1e572 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -14,7 +14,6 @@ using namespace com::sun::star; using namespace ooo::vba; - typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE; class MenuEnumeration : public MenuEnumeration_BASE diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index a0b663838bba..16068af9fcba 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -13,7 +13,6 @@ using namespace com::sun::star; using namespace ooo::vba; - typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE; class MenuEnumeration : public MenuEnumeration_BASE diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index 8cf18ec2183e..4d64a43bcf55 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -55,7 +55,6 @@ public: }; - ScVbaNames::ScVbaNames(const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRanges >& xNames, @@ -82,7 +81,6 @@ ScVbaNames::getScDocument() return rViewData.GetDocument(); } - css::uno::Any ScVbaNames::Add( const css::uno::Any& Name , const css::uno::Any& RefersTo, @@ -268,5 +266,4 @@ ScVbaNames::getServiceNames() return aServiceNames; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index d3cef1eaa52f..e80c4acb98f9 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -55,7 +55,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames(); }; - typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE; class ScVbaHPageBreak : public ScVbaHPageBreak_BASE diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index a06161684547..0f4c6d4ccd0e 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -179,7 +179,6 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script return uno::makeAny( uno::Reference< excel::XHPageBreak >( new ScVbaHPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) )); } - class RangePageBreaksEnumWrapper : public EnumerationHelper_BASE { uno::Reference<container::XIndexAccess > m_xIndexAccess; diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index 9923a78177f2..fff859362c9d 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -18,7 +18,6 @@ */ #include "vbapivotcache.hxx" - using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index 53fe0bab95f0..2e3758f7f388 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -19,7 +19,6 @@ #include "vbapivottable.hxx" #include "vbapivotcache.hxx" - using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index 1af9df7e6060..8be41a0f66f2 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/sheet/XDataPilotTable.hpp> #include <ooo/vba/excel/XPivotTable.hpp> - using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index f5c50f1d215d..afe2a33c88a6 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -29,7 +29,6 @@ #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbacollectionimpl.hxx> - typedef CollTestImplHelper< ov::excel::XPivotTables > ScVbaPivotTables_BASE; class ScVbaPivotTables : public ScVbaPivotTables_BASE @@ -44,7 +43,6 @@ public: virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - // XPivotTables // ScVbaPivotTables_BASE diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx index 0cdd5fb836a9..f557bb25960a 100644 --- a/sc/source/ui/vba/vbapropvalue.hxx +++ b/sc/source/ui/vba/vbapropvalue.hxx @@ -32,7 +32,6 @@ public: virtual css::uno::Any getValueEvent() = 0; }; - class ScVbaPropValue : public PropValueImpl_BASE { PropListener* m_pListener; diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 57d3ec747257..521f224e8d40 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -350,7 +350,6 @@ public: } }; - class ScVbaRangeAreas : public ScVbaCollectionBaseImpl { bool mbIsRows; @@ -492,7 +491,6 @@ const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRan throw uno::RuntimeException("Cannot obtain VBA range implementation object" ); } - class NumFormatHelper { uno::Reference< util::XNumberFormatsSupplier > mxSupplier; @@ -549,7 +547,6 @@ public: return OUString(); } - uno::Reference< beans::XPropertySet > xNumberProps( getNumberProps(), uno::UNO_QUERY_THROW ); OUString aFormatString; uno::Any aString = xNumberProps->getPropertyValue( "FormatString" ); @@ -692,7 +689,6 @@ public: } }; - const static OUString ISVISIBLE( "IsVisible"); const static OUString POSITION( "Position"); const static OUString EQUALS( "=" ); @@ -801,7 +797,6 @@ CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< tab } - class CellValueGetter : public ValueGetter { protected: @@ -955,7 +950,6 @@ public: }; - class Dim2ArrayValueGetter : public ArrayVisitor { protected: @@ -1241,7 +1235,6 @@ bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRang return true; } - ScVbaRange* getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) { @@ -1533,7 +1526,6 @@ ScVbaRange::getValue() throw (uno::RuntimeException, std::exception) } - void ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter, bool bFireEvent ) throw (uno::RuntimeException) { @@ -1619,7 +1611,6 @@ ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (uno::Runti return; } - uno::Reference< sheet::XSheetOperation > xSheetOperation(mxRange, uno::UNO_QUERY_THROW); xSheetOperation->clearContents( nFlags ); if( bFireEvent ) fireChangeEvent(); @@ -1879,7 +1870,6 @@ ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw ( ScRangeList aCellRanges = pUnoRangesBase->GetRangeList(); - for ( size_t i = 0, nRanges = aCellRanges.size(); i < nRanges; ++i ) { ScRange* pRange = aCellRanges[ i ]; @@ -3376,7 +3366,6 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan else throw uno::RuntimeException("Illegal Key param" ); - } void SAL_CALL @@ -4116,7 +4105,6 @@ ScVbaRange::getLeft() throw (uno::RuntimeException, std::exception) return uno::makeAny( lcl_hmmToPoints( aPoint.X ) ); } - uno::Any SAL_CALL ScVbaRange::getTop() throw (uno::RuntimeException, std::exception) { @@ -4127,7 +4115,6 @@ ScVbaRange::getTop() throw (uno::RuntimeException, std::exception) return uno::makeAny( lcl_hmmToPoints( aPoint.Y ) ); } - uno::Reference< sheet::XCellRangeReferrer > getNamedRange( const uno::Reference< uno::XInterface >& xIf, const uno::Reference< table::XCellRange >& thisRange ) { uno::Reference< beans::XPropertySet > xProps( xIf, uno::UNO_QUERY_THROW ); @@ -4467,7 +4454,6 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const xFiltProps->setPropertyValue( "ContainsHeader", uno::Any( bHasColHeader ) ); } - sal_Int32 nField = 0; // *IS* 1 based OUString sCriteria1; sal_Int32 nOperator = excel::XlAutoFilterOperator::xlAnd; diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 5fe1c664b412..8d0035b7c5df 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -65,7 +65,6 @@ class ValueSetter : public ArrayVisitor public: virtual bool processValue( const css::uno::Any& aValue, const css::uno::Reference< css::table::XCell >& xCell ) = 0; - }; class ValueGetter : public ArrayVisitor @@ -280,7 +279,6 @@ public: // XDefaultProperty OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Value"); } - // #TODO completely rewrite ScVbaRange, its become a hackfest // it needs to be closer to ScCellRangeBase in that the underlying // object model should probably be a ScRangelst. diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 05ec0f23a8d0..9a71a7cb3c69 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -58,10 +58,8 @@ inline double lclPointsToHmm( const uno::Any& rPoints ) throw (uno::RuntimeExcep } // namespace - // Base implementations - /** Container for a specific type of drawing object in a spreadsheet. Derived classes provide all required functionality specific to the type of @@ -298,10 +296,8 @@ uno::Any ScVbaSheetObjectsBase::getItemByStringIndex( const OUString& rIndex ) t return mxContainer->getItemByStringIndex( rIndex ); } - // Graphic object containers supporting ooo.vba.excel.XGraphicObject - ScVbaGraphicObjectsBase::ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (uno::RuntimeException) : ScVbaGraphicObjects_BASE( rxContainer ) { @@ -330,10 +326,8 @@ uno::Any SAL_CALL ScVbaGraphicObjectsBase::Add( const uno::Any& rLeft, const uno return uno::Any( uno::Reference< excel::XSheetObject >( xVbaObject.get() ) ); } - // Drawing controls - class ScVbaControlContainer : public ScVbaObjectContainer { public: @@ -443,10 +437,8 @@ void ScVbaControlContainer::implOnShapeCreated( const uno::Reference< drawing::X xControlShape->setControl( xControlModel ); } - // Push button - class ScVbaButtonContainer : public ScVbaControlContainer { public: diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 932cda0a61a5..16d05e70ab62 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -41,7 +41,6 @@ lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XMod return xStyleProps; } - void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorException ) { if (!mxModel.is() ) @@ -82,7 +81,6 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const } } - sal_Bool SAL_CALL ScVbaStyle::BuiltIn() throw (script::BasicErrorException, uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index 98f42a6e32cc..26f43a8392e3 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include "vbaformat.hxx" - typedef ScVbaFormat< ov::excel::XStyle > ScVbaStyle_BASE; class ScVbaStyle : public ScVbaStyle_BASE diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index 2ee6a02a71f9..87f852e2d398 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -32,7 +32,6 @@ lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Referenc return uno::makeAny( xStyle ); } - ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent ) { try @@ -52,7 +51,6 @@ ScVbaStyles::getStyleNames() throw ( uno::RuntimeException ) return mxNameContainerCellStyles->getElementNames(); } - uno::Any ScVbaStyles::createCollectionObject(const uno::Any& aObject) { diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index edb3b9d72eac..b40de14bedd1 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -202,7 +202,6 @@ ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::Ru lcl_setValidationProps( m_xRange, xProps ); } - void SAL_CALL ScVbaValidation::Delete( ) throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 3f383c6da532..417a425c04a1 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -61,7 +61,6 @@ typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess , com::sun::star::container::XNameAccess > SelectedSheets_BASE; - class SelectedSheetsEnum : public Enumeration_BASE { public: @@ -89,7 +88,6 @@ public: return uno::makeAny( uno::Reference< excel::XWorksheet > ( new ScVbaWorksheet( uno::Reference< XHelperInterface >(), m_xContext, *(m_it++), m_xModel ) ) ); } - }; class SelectedSheetsEnumAccess : public SelectedSheets_BASE @@ -185,7 +183,6 @@ public: return (it != namesToIndices.end()); } - }; ScVbaWindow::ScVbaWindow( @@ -500,7 +497,6 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException, std::exception) return bGrid; } - void SAL_CALL ScVbaWindow::setDisplayGridlines( sal_Bool _displaygridlines ) throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index dfb12bfb9710..25928acfea89 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -34,7 +34,6 @@ typedef boost::unordered_map< OUString, sal_Int32, OUStringHash, ::std::equal_to< OUString > > NameIndexHash; - static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) { return new ScVbaWorkbook( uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel ); @@ -216,14 +215,12 @@ ScVbaWindows::getElementType() throw (uno::RuntimeException) return cppu::UnoType<excel::XWindows>::get(); } - void SAL_CALL ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) throw (uno::RuntimeException, std::exception) { //#TODO #FIXME see what can be done for an implementation here } - OUString ScVbaWindows::getServiceImplName() { diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 00136d7f97f4..cef6f5699e4b 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -27,7 +27,6 @@ #include "excelvbahelper.hxx" #include <vbahelper/vbacollectionimpl.hxx> - typedef CollTestImplHelper< ov::excel::XWindows > ScVbaWindows_BASE; class ScVbaWindows : public ScVbaWindows_BASE @@ -40,7 +39,6 @@ public: virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - // XWindows virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ScVbaCollectionBaseImpl diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index d78bdde29f80..a72abd3642f3 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -64,7 +64,6 @@ void ScVbaWorkbook::initColorData( const uno::Sequence< sal_Int32 >& sColors ) *pDest = *pSource; } - void SAL_CALL ScVbaWorkbook::ResetColors( ) throw (::script::BasicErrorException, ::uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 9c01a17d5cb1..cb052fbb7e92 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -121,7 +121,6 @@ ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource ) return getWorkbook( mxContext, xDoc, mxParent ); } - uno::Any SAL_CALL ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException, std::exception) { @@ -242,7 +241,6 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/ OUString sFormat; sal_Int16 nFormat = 0; // default indicator - if ( Format.hasValue() ) { Format >>= nFormat; // val of nFormat overwritten if extracted diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index 01c3e43bf7f3..c7240e580354 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -19,14 +19,12 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX - #include <vbahelper/vbacollectionimpl.hxx> #include <ooo/vba/excel/XWorkbooks.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <vbahelper/vbadocumentsbase.hxx> #include "excelvbahelper.hxx" - typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks > ScVbaWorkbooks_BASE; class ScVbaWorkbooks : public ScVbaWorkbooks_BASE diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 4b5d2d4a62a1..ad5a4a3e1c9c 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -363,7 +363,6 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException, std::exceptio throw uno::RuntimeException("Sheet Name does not exist." ); } - void ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeException, std::exception) { @@ -598,7 +597,6 @@ ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno xNewSheet->Activate(); } - void ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) throw (uno::RuntimeException, std::exception) { @@ -656,7 +654,6 @@ ScVbaWorksheet::getPrevious() throw (uno::RuntimeException, std::exception) return getSheetAtOffset(-1); } - void ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObjects*/, const uno::Any& /*Contents*/, const uno::Any& /*Scenarios*/, const uno::Any& /*UserInterfaceOnly*/ ) throw (uno::RuntimeException, std::exception) { @@ -919,7 +916,6 @@ ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException, s return uno::Any( Range( uno::Any( Name ), aVoid ) ); } - uno::Reference< beans::XIntrospectionAccess > SAL_CALL ScVbaWorksheet::getIntrospection( ) throw (uno::RuntimeException, std::exception) { @@ -1022,7 +1018,6 @@ ScVbaWorksheet::getControlShape( const OUString& sName ) return uno::Any(); } - OUString ScVbaWorksheet::getServiceImplName() { diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 038b3f052bd4..38b944bbddd5 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -52,14 +52,12 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - typedef ::cppu::WeakImplHelper1< container::XEnumeration > SheetEnumeration_BASE; typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > SheetCollectionHelper_BASE; // a map ( or hashmap ) wont do as we need also to preserve the order // (as added ) of the items typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap; - // #FIXME #TODO the implementation of the Sheets collections sucks, // e.g. there is no support for tracking sheets added/removed from the collection @@ -391,7 +389,6 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException, rMarkData.SelectTable( static_cast< SCTAB >( pSheet->getSheetID() ), true ); } - } void SAL_CALL diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index c3101cd98ec0..c3b2e20b7600 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -31,7 +31,6 @@ #include "address.hxx" - typedef CollTestImplHelper< ov::excel::XWorksheets > ScVbaWorksheets_BASE; class ScVbaWorksheets : public ScVbaWorksheets_BASE @@ -52,7 +51,6 @@ public: virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - // XWorksheets virtual css::uno::Any SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible( const css::uno::Any& _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/source/ui/view/cellmergeoption.cxx b/sc/source/ui/view/cellmergeoption.cxx index db8400bb05f8..42b5862e4248 100644 --- a/sc/source/ui/view/cellmergeoption.cxx +++ b/sc/source/ui/view/cellmergeoption.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "cellmergeoption.hxx" #include "address.hxx" diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index ac091beea9c6..3a9f22d07c51 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -74,7 +74,6 @@ void ScCellShell::InitInterface_Impl() GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CELLS)); } - ScCellShell::ScCellShell(ScViewData* pData) : ScFormatShell(pData), pImpl( new CellShell_Impl() ), @@ -1067,6 +1066,4 @@ void ScCellShell::GetState(SfxItemSet &rSet) } // while ( nWitch ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 5e59b6cac486..233a46f6fd60 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -100,7 +100,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; - void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { ScModule* pScMod = SC_MOD(); @@ -140,7 +139,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // insert / delete cells / rows / columns - case FID_INS_ROW: pTabViewShell->InsertCells(INS_INSROWS); rReq.Done(); @@ -313,10 +311,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // delete contents from cells - case SID_DELETE_CONTENTS: pTabViewShell->DeleteContents( IDF_CONTENTS ); rReq.Done(); @@ -408,10 +404,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // fill... - case FID_FILL_TO_BOTTOM: pTabViewShell->FillSimple( FILL_TO_BOTTOM ); rReq.Done(); @@ -642,7 +636,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } - OUString aStartStr; // suggest default Startvalue only, when just 1 row or column @@ -654,7 +647,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pDoc->GetInputString( nStartCol, nStartRow, nStartTab, aStartStr); pDoc->GetValue( nStartCol, nStartRow, nStartTab, fStartVal ); - if(eFillDir==FILL_TO_BOTTOM && nStartRow < nEndRow ) { pDoc->GetInputString( nStartCol, nStartRow+1, nStartTab, aEndStr); @@ -1017,7 +1009,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // disposal (Outlines) // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl) - case SID_OUTLINE_HIDE: if ( GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ) ) @@ -1221,7 +1212,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // Clipboard case SID_COPY: // for graphs in DrawShell @@ -1601,10 +1591,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? break; - // other - case FID_INS_ROWBRK: pTabViewShell->InsertPageBreak( false ); rReq.Done(); @@ -2024,7 +2012,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pScMod->SetRefDialog( nId, false ); - } break; @@ -2062,7 +2049,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - case SID_TABOP: if (pReqArgs) { @@ -2433,8 +2419,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - - 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 55fa4be7083d..0375c96731ce 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -1042,7 +1042,6 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) } break; - //in case of Redlining and multiselection disable case SID_SORT_ASCENDING: case SID_SORT_DESCENDING: diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 9a5cd3f2dfee..32912761193e 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -514,7 +514,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - case SID_SELECTALL: { pTabViewShell->SelectAll(); @@ -707,7 +706,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - case SID_CELL_FORMAT_RESET: { pTabViewShell->DeleteContents( IDF_HARDATTR | IDF_EDITATTR ); diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index a2a30f84e48d..5c6640b64408 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.cxx @@ -444,5 +444,4 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) rReq.Done(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 4356a354111d..3472140c0cb3 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -46,10 +46,8 @@ ScDBFunc::~ScDBFunc() { } - // auxiliary functions - void ScDBFunc::GotoDBArea( const OUString& rDBName ) { ScDocument* pDoc = GetViewData().GetDocument(); @@ -238,10 +236,8 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std:: } } - // main functions - // Sort void ScDBFunc::UISort( const ScSortParam& rSortParam, bool bRecord ) @@ -341,7 +337,6 @@ void ScDBFunc::ToggleAutoFilter() pDBData->SetByRow( true ); //! undo, retrieve beforehand ?? pDBData->GetQueryParam( aParam ); - SCCOL nCol; SCROW nRow = aParam.nRow1; SCTAB nTab = GetViewData().GetTabNo(); diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx index 0e3012a4c712..9a9b32e57fe4 100644 --- a/sc/source/ui/view/dbfunc2.cxx +++ b/sc/source/ui/view/dbfunc2.cxx @@ -41,7 +41,4 @@ void ScDBFunc::UpdateCharts( bool bAllCharts ) ErrorMessage(STR_NOCHARTATCURSOR); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index f60471e57491..09293c01589e 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -86,11 +86,8 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- - - // Outliner - // Outline-Gruppierung erzeugen void ScDBFunc::MakeOutline( bool bColumns, bool bRecord ) @@ -359,10 +356,8 @@ void ScDBFunc::HideMarkedOutlines( bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } - // Teilergebnisse - void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, const ScSortParam* pForceNewSort ) { @@ -533,10 +528,8 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, } } - // Consolidate - void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord ) { ScDocShell* pDocShell = GetViewData().GetDocShell(); @@ -544,10 +537,8 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord ) SetTabNo( rParam.nTab, true ); } - // Pivot - static OUString lcl_MakePivotTabName( const OUString& rPrefix, SCTAB nNumber ) { OUString aName = rPrefix + OUString::number( nNumber ); @@ -2068,10 +2059,8 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet pMgr->LeaveListAction(); } - // DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen - void ScDBFunc::RepeatDB( bool bRecord ) { SCCOL nCurX = GetViewData().GetCurX(); diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index b3523335dcb4..08ae2b8c6a88 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -69,7 +69,4 @@ sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bo return nFound; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx index 8bcdc8810fd2..668337aac0da 100644 --- a/sc/source/ui/view/drawutil.cxx +++ b/sc/source/ui/view/drawutil.cxx @@ -24,7 +24,6 @@ #include "global.hxx" #include "viewdata.hxx" - void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, OutputDevice* pDev, @@ -87,5 +86,4 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, rScaleY.ReduceInaccurate( 25 ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index 3d1b90c81d82..5c4396d5e8aa 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.cxx @@ -21,7 +21,6 @@ // STATIC DATA ----------------------------------------------------------- - // UpdateBrowser in MarkListHasChanged gerufen void ScDrawView::UpdateBrowser() @@ -39,6 +38,4 @@ void ScDrawView::VCRemoveWin( Window* /* pWin */ ) // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index abbb48c92bd2..cfdc4f9f4087 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -217,5 +217,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 ab48a9ceec16..841d23863e17 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -164,7 +164,6 @@ void getRangeFromDataSource( uno::Reference< chart2::data::XDataSource > xDataSo } } - void getRangeFromErrorBar(const uno::Reference< chart2::XChartDocument > xChartDoc, std::vector<OUString>& rRangeRep) { uno::Reference <chart2::XDiagram > xDiagram = xChartDoc->getFirstDiagram(); @@ -553,5 +552,4 @@ void ScDrawView::SetMarkedOriginalSize() delete pUndoGroup; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 77d7941c63cf..7f4ef96f6ae9 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -566,7 +566,6 @@ bool ScDrawView::SdrBeginTextEdit( return bRet; } - SdrEndTextEditKind ScDrawView::SdrEndTextEdit( bool bDontDeleteReally ) { const SdrEndTextEditKind eRet = FmFormView::SdrEndTextEdit( bDontDeleteReally ); @@ -587,7 +586,6 @@ SdrEndTextEditKind ScDrawView::SdrEndTextEdit( bool bDontDeleteReally ) return eRet; } - void ScDrawView::ModelHasChanged() { SdrObject* pEditObj = GetTextEditObject(); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index fed79b5a8d8a..d79de14e17d5 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -80,7 +80,6 @@ using namespace ::com::sun::star; - TYPEINIT1( ScEditShell, SfxShell ); SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL)) @@ -402,7 +401,6 @@ void ScEditShell::Execute( SfxRequest& rReq ) rReq.AppendItem( aStringItem ); rReq.Done(); - } if (pTopView) @@ -1031,10 +1029,8 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) break; } - // anwenden - EditEngine* pEngine = pEditView->GetEditEngine(); bool bOld = pEngine->GetUpdateMode(); pEngine->SetUpdateMode(false); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 900b21d9b345..f7780135fb93 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -72,7 +72,6 @@ #include "markdata.hxx" #include "markarr.hxx" - #define ScFormatShell #define TableFont #define FormatForSelection @@ -257,7 +256,6 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) return; } - SfxBindings& rBindings = pViewData->GetBindings(); const SfxItemSet* pArgs = rReq.GetArgs(); const sal_uInt16 nSlotId = rReq.GetSlot(); @@ -1251,7 +1249,6 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) } } - void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2162,12 +2159,10 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) SfxItemState eState; // const SfxPoolItem* pItem; - // eigene Kontrolle ueber RadioButton-Funktionalitaet: // Unterstreichung - eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, true ); if ( eState == SFX_ITEM_DONTCARE ) { @@ -2192,10 +2187,8 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( nId, true ) ); } - // horizontale Ausrichtung - const SvxHorJustifyItem* pHorJustify = NULL; const SvxVerJustifyItem* pVerJustify = NULL; SvxCellVerJustify eVerJustify = SVX_VER_JUSTIFY_STANDARD; @@ -2265,10 +2258,8 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) bJustifyStd = false; } - // vertikale Ausrichtung - nWhich = 0; aBoolItem.SetValue( true ); @@ -2328,7 +2319,6 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) } } - void ScFormatShell::GetBorderState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2560,7 +2550,6 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) } } - void ScFormatShell::ExecuteTextDirection( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 20d2558439a1..f5615b5cb185 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <memory> @@ -422,7 +421,6 @@ static bool lcl_GetHyperlinkCell( return bFound; } - // WB_DIALOGCONTROL noetig fuer UNO-Controls ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) : Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ), @@ -1925,10 +1923,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta } } - // scenario selection - ScRange aScenRange; if ( rMEvt.IsLeft() && HasScenarioButton( aPos, aScenRange ) ) { @@ -1936,10 +1932,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - // Doppelklick angefangen ? - // StopMarking kann aus DrawMouseButtonDown gerufen werden if ( nMouseStatus != SC_GM_IGNORE && !bRefMode ) @@ -1953,10 +1947,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta nMouseStatus = SC_GM_TABDOWN; } - // Links in Edit-Zellen - bool bAlt = rMEvt.IsMod2(); if ( !bAlt && rMEvt.IsLeft() && GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link: Cursor nicht bewegen @@ -1966,10 +1958,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - // Gridwin - SelectionEngine - if ( rMEvt.IsLeft() ) { ScViewSelectionEngine* pSelEng = pViewData->GetView()->GetSelEngine(); @@ -2187,10 +2177,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) if (bRefMode) pScMod->EndReference(); - // Giesskannen-Modus (Gestalter) - if (pScMod->GetIsWaterCan()) { // Abfrage auf Undo schon oben @@ -2241,10 +2229,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pView->ResetBrushDocument(); // invalidates pBrushDoc pointer } - // double click (only left button) - bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() ); if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() ) { @@ -2326,10 +2312,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) return; } - // Links in edit cells - bool bAlt = rMEvt.IsMod2(); if ( !bAlt && !bRefMode && !bDouble && nMouseStatus == SC_GM_URLDOWN ) { @@ -2411,10 +2395,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } } - // Gridwin - SelectionEngine - // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return // sal_True for any call, so IsLeft must be checked here, too. @@ -3747,7 +3729,6 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) if ( pViewData->GetDocShell()->IsReadOnly() ) return DND_ACTION_NONE; - sal_Int8 nRet = DND_ACTION_NONE; if (rData.pCellTransfer) @@ -4013,7 +3994,6 @@ static sal_uLong lcl_GetDropLinkId( const uno::Reference<datatransfer::XTransfer return nFormatId; } - sal_Int8 ScGridWindow::ExecutePrivateDrop( const ExecuteDropEvent& rEvt ) { // hide drop marker @@ -4067,7 +4047,6 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos ScRange aDest( nDestPosX, nDestPosY, nThisTab, nDestPosX + nSizeX - 1, nDestPosY + nSizeY - 1, nThisTab ); - /* NOTE: AcceptPrivateDrop() already checked for filtered conditions during * dragging and adapted drawing of the selection frame. We check here * (again) because this may actually also be called from PasteSelection(), @@ -4443,7 +4422,6 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) return rEvt.mnAction; } - SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); @@ -4754,7 +4732,6 @@ void ScGridWindow::GetFocus() if (pViewShell->HasAccessibilityObjects()) pViewShell->BroadcastAccessibility(ScAccGridWinFocusGotHint(eWhich, GetAccessible())); - if ( !SC_MOD()->IsFormulaMode() ) { pViewShell->UpdateInputHandler(); @@ -4779,7 +4756,6 @@ void ScGridWindow::LoseFocus() Window::LoseFocus(); } - bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY) { @@ -5342,7 +5318,6 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, } aLogicEdit.Bottom() = aLogicEdit.Top() + nTextHeight; - Point aLogicClick = PixelToLogic(rPos,aEditMode); if ( aLogicEdit.IsInside(aLogicClick) ) { @@ -5438,7 +5413,6 @@ bool ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang ScRangeList aRanges; aMarks.FillRangeListWithMarks( &aRanges, false ); - size_t nRangeCount = aRanges.size(); for (size_t j=0; j< nRangeCount; ++j) { @@ -5766,7 +5740,6 @@ void ScGridWindow::UpdateCopySourceOverlay() Rectangle aRect( aClipStartScrPos, Size(nSizeXPix, nSizeYPix) ); - Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor(); Rectangle aLogic = PixelToLogic(aRect, aDrawMode); @@ -5794,10 +5767,8 @@ void ScGridWindow::UpdateCursorOverlay() std::vector<Rectangle> aPixelRects; - // determine the cursor rectangles in pixels (moved from ScGridWindow::DrawCursor) - SCTAB nTab = pViewData->GetTabNo(); SCCOL nX = pViewData->GetCurX(); SCROW nY = pViewData->GetCurY(); @@ -5971,10 +5942,8 @@ void ScGridWindow::UpdateAutoFillOverlay() DeleteAutoFillOverlay(); - // get the AutoFill handle rectangle in pixels - if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() && !pViewData->HasEditView(eWhich) && pViewData->IsActive() ) { @@ -6048,10 +6017,8 @@ void ScGridWindow::UpdateDragRectOverlay() DeleteDragRectOverlay(); - // get the rectangles in pixels (moved from DrawDragRect) - if ( bDragRect || bPagebreakDrawn ) { std::vector<Rectangle> aPixelRects; @@ -6224,10 +6191,8 @@ void ScGridWindow::UpdateShrinkOverlay() DeleteShrinkOverlay(); - // get the rectangle in pixels - Rectangle aPixRect; ScRange aRange; SCTAB nTab = pViewData->GetTabNo(); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 9c79f0c7372e..6578bd62963d 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -239,7 +239,6 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& // Data Pilot interaction - void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) { OSL_ENSURE(pDragDPObj, "pDragDPObj missing"); @@ -1052,5 +1051,4 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) pViewData->GetView()->ResetTimer(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 22d9c435527c..e9ac6ca2054a 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <editeng/eeitem.hxx> @@ -44,7 +43,6 @@ #include "unitconv.hxx" #include <svx/svdpage.hxx> - bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) { bool bRet = false; diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index d31da8a24148..24a6fb54ec07 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -375,10 +375,8 @@ void ScGridWindow::Paint( const Rectangle& rRect ) bIsInPaint = false; } - // Draw ---------------------------------------------------------------- - void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode ) { ScModule* pScMod = SC_MOD(); @@ -859,11 +857,9 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod if ( pNoteMarker ) pNoteMarker->Draw(); // ueber den Cursor, im Drawing-MapMode - // Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro), // ist das jetzt durcheinandergekommen und es muss neu gemalt werden - OSL_ENSURE(nPaintCount, "nPaintCount falsch"); --nPaintCount; if (!nPaintCount) @@ -1127,7 +1123,6 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, Out nRow = pThisRowInfo->nRowNo; - for (nCol=nX1; nCol<=nX2; nCol++) { CellInfo* pInfo = &pThisRowInfo->pCellInfo[nCol+1]; diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index a85a5497549d..bed697b2db5b 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -54,7 +54,6 @@ #include "global.hxx" #include "globstr.hrc" - bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) { bool bDone = false; @@ -383,7 +382,6 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) aHelpText = aClickHlinkStr + aHelpText; } - ScDocument* pDoc = pViewData->GetDocument(); SCsCOL nPosX; SCsROW nPosY; diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 44643d60062b..40997f2da53e 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -413,11 +413,9 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) } } - // loop through entries several times to avoid changing the line color too often // and to allow merging of lines - ScGridMerger aGrid( this, 1, 1 ); // start at SC_HDRPAINT_BOTTOM instead of 0 - selection doesn't get different @@ -934,10 +932,8 @@ void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp(rHEvt); } - // Dummys fuer virtuelle Methoden - SCCOLROW ScHeaderControl::GetHiddenCount( SCCOLROW nEntryNo ) const { SCCOLROW nHidden = 0; diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index 9c670b83d648..e07cd4aa0b4d 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -64,12 +64,10 @@ ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUStrin SetOutputSizePixel( aWinSize ); } - ScHintWindow::~ScHintWindow() { } - void ScHintWindow::Paint( const Rectangle& /* rRect */ ) { SetFont( aHeadFont ); diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx index 959ada7a33ba..9ef97dca4298 100644 --- a/sc/source/ui/view/imapwrap.cxx +++ b/sc/source/ui/view/imapwrap.cxx @@ -57,5 +57,4 @@ const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ) return pDlg->GetImageMap(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index 01f960010ac2..8ac68bffeec5 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -44,7 +44,6 @@ void ScInvertMerger::Flush() // also join vertically if there are non-adjacent columns involved - size_t nComparePos = 0; while ( nComparePos < pRects->size() ) { @@ -161,5 +160,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 faec9a910545..f7171048f552 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdoutl.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> @@ -187,5 +186,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 be76dde7a1b1..165e488d8cf3 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -900,7 +900,6 @@ void ScOutlineWindow::LoseFocus() Window::LoseFocus(); } - // mouse ---------------------------------------------------------------------- void ScOutlineWindow::StartMouseTracking( size_t nLevel, size_t nEntry ) @@ -969,7 +968,6 @@ void ScOutlineWindow::MouseButtonDown( const MouseEvent& rMEvt ) } } - // keyboard ------------------------------------------------------------------- void ScOutlineWindow::KeyInput( const KeyEvent& rKEvt ) @@ -1019,5 +1017,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 17e98b13a90b..c96ee1b4528d 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -45,6 +45,4 @@ void DeActivateOlk( ScViewData* /* pViewData */ ) // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 5fd547f15a19..a3f0a7c0abb3 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -84,7 +84,6 @@ static const ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = { COL_GREEN, COL_RED, COL_BLUE, COL_BROWN, COL_MAGENTA, COL_CYAN }; - // Helper class for color assignment to avoid repeated lookups for the same user ScActionColorChanger::ScActionColorChanger( const ScChangeTrack& rTrack ) : @@ -141,7 +140,6 @@ void ScActionColorChanger::Update( const ScChangeAction& rAction ) } } - ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, ScTableInfo& rTabInfo, ScDocument* pNewDoc, SCTAB nNewTab, long nNewScrX, long nNewScrY, @@ -700,7 +698,6 @@ static const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCR return pBackground; } - static bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther, SCCOL nX1, SCCOL nX2, bool bShowProt, bool bPagebreakMode ) { @@ -1249,7 +1246,6 @@ void ScOutputData::DrawClear() } } - // Lines long lclGetSnappedX( OutputDevice& rDev, long nPosX, bool bSnapPixel ) @@ -1313,7 +1309,6 @@ void ScOutputData::DrawFrame() } long nLayoutSign = bLayoutRTL ? -1 : 1; - // *** set column and row sizes of the frame border array *** svx::frame::Array& rArray = mrTabInfo.maArray; @@ -1389,7 +1384,6 @@ void ScOutputData::DrawFrame() mpDev->SetDrawMode(nOldDrawMode); } - // Line below the cell static const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, @@ -1445,7 +1439,6 @@ static const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, return pNextTop; } - static long lcl_getRotate( ScDocument* pDoc, SCTAB nTab, SCCOL nX, SCROW nY ) { long nRotate = 0; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 9381ffeee91e..1493e34c341b 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -82,7 +82,6 @@ const sal_uInt16 SC_SHRINKAGAIN_MAX = 7; // STATIC DATA ----------------------------------------------------------- - class ScDrawStringsVars { ScOutputData* pOutput; // Verbindung @@ -392,11 +391,9 @@ void ScDrawStringsVars::SetPattern( aMetric = pFmtDevice->GetFontMetric(); - // Wenn auf dem Drucker das Leading 0 ist, gibt es Probleme // -> Metric vom Bildschirm nehmen (wie EditEngine!) - if ( pFmtDevice->GetOutDevType() == OUTDEV_PRINTER && aMetric.GetIntLeading() == 0 ) { OutputDevice* pDefaultDev = Application::GetDefaultDevice(); @@ -822,10 +819,8 @@ double ScOutputData::GetStretch() } } - // output strings - static void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScRefCellValue& rCell ) { vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() ); @@ -1236,7 +1231,6 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY // construct the rectangles using logical left/right values (justify is called at the end) - // rAlignRect is the single cell or merged area, used for alignment. rParam.maAlignRect.Left() = nCellPosX; @@ -1494,10 +1488,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bool bDoCell = false; bool bNeedEdit = false; - // Part of a merged cell? - bool bOverlapped = (pInfo->bHOverlapped || pInfo->bVOverlapped); if ( bOverlapped ) { @@ -1516,10 +1508,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bMergeEmpty = true; } - // Rest of a long text further to the left? - if ( bEmpty && !bMergeEmpty && nX < nX1 && !bOverlapped ) { SCCOL nTempX=nX1; @@ -1535,10 +1525,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) } } - // Rest of a long text further to the right? - if ( bEmpty && !bMergeEmpty && nX == nX2 && !bOverlapped ) { // don't have to look further than nLastContentCol @@ -1556,17 +1544,13 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) } } - // normal visible cell - if (!bEmpty) bDoCell = true; - // don't output the cell that's being edited - if ( bDoCell && bEditMode && nCellX == nEditCol && nCellY == nEditRow ) bDoCell = false; @@ -1579,10 +1563,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bDoCell = false; } - // output the cell text - ScRefCellValue aCell; if (bDoCell) { @@ -1878,10 +1860,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bVClip = true; } - // horizontalen Platz testen - bool bRightAdjusted = false; // to correct text width calculation later bool bNeedEditEngine = false; if ( !bNeedEditEngine && !bOutside ) @@ -2227,7 +2207,6 @@ static long lcl_GetEditSize( EditEngine& rEngine, bool bWidth, bool bSwap, long return rEngine.GetTextHeight(); } - void ScOutputData::ShrinkEditEngine( EditEngine& rEngine, const Rectangle& rAlignRect, long nLeftM, long nTopM, long nRightM, long nBottomM, bool bWidth, sal_uInt16 nOrient, long nAttrRotate, bool bPixelToLogic, @@ -2787,10 +2766,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.mbBreak) { @@ -2822,10 +2799,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - // default alignment for asian vertical mode is top-right if ( rParam.mbAsianVertical && rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD ) rParam.meVerJust = SVX_VER_JUSTIFY_TOP; @@ -2847,10 +2822,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3290,10 +3263,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.mbBreak) { @@ -3315,10 +3286,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3336,10 +3305,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3556,10 +3523,8 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.hasLineBreak()) { @@ -3581,10 +3546,8 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3602,10 +3565,8 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3829,10 +3790,8 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width @@ -3862,10 +3821,8 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3883,10 +3840,8 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -4191,10 +4146,8 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width @@ -4224,10 +4177,8 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - // default alignment for asian vertical mode is top-right if ( rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD ) rParam.meVerJust = SVX_VER_JUSTIFY_TOP; @@ -4249,10 +4200,8 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -4668,7 +4617,6 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax) nRotMax = pRowInfo[nRotY].nRotMaxCol; - ScModule* pScMod = SC_MOD(); sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; bool bCellContrast = mbUseStyleColor && diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index f949c9dd90c1..4cdcd5017ed9 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -247,5 +247,4 @@ void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) DrawSelectiveObjects( 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 404d4dc3a1c1..556cd2f42935 100644 --- a/sc/source/ui/view/pfuncache.cxx +++ b/sc/source/ui/view/pfuncache.cxx @@ -189,5 +189,4 @@ long ScPrintFuncCache::GetDisplayStart( SCTAB nTab ) const return nDisplayStart; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index d98f8e9ba24c..8f2e7da70792 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -58,10 +58,8 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) : SetName(OUString("PageBreak")); } - ScPageBreakShell::~ScPageBreakShell() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index cc9f8eb2b00e..a642991cbabd 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -20,7 +20,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <svtools/colorcfg.hxx> #include <svx/fmview.hxx> #include <editeng/sizeitem.hxx> @@ -84,7 +83,6 @@ static long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, std::vector<long> return nDisplayStart; } - ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ) : Window( pParent ), nPageNo( 0 ), @@ -143,7 +141,6 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pView nRight[i] = 0; // initialized with actual positions when markers are drawn } - ScPreview::~ScPreview() { delete pDrawView; @@ -184,7 +181,6 @@ void ScPreview::UpdateDrawView() // nTab must be right } } - void ScPreview::TestLastPage() { if (nPageNo >= nTotalPages) @@ -219,7 +215,6 @@ void ScPreview::TestLastPage() } } - void ScPreview::CalcPages() { WaitObject aWait( this ); @@ -298,7 +293,6 @@ void ScPreview::CalcPages() DoInvalidate(); } - void ScPreview::RecalcPages() // only nPageNo is changed { if (!bValid) @@ -341,7 +335,6 @@ void ScPreview::RecalcPages() // only nPageNo is changed DoInvalidate(); } - void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) { if (!bValid) @@ -653,7 +646,6 @@ void ScPreview::Command( const CommandEvent& rCEvt ) Window::Command( rCEvt ); } - void ScPreview::KeyInput( const KeyEvent& rKEvt ) { // The + and - keys can't be configured as accelerator entries, so they must be handled directly @@ -682,7 +674,6 @@ void ScPreview::KeyInput( const KeyEvent& rKEvt ) Window::KeyInput(rKEvt); } - const ScPreviewLocationData& ScPreview::GetLocationData() { if ( !pLocationData ) @@ -699,7 +690,6 @@ const ScPreviewLocationData& ScPreview::GetLocationData() return *pLocationData; } - void ScPreview::DataChanged(bool bNewTime) { if (bNewTime) @@ -713,7 +703,6 @@ void ScPreview::DataChanged(bool bNewTime) Invalidate(); } - OUString ScPreview::GetPosString() { if (!bValid) @@ -731,7 +720,6 @@ OUString ScPreview::GetPosString() return aString; } - void ScPreview::SetZoom(sal_uInt16 nNewZoom) { if (nNewZoom < 20) @@ -760,7 +748,6 @@ void ScPreview::SetZoom(sal_uInt16 nNewZoom) } } - void ScPreview::SetPageNo( long nPage ) { nPageNo = nPage; @@ -770,7 +757,6 @@ void ScPreview::SetPageNo( long nPage ) Invalidate(); } - long ScPreview::GetFirstPage(SCTAB nTabP) { SCTAB nDocTabCount = pDocShell->GetDocument().GetTableCount(); @@ -797,7 +783,6 @@ long ScPreview::GetFirstPage(SCTAB nTabP) return nPage; } - static Size lcl_GetDocPageSize( ScDocument* pDoc, SCTAB nTab ) { OUString aName = pDoc->GetPageStyle( nTab ); @@ -815,7 +800,6 @@ static Size lcl_GetDocPageSize( ScDocument* pDoc, SCTAB nTab ) } } - sal_uInt16 ScPreview::GetOptimalZoom(bool bWidthOnly) { double nWinScaleX = ScGlobal::nScreenPPTX / pDocShell->GetOutputFactor(); @@ -850,7 +834,6 @@ sal_uInt16 ScPreview::GetOptimalZoom(bool bWidthOnly) return nZoom; } - void ScPreview::SetXOffset( long nX ) { if ( aOffset.X() == nX ) @@ -877,7 +860,6 @@ void ScPreview::SetXOffset( long nX ) Paint(Rectangle()); } - void ScPreview::SetYOffset( long nY ) { if ( aOffset.Y() == nY ) @@ -904,7 +886,6 @@ void ScPreview::SetYOffset( long nY ) Paint(Rectangle()); } - void ScPreview::DoInvalidate() { // If the whole GetState of the shell is called @@ -1076,7 +1057,6 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) { SetPointer( Pointer( POINTER_ARROW ) ); - ScDocument& rDoc = pDocShell->GetDocument(); OUString aOldName = rDoc.GetPageStyle( nTab ); bool bUndo = rDoc.IsUndoEnabled(); diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 08ced7a6c71d..7da573bbbe1f 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/outdev.hxx> #include "prevloc.hxx" @@ -278,7 +277,6 @@ static ScPreviewLocationEntry* lcl_GetEntryByAddress( const boost::ptr_list<ScPr return NULL; } - Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const { const double nScaleX = HMM_PER_TWIPS; @@ -535,10 +533,8 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev } } - // get column info - SCCOL nColCount = 0; SCCOL nCol; if ( bHasHeaderCol ) @@ -605,10 +601,8 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else rInfo.SetColInfo( 0, NULL ); - // get row info - SCROW nRowCount = 0; if ( bHasHeaderRow ) ++nRowCount; @@ -674,10 +668,8 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else rInfo.SetRowInfo( 0, NULL ); - // limit to visible area - rInfo.SetTab( nTab ); rInfo.LimitToArea( rVisiblePixel ); } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index a1ad80126ae1..691d2b0b17a6 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -267,7 +267,6 @@ void ScPreviewShell::UpdateNeededScrollBars( bool bFromZoom ) long aHeightOffSet = pDevice ? pDevice->PixelToLogic( Size( nBarW, nBarH ), pPreview->GetMapMode() ).Height() : 0; long aWidthOffSet = aHeightOffSet; - if (!GetPageSize( aPageSize )) return; @@ -1205,5 +1204,4 @@ ScDocument& ScPreviewShell::GetDocument() return pDocShell->GetDocument(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index f33443f49ac0..136c797939b2 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -70,6 +70,4 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) pPreview->DataChanged(true); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 9362c0838244..129486f07c0b 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -312,7 +312,6 @@ void ScPrintFunc::GetPrintState( ScPrintState& rState ) rState.nDocPages = nDocPages; } - bool ScPrintFunc::GetLastSourceRange( ScRange& rRange ) const { rRange = aLastSourceRange; @@ -391,7 +390,6 @@ static void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) } } - // output to Device (static) // // us used for: @@ -592,10 +590,8 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr aOutputData.PostPrintDrawingLayer(aMMOffset); // #i74768# } - // Printing - static void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) { // nDistance must be initialized differently before @@ -854,7 +850,6 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) } lcl_FillHFParam( aFtr, pFooterSet ); - // Compile Table-/Area-Params from single Items // TabPage "Table" @@ -934,10 +929,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) aTableParam.bForceBreaks = pOptions && pOptions->GetForceBreaks(); - // TabPage "Parts": - //! walk throuch all PrintAreas of the table !!! const ScRange* pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 ); const ScRange* pRepeatCol = pDoc->GetRepeatColRange( nPrintTab ); @@ -1020,10 +1013,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) nRepeatStartRow = nRepeatEndRow = SCROW_REPEAT_NONE; } - // Split pages - if (!bState) { nTabPages = CountPages(); // also calculates zoom @@ -1943,7 +1934,6 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, bool bDoPrint, ScPr (long)(aPageSize.Height() * nScaleY * 100 / nZoom)))); } - // adjust aPageRect for left/right page Rectangle aTempRect = Rectangle( Point(), aPageSize ); @@ -2013,7 +2003,6 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO (long)(aPageSize.Height() * nScaleY * 100 / nZoom)))); } - // adjust aPageRect for left/right page Rectangle aTempRect = Rectangle( Point(), aPageSize ); @@ -2373,11 +2362,9 @@ void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects() aTableParam.bNullVals = false; } - // UpdatePages is only called from outside to set the breaks correctly for viewing // - always without UserArea - bool ScPrintFunc::UpdatePages() { if (!pParamSet) @@ -2581,10 +2568,8 @@ void ScPrintFunc::ApplyPrintSettings() // Configure Printer to Printing - Size aEnumSize = aPageSize; - pPrinter->SetOrientation( bLandscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT ); if ( bLandscape ) { @@ -2612,7 +2597,6 @@ void ScPrintFunc::ApplyPrintSettings() } } - // rPageRanges = range for all tables // nStartPage = rPageRanges starts at nStartPage // nDisplayStart = continuous number for displaying the page number @@ -3011,11 +2995,9 @@ void ScPrintFunc::CalcPages() // calculates aPageRect and pages fr maPageRows.resize(nRealCnt+1, ScPageRowEntry()); } - // Page alignment/splitting after breaks in Col/RowFlags // Of several breaks in a hidden area, only one counts. - nPagesX = 0; nPagesY = 0; nTotalY = 0; diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 3d1481cacf5c..6d2bca2183f3 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -123,10 +123,8 @@ IMPL_CHILD_CTOR( ScPrintAreasDlgWrapper, SID_OPENDLG_EDIT_PRINTAREA ) IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION ) - // ScSimpleRefDlgWrapper - static bool bScSimpleRefFlag; static long nScSimpleRefHeight; static long nScSimpleRefWidth; @@ -182,7 +180,6 @@ void ScSimpleRefDlgWrapper::SetDefaultPosSize(Point aPos, Size aSize, bool bSet) } } - void ScSimpleRefDlgWrapper::SetAutoReOpen(bool bFlag) { bAutoReOpen=bFlag; @@ -229,10 +226,8 @@ void ScSimpleRefDlgWrapper::StartRefInput() } } - // ScAcceptChgDlgWrapper //FIXME: should be moved into ViewShell - ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, @@ -265,13 +260,10 @@ void ScAcceptChgDlgWrapper::ReInitDlg() } } - // ScHighlightChgDlgWrapper - IMPL_CHILD_CTOR( ScHighlightChgDlgWrapper, FID_CHG_SHOW ) - namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ) diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 602f9fbd26ea..0bd7d90c9561 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -23,7 +23,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <editeng/langitem.hxx> #include <editeng/editobj.hxx> #include <editeng/editview.hxx> diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index 67fabedf2a4f..80419ee58acd 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -31,7 +31,6 @@ ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pD EnableRTL( false ); } - ScTabSplitter::~ScTabSplitter() { } @@ -72,7 +71,6 @@ void ScTabSplitter::Splitting( Point& rSplitPos ) rSplitPos.Y() = aNew.Y(); } - void ScTabSplitter::SetFixed(bool bSet) { bFixed = bSet; diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 88d623b95570..aafd1144d333 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -141,7 +141,6 @@ void ScCornerButton::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } - void ScCornerButton::Resize() { Invalidate(); @@ -235,7 +234,6 @@ ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pView Init(); } - void ScTabView::InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ) { rScrollBar.SetRange( Range( 0, nMaxVal ) ); @@ -540,10 +538,8 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) else nBarX = nBarY = 0; - // Splitter auswerten - long nLeftSize = nSizeX; long nRightSize = 0; long nTopSize = 0; @@ -654,7 +650,6 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) pRowBar[SC_SPLIT_BOTTOM]->Hide(); } - // Grid-Windows if (bInner) @@ -677,10 +672,8 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) Point(nSplitPosX,nPosY), Size(nRightSize,nTopSize), nTotalWidth, bLayoutRTL ); } - // Scrollbars updaten - if (!bInUpdateHeader) { UpdateScrollBars(); // Scrollbars nicht beim Scrollen neu setzen @@ -858,7 +851,6 @@ double ScTabView::GetRelTabBarWidth() const return 0.0; } - ScGridWindow* ScTabView::GetActiveWin() { ScSplitPos ePos = aViewData.GetActivePart(); @@ -873,7 +865,6 @@ void ScTabView::SetActivePointer( const Pointer& rPointer ) pGridWin[i]->SetPointer( rPointer ); } - void ScTabView::ActiveGrabFocus() { ScSplitPos ePos = aViewData.GetActivePart(); @@ -881,7 +872,6 @@ void ScTabView::ActiveGrabFocus() pGridWin[ePos]->GrabFocus(); } - ScSplitPos ScTabView::FindWindow( Window* pWindow ) const { ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default @@ -1417,10 +1407,8 @@ void ScTabView::UpdateShow() if ( aViewData.GetDocShell()->IsPreview() ) bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = false; - // Windows anlegen - if (bShowH && !pGridWin[SC_SPLIT_BOTTOMRIGHT]) { pGridWin[SC_SPLIT_BOTTOMRIGHT] = new ScGridWindow( pFrameWin, &aViewData, SC_SPLIT_BOTTOMRIGHT ); @@ -1454,10 +1442,8 @@ void ScTabView::UpdateShow() pRowBar[SC_SPLIT_TOP] = new ScRowBar( pFrameWin, &aViewData, SC_SPLIT_TOP, &aHdrFunc, pHdrSelEng ); - // Windows anzeigen - ShowHide( &aHScrollLeft, bHScrollMode ); ShowHide( &aHScrollRight, bShowH && bHScrollMode ); ShowHide( &aVScrollBottom, bVScrollMode ); @@ -1483,7 +1469,6 @@ void ScTabView::UpdateShow() ShowHide( pColBar[SC_SPLIT_RIGHT], bShowH && bHeader ); ShowHide( pRowBar[SC_SPLIT_TOP], bShowV && bHeader ); - //! neue Gridwindows eintragen } diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 54b0ec871946..93452fd1d844 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <editeng/eeitem.hxx> #include <vcl/timer.hxx> diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 9589c102fa73..7053037e60a3 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -21,7 +21,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <editeng/brushitem.hxx> #include <editeng/editview.hxx> #include <svx/fmshell.hxx> @@ -94,10 +93,8 @@ ScRange lcl_getSubRangeByIndex( const ScRange& rRange, sal_Int32 nIndex ) using namespace com::sun::star; - // --- Public-Funktionen - void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, bool bControl ) { ScDocument* pDoc = aViewData.GetDocument(); @@ -675,7 +672,6 @@ void ScTabView::RemoveHintWindow() mpInputHintWindow.reset(); } - // find window that should not be over the cursor static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) { @@ -708,17 +704,14 @@ static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) return NULL; } - // Bildschirm an Cursorposition anpassen - void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, const ScSplitPos* pWhich ) { // aktiven Teil umschalten jetzt hier - ScSplitPos eActive = aViewData.GetActivePart(); ScHSplitPos eActiveX = WhichH(eActive); ScVSplitPos eActiveY = WhichV(eActive); @@ -737,10 +730,8 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, eActiveY = SC_SPLIT_BOTTOM; } - // eigentliches Align - if ( eMode != SC_FOLLOW_NONE ) { ScSplitPos eAlign; @@ -771,7 +762,6 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, // VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY ) - // falls z.B. Suchen-Dialog offen ist, Cursor nicht hinter den Dialog stellen // wenn moeglich, die Zeile mit dem Cursor oberhalb oder unterhalb des Dialogs @@ -839,7 +829,6 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, } } - SCsCOL nNewDeltaX = nDeltaX; SCsROW nNewDeltaY = nDeltaY; bool bDoLine = false; @@ -943,10 +932,8 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, if ( nNewDeltaY != nDeltaY ) ScrollY( nNewDeltaY - nDeltaY, eAlignY ); } - // nochmal aktiven Teil umschalten - if (bHFix) if (eActiveX == SC_SPLIT_RIGHT && nCurX < (SCsCOL)aViewData.GetFixPosX()) { @@ -981,10 +968,8 @@ bool ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt ) return bRet; } - // MoveCursor - mit Anpassung des Bildausschnitts - void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, bool bShift, bool bControl, bool bKeepOld, bool bKeepSel ) { @@ -1250,7 +1235,6 @@ void ScTabView::MoveCursorEnter( bool bShift ) // bShift -> hoch/runter } } - bool ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) { const KeyCode& rKCode = rKeyEvent.GetKeyCode(); @@ -1325,7 +1309,6 @@ bool ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) return false; } - // naechste/vorherige nicht geschuetzte Zelle void ScTabView::FindNextUnprot( bool bShift, bool bInSelection ) { @@ -1539,7 +1522,6 @@ void ScTabView::SelectNextTab( short nDir, bool bExtendSelection ) PaintExtras(); } - // SetTabNo - angezeigte Tabelle void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSameTabButMoved ) @@ -1769,10 +1751,8 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa } } - // Paint-Funktionen - nur fuer diese View - void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ) { DrawDeselectAll(); @@ -2282,7 +2262,6 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) } } - // PaintLeft - linke Kontrollelemente neu zeichnen void ScTabView::PaintLeft() diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index e5370806c354..2f72a20a53be 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -33,10 +33,8 @@ extern sal_uInt16 nScFillModeMouseModifier; // global.cxx // STATIC DATA ----------------------------------------------------------- - // --- Referenz-Eingabe / Fill-Cursor - void ScTabView::HideTip() { if ( nTipVisible ) @@ -496,6 +494,4 @@ void ScTabView::InterpretVisible() CheckNeedsRepaint(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 563bd2cf5657..e553fc1b0891 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -55,7 +55,6 @@ using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- - void ScTabView::Init() { /* RTL layout of the view windows is done manually, because it depends on @@ -646,5 +645,4 @@ void ScTabView::ResetBrushDocument() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 064c120a2f9c..197e952b1ef0 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -95,11 +95,9 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) return; } - // Pseudo-Slots von Draw-Toolbox auswerten //! wird das ueberhaupt noch gebraucht ????? - if (nNewId == SID_INSERT_DRAW && pArgs) { const SfxPoolItem* pItem; diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 8e7b24e4e642..21a8a21a4853 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -476,7 +476,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_ATTR_SIZE://XXX ??? break; - case SID_PRINTPREVIEW: { if ( !pThisFrame->GetFrame().IsInPlace() ) // nicht bei OLE @@ -558,7 +557,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - case FID_TOGGLESYNTAX: { bool bSet = !GetViewData().IsSyntaxMode(); @@ -858,7 +856,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - case SID_OUTLINE_DELETEALL: RemoveAllOutlines(); rReq.Done(); @@ -869,7 +866,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - case SID_WINDOW_SPLIT: { ScSplitMode eHSplit = GetViewData().GetHSplitMode(); @@ -1027,7 +1023,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - case FID_PROTECT_TABLE: { ScDocument* pDoc = GetViewData().GetDocument(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 6067ac1600b1..ed254f05b2d6 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -862,7 +862,6 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, bool bForce) pPageBreakShell->SetRepeatTarget( &aTarget ); } - if ( eOST!=eCurOST || bForce ) { bool bCellBrush = false; // "format paint brush" allowed for cells @@ -1059,7 +1058,6 @@ IMPL_LINK_NOARG(ScTabViewShell, FormControlActivated) return 0; } - // GetMySubShell / SetMySubShell: altes Verhalten simulieren, // dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells) @@ -1082,7 +1080,6 @@ SfxShell* ScTabViewShell::GetMySubShell() const return NULL; // keine von meinen dabei } - bool ScTabViewShell::IsDrawTextShell() const { return ( pDrawTextShell && ( GetMySubShell() == pDrawTextShell ) ); @@ -1567,7 +1564,6 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) pAccessibilityBroadcaster(NULL), \ mbInSwitch(false) - void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) { SfxApplication* pSfxApp = SFX_APP(); @@ -1766,9 +1762,6 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) SetBorderPixel( aBorder ); } - - - ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ) : SfxViewShell( pViewFrame, SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), @@ -1921,7 +1914,6 @@ ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings() return pNavSettings; } - 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 43bd5976df8b..53223c4e5853 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -389,7 +389,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 9b348188d49c..927527094ef9 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -23,7 +23,6 @@ #include "tabvwsh.hxx" #include "document.hxx" - void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine ) { if ( pLine ) @@ -79,5 +78,4 @@ void ScTabViewShell::UIDeactivated( SfxInPlaceClient* pClient ) SfxViewShell::UIDeactivated( pClient ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 83d7530a49d8..6283fd772efa 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -98,7 +98,6 @@ void ScTabViewShell::GetGalleryState( SfxItemSet& /* rSet */ ) { } - OUString ScTabViewShell::GetDescription() const { return OUString(" ** Test ** "); @@ -218,5 +217,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 c01343fe3ff2..0d90705a650f 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -143,7 +143,6 @@ bool ScTabViewShell::GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode ) // FID_DELETE_CELL // FID_VALIDATION - void ScTabViewShell::GetState( SfxItemSet& rSet ) { ScViewData& rViewData = GetViewData(); @@ -455,7 +454,6 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) } // while ( nWitch ) } - void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName) { ScDocument* pDoc = GetViewData().GetDocument(); @@ -795,5 +793,4 @@ void ScTabViewShell::GetDrawOptState( SfxItemSet& rSet ) rSet.Put( aBool ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 6db2356d9130..b3fb6a345b34 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -492,7 +492,6 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet) } } - void ScTabViewShell::ExecuteUndo(SfxRequest& rReq) { SfxShell* pSh = GetViewData().GetDispatcher().GetShell(0); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 99da797cda2e..35a6089c9ee3 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -444,7 +444,6 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( } break; - default: OSL_FAIL( "ScTabViewShell::CreateRefDialog: unbekannte ID" ); break; diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx index 828b3e0fd8b5..22be8e158d5e 100644 --- a/sc/source/ui/view/tabvwshd.cxx +++ b/sc/source/ui/view/tabvwshd.cxx @@ -30,7 +30,6 @@ #include "sc.hrc" #include <gridwin.hxx> - // STATIC DATA ----------------------------------------------------------- //! Parent-Window fuer Dialoge @@ -69,6 +68,4 @@ Window* ScTabViewShell::GetDialogParent() return GetActiveWin(); // for normal views, too } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 6904328d25d4..5a58806d589f 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -345,7 +345,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 06701689f913..5a6725663839 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <boost/scoped_ptr.hpp> #include "scitems.hxx" @@ -386,7 +385,6 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { aName = pDlg->GetInputString(); - switch ( nSlot ) { case FID_TAB_APPEND: @@ -506,7 +504,6 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) ScMarkData& rMark = GetViewData().GetMarkData(); SCTAB nTabSelCount = rMark.GetSelectCount(); - if(nTableCount==nTabSelCount) { pDlg->SetForceCopyTable(); @@ -911,5 +908,4 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index e38b495f9fe7..1f61bdfb509c 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -114,5 +114,4 @@ void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rUR pDrView->InsertObjectSafe( pObj, *pDrView->GetSdrPageView() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 5ce836ce3b64..4ece0051951a 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -269,5 +269,4 @@ bool ScTabViewShell::ExecuteRetypePassDlg(ScPasswordHash eDesiredHash) return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index a1a5c709ff98..95fadbac6fad 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -725,7 +725,6 @@ void ScViewData::SetPagebreakMode( bool bSet ) RefreshZoom(); } - ScMarkType ScViewData::GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const { ScMarkType eMarkType = SC_MARK_NONE; @@ -755,7 +754,6 @@ ScMarkType ScViewData::GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) return eMarkType; } - ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab, SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const { @@ -2221,7 +2219,6 @@ void ScViewData::WriteUserData(OUString& rData) cTabSep = OUString(SC_NEW_TABSEP); // in order to not kill a 3.1-version } - rData += OUString::number( maTabData[i]->nCurX ) + cTabSep + OUString::number( maTabData[i]->nCurY ) + cTabSep + OUString::number( maTabData[i]->eHSplitMode ) + cTabSep + diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 3a9724ccef62..5cdb61095d98 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -100,7 +100,6 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ); // STATIC DATA --------------------------------------------------------------- - bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -160,7 +159,6 @@ bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) return bAnyChanged; } - bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -198,7 +196,6 @@ bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) return bChanged; } - enum ScAutoSum { ScAutoSumNone = 0, @@ -206,7 +203,6 @@ enum ScAutoSum ScAutoSumSum }; - static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, ScDirection eDir, SCCOLROW& nExtend ) { @@ -229,7 +225,6 @@ static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, return ScAutoSumNone; } - #define SC_AUTOSUM_MAXCOUNT 20 static ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow, @@ -835,7 +830,6 @@ void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* p UpdatePageBreakData( true ); // for PageBreak-Mode } - void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* pPos, bool bSetModified ) { @@ -1002,7 +996,6 @@ void ScViewFunc::SetPrintRanges( bool bEntireSheet, const OUString* pPrint, pDocSh->SetDocumentModified(); } - // Merge cells bool ScViewFunc::TestMergeCells() // pre-test (for menu) @@ -1019,7 +1012,6 @@ bool ScViewFunc::TestMergeCells() // pre-test (for menu) return false; } - bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bCenter ) { // Editable- and Being-Nested- test must be at the beginning (in DocFunc too), @@ -1114,7 +1106,6 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bC return bOk; } - bool ScViewFunc::TestRemoveMerge() { bool bMerged = false; @@ -1128,7 +1119,6 @@ bool ScViewFunc::TestRemoveMerge() return bMerged; } - static bool lcl_extendMergeRange(ScCellMergeOption& rOption, const ScRange& rRange) { bool bExtended = false; @@ -1446,7 +1436,6 @@ void ScViewFunc::TransliterateText( sal_Int32 nType ) } } - // AutoFormat ScAutoFormatData* ScViewFunc::CreateAutoFormatData() @@ -1470,7 +1459,6 @@ ScAutoFormatData* ScViewFunc::CreateAutoFormatData() return pData; } - void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord ) { ScRange aRange; @@ -1802,7 +1790,6 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } - void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) { @@ -1824,7 +1811,6 @@ void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, } } - void ScViewFunc::ExtendScenario() { ScEditableTester aTester( this ); @@ -1843,7 +1829,6 @@ void ScViewFunc::ExtendScenario() ApplySelectionPattern(aPattern); } - void ScViewFunc::UseScenario( const OUString& rName ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -1867,7 +1852,6 @@ bool ScViewFunc::InsertTable( const OUString& rName, SCTAB nTab, bool bRecord ) return bSuccess; } - // Insert tables bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, @@ -1917,7 +1901,6 @@ bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, } } - bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -1949,7 +1932,6 @@ bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) } } - bool ScViewFunc::DeleteTable( SCTAB nTab, bool bRecord ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -2108,7 +2090,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) pUndoDoc, pUndoData )); } - if (bDelDone) { if ( nNewTab >= rDoc.GetTableCount() ) @@ -2125,7 +2106,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) pDocSh->PostPaintExtras(); pDocSh->SetDocumentModified(); - SfxApplication* pSfxApp = SFX_APP(); // Navigator pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) ); @@ -2139,7 +2119,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) return bDelDone; } - bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) { // order Table/Name is inverted for DocFunc @@ -2153,7 +2132,6 @@ bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) return bSuccess; } - bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab ) { bool bSuccess = GetViewData().GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, true, false ); @@ -2187,7 +2165,6 @@ void ScViewFunc::InsertAreaLink( const OUString& rFile, pDocSh->GetDocFunc().InsertAreaLink( rFile, rFilter, rOptions, rSource, aPos, nRefresh, false, false ); } - void ScViewFunc::InsertTableLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rTabName ) @@ -2316,7 +2293,6 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, } } - if (bUndo) { pDocSh->GetUndoManager()->AddUndoAction( @@ -2697,7 +2673,6 @@ void ScViewFunc::MoveTable( } } - void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -2735,7 +2710,6 @@ void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) } } - void ScViewFunc::HideTable( const ScMarkData& rMark ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -2784,7 +2758,6 @@ void ScViewFunc::HideTable( const ScMarkData& rMark ) } } - void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) { ScEditableTester aTester( this ); @@ -2819,7 +2792,6 @@ void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) pViewShell->TabKeyInput( KeyEvent( *(pChar++), KeyCode() ) ); } - void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, const SvxBorderLine* pDestLine, const SvxBorderLine* pSrcLine, @@ -2842,7 +2814,6 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, } } - #define SET_LINE_ATTRIBUTES(LINE,BOXLINE) \ pBoxLine = aBoxItem.Get##LINE(); \ if ( pBoxLine ) \ @@ -2856,7 +2827,6 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, aBoxItem.SetLine( NULL, BOXLINE ); \ } - void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, bool bColorOnly ) { @@ -2899,7 +2869,6 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, ATTR_PATTERN_START, ATTR_PATTERN_END )); - const SvxBorderLine* pBoxLine = NULL; SvxBorderLine aLine; @@ -2978,5 +2947,4 @@ void ScViewFunc::SetValidation( const ScValidationData& rNew ) ApplyAttr( aItem ); // with Paint and Undo... } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 627e870e519e..b00ab735f6c8 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -72,10 +72,8 @@ using namespace com::sun::star; // STATIC DATA --------------------------------------------------------------- - // GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx - // C U T void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects ) @@ -434,7 +432,6 @@ ScTransferObj* ScViewFunc::CopyToTransferable() return NULL; } - // P A S T E void ScViewFunc::PasteDraw() @@ -765,10 +762,8 @@ static bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL return false; } - // Einfuegen auf Tabelle: - // internes Paste namespace { @@ -1208,11 +1203,9 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, rMark.SetMarkArea( aUserRange ); MarkDataChanged(); - // Aus Clipboard kopieren, // wenn gerechnet werden soll, Originaldaten merken - boost::scoped_ptr<ScDocument> pMixDoc; if (nFunction) { @@ -1959,5 +1952,4 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow , } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 9298b6913a71..05efdf5a0b10 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -86,7 +86,6 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, { HideAllCursors(); - ScDocShell* pDocSh = GetViewData().GetDocShell(); ScDocument& rDoc = pDocSh->GetDocument(); SCTAB nTab = GetViewData().GetTabNo(); @@ -619,7 +618,6 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink Graphic aGraphic; GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); - if (!rGraphicFilter.ImportGraphic(aGraphic, aURL, GRFILTER_FORMAT_DONTKNOW, &nFilterFormat )) { @@ -781,5 +779,4 @@ bool ScViewFunc::HasBookmarkAtCursor( SvxHyperlinkItem* pContent ) return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 9ee7fa5dbcea..f5481b8ff0f8 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/MSOLEObjectSystemCreator.hpp> - #include <svx/unomodel.hxx> #include <unotools/streamwrap.hxx> @@ -104,10 +103,8 @@ bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, TransferableDataHelper aDataHelper( rxTransferable ); bool bRet = false; - // handle individual formats - if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE || nFormatId == SOT_FORMATSTR_ID_LINK_SOURCE || nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || @@ -741,5 +738,4 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 74fe5592d660..f6addba08c3d 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> #include <sfx2/bindings.hxx> diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 77093e4b12c1..68bf8097556c 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -54,7 +54,6 @@ bool bPasteIsMove = false; using namespace com::sun::star; - static void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize ) { SdrPage* pPage = pData->GetScDrawView()->GetModel()->GetPage( static_cast<sal_uInt16>(pData->GetTabNo()) ); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index a996f3735bcd..ed0d0f5e91e0 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -88,7 +88,6 @@ static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDo } } - ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScTabView( pParent, rDocSh, pViewShell ), bFormatValid( false ) @@ -660,10 +659,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, // #i97726# always get text for "repeat" of undo action aString = ScEditUtil::GetSpaceDelimitedString(aEngine); - // undo - EditTextObject* pUndoData = NULL; ScUndoEnterData::ValuesType aOldValues; @@ -681,10 +678,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, pUndoData = rData.Clone(); } - // enter data - if (bCommon) rDoc.ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! undo @@ -870,12 +865,10 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, } } - // apply attribute - undo OK // // complete set ( ATTR_STARTINDEX, ATTR_ENDINDEX ) - void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, bool bRecord ) @@ -1014,7 +1007,6 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem ) // CellContentChanged is called in ApplySelectionPattern } - // patterns and borders void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter, @@ -1312,7 +1304,6 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, bool bRecord if ( !pStyleSheet) return; - ScViewData& rViewData = GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); ScDocument& rDoc = pDocSh->GetDocument(); @@ -1399,12 +1390,10 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, bool bRecord StartFormatArea(); } - void ScViewFunc::RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ) { if ( !pStyleSheet) return; - ScViewData& rViewData = GetViewData(); ScDocument* pDoc = rViewData.GetDocument(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -1431,7 +1420,6 @@ void ScViewFunc::UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ) { if ( !pStyleSheet) return; - ScViewData& rViewData = GetViewData(); ScDocument* pDoc = rViewData.GetDocument(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -2162,7 +2150,6 @@ void ScViewFunc::SetWidthOrHeight( rDoc.SetDrawPageSize(nTab); } - if (!bOutline) DELETEZ(pUndoTab); diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index c7535a1789fb..17f6008421f2 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -274,7 +274,6 @@ void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc ) rMark.MarkToSimple(); } - bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, ScDocument * pDoc, size_t nRows ) { SCTAB nTab = rRange.aStart.Tab(); @@ -339,7 +338,6 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal rSet.DisableItem( nSlotId ); } - bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, SfxViewFrame& rFrame, SvxFontItem& rNewFont, @@ -389,7 +387,6 @@ void ScViewUtil::SetFullScreen( SfxViewShell& rViewShell, bool bSet ) } } - ScUpdateRect::ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) : nNewStartX(0) , nNewStartY(0) diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx index e3139ea18745..e0c3a6e8f9a4 100644 --- a/sc/source/ui/view/waitoff.cxx +++ b/sc/source/ui/view/waitoff.cxx @@ -48,5 +48,4 @@ ScWaitCursorOff::~ScWaitCursorOff() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index d518462e00d1..2c13cac63c35 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -128,7 +128,6 @@ uno::Reference<uno::XInterface> ScTestAddIn_CreateInstance( return xInst; } - // XAddIn UString ScTestAddIn::getProgrammaticFuntionName(const UString& aDisplayName) diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx index 1fe29d409925..822528d8a561 100644 --- a/sc/workben/addin.hxx +++ b/sc/workben/addin.hxx @@ -27,11 +27,9 @@ #include <cppuhelper/implbase4.hxx> - com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScTestAddIn_CreateInstance( const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& ); - class ScTestAddIn : public cppu::WeakImplHelper4< com::sun::star::sheet::XAddIn, stardiv::starcalc::test::XTestAddIn, @@ -89,7 +87,6 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index 930878163489..a98b843696df 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -107,6 +107,4 @@ void SAL_CALL ScAddInResult::removeResultListener( const ::com::sun::star::uno:: release(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx index e7d7718b4aef..559f4a1abd6b 100644 --- a/sc/workben/result.hxx +++ b/sc/workben/result.hxx @@ -24,16 +24,13 @@ #include <rtl/ustring.hxx> #include <boost/ptr_container/ptr_vector.hpp> - #include <com/sun/star/sheet/XVolatileResult.hpp> #include <cppuhelper/implbase1.hxx> - typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >* XResultListenerPtr; typedef boost::ptr_vector<XResultListenerPtr> XResultListenerArr_Impl; - class ScAddInResult : public cppu::WeakImplHelper1< com::sun::star::sheet::XVolatileResult> { @@ -56,7 +53,6 @@ public: virtual void SAL_CALL removeResultListener( const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 4a4e4488381a..9ce306f3d4cb 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -49,7 +49,6 @@ //! das muss als Konstante in irgendeine idl-Datei!!!! #define TEXTCONTROLCHAR_PARAGRAPH_BREAK 0 - class MyFixedText : public FixedText { protected: @@ -158,7 +157,6 @@ void ScTestListener::selectionChanged(const EventObject& aEvent) pFixedText->SetText(aStr); } - extern "C" Window* SAL_CALL CreateWindow( Window *pParent, const String& rParam ) { MyWindow *pWin = new MyWindow( pParent ); @@ -381,7 +379,6 @@ void lcl_DoCount() } } - void lcl_GlobalCell() { if ( xGlobalCell ) @@ -392,7 +389,6 @@ void lcl_GlobalCell() } } - void lcl_Annotations( FixedText& aTimeText ) { XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model @@ -456,7 +452,6 @@ void lcl_Annotations( FixedText& aTimeText ) } } - void lcl_Cursor( FixedText& aTimeText ) { aTimeText.SetText( "..." ); @@ -583,7 +578,6 @@ void lcl_Cursor( FixedText& aTimeText ) } } - void lcl_Cells( FixedText& aTimeText ) { aTimeText.SetText( "..." ); @@ -633,7 +627,6 @@ void lcl_Cells( FixedText& aTimeText ) sal_uLong nEnd = Time::GetSystemTicks(); aTimeText.SetText(String(nCount)+String(" ")+String(nEnd-nStart)+String(" ms")); - // if (xLock) // xLock->removeActionLock(); } @@ -1736,7 +1729,6 @@ IMPL_LINK_NOARG(MyWindow, BlaHdl) return 0; } - IMPL_LINK_NOARG(MyWindow, TabHdl) { String aResult; |