loplugin:finalclasses in sc

Change-Id: I83438eaf2c1045a9212a63ed9fd8b3371e9b06aa
Reviewed-on: https://gerrit.libreoffice.org/43896
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2017-10-26 14:55:54 +02:00
parent f5457c856f
commit ac8901d9d2
29 changed files with 101 additions and 160 deletions

View File

@@ -124,7 +124,7 @@ public:
virtual void notify() = 0; virtual void notify() = 0;
}; };
class SC_DLLPUBLIC ScChartListenerCollection class SC_DLLPUBLIC ScChartListenerCollection final
{ {
public: public:
typedef std::map<OUString, std::unique_ptr<ScChartListener>> ListenersType; typedef std::map<OUString, std::unique_ptr<ScChartListener>> ListenersType;
@@ -149,7 +149,6 @@ private:
ScChartListenerCollection& operator=( const ScChartListenerCollection& ) = delete; ScChartListenerCollection& operator=( const ScChartListenerCollection& ) = delete;
protected:
void Init(); void Init();
public: public:

View File

@@ -92,13 +92,12 @@ class CompileFormulaContext;
// constants and data types internal to compiler // constants and data types internal to compiler
struct ScRawToken struct ScRawToken final
{ {
friend class ScCompiler; friend class ScCompiler;
// Friends that use a temporary ScRawToken on the stack (and therefore need // Friends that use a temporary ScRawToken on the stack (and therefore need
// the private dtor) and know what they're doing.. // the private dtor) and know what they're doing..
friend class ScTokenArray; friend class ScTokenArray;
protected:
OpCode eOp; OpCode eOp;
formula::StackVar eType; // type of data; this determines how the unions are used formula::StackVar eType; // type of data; this determines how the unions are used
public: public:

View File

@@ -28,7 +28,7 @@
class ScStyleSheetPool; class ScStyleSheetPool;
class ScStyleSheet : public SfxStyleSheet class ScStyleSheet final : public SfxStyleSheet
{ {
friend class ScStyleSheetPool; friend class ScStyleSheetPool;
@@ -41,16 +41,11 @@ public:
NOTUSED NOTUSED
}; };
private:
mutable ScStyleSheet::Usage eUsage;
public:
ScStyleSheet( const ScStyleSheet& rStyle ); ScStyleSheet( const ScStyleSheet& rStyle );
virtual bool SetParent ( const OUString& rParentName ) override; virtual bool SetParent ( const OUString& rParentName ) override;
SC_DLLPUBLIC void ResetParent(); SC_DLLPUBLIC void ResetParent();
virtual SfxItemSet& GetItemSet () override; SC_DLLPUBLIC virtual SfxItemSet& GetItemSet() override;
virtual bool IsUsed () const override; virtual bool IsUsed () const override;
virtual bool HasFollowSupport () const override; virtual bool HasFollowSupport () const override;
virtual bool HasParentSupport () const override; virtual bool HasParentSupport () const override;
@@ -60,7 +55,7 @@ public:
void SetUsage( ScStyleSheet::Usage eUse ) const { eUsage = eUse; } void SetUsage( ScStyleSheet::Usage eUse ) const { eUsage = eUse; }
ScStyleSheet::Usage GetUsage() const { return eUsage; } ScStyleSheet::Usage GetUsage() const { return eUsage; }
protected: private:
virtual ~ScStyleSheet() override; virtual ~ScStyleSheet() override;
ScStyleSheet( const OUString& rName, ScStyleSheet( const OUString& rName,
@@ -69,6 +64,8 @@ protected:
sal_uInt16 nMask ); sal_uInt16 nMask );
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
mutable ScStyleSheet::Usage eUsage;
}; };
#endif // INCLUDED_SC_INC_STLSHEET_HXX #endif // INCLUDED_SC_INC_STLSHEET_HXX

View File

@@ -54,7 +54,7 @@ public:
const std::string &sSymName, SubArguments &vSubArguments) override; const std::string &sSymName, SubArguments &vSubArguments) override;
virtual std::string BinFuncName() const override { return "Csc"; } virtual std::string BinFuncName() const override { return "Csc"; }
}; };
class OpSumIfs: public CheckVariables class OpSumIfs final : public CheckVariables
{ {
public: public:
OpSumIfs(): CheckVariables(), mNeedReductionKernel(false) {} OpSumIfs(): CheckVariables(), mNeedReductionKernel(false) {}
@@ -62,7 +62,7 @@ public:
const std::string &sSymName, SubArguments &vSubArguments) override; const std::string &sSymName, SubArguments &vSubArguments) override;
virtual std::string BinFuncName() const override { return "SumIfs"; } virtual std::string BinFuncName() const override { return "SumIfs"; }
bool NeedReductionKernel() const { return mNeedReductionKernel; } bool NeedReductionKernel() const { return mNeedReductionKernel; }
protected: private:
bool mNeedReductionKernel; bool mNeedReductionKernel;
}; };
class OpCosh: public Normal class OpCosh: public Normal

View File

@@ -461,18 +461,15 @@ struct XclExpChTrData
// XclExpChTrCellContent - changed cell content // XclExpChTrCellContent - changed cell content
class XclExpChTrCellContent : public XclExpChTrAction, protected XclExpRoot class XclExpChTrCellContent final : public XclExpChTrAction, protected XclExpRoot
{ {
private:
XclExpChTrData* pOldData; XclExpChTrData* pOldData;
XclExpChTrData* pNewData; XclExpChTrData* pNewData;
sal_uInt16 nOldLength; // this is not the record size sal_uInt16 nOldLength; // this is not the record size
ScAddress aPosition;
static void MakeEmptyChTrData( XclExpChTrData*& rpData ); static void MakeEmptyChTrData( XclExpChTrData*& rpData );
protected:
ScAddress aPosition;
void GetCellData( void GetCellData(
const XclExpRoot& rRoot, const ScCellValue& rScCell, XclExpChTrData*& rpData, const XclExpRoot& rRoot, const ScCellValue& rScCell, XclExpChTrData*& rpData,
sal_uInt32& rXclLength1, sal_uInt16& rXclLength2 ); sal_uInt32& rXclLength1, sal_uInt16& rXclLength2 );
@@ -546,9 +543,8 @@ public:
// XclExpChTrMoveRange - move cell range // XclExpChTrMoveRange - move cell range
class XclExpChTrMoveRange : public XclExpChTrAction class XclExpChTrMoveRange final : public XclExpChTrAction
{ {
protected:
ScRange aSourceRange; ScRange aSourceRange;
ScRange aDestRange; ScRange aDestRange;

View File

@@ -43,16 +43,14 @@ public:
const OUString& GetValue() const { return aValue; } const OUString& GetValue() const { return aValue; }
}; };
class ExcScenario class ExcScenario final
{ {
public: public:
ExcScenario( XclImpStream& rIn, const RootData& rRoot ); ExcScenario( XclImpStream& rIn, const RootData& rRoot );
void Apply( const XclImpRoot& rRoot, const bool bLast ); void Apply( const XclImpRoot& rRoot, const bool bLast );
protected: private:
OUString aName; OUString aName;
OUString aComment; OUString aComment;
OUString aUserName; OUString aUserName;

View File

@@ -598,16 +598,15 @@ public:
}; };
// Font-Collection // Font-Collection
class Sc10FontCollection : public ScCollection class Sc10FontCollection final : public ScCollection
{ {
protected:
ErrCode nError;
public: public:
Sc10FontCollection( SvStream& rStream ); Sc10FontCollection( SvStream& rStream );
ErrCode GetError() { return nError; } ErrCode GetError() { return nError; }
Sc10FontData* At(sal_uInt16 nIndex) { return static_cast<Sc10FontData*>(ScCollection::At(nIndex)); } Sc10FontData* At(sal_uInt16 nIndex) { return static_cast<Sc10FontData*>(ScCollection::At(nIndex)); }
private: private:
using ScCollection::At; using ScCollection::At;
ErrCode nError;
}; };
//Range-Data //Range-Data
@@ -632,16 +631,15 @@ public:
}; };
// Range-Collection // Range-Collection
class Sc10NameCollection : public ScCollection class Sc10NameCollection final : public ScCollection
{ {
protected:
ErrCode nError;
public: public:
Sc10NameCollection(SvStream& rStream); Sc10NameCollection(SvStream& rStream);
ErrCode GetError() { return nError; } ErrCode GetError() { return nError; }
Sc10NameData* At(sal_uInt16 nIndex) { return static_cast<Sc10NameData*>(ScCollection::At(nIndex)); } Sc10NameData* At(sal_uInt16 nIndex) { return static_cast<Sc10NameData*>(ScCollection::At(nIndex)); }
private: private:
using ScCollection::At; using ScCollection::At;
ErrCode nError;
}; };
// Template-Data // Template-Data
@@ -683,16 +681,15 @@ virtual ScDataObject* Clone() const override { return new Sc10PatternData(
}; };
// Template-Collection // Template-Collection
class Sc10PatternCollection : public ScCollection class Sc10PatternCollection final : public ScCollection
{ {
protected:
ErrCode nError;
public: public:
Sc10PatternCollection(SvStream& rStream); Sc10PatternCollection(SvStream& rStream);
ErrCode GetError() { return nError; } ErrCode GetError() { return nError; }
Sc10PatternData* At(sal_uInt16 nIndex) { return static_cast<Sc10PatternData*>(ScCollection::At(nIndex)); } Sc10PatternData* At(sal_uInt16 nIndex) { return static_cast<Sc10PatternData*>(ScCollection::At(nIndex)); }
private: private:
using ScCollection::At; using ScCollection::At;
ErrCode nError;
}; };
// DataBank-Data // DataBank-Data
@@ -711,17 +708,16 @@ virtual ScDataObject* Clone() const override { return new Sc10DataBaseData
}; };
// DataBank-Collection // DataBank-Collection
class Sc10DataBaseCollection : public ScCollection class Sc10DataBaseCollection final : public ScCollection
{ {
protected:
ErrCode nError;
sal_Char ActName[32];
public: public:
Sc10DataBaseCollection(SvStream& rStream); Sc10DataBaseCollection(SvStream& rStream);
ErrCode GetError() { return nError; } ErrCode GetError() { return nError; }
Sc10DataBaseData* At(sal_uInt16 nIndex) { return static_cast<Sc10DataBaseData*>(ScCollection::At(nIndex)); } Sc10DataBaseData* At(sal_uInt16 nIndex) { return static_cast<Sc10DataBaseData*>(ScCollection::At(nIndex)); }
private: private:
using ScCollection::At; using ScCollection::At;
ErrCode nError;
sal_Char ActName[32];
}; };
class Sc10PageData : public ScDataObject class Sc10PageData : public ScDataObject

View File

@@ -236,7 +236,7 @@ public:
}; };
/** A group object. */ /** A group object. */
class XclImpGroupObj : public XclImpDrawObjBase class XclImpGroupObj final : public XclImpDrawObjBase
{ {
public: public:
explicit XclImpGroupObj( const XclImpRoot& rRoot ); explicit XclImpGroupObj( const XclImpRoot& rRoot );
@@ -244,7 +244,7 @@ public:
/** Tries to insert the drawing object into this or a nested group. */ /** Tries to insert the drawing object into this or a nested group. */
bool TryInsert( XclImpDrawObjRef const & xDrawObj ); bool TryInsert( XclImpDrawObjRef const & xDrawObj );
protected: private:
/** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override;
/** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
@@ -256,18 +256,17 @@ protected:
/** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */
virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override;
protected:
XclImpDrawObjVector maChildren; /// Grouped objects. XclImpDrawObjVector maChildren; /// Grouped objects.
sal_uInt16 mnFirstUngrouped; /// Object identifier of first object not grouped into this group. sal_uInt16 mnFirstUngrouped; /// Object identifier of first object not grouped into this group.
}; };
/** A line object. */ /** A line object. */
class XclImpLineObj : public XclImpDrawObjBase class XclImpLineObj final : public XclImpDrawObjBase
{ {
public: public:
explicit XclImpLineObj( const XclImpRoot& rRoot ); explicit XclImpLineObj( const XclImpRoot& rRoot );
protected: private:
/** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override;
/** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
@@ -277,7 +276,6 @@ protected:
/** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */
virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override;
protected:
XclObjLineData maLineData; /// BIFF5 line formatting. XclObjLineData maLineData; /// BIFF5 line formatting.
sal_uInt16 mnArrows; /// Line arrows. sal_uInt16 mnArrows; /// Line arrows.
sal_uInt8 mnStartPoint; /// Starting point. sal_uInt8 mnStartPoint; /// Starting point.
@@ -323,12 +321,12 @@ protected:
}; };
/** An arc object. */ /** An arc object. */
class XclImpArcObj : public XclImpDrawObjBase class XclImpArcObj final : public XclImpDrawObjBase
{ {
public: public:
explicit XclImpArcObj( const XclImpRoot& rRoot ); explicit XclImpArcObj( const XclImpRoot& rRoot );
protected: private:
/** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */
virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override; virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) override;
/** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */
@@ -338,19 +336,18 @@ protected:
/** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */
virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override;
protected:
XclObjFillData maFillData; /// BIFF5 fill formatting. XclObjFillData maFillData; /// BIFF5 fill formatting.
XclObjLineData maLineData; /// BIFF5 line formatting. XclObjLineData maLineData; /// BIFF5 line formatting.
sal_uInt8 mnQuadrant; /// Visible quadrant of the circle. sal_uInt8 mnQuadrant; /// Visible quadrant of the circle.
}; };
/** A polygon object. */ /** A polygon object. */
class XclImpPolygonObj : public XclImpRectObj class XclImpPolygonObj final : public XclImpRectObj
{ {
public: public:
explicit XclImpPolygonObj( const XclImpRoot& rRoot ); explicit XclImpPolygonObj( const XclImpRoot& rRoot );
protected: private:
/** Reads the COORDLIST record following the OBJ record. */ /** Reads the COORDLIST record following the OBJ record. */
void ReadCoordList( XclImpStream& rStrm ); void ReadCoordList( XclImpStream& rStrm );
@@ -361,7 +358,6 @@ protected:
/** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */
virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override; virtual SdrObjectPtr DoCreateSdrObj( XclImpDffConverter& rDffConv, const tools::Rectangle& rAnchorRect ) const override;
protected:
typedef std::vector< Point > PointVector; typedef std::vector< Point > PointVector;
PointVector maCoords; /// Coordinates relative to bounding rectangle. PointVector maCoords; /// Coordinates relative to bounding rectangle.
sal_uInt16 mnPolyFlags; /// Additional flags. sal_uInt16 mnPolyFlags; /// Additional flags.
@@ -573,12 +569,12 @@ protected:
}; };
/** An option button control. */ /** An option button control. */
class XclImpOptionButtonObj : public XclImpCheckBoxObj class XclImpOptionButtonObj final : public XclImpCheckBoxObj
{ {
public: public:
explicit XclImpOptionButtonObj( const XclImpRoot& rRoot ); explicit XclImpOptionButtonObj( const XclImpRoot& rRoot );
protected: private:
/** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override;
/** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */
@@ -590,7 +586,6 @@ protected:
/** Returns the type of the macro event to be created. */ /** Returns the type of the macro event to be created. */
virtual XclTbxEventType DoGetEventType() const override; virtual XclTbxEventType DoGetEventType() const override;
protected:
sal_uInt16 mnNextInGroup; /// Next option button in a group. sal_uInt16 mnNextInGroup; /// Next option button in a group.
sal_uInt16 mnFirstInGroup; /// 1 = Button is the first in a group. sal_uInt16 mnFirstInGroup; /// 1 = Button is the first in a group.
}; };
@@ -611,12 +606,12 @@ protected:
}; };
/** A groupbox control. */ /** A groupbox control. */
class XclImpGroupBoxObj : public XclImpTbxObjBase class XclImpGroupBoxObj final : public XclImpTbxObjBase
{ {
public: public:
explicit XclImpGroupBoxObj( const XclImpRoot& rRoot ); explicit XclImpGroupBoxObj( const XclImpRoot& rRoot );
protected: private:
/** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */
virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override; virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) override;
/** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */
@@ -628,7 +623,6 @@ protected:
/** Returns the type of the macro event to be created. */ /** Returns the type of the macro event to be created. */
virtual XclTbxEventType DoGetEventType() const override; virtual XclTbxEventType DoGetEventType() const override;
protected:
sal_uInt16 mnGroupBoxFlags; sal_uInt16 mnGroupBoxFlags;
}; };
@@ -648,12 +642,12 @@ protected:
}; };
/** An edit control. */ /** An edit control. */
class XclImpEditObj : public XclImpTbxObjBase class XclImpEditObj final : public XclImpTbxObjBase
{ {
public: public:
explicit XclImpEditObj( const XclImpRoot& rRoot ); explicit XclImpEditObj( const XclImpRoot& rRoot );
protected: private:
/** REturns true, if the field type is numeric. */ /** REturns true, if the field type is numeric. */
bool IsNumeric() const; bool IsNumeric() const;
@@ -668,7 +662,6 @@ protected:
/** Returns the type of the macro event to be created. */ /** Returns the type of the macro event to be created. */
virtual XclTbxEventType DoGetEventType() const override; virtual XclTbxEventType DoGetEventType() const override;
protected:
sal_uInt16 mnContentType; sal_uInt16 mnContentType;
sal_uInt16 mnMultiLine; sal_uInt16 mnMultiLine;
sal_uInt16 mnScrollBar; sal_uInt16 mnScrollBar;
@@ -754,12 +747,12 @@ protected:
}; };
/** A listbox control. */ /** A listbox control. */
class XclImpListBoxObj : public XclImpTbxObjListBase class XclImpListBoxObj final : public XclImpTbxObjListBase
{ {
public: public:
explicit XclImpListBoxObj( const XclImpRoot& rRoot ); explicit XclImpListBoxObj( const XclImpRoot& rRoot );
protected: private:
/** Reads listbox settings and selection. */ /** Reads listbox settings and selection. */
void ReadFullLbsData( XclImpStream& rStrm, std::size_t nRecLeft ); void ReadFullLbsData( XclImpStream& rStrm, std::size_t nRecLeft );
@@ -774,17 +767,16 @@ protected:
/** Returns the type of the macro event to be created. */ /** Returns the type of the macro event to be created. */
virtual XclTbxEventType DoGetEventType() const override; virtual XclTbxEventType DoGetEventType() const override;
protected:
ScfUInt8Vec maSelection; ScfUInt8Vec maSelection;
}; };
/** A dropdown listbox control. */ /** A dropdown listbox control. */
class XclImpDropDownObj : public XclImpTbxObjListBase class XclImpDropDownObj final : public XclImpTbxObjListBase
{ {
public: public:
explicit XclImpDropDownObj( const XclImpRoot& rRoot ); explicit XclImpDropDownObj( const XclImpRoot& rRoot );
protected: private:
/** Returns the type of the dropdown control. */ /** Returns the type of the dropdown control. */
sal_uInt16 GetDropDownType() const; sal_uInt16 GetDropDownType() const;
@@ -802,7 +794,6 @@ protected:
/** Returns the type of the macro event to be created. */ /** Returns the type of the macro event to be created. */
virtual XclTbxEventType DoGetEventType() const override; virtual XclTbxEventType DoGetEventType() const override;
protected:
sal_uInt16 mnLeft; sal_uInt16 mnLeft;
sal_uInt16 mnTop; sal_uInt16 mnTop;
sal_uInt16 mnRight; sal_uInt16 mnRight;

View File

@@ -56,17 +56,29 @@ class ScRangeList;
This base class provides an implementation of the This base class provides an implementation of the
<code>AccessibleTable</code> service. <code>AccessibleTable</code> service.
*/ */
class ScAccessibleSpreadsheet class ScAccessibleSpreadsheet final
: public ScAccessibleTableBase : public ScAccessibleTableBase
{ {
public: public:
//===== internal ========================================================
ScAccessibleSpreadsheet( ScAccessibleSpreadsheet(
ScAccessibleDocument* pAccDoc, ScAccessibleDocument* pAccDoc,
ScTabViewShell* pViewShell, ScTabViewShell* pViewShell,
SCTAB nTab, SCTAB nTab,
ScSplitPos eSplitPos); ScSplitPos eSplitPos);
protected:
using ScAccessibleTableBase::disposing;
virtual void SAL_CALL disposing() override;
void CompleteSelectionChanged(bool bNewState);
void LostFocus();
void GotFocus();
void BoundingBoxChanged();
void VisAreaChanged();
private:
ScAccessibleSpreadsheet( ScAccessibleSpreadsheet(
ScAccessibleSpreadsheet& rParent, ScAccessibleSpreadsheet& rParent,
const ScRange& rRange ); const ScRange& rRange );
@@ -81,20 +93,6 @@ protected:
using ScAccessibleTableBase::IsDefunc; using ScAccessibleTableBase::IsDefunc;
public:
using ScAccessibleTableBase::disposing;
virtual void SAL_CALL disposing() override;
void CompleteSelectionChanged(bool bNewState);
void LostFocus();
void GotFocus();
void BoundingBoxChanged();
void VisAreaChanged();
private:
///===== SfxListener ===================================================== ///===== SfxListener =====================================================
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
@@ -209,13 +207,12 @@ private:
virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) override;
virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) override; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) override;
protected:
/// Return the object's current bounding box relative to the desktop. /// Return the object's current bounding box relative to the desktop.
virtual tools::Rectangle GetBoundingBoxOnScreen() const override; virtual tools::Rectangle GetBoundingBoxOnScreen() const override;
/// Return the object's current bounding box relative to the parent object. /// Return the object's current bounding box relative to the parent object.
virtual tools::Rectangle GetBoundingBox() const override; virtual tools::Rectangle GetBoundingBox() const override;
private:
ScTabViewShell* mpViewShell; ScTabViewShell* mpViewShell;
ScRangeList* mpMarkedRanges; ScRangeList* mpMarkedRanges;
ScAccessibleDocument* mpAccDoc; ScAccessibleDocument* mpAccDoc;

View File

@@ -15,11 +15,8 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
class ScPivotLayoutTreeListData : public ScPivotLayoutTreeListBase class ScPivotLayoutTreeListData final : public ScPivotLayoutTreeListBase
{ {
private:
std::vector<std::unique_ptr<ScItemValue> > maDataItemValues;
public: public:
ScPivotLayoutTreeListData(vcl::Window* pParent, WinBits nBits); ScPivotLayoutTreeListData(vcl::Window* pParent, WinBits nBits);
virtual ~ScPivotLayoutTreeListData() override; virtual ~ScPivotLayoutTreeListData() override;
@@ -28,13 +25,15 @@ public:
void FillDataField(ScPivotFieldVector& rDataFields); void FillDataField(ScPivotFieldVector& rDataFields);
void PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames); void PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames);
protected: private:
virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget) override; virtual void InsertEntryForSourceTarget(SvTreeListEntry* pSource, SvTreeListEntry* pTarget) override;
virtual void InsertEntryForItem(ScItemValue* pItemValue, sal_uLong nPosition) override; virtual void InsertEntryForItem(ScItemValue* pItemValue, sal_uLong nPosition) override;
void AdjustDuplicateCount(ScItemValue* pInputItemValue); void AdjustDuplicateCount(ScItemValue* pInputItemValue);
virtual void KeyInput(const KeyEvent& rKeyEvent) override; virtual void KeyInput(const KeyEvent& rKeyEvent) override;
std::vector<std::unique_ptr<ScItemValue> > maDataItemValues;
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

View File

@@ -131,9 +131,8 @@ public:
virtual DataCellIterator iterateCells() = 0; virtual DataCellIterator iterateCells() = 0;
}; };
class DataRangeByColumnIterator : public DataRangeIterator class DataRangeByColumnIterator final : public DataRangeIterator
{ {
protected:
SCCOL mCol; SCCOL mCol;
public: public:
@@ -147,9 +146,8 @@ public:
virtual DataCellIterator iterateCells() override; virtual DataCellIterator iterateCells() override;
}; };
class DataRangeByRowIterator : public DataRangeIterator class DataRangeByRowIterator final : public DataRangeIterator
{ {
protected:
SCROW mRow; SCROW mRow;
public: public:

View File

@@ -52,9 +52,8 @@ public:
bool bIsAcceptable; bool bIsAcceptable;
}; };
class ScAcceptChgDlg : public SfxModelessDialog class ScAcceptChgDlg final : public SfxModelessDialog
{ {
private:
Idle aSelectionIdle; Idle aSelectionIdle;
Idle aReOpenIdle; Idle aReOpenIdle;
VclPtr<PopupMenu> m_xPopup; VclPtr<PopupMenu> m_xPopup;
@@ -108,8 +107,6 @@ private:
DECL_LINK( ReOpenTimerHdl, Timer*, void ); DECL_LINK( ReOpenTimerHdl, Timer*, void );
DECL_LINK( ColCompareHdl, const SvSortData*, sal_Int32 ); DECL_LINK( ColCompareHdl, const SvSortData*, sal_Int32 );
protected:
void RejectFiltered(); void RejectFiltered();
void AcceptFiltered(); void AcceptFiltered();

View File

@@ -26,7 +26,7 @@
class OutputDevice; class OutputDevice;
class ScDDComboBoxButton class ScDDComboBoxButton final
{ {
public: public:
ScDDComboBoxButton( OutputDevice* pOutputDevice ); ScDDComboBoxButton( OutputDevice* pOutputDevice );
@@ -50,7 +50,6 @@ public:
private: private:
void ImpDrawArrow( const tools::Rectangle& rRect ); void ImpDrawArrow( const tools::Rectangle& rRect );
protected:
VclPtr<OutputDevice> pOut; VclPtr<OutputDevice> pOut;
Point aBtnPos; Point aBtnPos;
Size aBtnSize; Size aBtnSize;

View File

@@ -31,7 +31,7 @@ class ScViewData;
class ScDrawObjData; class ScDrawObjData;
class SdrUndoManager; class SdrUndoManager;
class ScDrawView: public FmFormView class ScDrawView final : public FmFormView
{ {
ScViewData* pViewData; ScViewData* pViewData;
VclPtr<OutputDevice> pDev; //! needed ? VclPtr<OutputDevice> pDev; //! needed ?
@@ -45,7 +45,6 @@ class ScDrawView: public FmFormView
void Construct(); void Construct();
protected:
virtual void ModelHasChanged() override; virtual void ModelHasChanged() override;
// add custom handles (used by other apps, e.g. AnchorPos) // add custom handles (used by other apps, e.g. AnchorPos)

View File

@@ -40,7 +40,7 @@ class ScInputHandler;
class ScDocShell; class ScDocShell;
class ScFormulaCell; class ScFormulaCell;
class ScFormulaDlg : public formula::FormulaDlg, class ScFormulaDlg final : public formula::FormulaDlg,
public IAnyRefDialog public IAnyRefDialog
{ {
ScFormulaReferenceHelper m_aHelper; ScFormulaReferenceHelper m_aHelper;
@@ -100,8 +100,8 @@ public:
virtual void AddRefEntry() override; virtual void AddRefEntry() override;
virtual void SetActive() override; virtual void SetActive() override;
virtual void ViewShellChanged() override; virtual void ViewShellChanged() override;
protected:
private:
virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override; virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = nullptr ) override;
static void SaveLRUEntry(const ScFuncDesc* pFuncDesc); static void SaveLRUEntry(const ScFuncDesc* pFuncDesc);

View File

@@ -25,9 +25,8 @@
enum class SdrInventor : sal_uInt32; enum class SdrInventor : sal_uInt32;
/** Draw Control */ /** Draw Control */
class FuConstUnoControl : public FuConstruct class FuConstUnoControl final : public FuConstruct
{ {
protected:
SdrInventor nInventor; SdrInventor nInventor;
sal_uInt16 nIdentifier; sal_uInt16 nIdentifier;

View File

@@ -221,7 +221,7 @@ private:
DECL_LINK( Impl_ScrollHdl, ScrollBar*, void ); DECL_LINK( Impl_ScrollHdl, ScrollBar*, void );
}; };
class ScInputWindow : public ToolBox // Parent toolbox class ScInputWindow final : public ToolBox // Parent toolbox
{ {
public: public:
ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind ); ScInputWindow( vcl::Window* pParent, const SfxBindings* pBind );
@@ -266,10 +266,9 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
virtual void MouseMove( const MouseEvent& rMEvt ) override; virtual void MouseMove( const MouseEvent& rMEvt ) override;
protected: private:
bool IsPointerAtResizePos(); bool IsPointerAtResizePos();
private:
VclPtr<ScPosWnd> aWndPos; VclPtr<ScPosWnd> aWndPos;
VclPtr<ScTextWndBase> pRuntimeWindow; VclPtr<ScTextWndBase> pRuntimeWindow;
ScTextWndBase& aTextWindow; ScTextWndBase& aTextWindow;

View File

@@ -25,9 +25,8 @@
#include <vcl/fixed.hxx> #include <vcl/fixed.hxx>
#include "scui_def.hxx" #include "scui_def.hxx"
class ScNameCreateDlg : public ModalDialog class ScNameCreateDlg final : public ModalDialog
{ {
protected:
VclPtr<CheckBox> m_pTopBox; VclPtr<CheckBox> m_pTopBox;
VclPtr<CheckBox> m_pLeftBox; VclPtr<CheckBox> m_pLeftBox;
VclPtr<CheckBox> m_pBottomBox; VclPtr<CheckBox> m_pBottomBox;

View File

@@ -25,10 +25,8 @@
class ScDocShell; class ScDocShell;
class AbstractSvxPostItDialog; class AbstractSvxPostItDialog;
class ScRedComDialog class ScRedComDialog final
{ {
private:
ScChangeAction *pChangeAction; ScChangeAction *pChangeAction;
ScDocShell *pDocShell; ScDocShell *pDocShell;
OUString aComment; OUString aComment;
@@ -37,8 +35,6 @@ private:
DECL_LINK( PrevHdl, AbstractSvxPostItDialog&, void ); DECL_LINK( PrevHdl, AbstractSvxPostItDialog&, void );
DECL_LINK( NextHdl, AbstractSvxPostItDialog&, void ); DECL_LINK( NextHdl, AbstractSvxPostItDialog&, void );
protected:
void ReInit(ScChangeAction *); void ReInit(ScChangeAction *);
void SelectCell(); void SelectCell();

View File

@@ -97,10 +97,8 @@ private:
std::function<void (ScEditWindow&)> m_GetFocusLink; std::function<void (ScEditWindow&)> m_GetFocusLink;
}; };
class SC_DLLPUBLIC ScExtIButton : public ImageButton class SC_DLLPUBLIC ScExtIButton final : public ImageButton
{ {
private:
Idle aIdle; Idle aIdle;
VclPtr<PopupMenu> pPopupMenu; VclPtr<PopupMenu> pPopupMenu;
Link<ScExtIButton&,void> aMLink; Link<ScExtIButton&,void> aMLink;
@@ -109,8 +107,6 @@ private:
DECL_DLLPRIVATE_LINK( TimerHdl, Timer*, void ); DECL_DLLPRIVATE_LINK( TimerHdl, Timer*, void );
protected:
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
virtual void MouseButtonUp( const MouseEvent& rMEvt) override; virtual void MouseButtonUp( const MouseEvent& rMEvt) override;
virtual void Click() override; virtual void Click() override;

View File

@@ -76,10 +76,9 @@ private:
void SelectHdl(const void *); void SelectHdl(const void *);
}; };
class ScTpSubTotalGroup1 : public ScTpSubTotalGroup class ScTpSubTotalGroup1 final : public ScTpSubTotalGroup
{ {
friend class VclPtr<ScTpSubTotalGroup1>; friend class VclPtr<ScTpSubTotalGroup1>;
protected:
ScTpSubTotalGroup1( vcl::Window* pParent, ScTpSubTotalGroup1( vcl::Window* pParent,
const SfxItemSet& rArgSet ); const SfxItemSet& rArgSet );
@@ -92,10 +91,9 @@ public:
virtual void Reset ( const SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override;
}; };
class ScTpSubTotalGroup2 : public ScTpSubTotalGroup class ScTpSubTotalGroup2 final : public ScTpSubTotalGroup
{ {
friend class VclPtr<ScTpSubTotalGroup2>; friend class VclPtr<ScTpSubTotalGroup2>;
protected:
ScTpSubTotalGroup2( vcl::Window* pParent, ScTpSubTotalGroup2( vcl::Window* pParent,
const SfxItemSet& rArgSet ); const SfxItemSet& rArgSet );
@@ -108,10 +106,9 @@ public:
virtual void Reset ( const SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override;
}; };
class ScTpSubTotalGroup3 : public ScTpSubTotalGroup class ScTpSubTotalGroup3 final : public ScTpSubTotalGroup
{ {
friend class VclPtr<ScTpSubTotalGroup3>; friend class VclPtr<ScTpSubTotalGroup3>;
protected:
ScTpSubTotalGroup3( vcl::Window* pParent, ScTpSubTotalGroup3( vcl::Window* pParent,
const SfxItemSet& rArgSet ); const SfxItemSet& rArgSet );
@@ -124,13 +121,8 @@ public:
virtual void Reset ( const SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override;
}; };
class ScTpSubTotalOptions : public SfxTabPage class ScTpSubTotalOptions final : public SfxTabPage
{ {
friend class VclPtr<ScTpSubTotalOptions>;
protected:
ScTpSubTotalOptions( vcl::Window* pParent,
const SfxItemSet& rArgSet );
public: public:
virtual ~ScTpSubTotalOptions() override; virtual ~ScTpSubTotalOptions() override;
virtual void dispose() override; virtual void dispose() override;
@@ -140,6 +132,16 @@ public:
virtual void Reset ( const SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override;
private: private:
friend class VclPtr<ScTpSubTotalOptions>;
ScTpSubTotalOptions( vcl::Window* pParent,
const SfxItemSet& rArgSet );
void Init ();
void FillUserSortListBox ();
// Handler ------------------------
DECL_LINK( CheckHdl, Button*, void );
VclPtr<CheckBox> pBtnPagebreak; VclPtr<CheckBox> pBtnPagebreak;
VclPtr<CheckBox> pBtnCase; VclPtr<CheckBox> pBtnCase;
VclPtr<CheckBox> pBtnSort; VclPtr<CheckBox> pBtnSort;
@@ -149,18 +151,10 @@ private:
VclPtr<CheckBox> pBtnFormats; VclPtr<CheckBox> pBtnFormats;
VclPtr<CheckBox> pBtnUserDef; VclPtr<CheckBox> pBtnUserDef;
VclPtr<ListBox> pLbUserDef; VclPtr<ListBox> pLbUserDef;
ScViewData* pViewData; ScViewData* pViewData;
ScDocument* pDoc; ScDocument* pDoc;
const sal_uInt16 nWhichSubTotals; const sal_uInt16 nWhichSubTotals;
const ScSubTotalParam& rSubTotalData; const ScSubTotalParam& rSubTotalData;
private:
void Init ();
void FillUserSortListBox ();
// Handler ------------------------
DECL_LINK( CheckHdl, Button*, void );
}; };
#endif // INCLUDED_SC_SOURCE_UI_INC_TPSUBT_HXX #endif // INCLUDED_SC_SOURCE_UI_INC_TPSUBT_HXX

View File

@@ -16,9 +16,8 @@
typedef CollTestImplHelper< ov::excel::XFileDialogSelectedItems > FileDialogSelectedItems_BASE; typedef CollTestImplHelper< ov::excel::XFileDialogSelectedItems > FileDialogSelectedItems_BASE;
class ScVbaFileDialogSelectedItems : public FileDialogSelectedItems_BASE class ScVbaFileDialogSelectedItems final : public FileDialogSelectedItems_BASE
{ {
protected:
const std::vector<OUString> m_sItems; const std::vector<OUString> m_sItems;
public: public:
ScVbaFileDialogSelectedItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const std::vector<OUString>& sItems); ScVbaFileDialogSelectedItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const std::vector<OUString>& sItems);

View File

@@ -28,15 +28,15 @@
#include "vbacondition.hxx" #include "vbacondition.hxx"
typedef ScVbaCondition< ov::excel::XFormatCondition > ScVbaFormatCondition_BASE; typedef ScVbaCondition< ov::excel::XFormatCondition > ScVbaFormatCondition_BASE;
class ScVbaFormatCondition : public ScVbaFormatCondition_BASE class ScVbaFormatCondition final : public ScVbaFormatCondition_BASE
{ {
protected:
OUString msStyleName; OUString msStyleName;
css::uno::Reference< css::sheet::XSheetConditionalEntry > mxSheetConditionalEntry; css::uno::Reference< css::sheet::XSheetConditionalEntry > mxSheetConditionalEntry;
css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries; css::uno::Reference< css::sheet::XSheetConditionalEntries > mxSheetConditionalEntries;
css::uno::Reference< ov::excel::XFormatConditions> moFormatConditions; css::uno::Reference< ov::excel::XFormatConditions> moFormatConditions;
css::uno::Reference< ov::excel::XStyle > mxStyle; css::uno::Reference< ov::excel::XStyle > mxStyle;
css::uno::Reference< css::beans::XPropertySet > mxParentRangePropertySet; css::uno::Reference< css::beans::XPropertySet > mxParentRangePropertySet;
public: public:
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
/// @throws css::script::BasicErrorException /// @throws css::script::BasicErrorException

View File

@@ -33,19 +33,18 @@ class ScDocument;
typedef InheritedHelperInterfaceWeakImpl< ov::excel::XInterior > ScVbaInterior_BASE; typedef InheritedHelperInterfaceWeakImpl< ov::excel::XInterior > ScVbaInterior_BASE;
class ScVbaInterior : public ScVbaInterior_BASE class ScVbaInterior final : public ScVbaInterior_BASE
{ {
css::uno::Reference< css::beans::XPropertySet > m_xProps; css::uno::Reference< css::beans::XPropertySet > m_xProps;
ScDocument* m_pScDoc; ScDocument* m_pScDoc;
Color m_aPattColor; Color m_aPattColor;
sal_Int32 m_nPattern; sal_Int32 m_nPattern;
css::uno::Reference< css::container::XIndexAccess > getPalette(); css::uno::Reference< css::container::XIndexAccess > getPalette();
css::uno::Reference< css::container::XNameContainer > GetAttributeContainer(); css::uno::Reference< css::container::XNameContainer > GetAttributeContainer();
static css::uno::Any SetAttributeData( sal_Int32 nValue ); static css::uno::Any SetAttributeData( sal_Int32 nValue );
static sal_Int32 GetAttributeData( css::uno::Any const & aValue ); static sal_Int32 GetAttributeData( css::uno::Any const & aValue );
Color GetBackColor(); Color GetBackColor();
protected:
static Color GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt32 nXclPattern ); static Color GetPatternColor( const Color& rPattColor, const Color& rBackColor, sal_uInt32 nXclPattern );
static Color GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 nTrans ); static Color GetMixedColor( const Color& rFore, const Color& rBack, sal_uInt8 nTrans );
static sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans ); static sal_uInt8 GetMixedColorComp( sal_uInt8 nFore, sal_uInt8 nBack, sal_uInt8 nTrans );
@@ -54,6 +53,7 @@ protected:
css::uno::Any GetUserDefinedAttributes( const OUString& sName ); css::uno::Any GetUserDefinedAttributes( const OUString& sName );
void SetUserDefinedAttributes( const OUString& sName, const css::uno::Any& aValue ); void SetUserDefinedAttributes( const OUString& sName, const css::uno::Any& aValue );
void SetMixedColor(); void SetMixedColor();
public: public:
/// @throws css::lang::IllegalArgumentException /// @throws css::lang::IllegalArgumentException
ScVbaInterior( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, ScVbaInterior( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext,

View File

@@ -30,12 +30,11 @@ class ScDocShell;
typedef CollTestImplHelper< ov::excel::XNames > ScVbaNames_BASE; typedef CollTestImplHelper< ov::excel::XNames > ScVbaNames_BASE;
class ScVbaNames : public ScVbaNames_BASE class ScVbaNames final : public ScVbaNames_BASE
{ {
css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::frame::XModel > mxModel;
css::uno::Reference< css::sheet::XNamedRanges > mxNames; css::uno::Reference< css::sheet::XNamedRanges > mxNames;
protected:
const css::uno::Reference< css::frame::XModel >& getModel() { return mxModel; } const css::uno::Reference< css::frame::XModel >& getModel() { return mxModel; }
public: public:

View File

@@ -27,9 +27,8 @@
typedef InheritedHelperInterfaceWeakImpl< ov::excel::XOLEObject > OLEObjectImpl_BASE; typedef InheritedHelperInterfaceWeakImpl< ov::excel::XOLEObject > OLEObjectImpl_BASE;
class ScVbaOLEObject : public OLEObjectImpl_BASE class ScVbaOLEObject final : public OLEObjectImpl_BASE
{ {
protected:
virtual OUString getServiceImplName() override; virtual OUString getServiceImplName() override;
virtual css::uno::Sequence<OUString> getServiceNames() override; virtual css::uno::Sequence<OUString> getServiceNames() override;
css::uno::Reference< ov::msforms::XControl> m_xControl; css::uno::Reference< ov::msforms::XControl> m_xControl;

View File

@@ -25,7 +25,7 @@
#include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbahelperinterface.hxx>
#include "excelvbahelper.hxx" #include "excelvbahelper.hxx"
class ScVbaPane : public cppu::WeakImplHelper< ov::excel::XPane > class ScVbaPane final : public cppu::WeakImplHelper< ov::excel::XPane >
{ {
public: public:
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
@@ -46,11 +46,9 @@ public:
virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override; virtual void SAL_CALL SmallScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override;
virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override; virtual void SAL_CALL LargeScroll( const css::uno::Any& Down, const css::uno::Any& Up, const css::uno::Any& ToRight, const css::uno::Any& ToLeft ) override;
protected: private:
css::uno::Reference< css::frame::XModel > m_xModel; css::uno::Reference< css::frame::XModel > m_xModel;
css::uno::Reference< css::sheet::XViewPane > m_xViewPane; css::uno::Reference< css::sheet::XViewPane > m_xViewPane;
private:
css::uno::WeakReference< ov::XHelperInterface > m_xParent; css::uno::WeakReference< ov::XHelperInterface > m_xParent;
css::uno::Reference< css::uno::XComponentContext > m_xContext; css::uno::Reference< css::uno::XComponentContext > m_xContext;
}; };

View File

@@ -28,9 +28,8 @@
typedef ScVbaFormat< ov::excel::XStyle > ScVbaStyle_BASE; typedef ScVbaFormat< ov::excel::XStyle > ScVbaStyle_BASE;
class ScVbaStyle : public ScVbaStyle_BASE class ScVbaStyle final : public ScVbaStyle_BASE
{ {
protected:
css::uno::Reference< css::style::XStyle > mxStyle; css::uno::Reference< css::style::XStyle > mxStyle;
css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer; css::uno::Reference< css::container::XNameContainer > mxStyleFamilyNameContainer;
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException

View File

@@ -555,9 +555,8 @@ public:
inline ConvertDataClass Class() const; inline ConvertDataClass Class() const;
}; };
class ConvertDataLinear : public ConvertData class ConvertDataLinear final : public ConvertData
{ {
protected:
double fOffs; double fOffs;
public: public:
inline ConvertDataLinear( inline ConvertDataLinear(