diff options
Diffstat (limited to 'sc/source')
394 files changed, 5211 insertions, 5212 deletions
diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index b50ea9f991d4..a366b0968277 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -33,7 +33,7 @@ public: ScFormulaListener(ScFormulaCell* pCell); virtual ~ScFormulaListener(); - void Notify( const SfxHint& rHint ); + void Notify( const SfxHint& rHint ) SAL_OVERRIDE; bool NeedsRepaint() const; }; diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index e08766e9f63b..f48a961e831a 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -2657,7 +2657,7 @@ public: virtual ~UpdateRefGroupBoundChecker() {} - virtual void processSharedTop( ScFormulaCell** ppCells, size_t /*nRow*/, size_t /*nLength*/ ) + virtual void processSharedTop( ScFormulaCell** ppCells, size_t /*nRow*/, size_t /*nLength*/ ) SAL_OVERRIDE { // Check its tokens and record its reference boundaries. ScFormulaCell& rCell = **ppCells; @@ -2676,12 +2676,12 @@ public: virtual ~FormulaGroupPicker() {} - virtual void processNonShared( ScFormulaCell* pCell, size_t nRow ) + virtual void processNonShared( ScFormulaCell* pCell, size_t nRow ) SAL_OVERRIDE { mrGroups.push_back(FormulaGroup(pCell, nRow)); } - virtual void processSharedTop( ScFormulaCell** ppCells, size_t nRow, size_t nLength ) + virtual void processSharedTop( ScFormulaCell** ppCells, size_t nRow, size_t nLength ) SAL_OVERRIDE { mrGroups.push_back(FormulaGroup(ppCells, nRow, nLength)); } diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index fbfec2850272..a4a83e4af6c1 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -165,12 +165,12 @@ class ScriptTypeAggregator : public sc::ColumnSpanSet::Action public: ScriptTypeAggregator(ScDocument& rDoc) : mrDoc(rDoc), mnScriptType(0) {} - virtual void startColumn(SCTAB nTab, SCCOL nCol) + virtual void startColumn(SCTAB nTab, SCCOL nCol) SAL_OVERRIDE { mrDoc.InitColumnBlockPosition(maBlockPos, nTab, nCol); } - virtual void execute(const ScAddress& rPos, SCROW nLength, bool bVal) + virtual void execute(const ScAddress& rPos, SCROW nLength, bool bVal) SAL_OVERRIDE { if (!bVal) return; diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index cca401505376..9a9ae44a5cc0 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -56,8 +56,8 @@ class ScDPGroupNumFilter : public ScDPFilteredCache::FilterBase public: ScDPGroupNumFilter(const std::vector<ScDPItemData>& rValues, const ScDPNumGroupInfo& rInfo); virtual ~ScDPGroupNumFilter() {} - virtual bool match(const ScDPItemData &rCellData) const; - virtual std::vector<ScDPItemData> getMatchValues() const; + virtual bool match(const ScDPItemData &rCellData) const SAL_OVERRIDE; + virtual std::vector<ScDPItemData> getMatchValues() const SAL_OVERRIDE; private: std::vector<ScDPItemData> maValues; ScDPNumGroupInfo maNumInfo; @@ -115,8 +115,8 @@ public: ScDPGroupDateFilter( const std::vector<ScDPItemData>& rValues, const Date& rNullDate, const ScDPNumGroupInfo& rNumInfo); - virtual bool match(const ScDPItemData & rCellData) const; - virtual std::vector<ScDPItemData> getMatchValues() const; + virtual bool match(const ScDPItemData & rCellData) const SAL_OVERRIDE; + virtual std::vector<ScDPItemData> getMatchValues() const SAL_OVERRIDE; private: ScDPGroupDateFilter(); // disabled diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 66f9af3cc7ef..5efc3a69b4c3 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -125,12 +125,12 @@ public: bool isValid() const; - virtual void getValue(long nCol, ScDPItemData &rData, short& rNumType) const; - virtual OUString getColumnLabel(long nCol) const; - virtual long getColumnCount() const; - virtual bool first(); - virtual bool next(); - virtual void finish(); + virtual void getValue(long nCol, ScDPItemData &rData, short& rNumType) const SAL_OVERRIDE; + virtual OUString getColumnLabel(long nCol) const SAL_OVERRIDE; + virtual long getColumnCount() const SAL_OVERRIDE; + virtual bool first() SAL_OVERRIDE; + virtual bool next() SAL_OVERRIDE; + virtual void finish() SAL_OVERRIDE; }; DBConnector::DBConnector(ScDPCache& rCache, const uno::Reference<sdbc::XRowSet>& xRowSet, const Date& rNullDate) : diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 67a28622388a..e5ee60f083a4 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -491,7 +491,7 @@ struct CaseInsensitiveNamePredicate : svl::StyleSheetPredicate } bool - Check(const SfxStyleSheetBase& rStyleSheet) + Check(const SfxStyleSheetBase& rStyleSheet) SAL_OVERRIDE { if (rStyleSheet.GetFamily() == mFamily) { diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index cb59dc4c9473..523e8f485ce9 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -129,7 +129,7 @@ struct SetRowHeightOnlyFunc : public OptimalHeightsFuncObjBase mpTab(pTab) {} - virtual bool operator() (SCROW nStartRow, SCROW nEndRow, sal_uInt16 nHeight) + virtual bool operator() (SCROW nStartRow, SCROW nEndRow, sal_uInt16 nHeight) SAL_OVERRIDE { mpTab->SetRowHeightOnly(nStartRow, nEndRow, nHeight); return false; @@ -148,7 +148,7 @@ struct SetRowHeightRangeFunc : public OptimalHeightsFuncObjBase mnPPTY(nPPTY) {} - virtual bool operator() (SCROW nStartRow, SCROW nEndRow, sal_uInt16 nHeight) + virtual bool operator() (SCROW nStartRow, SCROW nEndRow, sal_uInt16 nHeight) SAL_OVERRIDE { return mpTab->SetRowHeightRange(nStartRow, nEndRow, nHeight, mnPPTX, mnPPTY); } diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx index b9e0b154c545..0faee12d5db7 100644 --- a/sc/source/core/inc/addinlis.hxx +++ b/sc/source/core/inc/addinlis.hxx @@ -68,21 +68,21 @@ public: // XResultListener virtual void SAL_CALL modified( const ::com::sun::star::sheet::ResultEvent& aEvent ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // SC_ADDINLIS_HXX diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx index ea11846f5c22..cb0bd0369901 100644 --- a/sc/source/core/inc/ddelink.hxx +++ b/sc/source/core/inc/ddelink.hxx @@ -60,10 +60,10 @@ public: // overloaded by SvBaseLink: virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( - const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ); + const OUString& rMimeType, const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; // overloaded by SvtBroadcaster: - virtual void ListenersGone(); + virtual void ListenersGone() SAL_OVERRIDE; // for interpreter: diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 8d75bf3e0472..094da69e42b0 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -98,9 +98,9 @@ public: const ScRange& getRange() const; - virtual SCCOL getColSize() const; - virtual SCROW getRowSize() const; - virtual SCSIZE getVisibleDataCellCount() const; + virtual SCCOL getColSize() const SAL_OVERRIDE; + virtual SCROW getRowSize() const SAL_OVERRIDE; + virtual SCSIZE getVisibleDataCellCount() const SAL_OVERRIDE; /** * Get a string value of a specified cell position. Note that the @@ -110,9 +110,9 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual OUString getString(SCCOL nCol, SCROW nRow) const; + virtual OUString getString(SCCOL nCol, SCROW nRow) const SAL_OVERRIDE; - virtual SCCOL getFirstFieldColumn() const; + virtual SCCOL getFirstFieldColumn() const SAL_OVERRIDE; /** * Get a <i>0-based</i> column index that corresponds with the passed field * index. Note that the field index passed as the 1st parameter is @@ -122,10 +122,10 @@ public: * * @return 0-based column index */ - virtual SCCOL findFieldColumn(SCCOL nIndex) const; - virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const; - virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const; - virtual bool isRangeEqual(const ScRange& rRange) const; + virtual SCCOL findFieldColumn(SCCOL nIndex) const SAL_OVERRIDE; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const SAL_OVERRIDE; + virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const SAL_OVERRIDE; + virtual bool isRangeEqual(const ScRange& rRange) const SAL_OVERRIDE; private: ScRange maRange; @@ -139,9 +139,9 @@ public: explicit ScDBExternalRange(ScDocument* pDoc, const ScMatrixRef& pMat); virtual ~ScDBExternalRange(); - virtual SCCOL getColSize() const; - virtual SCROW getRowSize() const; - virtual SCSIZE getVisibleDataCellCount() const; + virtual SCCOL getColSize() const SAL_OVERRIDE; + virtual SCROW getRowSize() const SAL_OVERRIDE; + virtual SCSIZE getVisibleDataCellCount() const SAL_OVERRIDE; /** * Get a string value of a specified cell position. Note that the @@ -151,9 +151,9 @@ public: * @param nCol column position (0 to column size-1) * @param nRow row position (0 to row size-1) */ - virtual OUString getString(SCCOL nCol, SCROW nRow) const; + virtual OUString getString(SCCOL nCol, SCROW nRow) const SAL_OVERRIDE; - virtual SCCOL getFirstFieldColumn() const; + virtual SCCOL getFirstFieldColumn() const SAL_OVERRIDE; /** * Get a <i>0-based</i> column index that corresponds with the passed field @@ -164,10 +164,10 @@ public: * * @return 0-based column index */ - virtual SCCOL findFieldColumn(SCCOL nIndex) const; - virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const; - virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const; - virtual bool isRangeEqual(const ScRange& rRange) const; + virtual SCCOL findFieldColumn(SCCOL nIndex) const SAL_OVERRIDE; + virtual SCCOL findFieldColumn(const OUString& rStr, sal_uInt16* pErr = NULL) const SAL_OVERRIDE; + virtual ScDBQueryParamBase* createQueryParam(const ScDBRangeBase* pQueryRef) const SAL_OVERRIDE; + virtual bool isRangeEqual(const ScRange& rRange) const SAL_OVERRIDE; private: const ScMatrixRef mpMatrix; diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 8b8a8e541920..10b15a9cbc4f 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -138,19 +138,19 @@ public: FormulaTreeNodeRef ft): DynamicKernelArgument(s, ft) {} /// Generate declaration - virtual void GenDecl(std::stringstream &ss) const + virtual void GenDecl(std::stringstream &ss) const SAL_OVERRIDE { ss << "unsigned " << mSymName; } - virtual void GenDeclRef(std::stringstream &ss) const + virtual void GenDeclRef(std::stringstream &ss) const SAL_OVERRIDE { ss << GenSlidingWindowDeclRef(false); } - virtual void GenSlidingWindowDecl(std::stringstream &ss) const + virtual void GenSlidingWindowDecl(std::stringstream &ss) const SAL_OVERRIDE { GenDecl(ss); } - virtual std::string GenSlidingWindowDeclRef(bool=false) const + virtual std::string GenSlidingWindowDeclRef(bool=false) const SAL_OVERRIDE { std::stringstream ss; if (GetFormulaToken()->GetType() != formula::svString) @@ -159,12 +159,12 @@ public: ss << Tok->GetString().getString().toAsciiUpperCase().hashCode() << "U"; return ss.str(); } - virtual size_t GetWindowSize(void) const + virtual size_t GetWindowSize(void) const SAL_OVERRIDE { return 1; } /// Pass the 32-bit hash of the string to the kernel - virtual size_t Marshal(cl_kernel k, int argno, int, cl_program) + virtual size_t Marshal(cl_kernel k, int argno, int, cl_program) SAL_OVERRIDE { FormulaToken *ref = mFormulaTree->GetFormulaToken(); cl_uint hashCode = 0; @@ -195,25 +195,25 @@ public: FormulaTreeNodeRef ft): DynamicKernelArgument(s, ft) {} /// Generate declaration - virtual void GenDecl(std::stringstream &ss) const + virtual void GenDecl(std::stringstream &ss) const SAL_OVERRIDE { ss << "double " << mSymName; } - virtual void GenDeclRef(std::stringstream &ss) const + virtual void GenDeclRef(std::stringstream &ss) const SAL_OVERRIDE { ss << mSymName; } - virtual void GenSlidingWindowDecl(std::stringstream &ss) const + virtual void GenSlidingWindowDecl(std::stringstream &ss) const SAL_OVERRIDE { GenDecl(ss); } - virtual std::string GenSlidingWindowDeclRef(bool=false) const + virtual std::string GenSlidingWindowDeclRef(bool=false) const SAL_OVERRIDE { if (GetFormulaToken()->GetType() != formula::svDouble) throw Unhandled(); return mSymName; } - virtual size_t GetWindowSize(void) const + virtual size_t GetWindowSize(void) const SAL_OVERRIDE { return 1; } @@ -225,7 +225,7 @@ public: return Tok->GetDouble(); } /// Create buffer and pass the buffer to a given kernel - virtual size_t Marshal(cl_kernel k, int argno, int, cl_program) + virtual size_t Marshal(cl_kernel k, int argno, int, cl_program) SAL_OVERRIDE { double tmp = GetDouble(); // Pass the scalar result back to the rest of the formula kernel @@ -244,28 +244,28 @@ public: FormulaTreeNodeRef ft): DynamicKernelArgument(s, ft) {} /// Generate declaration - virtual void GenDecl(std::stringstream &ss) const + virtual void GenDecl(std::stringstream &ss) const SAL_OVERRIDE { ss << "double " << mSymName; } - virtual void GenDeclRef(std::stringstream &ss) const + virtual void GenDeclRef(std::stringstream &ss) const SAL_OVERRIDE { ss << "3.14159265358979"; } - virtual void GenSlidingWindowDecl(std::stringstream &ss) const + virtual void GenSlidingWindowDecl(std::stringstream &ss) const SAL_OVERRIDE { GenDecl(ss); } - virtual std::string GenSlidingWindowDeclRef(bool=false) const + virtual std::string GenSlidingWindowDeclRef(bool=false) const SAL_OVERRIDE { return mSymName; } - virtual size_t GetWindowSize(void) const + virtual size_t GetWindowSize(void) const SAL_OVERRIDE { return 1; } /// Create buffer and pass the buffer to a given kernel - virtual size_t Marshal(cl_kernel k, int argno, int, cl_program) + virtual size_t Marshal(cl_kernel k, int argno, int, cl_program) SAL_OVERRIDE { double tmp = 0.0; // Pass the scalar result back to the rest of the formula kernel @@ -283,23 +283,23 @@ public: FormulaTreeNodeRef ft): DynamicKernelArgument(s, ft) {} /// Generate declaration - virtual void GenDecl(std::stringstream &ss) const + virtual void GenDecl(std::stringstream &ss) const SAL_OVERRIDE { ss << "double " << mSymName; } - virtual void GenDeclRef(std::stringstream &ss) const + virtual void GenDeclRef(std::stringstream &ss) const SAL_OVERRIDE { ss << mSymName; } - virtual void GenSlidingWindowDecl(std::stringstream &ss) const + virtual void GenSlidingWindowDecl(std::stringstream &ss) const SAL_OVERRIDE { GenDecl(ss); } - virtual std::string GenSlidingWindowDeclRef(bool=false) const + virtual std::string GenSlidingWindowDeclRef(bool=false) const SAL_OVERRIDE { return mSymName + "_Random()"; } - void GenSlidingWindowFunction(std::stringstream &ss) + void GenSlidingWindowFunction(std::stringstream &ss) SAL_OVERRIDE { ss << "\ndouble " << mSymName; ss << "_Random ()\n{\n"; @@ -319,12 +319,12 @@ public: ss << " return tmp;\n"; ss << "}"; } - virtual size_t GetWindowSize(void) const + virtual size_t GetWindowSize(void) const SAL_OVERRIDE { return 1; } /// Create buffer and pass the buffer to a given kernel - virtual size_t Marshal(cl_kernel k, int argno, int, cl_program) + virtual size_t Marshal(cl_kernel k, int argno, int, cl_program) SAL_OVERRIDE { double tmp = 0.0; // Pass the scalar result back to the rest of the formula kernel @@ -343,17 +343,17 @@ public: FormulaTreeNodeRef ft, int index = 0): VectorRef(s, ft, index) {} - virtual void GenSlidingWindowFunction(std::stringstream &) {} + virtual void GenSlidingWindowFunction(std::stringstream &) SAL_OVERRIDE {} /// Generate declaration - virtual void GenDecl(std::stringstream &ss) const + virtual void GenDecl(std::stringstream &ss) const SAL_OVERRIDE { ss << "__global unsigned int *"<<mSymName; } - virtual void GenSlidingWindowDecl(std::stringstream& ss) const + virtual void GenSlidingWindowDecl(std::stringstream& ss) const SAL_OVERRIDE { DynamicKernelStringArgument::GenDecl(ss); } - virtual size_t Marshal(cl_kernel, int, int, cl_program); + virtual size_t Marshal(cl_kernel, int, int, cl_program) SAL_OVERRIDE; }; /// Marshal a string vector reference @@ -419,27 +419,27 @@ public: DynamicKernelMixedArgument(const std::string &s, FormulaTreeNodeRef ft): VectorRef(s, ft), mStringArgument(s+"s", ft) {} - virtual void GenSlidingWindowDecl(std::stringstream& ss) const + virtual void GenSlidingWindowDecl(std::stringstream& ss) const SAL_OVERRIDE { VectorRef::GenSlidingWindowDecl(ss); ss << ", "; mStringArgument.GenSlidingWindowDecl(ss); } - virtual void GenSlidingWindowFunction(std::stringstream &) {} + virtual void GenSlidingWindowFunction(std::stringstream &) SAL_OVERRIDE {} /// Generate declaration - virtual void GenDecl(std::stringstream &ss) const + virtual void GenDecl(std::stringstream &ss) const SAL_OVERRIDE { VectorRef::GenDecl(ss); ss << ", "; mStringArgument.GenDecl(ss); } - virtual void GenDeclRef(std::stringstream &ss) const + virtual void GenDeclRef(std::stringstream &ss) const SAL_OVERRIDE { VectorRef::GenDeclRef(ss); ss << ","; mStringArgument.GenDeclRef(ss); } - virtual std::string GenSlidingWindowDeclRef(bool) const + virtual std::string GenSlidingWindowDeclRef(bool) const SAL_OVERRIDE { std::stringstream ss; ss << "(!isNan(" << VectorRef::GenSlidingWindowDeclRef(); @@ -448,19 +448,19 @@ public: ss << ")"; return ss.str(); } - virtual std::string GenDoubleSlidingWindowDeclRef(bool=false) const + virtual std::string GenDoubleSlidingWindowDeclRef(bool=false) const SAL_OVERRIDE { std::stringstream ss; ss << VectorRef::GenSlidingWindowDeclRef(); return ss.str(); } - virtual std::string GenStringSlidingWindowDeclRef(bool=false) const + virtual std::string GenStringSlidingWindowDeclRef(bool=false) const SAL_OVERRIDE { std::stringstream ss; ss << mStringArgument.GenSlidingWindowDeclRef(); return ss.str(); } - virtual size_t Marshal(cl_kernel k, int argno, int vw, cl_program p) + virtual size_t Marshal(cl_kernel k, int argno, int vw, cl_program p) SAL_OVERRIDE { int i = VectorRef::Marshal(k, argno, vw, p); i += mStringArgument.Marshal(k, argno+i, vw, p); @@ -705,27 +705,27 @@ public: VectorRef(s, ft), mDoubleArgument(s, ft, CodeGen, index), mStringArgument(s+"s", ft, CodeGen, index) {} - virtual void GenSlidingWindowDecl(std::stringstream& ss) const + virtual void GenSlidingWindowDecl(std::stringstream& ss) const SAL_OVERRIDE { mDoubleArgument.GenSlidingWindowDecl(ss); ss << ", "; mStringArgument.GenSlidingWindowDecl(ss); } - virtual void GenSlidingWindowFunction(std::stringstream &) {} + virtual void GenSlidingWindowFunction(std::stringstream &) SAL_OVERRIDE {} /// Generate declaration - virtual void GenDecl(std::stringstream &ss) const + virtual void GenDecl(std::stringstream &ss) const SAL_OVERRIDE { mDoubleArgument.GenDecl(ss); ss << ", "; mStringArgument.GenDecl(ss); } - virtual void GenDeclRef(std::stringstream &ss) const + virtual void GenDeclRef(std::stringstream &ss) const SAL_OVERRIDE { mDoubleArgument.GenDeclRef(ss); ss << ","; mStringArgument.GenDeclRef(ss); } - virtual std::string GenSlidingWindowDeclRef(bool) const + virtual std::string GenSlidingWindowDeclRef(bool) const SAL_OVERRIDE { std::stringstream ss; ss << "(!isNan(" << mDoubleArgument.GenSlidingWindowDeclRef(); @@ -734,19 +734,19 @@ public: ss << ")"; return ss.str(); } - virtual std::string GenDoubleSlidingWindowDeclRef(bool=false) const + virtual std::string GenDoubleSlidingWindowDeclRef(bool=false) const SAL_OVERRIDE { std::stringstream ss; ss << mDoubleArgument.GenSlidingWindowDeclRef(); return ss.str(); } - virtual std::string GenStringSlidingWindowDeclRef(bool=false) const + virtual std::string GenStringSlidingWindowDeclRef(bool=false) const SAL_OVERRIDE { std::stringstream ss; ss << mStringArgument.GenSlidingWindowDeclRef(); return ss.str(); } - virtual size_t Marshal(cl_kernel k, int argno, int vw, cl_program p) + virtual size_t Marshal(cl_kernel k, int argno, int vw, cl_program p) SAL_OVERRIDE { int i = mDoubleArgument.Marshal(k, argno, vw, p); i += mStringArgument.Marshal(k, argno + i, vw, p); @@ -1201,7 +1201,7 @@ public: typedef ParallelReductionVectorRef<VectorRef> ParallelNumericRange; virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE { ss << "\ndouble " << sSymName; ss << "_"<< BinFuncName() <<"("; @@ -1312,8 +1312,8 @@ public: ss << ";\n}"; } virtual bool isAverage() const { return false; } - virtual bool takeString() const { return false; } - virtual bool takeNumeric() const { return true; } + virtual bool takeString() const SAL_OVERRIDE { return false; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; // Strictly binary operators @@ -1321,7 +1321,7 @@ class Binary: public SlidingFunctionBase { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE { ss << "\ndouble " << sSymName; ss << "_"<< BinFuncName() <<"("; @@ -1339,15 +1339,15 @@ public: vSubArguments[1]->GenSlidingWindowDeclRef(false)) << ";\n\t"; ss << "return tmp;\n}"; } - virtual bool takeString() const { return true; } - virtual bool takeNumeric() const { return true; } + virtual bool takeString() const SAL_OVERRIDE { return true; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class SumOfProduct: public SlidingFunctionBase { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments) + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE { size_t nCurWindowSize = 0; FormulaToken *tmpCur = NULL; @@ -1595,152 +1595,152 @@ public: #endif } - virtual bool takeString() const { return false; } - virtual bool takeNumeric() const { return true; } + virtual bool takeString() const SAL_OVERRIDE { return false; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; /// operator traits class OpNop: public Reduction { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string Gen2(const std::string &lhs, const std::string &) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string Gen2(const std::string &lhs, const std::string &) const SAL_OVERRIDE { return lhs; } - virtual std::string BinFuncName(void) const { return "nop"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "nop"; } }; class OpCount: public Reduction { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { std::stringstream ss; ss << "(isNan(" << lhs << ")?"<<rhs<<":"<<rhs<<"+1.0)"; return ss.str(); } - virtual std::string BinFuncName(void) const { return "fcount"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fcount"; } }; class OpEqual: public Binary { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { std::stringstream ss; ss << "strequal("<< lhs << "," << rhs <<")"; return ss.str(); } - virtual std::string BinFuncName(void) const { return "eq"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "eq"; } }; class OpLessEqual: public Binary { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { std::stringstream ss; ss << "("<< lhs << "<=" << rhs <<")"; return ss.str(); } - virtual std::string BinFuncName(void) const { return "leq"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "leq"; } }; class OpGreater: public Binary { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { std::stringstream ss; ss << "("<< lhs << ">" << rhs <<")"; return ss.str(); } - virtual std::string BinFuncName(void) const { return "gt"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "gt"; } }; class OpSum: public Reduction { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { std::stringstream ss; ss << "((" << lhs <<")+("<< rhs<<"))"; return ss.str(); } - virtual std::string BinFuncName(void) const { return "fsum"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fsum"; } }; class OpAverage: public Reduction { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { std::stringstream ss; ss << "fsum_count(" << lhs <<","<< rhs<<", &nCount)"; return ss.str(); } - virtual std::string BinFuncName(void) const { return "fsum"; } - virtual bool isAverage() const { return true; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fsum"; } + virtual bool isAverage() const SAL_OVERRIDE { return true; } }; class OpSub: public Reduction { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { return lhs + "-" + rhs; } - virtual std::string BinFuncName(void) const { return "fsub"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fsub"; } }; class OpMul: public Reduction { public: - virtual std::string GetBottom(void) { return "1"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "1"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { return lhs + "*" + rhs; } - virtual std::string BinFuncName(void) const { return "fmul"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fmul"; } }; /// Technically not a reduction, but fits the framework. class OpDiv: public Reduction { public: - virtual std::string GetBottom(void) { return "1.0"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "1.0"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { return "(" + lhs + "/" + rhs + ")"; } - virtual std::string BinFuncName(void) const { return "fdiv"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fdiv"; } }; class OpMin: public Reduction { public: - virtual std::string GetBottom(void) { return "MAXFLOAT"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "MAXFLOAT"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { return "mcw_fmin("+lhs + "," + rhs +")"; } - virtual std::string BinFuncName(void) const { return "min"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "min"; } }; class OpMax: public Reduction { public: - virtual std::string GetBottom(void) { return "-MAXFLOAT"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "-MAXFLOAT"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { return "mcw_fmax("+lhs + "," + rhs +")"; } - virtual std::string BinFuncName(void) const { return "max"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "max"; } }; class OpSumProduct: public SumOfProduct { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string Gen2(const std::string &lhs, const std::string &rhs) const SAL_OVERRIDE { return lhs + "*" + rhs; } - virtual std::string BinFuncName(void) const { return "fsop"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fsop"; } }; namespace { struct SumIfsArgs { @@ -1761,7 +1761,7 @@ public: const std::string &s, const FormulaTreeNodeRef& ft, SlidingFunctionBase* pCodeGen); /// Create buffer and pass the buffer to a given kernel - virtual size_t Marshal(cl_kernel k, int argno, int nVectorWidth, cl_program pProgram) + virtual size_t Marshal(cl_kernel k, int argno, int nVectorWidth, cl_program pProgram) SAL_OVERRIDE { unsigned i = 0; for (SubArgumentsType::iterator it = mvSubArguments.begin(), e= mvSubArguments.end(); it!=e; @@ -1905,12 +1905,12 @@ public: return i; } - virtual void GenSlidingWindowFunction(std::stringstream &ss) { + virtual void GenSlidingWindowFunction(std::stringstream &ss) SAL_OVERRIDE { for (unsigned i = 0; i < mvSubArguments.size(); i++) mvSubArguments[i]->GenSlidingWindowFunction(ss); mpCodeGen->GenSlidingWindowFunction(ss, mSymName, mvSubArguments); } - virtual void GenDeclRef(std::stringstream &ss) const + virtual void GenDeclRef(std::stringstream &ss) const SAL_OVERRIDE { for (unsigned i = 0; i < mvSubArguments.size(); i++) { @@ -1919,7 +1919,7 @@ public: mvSubArguments[i]->GenDeclRef(ss); } } - virtual void GenDecl(std::stringstream &ss) const + virtual void GenDecl(std::stringstream &ss) const SAL_OVERRIDE { for (SubArgumentsType::const_iterator it = mvSubArguments.begin(), e= mvSubArguments.end(); it!=e; ++it) { @@ -1929,7 +1929,7 @@ public: } } - virtual size_t GetWindowSize(void) const + virtual size_t GetWindowSize(void) const SAL_OVERRIDE { size_t nCurWindowSize = 0; for (unsigned i = 0; i < mvSubArguments.size(); i++) @@ -1942,7 +1942,7 @@ public: } /// When declared as input to a sliding window function - virtual void GenSlidingWindowDecl(std::stringstream &ss) const + virtual void GenSlidingWindowDecl(std::stringstream &ss) const SAL_OVERRIDE { for (SubArgumentsType::const_iterator it = mvSubArguments.begin(), e= mvSubArguments.end(); it!=e; ++it) @@ -1954,7 +1954,7 @@ public: } /// Generate either a function call to each children /// or direclty inline it if we are already inside a loop - virtual std::string GenSlidingWindowDeclRef(bool nested=false) const + virtual std::string GenSlidingWindowDeclRef(bool nested=false) const SAL_OVERRIDE { std::stringstream ss; if (!nested) @@ -1975,7 +1975,7 @@ public: } return ss.str(); } - virtual std::string DumpOpName(void) const + virtual std::string DumpOpName(void) const SAL_OVERRIDE { std::string t = "_" + mpCodeGen->BinFuncName(); for (unsigned i = 0; i < mvSubArguments.size(); i++) @@ -1983,7 +1983,7 @@ public: return t; } virtual void DumpInlineFun(std::set<std::string>& decls, - std::set<std::string>& funs) const + std::set<std::string>& funs) const SAL_OVERRIDE { mpCodeGen->BinInlineFun(decls,funs); for (unsigned i = 0; i < mvSubArguments.size(); i++) diff --git a/sc/source/core/opencl/op_addin.hxx b/sc/source/core/opencl/op_addin.hxx index 69936605b768..6ed46a9c78ec 100644 --- a/sc/source/core/opencl/op_addin.hxx +++ b/sc/source/core/opencl/op_addin.hxx @@ -18,8 +18,8 @@ class OpBesselj: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Besselj"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Besselj"; } }; }} diff --git a/sc/source/core/opencl/op_array.hxx b/sc/source/core/opencl/op_array.hxx index 5e74ebbed592..57fa7e6cbef5 100644 --- a/sc/source/core/opencl/op_array.hxx +++ b/sc/source/core/opencl/op_array.hxx @@ -18,24 +18,24 @@ class OpSumX2MY2: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "SumX2MY2"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumX2MY2"; } }; class OpSumX2PY2: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "SumX2PY2"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumX2PY2"; } }; class OpSumXMY2: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "SumXMY2"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumXMY2"; } }; }} diff --git a/sc/source/core/opencl/op_database.hxx b/sc/source/core/opencl/op_database.hxx index 27852c8c2d1d..cf9706212514 100644 --- a/sc/source/core/opencl/op_database.hxx +++ b/sc/source/core/opencl/op_database.hxx @@ -19,88 +19,88 @@ class OpDmax: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Dmax"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dmax"; } }; class OpDmin: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Dmin"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dmin"; } }; class OpDproduct: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Dproduct"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dproduct"; } }; class OpDaverage: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Daverage"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Daverage"; } }; class OpDstdev: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Dstdev"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dstdev"; } }; class OpDstdevp: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Dstdevp"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dstdevp"; } }; class OpDsum: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Dsum"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dsum"; } }; class OpDvar: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Dvar"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dvar"; } }; class OpDvarp: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Dvarp"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dvarp"; } }; class OpDcount: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Dcount"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dcount"; } }; class OpDcount2: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Dcount2"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dcount2"; } }; diff --git a/sc/source/core/opencl/op_financial.hxx b/sc/source/core/opencl/op_financial.hxx index 2ddfa051f453..fae06a6553a1 100644 --- a/sc/source/core/opencl/op_financial.hxx +++ b/sc/source/core/opencl/op_financial.hxx @@ -18,232 +18,232 @@ class RRI: public SlidingFunctionBase { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual bool takeString() const { return false; } - virtual bool takeNumeric() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual bool takeString() const SAL_OVERRIDE { return false; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class OpRRI:public RRI { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string BinFuncName(void) const { return "RRI"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RRI"; } }; class OpNominal: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "NOMINAL_ADD"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NOMINAL_ADD"; } }; class OpDollarde:public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Dollarde"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dollarde"; } }; class OpDollarfr:public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Dollarfr"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dollarfr"; } }; class OpDISC: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "DISC"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DISC"; } }; class OpINTRATE: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "INTRATE"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "INTRATE"; } }; class OpFV: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ); + std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FV"; } }; class OpIPMT: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ); + std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IPMT"; } }; class OpISPMT: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "ISPMT"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ISPMT"; } }; class OpDuration: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Duration"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Duration"; } }; class OpDuration_ADD: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ); + std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Duration_ADD"; } }; class OpMDuration: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ); + std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const {return "MDuration"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE {return "MDuration"; } }; class Fvschedule: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; }; class Cumipmt: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class IRR: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; }; class OpIRR: public IRR { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string BinFuncName(void) const { return "IRR"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IRR"; } }; class XNPV: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; }; class PriceMat: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpSYD: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "SYD"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SYD"; } }; class MIRR: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; }; class OpEffective:public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Effect_Add"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Effect_Add"; } }; class OpCumipmt: public Cumipmt { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string BinFuncName(void) const { return "Cumipmt"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cumipmt"; } }; class OpXNPV: public XNPV { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string BinFuncName(void) const { return "XNPV"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "XNPV"; } }; @@ -251,47 +251,47 @@ class OpTbilleq: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "fTbilleq"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbilleq"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpCumprinc: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "cumprinc"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "cumprinc"; } }; class OpAccrintm: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Accrintm"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Accrintm"; } }; class OpAccrint: public Normal { public: - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Accrint"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Accrint"; } }; class OpYield: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Yield"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yield"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -299,123 +299,123 @@ class OpSLN: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "SLN"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SLN"; } }; class OpFvschedule: public Fvschedule { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string BinFuncName(void) const { return "Fvschedule"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fvschedule"; } }; class OpYieldmat: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Yieldmat"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yieldmat"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpPMT: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "PMT"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PMT"; } }; class OpNPV: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "NPV"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NPV"; } }; class OpPrice: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "Price"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Price"; } }; class OpNper: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "NPER"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NPER"; } }; class OpOddlprice: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>&, - std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "Oddlprice"; } + std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Oddlprice"; } }; class OpOddlyield: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "Oddlyield"; } + std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Oddlyield"; } }; class OpPriceDisc: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>&, - std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "PriceDisc"; } + std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PriceDisc"; } }; class OpPPMT: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "PPMT"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PPMT"; } }; class OpCoupdaybs:public Normal { public: - virtual std::string GetBottom(void) { return "0";} + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "Coupdaybs"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupdaybs"; } }; class OpCoupdays:public Normal { public: - virtual std::string GetBottom(void) { return "0";} + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "Coupdays";} + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupdays";} }; class OpCoupdaysnc:public Normal { public: - virtual std::string GetBottom(void) { return "0";} + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "Coupdaysnc"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupdaysnc"; } }; @@ -423,9 +423,9 @@ class OpCouppcd:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "Couppcd"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Couppcd"; } }; @@ -433,147 +433,147 @@ class OpCoupncd:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "Coupncd"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupncd"; } }; class OpCoupnum:public Normal { public: - virtual std::string GetBottom(void) { return "0";} + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "Coupnum"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coupnum"; } }; class OpDDB:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "DDB"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DDB"; } }; class OpDB:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "DB"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DB"; } }; class OpAmordegrc:public Normal { public: - virtual std::string GetBottom(void) { return "0";} + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "Amordegrc"; } + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Amordegrc"; } }; class OpAmorlinc:public Normal { public: - virtual std::string GetBottom(void) { return "0";} + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "Amorlinc"; } + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Amorlinc"; } }; class OpReceived:public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Received"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Received"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpYielddisc: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Yielddisc"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yielddisc"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpTbillprice: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "fTbillprice"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbillprice"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpPriceMat:public PriceMat { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string BinFuncName(void) const { return "PriceMat"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PriceMat"; } }; class RATE: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpIntrate: public RATE { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string BinFuncName(void) const { return "rate"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "rate"; } }; class OpTbillyield: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "fTbillyield"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbillyield"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpMIRR: public MIRR { public: - virtual std::string GetBottom(void) { return "0"; } - virtual std::string BinFuncName(void) const { return "MIRR"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MIRR"; } }; class OpPV: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "PV"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PV"; } }; class OpVDB: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "VDB"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VDB"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpXirr: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Xirr"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Xirr"; } }; }} diff --git a/sc/source/core/opencl/op_logical.hxx b/sc/source/core/opencl/op_logical.hxx index b121723c030c..ff548e13bfb0 100644 --- a/sc/source/core/opencl/op_logical.hxx +++ b/sc/source/core/opencl/op_logical.hxx @@ -19,30 +19,30 @@ class OpAnd: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "And"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "And"; } }; class OpOr: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Or"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Or"; } }; class OpNot: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Not"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Not"; } }; class OpXor: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Xor"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Xor"; } }; }} diff --git a/sc/source/core/opencl/op_math.hxx b/sc/source/core/opencl/op_math.hxx index a8d3d7f892c9..51a0379eed18 100644 --- a/sc/source/core/opencl/op_math.hxx +++ b/sc/source/core/opencl/op_math.hxx @@ -18,33 +18,33 @@ class OpCos: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Cos"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cos"; } }; class OpSec: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Sec"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sec"; } }; class OpSecH: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "SecH"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SecH"; } }; class OpMROUND: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "MROUND"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MROUND"; } }; @@ -52,16 +52,16 @@ class OpCsc: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Csc"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Csc"; } }; class OpSumIfs: public CheckVariables { public: OpSumIfs(void): CheckVariables(), mNeedReductionKernel(false) {} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "SumIfs"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumIfs"; } bool NeedReductionKernel(void) const { return mNeedReductionKernel; } protected: bool mNeedReductionKernel; @@ -70,429 +70,429 @@ class OpCosh: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "Cosh"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cosh"; } }; class OpSinh: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Sinh"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sinh"; } }; class OpSin: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Sin"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sin"; } }; class OpAbs:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScAbs"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScAbs"; } }; class OpArcCos:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScACos"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACos"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpArcCosHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "1.0"; } - virtual std::string BinFuncName(void) const { return "ScACosH"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "1.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACosH"; } }; class OpTan: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Tan"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Tan"; } }; class OpTanH: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "TanH"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TanH"; } }; class OpSqrt: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Sqrt"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sqrt"; } }; class OpArcCot:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScACot"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACot"; } }; class OpArcCotHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "2.0"; } - virtual std::string BinFuncName(void) const { return "ScACotH"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "2.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACotH"; } }; class OpArcSin:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScASin"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScASin"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpArcSinHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScASinH"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScASinH"; } }; class OpTrunc: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Trunc"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Trunc"; } }; class OpArcTan2:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScATan2"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATan2"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpArcTan:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScATan"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATan"; } }; class OpArcTanH:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScATanH"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATanH"; } }; class OpBitAnd:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScBitAnd"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitAnd"; } }; class OpBitOr:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScBitOr"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitOr"; } }; class OpBitXor:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScBitXor"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitXor"; } }; class OpBitLshift:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScBitLshift"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitLshift"; } }; class OpBitRshift:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScBitRshift"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScBitRshift"; } }; class OpLn: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Ln"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Ln"; } }; class OpRound: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Round"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Round"; } }; class OpRoundUp: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "RoundUp"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RoundUp"; } }; class OpRoundDown: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "RoundDown"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RoundDown"; } }; class OpInt: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Int"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Int"; } }; class OpRadians: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Radians"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Radians"; } }; class OpIsEven: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "IsEven"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IsEven"; } }; class OpIsOdd: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "IsOdd"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IsOdd"; } }; class OpCot: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Cot"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cot"; } }; class OpSumSQ: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "SumSQ"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumSQ"; } }; class OpCoth: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "Coth"; } + std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Coth"; } }; class OpPower: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Power"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Power"; } }; class OpOdd: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Odd"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Odd"; } }; class OpFloor: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Floor"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Floor"; } }; class OpCscH: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "CscH"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CscH"; } }; class OpCeil:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScCeil"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScCeil"; } }; class OpExp: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Exp"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Exp"; } }; class OpLog10: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Log10"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log10"; } }; class OpConvert: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Convert"; } - virtual bool takeString() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Convert"; } + virtual bool takeString() const SAL_OVERRIDE { return true; } }; class OpEven: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Even"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Even"; } }; class OpAverageIfs: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "AverageIfs"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AverageIfs"; } }; class OpCountIfs: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "CountIfs"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CountIfs"; } }; class OpMod: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Mod"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Mod"; } }; class OpProduct: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Product"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Product"; } }; class OpSqrtPi: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "SqrtPi"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SqrtPi"; } }; class OpCombina: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Combina"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Combina"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpLog: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Log"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log"; } }; class OpKombin: public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "ScKombin"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScKombin"; } }; class OpAverageIf: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "AverageIf"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AverageIf"; } }; class OpDeg: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Degrees"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Degrees"; } }; class OpCountIf: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Countif"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Countif"; } }; class OpFact: public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); - virtual std::string GetBottom(void) { return "0.0"; } - virtual std::string BinFuncName(void) const { return "Fact"; } + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fact"; } }; class OpSeriesSum: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "SeriesSum"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SeriesSum"; } }; class OpSumIf: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "SumIf"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumIf"; } }; class OpQuotient: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Quotient"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Quotient"; } }; class OpNegSub: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "NegSub"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NegSub"; } }; }} diff --git a/sc/source/core/opencl/op_spreadsheet.hxx b/sc/source/core/opencl/op_spreadsheet.hxx index 73ca7336a5ee..3f1f43c6e791 100644 --- a/sc/source/core/opencl/op_spreadsheet.hxx +++ b/sc/source/core/opencl/op_spreadsheet.hxx @@ -18,8 +18,8 @@ class OpVLookup: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "VLookup"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VLookup"; } }; }} diff --git a/sc/source/core/opencl/op_statistical.hxx b/sc/source/core/opencl/op_statistical.hxx index 570994607566..24c598906c83 100644 --- a/sc/source/core/opencl/op_statistical.hxx +++ b/sc/source/core/opencl/op_statistical.hxx @@ -18,184 +18,184 @@ class OpStandard: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Standard"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Standard"; } }; class OpExponDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "ExponDist"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ExponDist"; } }; class OpVar: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Var"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Var"; } }; class OpSTEYX: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "STEYX"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "STEYX"; } }; class OpVarP: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "VarP"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VarP"; } }; class OpZTest: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "ZTest"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ZTest"; } }; class OpStDevP: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "StDevP"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "StDevP"; } }; class OpStDev: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "StDev"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "StDev"; } }; class OpSkewp: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Skewp"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Skewp"; } }; class OpSlope: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Slope"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Slope"; } }; class OpWeibull: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Weibull"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Weibull"; } }; class OpFdist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "Fdist"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fdist"; } }; class OpTDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "TDist"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TDist"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpTInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "TInv"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TInv"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpTTest: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "TTest"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TTest"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpSkew: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Skew"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Skew"; } }; class OpFisher: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Fisher"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fisher"; } }; class OpFisherInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "FisherInv"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FisherInv"; } }; class OpGamma: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Gamma"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Gamma"; } }; class OpCorrel: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Correl"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Correl"; } }; class OpNegbinomdist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpNegbinomdist"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNegbinomdist"; } }; class OpPearson: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpPearson"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPearson"; } }; class OpGammaLn: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "GammaLn"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GammaLn"; } }; class OpGauss: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ); - virtual std::string BinFuncName(void) const { return "Gauss"; } + std::set<std::string>& ) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Gauss"; } }; class OpGeoMean: public CheckVariables @@ -203,8 +203,8 @@ class OpGeoMean: public CheckVariables public: OpGeoMean(void): CheckVariables(), mNeedReductionKernel(true) {} virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "GeoMean"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GeoMean"; } bool NeedReductionKernel(void) const { return mNeedReductionKernel; } protected: bool mNeedReductionKernel; @@ -214,331 +214,331 @@ class OpHarMean: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "HarMean"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "HarMean"; } }; class OpRsq: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpRsq"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpRsq"; } }; class OpNormdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpNormdist"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormdist"; } }; class OpMedian:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpMedian"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMedian"; } }; class OpNormsdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "OpNormsdist"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormsdist"; } }; class OpNorminv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpNorminv"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNorminv"; } }; class OpNormsinv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpNormsinv"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormsinv"; } }; class OpPhi:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpPhi"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPhi"; } }; class OpKurt: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Kurt"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Kurt"; } }; class OpCovar: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); - virtual std::string BinFuncName(void) const { return "Covar"; } + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Covar"; } }; class OpVariationen:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpVariationen"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVariationen"; } }; class OpVariationen2:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpVariationen2";} + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVariationen2";} }; class OpConfidence: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ); + std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "Confidence"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Confidence"; } }; class OpIntercept: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Intercept"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Intercept"; } }; class OpLogInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "LogInv"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "LogInv"; } }; class OpCritBinom: public Normal { public: - virtual std::string GetBottom(void) { return "0"; } + virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, - const std::string &sSymName, SubArguments& vSubArguments); + const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; virtual void BinInlineFun(std::set<std::string>& , - std::set<std::string>& ); + std::set<std::string>& ) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const { return "CritBinom"; } + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CritBinom"; } }; class OpForecast: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "Forecast"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Forecast"; } }; class OpLogNormDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "LogNormdist"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "LogNormdist"; } }; class OpGammaDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs); - virtual std::string BinFuncName(void) const { return "GammaDist"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GammaDist"; } }; class OpHypGeomDist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpHypGeomDist"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpHypGeomDist"; } }; class OpChiDist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "OpChiDist"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpChiDist"; } }; class OpBinomdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "OpBinomdist"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpBinomdist"; } }; class OpChiSqDist: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "ChiSqDist"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ChiSqDist"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpChiSqInv: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "ChiSqInv"; } - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ChiSqInv"; } + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpChiInv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "OpChiInv"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpChiInv"; } }; class OpPoisson:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "OpPoisson"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPoisson"; } }; class OpGammaInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs -); - virtual std::string BinFuncName(void) const { return "GammaInv"; } +) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GammaInv"; } }; class OpFInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs -); - virtual std::string BinFuncName(void) const { return "FInv"; } +) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FInv"; } }; class OpFTest: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs -); - virtual std::string BinFuncName(void) const { return "FTest"; } +) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FTest"; } }; class OpDevSq: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "DevSq"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DevSq"; } }; class OpB: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs -); - virtual std::string BinFuncName(void) const { return "B"; } +) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "B"; } }; class OpBetaDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; void BinInlineFun(std::set<std::string>& decls,std::set<std::string>& funs -); - virtual std::string BinFuncName(void) const { return "BetaDist"; } +) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "BetaDist"; } }; class OpBetainv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&); - virtual std::string BinFuncName(void) const { return "OpBetainv"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpBetainv"; } }; class OpMinA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpMinA"; } - virtual bool takeString() const { return true; } - virtual bool takeNumeric() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMinA"; } + virtual bool takeString() const SAL_OVERRIDE { return true; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class OpCountA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpCountA"; } - virtual bool takeString() const { return true; } - virtual bool takeNumeric() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpCountA"; } + virtual bool takeString() const SAL_OVERRIDE { return true; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class OpMaxA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpMaxA"; } - virtual bool takeString() const { return true; } - virtual bool takeNumeric() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMaxA"; } + virtual bool takeString() const SAL_OVERRIDE { return true; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class OpVarA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpVarA"; } - virtual bool takeString() const { return true; } - virtual bool takeNumeric() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVarA"; } + virtual bool takeString() const SAL_OVERRIDE { return true; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class OpVarPA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpVarPA"; } - virtual bool takeString() const { return true; } - virtual bool takeNumeric() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVarPA"; } + virtual bool takeString() const SAL_OVERRIDE { return true; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class OpStDevPA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpStDevPA"; } - virtual bool takeString() const { return true; } - virtual bool takeNumeric() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpStDevPA"; } + virtual bool takeString() const SAL_OVERRIDE { return true; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class OpAverageA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpAverageA"; } - virtual bool takeString() const { return true; } - virtual bool takeNumeric() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpAverageA"; } + virtual bool takeString() const SAL_OVERRIDE { return true; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class OpStDevA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "OpStDevA"; } - virtual bool takeString() const { return true; } - virtual bool takeNumeric() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpStDevA"; } + virtual bool takeString() const SAL_OVERRIDE { return true; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class OpAveDev: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual std::string BinFuncName(void) const { return "AveDev"; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AveDev"; } }; }} diff --git a/sc/source/core/opencl/opbase.hxx b/sc/source/core/opencl/opbase.hxx index a75e160cefa1..8a15c136523b 100644 --- a/sc/source/core/opencl/opbase.hxx +++ b/sc/source/core/opencl/opbase.hxx @@ -200,27 +200,27 @@ public: const std::string &GetNameAsString(void) const { return mSymName; } /// Generate declaration - virtual void GenDecl(std::stringstream &ss) const; + virtual void GenDecl(std::stringstream &ss) const SAL_OVERRIDE; /// When declared as input to a sliding window function - virtual void GenSlidingWindowDecl(std::stringstream &ss) const; + virtual void GenSlidingWindowDecl(std::stringstream &ss) const SAL_OVERRIDE; /// When referenced in a sliding window function - virtual std::string GenSlidingWindowDeclRef(bool=false) const; + virtual std::string GenSlidingWindowDeclRef(bool=false) const SAL_OVERRIDE; /// Create buffer and pass the buffer to a given kernel - virtual size_t Marshal(cl_kernel, int, int, cl_program); + virtual size_t Marshal(cl_kernel, int, int, cl_program) SAL_OVERRIDE; virtual ~VectorRef(); - virtual void GenSlidingWindowFunction(std::stringstream &) {} + virtual void GenSlidingWindowFunction(std::stringstream &) SAL_OVERRIDE {} const std::string &GetSymName(void) const { return mSymName; } - virtual size_t GetWindowSize(void) const; - virtual std::string DumpOpName(void) const { return std::string(""); } + virtual size_t GetWindowSize(void) const SAL_OVERRIDE; + virtual std::string DumpOpName(void) const SAL_OVERRIDE { return std::string(""); } virtual void DumpInlineFun(std::set<std::string>& , - std::set<std::string>& ) const {} + std::set<std::string>& ) const SAL_OVERRIDE {} const std::string& GetName(void) const { return mSymName; } virtual cl_mem GetCLBuffer(void) const { return mpClmem; } - virtual bool NeedParallelReduction(void) const { return false; } + virtual bool NeedParallelReduction(void) const SAL_OVERRIDE { return false; } protected: // Used by marshaling @@ -261,9 +261,9 @@ class Normal: public SlidingFunctionBase { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, - const std::string &sSymName, SubArguments &vSubArguments); - virtual bool takeString() const { return false; } - virtual bool takeNumeric() const { return true; } + const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; + virtual bool takeString() const SAL_OVERRIDE { return false; } + virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; class CheckVariables:public Normal diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 68f2ba5fba4f..871d9c535414 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -689,7 +689,7 @@ struct Convention_A1 : public ScCompiler::Convention ParseResult parseAnyToken( const OUString& rFormula, sal_Int32 nSrcPos, - const CharClass* pCharClass) const + const CharClass* pCharClass) const SAL_OVERRIDE { ParseResult aRet; if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) ) @@ -704,7 +704,7 @@ struct Convention_A1 : public ScCompiler::Convention nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); } - virtual sal_uLong getCharTableFlags( sal_Unicode c, sal_Unicode /*cLast*/ ) const + virtual sal_uLong getCharTableFlags( sal_Unicode c, sal_Unicode /*cLast*/ ) const SAL_OVERRIDE { return mpCharTable[static_cast<sal_uInt8>(c)]; } @@ -786,7 +786,7 @@ struct ConventionOOO_A1 : public Convention_A1 const ScAddress& rPos, const OUString& rErrRef, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, - bool bSingleRef ) const + bool bSingleRef ) const SAL_OVERRIDE { ScComplexRefData aRef( rRef ); // In case absolute/relative positions weren't separately available: @@ -803,7 +803,7 @@ struct ConventionOOO_A1 : public Convention_A1 } } - virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const + virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const SAL_OVERRIDE { switch (eSymType) { @@ -818,12 +818,12 @@ struct ConventionOOO_A1 : public Convention_A1 virtual bool parseExternalName( const OUString& rSymbol, OUString& rFile, OUString& rName, const ScDocument* pDoc, - const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const + const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const SAL_OVERRIDE { return lcl_parseExternalName(rSymbol, rFile, rName, '#', pDoc, pExternalLinks); } - virtual OUString makeExternalNameStr( const OUString& rFile, const OUString& rName ) const + virtual OUString makeExternalNameStr( const OUString& rFile, const OUString& rName ) const SAL_OVERRIDE { return lcl_makeExternalNameStr( rFile, rName, '#', false); } @@ -875,7 +875,7 @@ struct ConventionOOO_A1 : public Convention_A1 virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, - const OUString& rTabName, const ScSingleRefData& rRef ) const + const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE { makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabName, rRef, false); } @@ -923,7 +923,7 @@ struct ConventionOOO_A1 : public Convention_A1 virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, - const ScComplexRefData& rRef ) const + const ScComplexRefData& rRef ) const SAL_OVERRIDE { makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabNames, rTabName, rRef, false); } @@ -937,7 +937,7 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 const ScAddress& rPos, const OUString& rErrRef, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, - bool bSingleRef ) const + bool bSingleRef ) const SAL_OVERRIDE { rBuffer.append('['); ScComplexRefData aRef( rRef ); @@ -966,14 +966,14 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 rBuffer.append(']'); } - virtual OUString makeExternalNameStr( const OUString& rFile, const OUString& rName ) const + virtual OUString makeExternalNameStr( const OUString& rFile, const OUString& rName ) const SAL_OVERRIDE { return lcl_makeExternalNameStr( rFile, rName, '#', true); } virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, - const OUString& rTabName, const ScSingleRefData& rRef ) const + const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE { makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabName, rRef, true); } @@ -981,7 +981,7 @@ struct ConventionOOO_A1_ODF : public ConventionOOO_A1 virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, const std::vector<OUString>& rTabNames, - const OUString& rTabName, const ScComplexRefData& rRef ) const + const OUString& rTabName, const ScComplexRefData& rRef ) const SAL_OVERRIDE { makeExternalRefStrImpl(rBuffer, rPos, rFileName, rTabNames, rTabName, rRef, true); } @@ -1177,7 +1177,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL const ScAddress& rPos, const OUString& /*rErrRef*/, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, - bool bSingleRef ) const + bool bSingleRef ) const SAL_OVERRIDE { ScComplexRefData aRef( rRef ); @@ -1237,7 +1237,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL virtual ParseResult parseAnyToken( const OUString& rFormula, sal_Int32 nSrcPos, - const CharClass* pCharClass) const + const CharClass* pCharClass) const SAL_OVERRIDE { ParseResult aRet; if ( lcl_isValidQuotedText(rFormula, nSrcPos, aRet) ) @@ -1252,26 +1252,26 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); } - virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const + virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const SAL_OVERRIDE { return ConventionXL::getSpecialSymbol(eSymType); } virtual bool parseExternalName( const OUString& rSymbol, OUString& rFile, OUString& rName, const ScDocument* pDoc, - const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const + const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const SAL_OVERRIDE { return ConventionXL::parseExternalName( rSymbol, rFile, rName, pDoc, pExternalLinks); } - virtual OUString makeExternalNameStr( const OUString& rFile, const OUString& rName ) const + virtual OUString makeExternalNameStr( const OUString& rFile, const OUString& rName ) const SAL_OVERRIDE { return ConventionXL::makeExternalNameStr(rFile, rName); } virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, - const OUString& rTabName, const ScSingleRefData& rRef ) const + const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE { // ['file:///path/to/file/filename.xls']'Sheet Name'!$A$1 // This is a little different from the format Excel uses, as Excel @@ -1289,7 +1289,7 @@ struct ConventionXL_A1 : public Convention_A1, public ConventionXL virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, - const ScComplexRefData& rRef ) const + const ScComplexRefData& rRef ) const SAL_OVERRIDE { ScRange aAbsRef = rRef.toAbs(rPos); @@ -1347,7 +1347,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL const ScAddress& rPos, const OUString& /*rErrRef*/, const std::vector<OUString>& rTabNames, const ScComplexRefData& rRef, - bool bSingleRef ) const + bool bSingleRef ) const SAL_OVERRIDE { ScRange aAbsRef = rRef.toAbs(rPos); ScComplexRefData aRef( rRef ); @@ -1408,7 +1408,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL ParseResult parseAnyToken( const OUString& rFormula, sal_Int32 nSrcPos, - const CharClass* pCharClass) const + const CharClass* pCharClass) const SAL_OVERRIDE { ConventionXL::parseExternalDocName(rFormula, nSrcPos); @@ -1426,26 +1426,26 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL nSrcPos, nStartFlags, aAddAllowed, nContFlags, aAddAllowed ); } - virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const + virtual sal_Unicode getSpecialSymbol( SpecialSymbolType eSymType ) const SAL_OVERRIDE { return ConventionXL::getSpecialSymbol(eSymType); } virtual bool parseExternalName( const OUString& rSymbol, OUString& rFile, OUString& rName, const ScDocument* pDoc, - const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const + const uno::Sequence<sheet::ExternalLinkInfo>* pExternalLinks ) const SAL_OVERRIDE { return ConventionXL::parseExternalName( rSymbol, rFile, rName, pDoc, pExternalLinks); } - virtual OUString makeExternalNameStr( const OUString& rFile, const OUString& rName ) const + virtual OUString makeExternalNameStr( const OUString& rFile, const OUString& rName ) const SAL_OVERRIDE { return ConventionXL::makeExternalNameStr(rFile, rName); } virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, - const OUString& rTabName, const ScSingleRefData& rRef ) const + const OUString& rTabName, const ScSingleRefData& rRef ) const SAL_OVERRIDE { // ['file:///path/to/file/filename.xls']'Sheet Name'!$A$1 // This is a little different from the format Excel uses, as Excel @@ -1465,7 +1465,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL virtual void makeExternalRefStr( OUStringBuffer& rBuffer, const ScAddress& rPos, const OUString& rFileName, const std::vector<OUString>& rTabNames, const OUString& rTabName, - const ScComplexRefData& rRef ) const + const ScComplexRefData& rRef ) const SAL_OVERRIDE { ScRange aAbsRef = rRef.toAbs(rPos); @@ -1508,7 +1508,7 @@ struct ConventionXL_R1C1 : public ScCompiler::Convention, public ConventionXL r1c1_add_col(rBuffer, rRef.Ref2, aAbsRef.aEnd); } - virtual sal_uLong getCharTableFlags( sal_Unicode c, sal_Unicode cLast ) const + virtual sal_uLong getCharTableFlags( sal_Unicode c, sal_Unicode cLast ) const SAL_OVERRIDE { sal_uLong nFlags = mpCharTable[static_cast<sal_uInt8>(c)]; if (c == '-' && cLast == '[') diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index feadbc1ea0f9..e0a580c9150c 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@ -509,9 +509,9 @@ class FormulaGroupInterpreterOpenCLMissing : public FormulaGroupInterpreter public: FormulaGroupInterpreterOpenCLMissing() : FormulaGroupInterpreter() {} virtual ~FormulaGroupInterpreterOpenCLMissing() {} - virtual ScMatrixRef inverseMatrix(const ScMatrix&) { return ScMatrixRef(); } + virtual ScMatrixRef inverseMatrix(const ScMatrix&) SAL_OVERRIDE { return ScMatrixRef(); } virtual CompiledFormula* createCompiledFormula(ScDocument&, const ScAddress&, ScFormulaCellGroup&, ScTokenArray&) SAL_OVERRIDE { return NULL; } - virtual bool interpret(ScDocument&, const ScAddress&, ScFormulaCellGroupRef&, ScTokenArray&) { return false; } + virtual bool interpret(ScDocument&, const ScAddress&, ScFormulaCellGroupRef&, ScTokenArray&) SAL_OVERRIDE { return false; } }; static void SAL_CALL thisModule() {} diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 3c7fb4f6ed2e..dba4882c62da 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -2191,7 +2191,7 @@ public: virtual ~ScGammaDistFunction() {} - double GetValue( double x ) const { return fp - rInt.GetGammaDist(x, fAlpha, fBeta); } + double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetGammaDist(x, fAlpha, fBeta); } }; void ScInterpreter::ScGammaInv() @@ -2231,7 +2231,7 @@ public: virtual ~ScBetaDistFunction() {} - double GetValue( double x ) const { return fp - rInt.GetBetaDist(x, fAlpha, fBeta); } + double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetBetaDist(x, fAlpha, fBeta); } }; void ScInterpreter::ScBetaInv() @@ -2287,7 +2287,7 @@ public: virtual ~ScTDistFunction() {} - double GetValue( double x ) const { return fp - rInt.GetTDist( x, fDF, nT ); } + double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetTDist( x, fDF, nT ); } }; void ScInterpreter::ScTInv( int nType ) @@ -2333,7 +2333,7 @@ public: virtual ~ScFDistFunction() {} - double GetValue( double x ) const { return fp - rInt.GetFDist(x, fF1, fF2); } + double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetFDist(x, fF1, fF2); } }; void ScInterpreter::ScFInv() @@ -2389,7 +2389,7 @@ public: virtual ~ScChiDistFunction() {} - double GetValue( double x ) const { return fp - rInt.GetChiDist(x, fDF); } + double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetChiDist(x, fDF); } }; void ScInterpreter::ScChiInv() @@ -2424,7 +2424,7 @@ public: virtual ~ScChiSqDistFunction() {} - double GetValue( double x ) const { return fp - rInt.GetChiSqDistCDF(x, fDF); } + double GetValue( double x ) const SAL_OVERRIDE { return fp - rInt.GetChiSqDistCDF(x, fDF); } }; void ScInterpreter::ScChiSqInv() diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index b98fb9bed306..97282d0814c1 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -292,13 +292,13 @@ class FuncCount : public sc::ColumnSpanSet::ColumnAction public: FuncCount() : mpCol(0), mnCount(0), mnNumFmt(0) {} - virtual void startColumn(ScColumn* pCol) + virtual void startColumn(ScColumn* pCol) SAL_OVERRIDE { mpCol = pCol; mpCol->InitBlockPosition(maPos); } - virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) + virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) SAL_OVERRIDE { if (!bVal) return; @@ -324,13 +324,13 @@ class FuncSum : public sc::ColumnSpanSet::ColumnAction public: FuncSum() : mpCol(0), mfSum(0.0), mnError(0), mnNumFmt(0) {} - virtual void startColumn(ScColumn* pCol) + virtual void startColumn(ScColumn* pCol) SAL_OVERRIDE { mpCol = pCol; mpCol->InitBlockPosition(maPos); } - virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) + virtual void execute(SCROW nRow1, SCROW nRow2, bool bVal) SAL_OVERRIDE { if (!bVal) return; diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 75bc1bbab1ad..3764147015be 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -120,21 +120,21 @@ private: ::osl::Mutex m_aMutex; public: // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<container::XIndexContainer>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<container::XIndexContainer>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); return ( IdToOleNameHash.size() > 0 ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( IdToOleNameHash[ aName ] ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); uno::Sequence< OUString > aResult( IdToOleNameHash.size() ); @@ -145,7 +145,7 @@ public: *pName = it->first; return aResult; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); return ( IdToOleNameHash.find( aName ) != IdToOleNameHash.end() ); @@ -158,7 +158,7 @@ public: return IdToOleNameHash.size(); } // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( hasByName( aName ) ) @@ -168,14 +168,14 @@ public: throw lang::IllegalArgumentException(); IdToOleNameHash[ aName ] = xElement; } - virtual void SAL_CALL removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual void SAL_CALL removeByName( const OUString& aName ) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) throw container::NoSuchElementException(); IdToOleNameHash.erase( IdToOleNameHash.find( aName ) ); } - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { ::osl::MutexGuard aGuard( m_aMutex ); if ( !hasByName( aName ) ) diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 26d2b255025d..9f6f0f0cb302 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -57,7 +57,7 @@ public: private: /** Writes the start of the record that is equal in all EXTERNNAME records and calls WriteAddData(). */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; /** Called to write additional data following the common record contents. @descr Derived classes should overwrite this function to write their data. */ virtual void WriteAddData( XclExpStream& rStrm ); @@ -78,7 +78,7 @@ public: private: /** Writes additional record contents. */ - virtual void WriteAddData( XclExpStream& rStrm ); + virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -92,7 +92,7 @@ public: private: /** Writes additional record contents. */ - virtual void WriteAddData( XclExpStream& rStrm ); + virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef boost::shared_ptr< XclExpCachedMatrix > XclExpCachedMatRef; @@ -111,7 +111,7 @@ public: private: /** Writes additional record contents. */ - virtual void WriteAddData( XclExpStream& rStrm ); + virtual void WriteAddData( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclExpSupbook& mrSupbook; @@ -138,7 +138,7 @@ public: sal_uInt16 InsertExtName( const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ); /** Writes the EXTERNNAME record list. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpExtNameBase > XclExpExtNameList; @@ -167,7 +167,7 @@ public: bool InsertValue( SCCOL nScCol, SCROW nScRow, const Any& rValue ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; void WriteBool( XclExpStream& rStrm, bool bValue ); void WriteDouble( XclExpStream& rStrm, double fValue ); @@ -204,7 +204,7 @@ public: void StoreCellRange( const ScRange& rRange, const ::formula::FormulaToken& rToken ); /** Writes the XCT and all CRN records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: ScExternalRefCache::TableTypeRef mxCacheTable; @@ -258,13 +258,13 @@ public: sal_uInt16 InsertAddIn( const OUString& rName ); /** Writes the EXTERNSHEET and all EXTERNNAME, XCT and CRN records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Initializes the record data with the passed encoded URL. */ void Init( const OUString& rEncUrl ); /** Writes the contents of the EXTERNSHEET record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpString maTabName; /// The name of the sheet. @@ -318,14 +318,14 @@ public: sal_uInt16 InsertExtName( const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ); /** Writes the SUPBOOK and all EXTERNNAME, XCT and CRN records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Returns the sheet name inside of this SUPBOOK. */ const XclExpString* GetTabName( sal_uInt16 nSBTab ) const; /** Writes the SUPBOOK record contents. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpXct > XclExpXctList; @@ -411,7 +411,7 @@ public: XclExpRefLogEntry* pRefLogEntry = NULL ); /** Writes all SUPBOOK records with their sub records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; struct XclExpSBIndex { @@ -511,36 +511,36 @@ public: virtual void FindExtSheet( sal_uInt16& rnExtSheet, sal_uInt16& rnFirstXclTab, sal_uInt16& rnLastXclTab, SCTAB nFirstScTab, SCTAB nLastScTab, - XclExpRefLogEntry* pRefLogEntry ); - virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ); + XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; + virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ) SAL_OVERRIDE; virtual void FindExtSheet( sal_uInt16 nFileId, const OUString& rTabName, sal_uInt16 nXclTabSpan, sal_uInt16& rnExtSheet, sal_uInt16& rnFirstSBTab, sal_uInt16& rnLastSBTab, - XclExpRefLogEntry* pRefLogEntry ); + XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; - virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ); + virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ) SAL_OVERRIDE; - virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ); - virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ); + virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ) SAL_OVERRIDE; + virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ) SAL_OVERRIDE; virtual bool InsertAddIn( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ); + const OUString& rName ) SAL_OVERRIDE; /** InsertEuroTool */ virtual bool InsertEuroTool( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ); + const OUString& rName ) SAL_OVERRIDE; virtual bool InsertDde( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rApplic, const OUString& rTopic, const OUString& rItem ); + const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) SAL_OVERRIDE; virtual bool InsertExtName( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl, - const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ); + const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) SAL_OVERRIDE; - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpExternSheet > XclExpExtSheetList; @@ -581,35 +581,35 @@ public: virtual void FindExtSheet( sal_uInt16& rnExtSheet, sal_uInt16& rnFirstXclTab, sal_uInt16& rnLastXclTab, SCTAB nFirstScTab, SCTAB nLastScTab, - XclExpRefLogEntry* pRefLogEntry ); - virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ); + XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; + virtual sal_uInt16 FindExtSheet( sal_Unicode cCode ) SAL_OVERRIDE; virtual void FindExtSheet( sal_uInt16 nFileId, const OUString& rTabName, sal_uInt16 nXclTabSpan, sal_uInt16& rnExtSheet, sal_uInt16& rnFirstSBTab, sal_uInt16& rnLastSBTab, - XclExpRefLogEntry* pRefLogEntry ); + XclExpRefLogEntry* pRefLogEntry ) SAL_OVERRIDE; - virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ); + virtual void StoreCellRange( const ScSingleRefData& rRef1, const ScSingleRefData& rRef2, const ScAddress& rPos ) SAL_OVERRIDE; - virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ); - virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ); + virtual void StoreCell( sal_uInt16 nFileId, const OUString& rTabName, const ScAddress& rPos ) SAL_OVERRIDE; + virtual void StoreCellRange( sal_uInt16 nFileId, const OUString& rTabName, const ScRange& rRange ) SAL_OVERRIDE; virtual bool InsertAddIn( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ); + const OUString& rName ) SAL_OVERRIDE; /** InsertEuroTool */ virtual bool InsertEuroTool( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rName ); + const OUString& rName ) SAL_OVERRIDE; virtual bool InsertDde( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, - const OUString& rApplic, const OUString& rTopic, const OUString& rItem ); + const OUString& rApplic, const OUString& rTopic, const OUString& rItem ) SAL_OVERRIDE; virtual bool InsertExtName( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl, - const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ); + const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) SAL_OVERRIDE; - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Searches for or inserts a new XTI structure. diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index b15659e37cf7..42268fab2c1f 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -89,13 +89,13 @@ public: bool IsMacroCall( bool bVBasic, bool bFunc ) const; /** Writes the entire NAME record to the passed stream. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the NAME record to the passed stream. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: OUString maOrigName; /// The original user-defined name. diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 42a2c002e047..09dadf7f840f 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -1809,8 +1809,8 @@ class XclExpPivotRecWrapper : public XclExpRecordBase { public: explicit XclExpPivotRecWrapper( XclExpPivotTableManager& rPTMgr, SCTAB nScTab ); - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: XclExpPivotTableManager& mrPTMgr; SCTAB mnScTab; diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 9afaf913872a..554e7921f6cb 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -77,23 +77,23 @@ public: PaletteIndex( const ColorDataVec& rColorDataTable ) : maColorData( rColorDataTable ) {} // Methods XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return maColorData.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { //--Index; // apparently the palette is already 1 based return uno::makeAny( sal_Int32( maColorData[ Index ] ) ); } // Methods XElementAcess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::getCppuType( (sal_Int32*)0 ); } - virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return (maColorData.size() > 0); } diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx index 4748c3191528..e285bebd4edc 100644 --- a/sc/source/filter/excel/xltoolbar.cxx +++ b/sc/source/filter/excel/xltoolbar.cxx @@ -31,8 +31,8 @@ class MSOExcelCommandConvertor : public MSOCommandConvertor IdToString tcidToOOcmd; public: MSOExcelCommandConvertor(); - virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ); - virtual OUString MSOTCIDToOOCommand( sal_Int16 key ); + virtual OUString MSOCommandToOOCommand( sal_Int16 msoCmd ) SAL_OVERRIDE; + virtual OUString MSOTCIDToOOCommand( sal_Int16 key ) SAL_OVERRIDE; }; MSOExcelCommandConvertor::MSOExcelCommandConvertor() diff --git a/sc/source/filter/excel/xltoolbar.hxx b/sc/source/filter/excel/xltoolbar.hxx index 9161f19b3cf7..e895ed77e4de 100644 --- a/sc/source/filter/excel/xltoolbar.hxx +++ b/sc/source/filter/excel/xltoolbar.hxx @@ -25,8 +25,8 @@ public: sal_uInt16 cmdType:5; bool C:1; sal_uInt16 reserved3:8; - bool Read( SvStream& rS ); - void Print(FILE* fp); + bool Read( SvStream& rS ) SAL_OVERRIDE; + void Print(FILE* fp) SAL_OVERRIDE; }; class ScTBC : public TBBase @@ -37,8 +37,8 @@ class ScTBC : public TBBase public: ScTBC(); ~ScTBC(){} - void Print( FILE* ); - bool Read(SvStream &rS); + void Print( FILE* ) SAL_OVERRIDE; + bool Read(SvStream &rS) SAL_OVERRIDE; bool ImportToolBarControl( ScCTBWrapper&, const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >& toolbarcontainer, CustomToolBarImportHelper& helper, bool bIsMenuBar ); }; @@ -53,8 +53,8 @@ class ScCTB : public TBBase public: ScCTB(sal_uInt16); ~ScCTB(){} - void Print( FILE* ); - bool Read(SvStream &rS); + void Print( FILE* ) SAL_OVERRIDE; + bool Read(SvStream &rS) SAL_OVERRIDE; bool IsMenuToolbar(); bool ImportCustomToolBar( ScCTBWrapper&, CustomToolBarImportHelper& ); bool ImportMenuTB( ScCTBWrapper&, const css::uno::Reference< css::container::XIndexContainer >&, CustomToolBarImportHelper& ); @@ -78,8 +78,8 @@ public: CTBS& operator = ( const CTBS&); CTBS(); ~CTBS(){} - void Print( FILE* ); - bool Read(SvStream &rS); + void Print( FILE* ) SAL_OVERRIDE; + bool Read(SvStream &rS) SAL_OVERRIDE; }; class ScCTBWrapper : public TBBase @@ -91,8 +91,8 @@ class ScCTBWrapper : public TBBase public: ScCTBWrapper(); ~ScCTBWrapper(); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; bool ImportCustomToolBar( SfxObjectShell& rDocSh ); ScCTB* GetCustomizationData( const OUString& name ); }; diff --git a/sc/source/filter/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index 8e1d984799d2..142de659cd50 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -38,15 +38,15 @@ private: XclExpString sUsername; sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID ); inline const sal_uInt8* GetGUID() const { return aGUID; } - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -73,7 +73,7 @@ public: inline const_iterator end () const { return aViews.end(); } - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -85,12 +85,12 @@ private: sal_uInt8 aGUID[ 16 ]; sal_uInt32 nCurrTab; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -99,11 +99,11 @@ public: class XclExpUsersViewEnd : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -112,11 +112,11 @@ public: class XclExpChTr0x0191 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -125,11 +125,11 @@ public: class XclExpChTr0x0198 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -138,11 +138,11 @@ public: class XclExpChTr0x0192 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -151,11 +151,11 @@ public: class XclExpChTr0x0197 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -170,8 +170,8 @@ public: inline XclExpChTrEmpty( sal_uInt16 nNum ) : nRecNum( nNum ) {} virtual ~XclExpChTrEmpty(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -180,13 +180,13 @@ public: class XclExpChTr0x0195 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: virtual ~XclExpChTr0x0195(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -198,14 +198,14 @@ private: XclExpString sUsername; DateTime aDateTime; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ); virtual ~XclExpChTr0x0194(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) : @@ -223,7 +223,7 @@ private: sal_uInt8 aGUID[ 16 ]; sal_uInt32 nCount; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: inline XclExpChTrHeader() : nCount( 0 ) {} @@ -232,10 +232,10 @@ public: inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); } inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; } - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -249,7 +249,7 @@ private: DateTime aDateTime; sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: inline XclExpChTrInfo( @@ -259,10 +259,10 @@ public: sal_Int32 nLogNumber ); virtual ~XclExpChTrInfo(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; inline XclExpChTrInfo::XclExpChTrInfo( const OUString& rUsername, const DateTime& rDateTime, const sal_uInt8* pGUID, sal_Int32 nLogNumber ) : @@ -313,7 +313,7 @@ private: inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: inline XclExpChTrTabId( sal_uInt16 nCount ) : @@ -323,10 +323,10 @@ public: void Copy( const XclExpChTrTabIdBuffer& rBuffer ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -362,7 +362,7 @@ protected: inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; // save header data, call SaveActionData() - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; inline sal_Size GetHeaderByteCount() const { return 12; } // overload to save action data without header, called by SaveCont() @@ -395,8 +395,8 @@ public: // could be overloaded to use more indexes per action virtual void SetIndex( sal_uInt32& rIndex ); - virtual void Save( XclExpStream& rStrm ); - virtual sal_Size GetLen() const; + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; inline XclExpChTrAction* GetAddAction() { return pAddAction; } }; @@ -471,7 +471,7 @@ protected: const XclExpRoot& rRoot, const ScCellValue& rScCell, XclExpChTrData*& rpData, sal_uInt32& rXclLength1, sal_uInt16& rXclLength2 ); - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; public: XclExpChTrCellContent( @@ -480,10 +480,10 @@ public: const XclExpChTrTabIdBuffer& rTabIdBuffer ); virtual ~XclExpChTrCellContent(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetActionByteCount() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -497,9 +497,9 @@ protected: XclExpChTrInsert( const XclExpChTrInsert& rCopy ) : XclExpChTrAction( rCopy ), aRange( rCopy.aRange ) {} - virtual void SaveActionData( XclExpStream& rStrm ) const; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; public: XclExpChTrInsert( @@ -509,10 +509,10 @@ public: ScChangeTrack& rChangeTrack ); virtual ~XclExpChTrInsert(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetActionByteCount() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -524,7 +524,7 @@ private: SCTAB nTab; protected: - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; public: XclExpChTrInsertTab( @@ -533,10 +533,10 @@ public: const XclExpChTrTabIdBuffer& rTabIdBuffer ); virtual ~XclExpChTrInsertTab(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetActionByteCount() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -548,9 +548,9 @@ protected: ScRange aSourceRange; ScRange aDestRange; - virtual void SaveActionData( XclExpStream& rStrm ) const; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const SAL_OVERRIDE; public: XclExpChTrMoveRange( @@ -560,10 +560,10 @@ public: ScChangeTrack& rChangeTrack ); virtual ~XclExpChTrMoveRange(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetActionByteCount() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -572,16 +572,16 @@ public: class XclExpChTr0x014A : public XclExpChTrInsert { protected: - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const SAL_OVERRIDE; public: XclExpChTr0x014A( const XclExpChTrInsert& rAction ); virtual ~XclExpChTr0x014A(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetActionByteCount() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetActionByteCount() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index f4a128e8a122..2e09d2ea1aa4 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -162,7 +162,7 @@ class XclImpChTrFmlConverter : public ExcelToSc8 private: XclImpChangeTrack& rChangeTrack; - virtual bool Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ); + virtual bool Read3DTabReference( sal_uInt16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ) SAL_OVERRIDE; public: inline XclImpChTrFmlConverter( diff --git a/sc/source/filter/inc/autofilterbuffer.hxx b/sc/source/filter/inc/autofilterbuffer.hxx index c150e3f30c76..6507a1874ee4 100644 --- a/sc/source/filter/inc/autofilterbuffer.hxx +++ b/sc/source/filter/inc/autofilterbuffer.hxx @@ -81,12 +81,12 @@ public: explicit DiscreteFilter( const WorkbookHelper& rHelper ); /** Imports filter settings from the filters and filter elements. */ - virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; private: typedef ::std::vector< OUString > FilterValueVector; @@ -105,12 +105,12 @@ public: explicit Top10Filter( const WorkbookHelper& rHelper ); /** Imports filter settings from the filters and filter elements. */ - virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; private: double mfValue; /// Number of items or percentage. @@ -148,12 +148,12 @@ public: explicit CustomFilter( const WorkbookHelper& rHelper ); /** Imports filter settings from the filters and filter elements. */ - virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual void importAttribs( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; /** Imports filter settings from the FILTERS and FILTER records. */ - virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual void importRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; /** Returns converted UNO API filter settings representing all filter settings. */ - virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ); + virtual ApiFilterSettings finalizeImport( sal_Int32 nMaxCount ) SAL_OVERRIDE; private: /** Apeends the passed filter criteriom, if it contains valid settings. */ diff --git a/sc/source/filter/inc/autofiltercontext.hxx b/sc/source/filter/inc/autofiltercontext.hxx index 5efb9d6d0237..8c958189c0b6 100644 --- a/sc/source/filter/inc/autofiltercontext.hxx +++ b/sc/source/filter/inc/autofiltercontext.hxx @@ -37,11 +37,11 @@ public: explicit FilterSettingsContext( WorksheetContextBase& rParent, FilterSettingsBase& rFilterSettings ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: FilterSettingsBase& mrFilterSettings; @@ -55,11 +55,11 @@ public: explicit FilterColumnContext( WorksheetContextBase& rParent, FilterColumn& rFilterColumn ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: FilterColumn& mrFilterColumn; @@ -73,11 +73,11 @@ public: explicit AutoFilterContext( WorksheetFragmentBase& rFragment, AutoFilter& rAutoFilter ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: AutoFilter& mrAutoFilter; diff --git a/sc/source/filter/inc/biffcodec.hxx b/sc/source/filter/inc/biffcodec.hxx index aeb2bbded10b..8031fbbc6b87 100644 --- a/sc/source/filter/inc/biffcodec.hxx +++ b/sc/source/filter/inc/biffcodec.hxx @@ -45,8 +45,8 @@ public: inline BiffDecoderBase* clone() { return implClone(); } /** Implementation of the ::comphelper::IDocPasswordVerifier interface. */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; /** Returns true, if the decoder has been initialized correctly. */ inline bool isValid() const { return mbValid; } @@ -90,11 +90,11 @@ private: BiffDecoder_XOR( const BiffDecoder_XOR& rDecoder ); /** Returns a clone of the decoder for usage in new streams. */ - virtual BiffDecoder_XOR* implClone(); + virtual BiffDecoder_XOR* implClone() SAL_OVERRIDE; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ); - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); + 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. */ @@ -102,7 +102,7 @@ private: sal_uInt8* pnDestData, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, - sal_uInt16 nBytes ); + sal_uInt16 nBytes ) SAL_OVERRIDE; private: ::oox::core::BinaryCodec_XOR maCodec; /// Cipher algorithm implementation. @@ -121,18 +121,18 @@ private: BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ); /** Returns a clone of the decoder for usage in new streams. */ - virtual BiffDecoder_RCF* implClone(); + virtual BiffDecoder_RCF* implClone() SAL_OVERRIDE; /** Implements password verification and initialization of the decoder. */ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > implVerifyPassword( const OUString& rPassword ); - virtual bool implVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); + 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, const sal_uInt8* pnSrcData, sal_Int64 nStreamPos, - sal_uInt16 nBytes ); + sal_uInt16 nBytes ) SAL_OVERRIDE; private: ::oox::core::BinaryCodec_RCF maCodec; /// Cipher algorithm implementation. diff --git a/sc/source/filter/inc/biffinputstream.hxx b/sc/source/filter/inc/biffinputstream.hxx index ca11f905f4d7..11f324677bbd 100644 --- a/sc/source/filter/inc/biffinputstream.hxx +++ b/sc/source/filter/inc/biffinputstream.hxx @@ -209,24 +209,24 @@ public: // BinaryStreamBase interface (seeking) ----------------------------------- /** Returns the data size of the whole record without record headers. */ - virtual sal_Int64 size() const; + virtual sal_Int64 size() const SAL_OVERRIDE; /** Returns the position inside of the whole record content. */ - virtual sal_Int64 tell() const; + virtual sal_Int64 tell() const SAL_OVERRIDE; /** Seeks in record content to the specified position. */ - virtual void seek( sal_Int64 nRecPos ); + virtual void seek( sal_Int64 nRecPos ) SAL_OVERRIDE; /** Closes the input stream but not the wrapped stream. */ - virtual void close(); + virtual void close() SAL_OVERRIDE; // BinaryInputStream interface (stream read access) ----------------------- /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Reads nBytes bytes and copies them to the passed buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Seeks forward inside the current record. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Stream operator for integral and floating-point types. */ template< typename Type > diff --git a/sc/source/filter/inc/chartsheetfragment.hxx b/sc/source/filter/inc/chartsheetfragment.hxx index 3cce8ab47e0d..cc9e9449dbbc 100644 --- a/sc/source/filter/inc/chartsheetfragment.hxx +++ b/sc/source/filter/inc/chartsheetfragment.hxx @@ -35,14 +35,14 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void initializeImport(); - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void initializeImport() SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; private: /** Imports the relation identifier for the DrawingML part. */ diff --git a/sc/source/filter/inc/commentsfragment.hxx b/sc/source/filter/inc/commentsfragment.hxx index 5b55a90b0b91..97a59ace922b 100644 --- a/sc/source/filter/inc/commentsfragment.hxx +++ b/sc/source/filter/inc/commentsfragment.hxx @@ -35,14 +35,14 @@ public: const WorksheetHelper& rHelper, const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onEndRecord(); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onEndRecord() SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: /** Imports comment data from the comment element. */ diff --git a/sc/source/filter/inc/condformatcontext.hxx b/sc/source/filter/inc/condformatcontext.hxx index 1a0a59c2a7c0..c2fc442e81fb 100644 --- a/sc/source/filter/inc/condformatcontext.hxx +++ b/sc/source/filter/inc/condformatcontext.hxx @@ -35,8 +35,8 @@ class ColorScaleContext : public WorksheetContextBase public: explicit ColorScaleContext( CondFormatContext& rFragment, CondFormatRuleRef xRule ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; private: CondFormatRuleRef mxRule; @@ -47,8 +47,8 @@ class DataBarContext : public WorksheetContextBase public: explicit DataBarContext( CondFormatContext& rFormat, CondFormatRuleRef xRule ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; private: CondFormatRuleRef mxRule; @@ -59,8 +59,8 @@ class IconSetContext : public WorksheetContextBase public: explicit IconSetContext( CondFormatContext& rFormat, CondFormatRuleRef xRule ); - virtual oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; private: CondFormatRuleRef mxRule; }; @@ -71,14 +71,14 @@ public: explicit CondFormatContext( WorksheetFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); - - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); - virtual void onEndRecord(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; + + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onEndRecord() SAL_OVERRIDE; private: CondFormatRef mxCondFmt; diff --git a/sc/source/filter/inc/connectionsfragment.hxx b/sc/source/filter/inc/connectionsfragment.hxx index fd8f40a93c5a..5b4ecd2cb97c 100644 --- a/sc/source/filter/inc/connectionsfragment.hxx +++ b/sc/source/filter/inc/connectionsfragment.hxx @@ -35,11 +35,11 @@ public: explicit ConnectionContext( WorkbookFragmentBase& rParent, Connection& rConnection ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: Connection& mrConnection; @@ -55,11 +55,11 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/drawingfragment.hxx b/sc/source/filter/inc/drawingfragment.hxx index d1d1eda4e92c..5796788d807b 100644 --- a/sc/source/filter/inc/drawingfragment.hxx +++ b/sc/source/filter/inc/drawingfragment.hxx @@ -51,7 +51,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape ); private: - virtual void attachMacro( const OUString& rMacroUrl ); + virtual void attachMacro( const OUString& rMacroUrl ) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape; @@ -70,7 +70,7 @@ public: protected: virtual void finalizeXShape( ::oox::core::XmlFilterBase& rFilter, - const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); + const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ) SAL_OVERRIDE; private: OUString maMacroName; @@ -115,9 +115,9 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; private: typedef ::std::auto_ptr< ShapeAnchor > ShapeAnchorRef; @@ -140,7 +140,7 @@ public: sal_Int32 nCtrlIndex, sal_Int32 nCtrlType, sal_Int32 nDropStyle ); private: - virtual void attachMacro( const OUString& rMacroUrl ); + virtual void attachMacro( const OUString& rMacroUrl ) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > mxCtrlFormIC; @@ -160,28 +160,28 @@ public: const ::oox::vml::ShapeBase* getNoteShape( const ::com::sun::star::table::CellAddress& rPos ) const; /** Filters cell note shapes. */ - virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const; + virtual bool isShapeSupported( const ::oox::vml::ShapeBase& rShape ) const SAL_OVERRIDE; /** Returns additional base names for automatic shape name creation. */ - virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const; + virtual OUString getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) const SAL_OVERRIDE; /** Calculates the shape rectangle from a cell anchor string. */ virtual bool convertClientAnchor( ::com::sun::star::awt::Rectangle& orShapeRect, - const OUString& rShapeAnchor ) const; + const OUString& rShapeAnchor ) const SAL_OVERRIDE; /** Creates a UNO control shape for legacy drawing controls. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createAndInsertClientXShape( const ::oox::vml::ShapeBase& rShape, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; /** Updates the bounding box covering all shapes of this drawing. */ virtual void notifyXShapeInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, const ::com::sun::star::awt::Rectangle& rShapeRect, - const ::oox::vml::ShapeBase& rShape, bool bGroupChild ); + const ::oox::vml::ShapeBase& rShape, bool bGroupChild ) SAL_OVERRIDE; private: /** Converts the passed VML textbox text color to an OLE color. */ @@ -215,7 +215,7 @@ public: const OUString& rFragmentPath ); protected: - virtual void finalizeImport(); + virtual void finalizeImport() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/drawingmanager.hxx b/sc/source/filter/inc/drawingmanager.hxx index c0c1cec95420..c374594979e6 100644 --- a/sc/source/filter/inc/drawingmanager.hxx +++ b/sc/source/filter/inc/drawingmanager.hxx @@ -219,7 +219,7 @@ public: /** Called when a new UNO shape has been inserted into the draw page. */ virtual void notifyShapeInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, - const ::com::sun::star::awt::Rectangle& rShapeRect ); + const ::com::sun::star::awt::Rectangle& rShapeRect ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx index cf92e6056bff..d02bf23c4c62 100644 --- a/sc/source/filter/inc/eeimport.hxx +++ b/sc/source/filter/inc/eeimport.hxx @@ -51,12 +51,12 @@ public: ScEEImport( ScDocument* pDoc, const ScRange& rRange ); virtual ~ScEEImport(); - virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ); - virtual ScRange GetRange() { return maRange; } + virtual sal_uLong Read( SvStream& rStream, const OUString& rBaseURL ) SAL_OVERRIDE; + virtual ScRange GetRange() SAL_OVERRIDE { return maRange; } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, SvNumberFormatter* pFormatter = NULL, - bool bConvertDate = true ); + bool bConvertDate = true ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/inc/excelchartconverter.hxx b/sc/source/filter/inc/excelchartconverter.hxx index 5abff61ba6ae..43f80c5bba98 100644 --- a/sc/source/filter/inc/excelchartconverter.hxx +++ b/sc/source/filter/inc/excelchartconverter.hxx @@ -36,13 +36,13 @@ public: /** Creates an external data provider that is able to use spreadsheet data. */ virtual void createDataProvider( - const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc ); + const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& rxChartDoc ) SAL_OVERRIDE; /** Creates a data sequence from the passed formula. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > createDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider >& rxDataProvider, - const ::oox::drawingml::chart::DataSequenceModel& rDataSeq ); + const ::oox::drawingml::chart::DataSequenceModel& rDataSeq ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/excelfilter.hxx b/sc/source/filter/inc/excelfilter.hxx index 83eb7da54601..bc472de4c738 100644 --- a/sc/source/filter/inc/excelfilter.hxx +++ b/sc/source/filter/inc/excelfilter.hxx @@ -41,21 +41,21 @@ public: WorkbookGlobals& getWorkbookGlobals() const; void unregisterWorkbookGlobals(); - virtual bool importDocument() throw(); - virtual bool exportDocument() throw(); + virtual bool importDocument() throw() SAL_OVERRIDE; + virtual bool exportDocument() throw() SAL_OVERRIDE; - virtual const ::oox::drawingml::Theme* getCurrentTheme() const; - virtual ::oox::vml::Drawing* getVmlDrawing(); - virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles(); - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); - virtual void useInternalChartDataTable( bool bInternal ); + virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; + virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; + virtual const ::oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; + virtual void useInternalChartDataTable( bool bInternal ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: - virtual GraphicHelper* implCreateGraphicHelper() const; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual OUString implGetImplementationName() const; + virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; + virtual OUString implGetImplementationName() const SAL_OVERRIDE; WorkbookGlobals* mpBookGlob; }; diff --git a/sc/source/filter/inc/excelvbaproject.hxx b/sc/source/filter/inc/excelvbaproject.hxx index d0994dbcd9ef..9bc706c55847 100644 --- a/sc/source/filter/inc/excelvbaproject.hxx +++ b/sc/source/filter/inc/excelvbaproject.hxx @@ -41,7 +41,7 @@ public: protected: /** Adds dummy modules for sheets without imported code name. */ - virtual void prepareImport(); + virtual void prepareImport() SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheetDocument > diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 5d7b046f57e3..cd6d2539da7e 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -52,9 +52,9 @@ public: ExcelToSc( const XclImpRoot& rRoot ); virtual ~ExcelToSc(); virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen, - bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ); + bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; - virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ); + virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, const OUString& rUrl, const ::std::vector<OUString>& rTabNames ); @@ -129,16 +129,16 @@ public: ExcelToSc8( const XclImpRoot& rRoot ); virtual ~ExcelToSc8(); - virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ); + virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; - virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ); + virtual ConvErr Convert( _ScRangeListTabs&, XclImpStream& rStrm, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, - const OUString& rUrl, const ::std::vector<OUString>& rTabNames ); + const OUString& rUrl, const ::std::vector<OUString>& rTabNames ) SAL_OVERRIDE; static inline bool IsComplRowRange( const sal_uInt16 nRow1, const sal_uInt16 nRow2 ); - virtual bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ); + virtual bool GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index f0270fe9c311..b5c102965b78 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -42,7 +42,7 @@ public: ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ); virtual ~ImportExcel8( void ); - virtual FltError Read( void ); + virtual FltError Read( void ) SAL_OVERRIDE; void Calccount( void ); // 0x0C void Precision( void ); // 0x0E @@ -61,8 +61,8 @@ public: void FeatHdr( void ); // 0x0867 void Feat( void ); // 0x0868 - virtual void EndSheet( void ); - virtual void PostDocLoad( void ); + virtual void EndSheet( void ) SAL_OVERRIDE; + virtual void PostDocLoad( void ) SAL_OVERRIDE; private: void LoadDocumentProperties(); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index 90a2a12fa58c..2f1967906a3b 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -49,8 +49,8 @@ struct ScQueryEntry; class ExcRecord : public XclExpRecord { public: - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; virtual sal_uInt16 GetNum() const = 0; virtual sal_Size GetLen() const = 0; @@ -60,7 +60,7 @@ protected: private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -71,9 +71,9 @@ class ExcEmptyRec : public ExcRecord private: protected: public: - virtual void Save( XclExpStream& rStrm ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //--------------------------------------------------------- class ExcDummyRec - @@ -82,8 +82,8 @@ class ExcDummyRec : public ExcRecord { protected: public: - virtual void Save( XclExpStream& rStrm ); - virtual sal_uInt16 GetNum() const; + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; virtual const sal_uInt8* GetData() const = 0; // byte data must contain header and body }; @@ -94,7 +94,7 @@ public: class ExcBoolRecord : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; protected: bool bVal; @@ -104,7 +104,7 @@ protected: public: inline ExcBoolRecord( const bool bDefault ) : bVal( bDefault ) {} - virtual sal_Size GetLen( void ) const; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; @@ -129,12 +129,12 @@ public: class ExcBof : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: ExcBof( void ); - virtual sal_uInt16 GetNum( void ) const; - virtual sal_Size GetLen( void ) const; + virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; @@ -144,12 +144,12 @@ public: class ExcBofW : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: ExcBofW( void ); - virtual sal_uInt16 GetNum( void ) const; - virtual sal_Size GetLen( void ) const; + virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; @@ -159,8 +159,8 @@ class ExcEof : public ExcRecord { private: public: - virtual sal_uInt16 GetNum( void ) const; - virtual sal_Size GetLen( void ) const; + virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; }; @@ -173,8 +173,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const; - virtual const sal_uInt8* GetData( void ) const; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; // EXC_ID_WINDOWPROTECTION @@ -183,7 +183,7 @@ class XclExpWindowProtection : public XclExpBoolRecord public: XclExpWindowProtection(bool bValue); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; // EXC_ID_PROTECT Document Protection @@ -198,7 +198,7 @@ class XclExpSheetProtection : public XclExpProtection SCTAB mnTab; public: XclExpSheetProtection(bool bValue, SCTAB nTab); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; class XclExpPassHash : public XclExpRecord @@ -208,7 +208,7 @@ public: virtual ~XclExpPassHash(); private: - virtual void WriteBody(XclExpStream& rStrm); + virtual void WriteBody(XclExpStream& rStrm) SAL_OVERRIDE; private: sal_uInt16 mnHash; @@ -224,8 +224,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const; - virtual const sal_uInt8* GetData( void ) const; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; @@ -236,8 +236,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const; - virtual const sal_uInt8* GetData( void ) const; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; @@ -247,9 +247,9 @@ class Exc1904 : public ExcBoolRecord { public: Exc1904( ScDocument& rDoc ); - virtual sal_uInt16 GetNum( void ) const; + virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: bool bDateCompatibility; }; @@ -273,7 +273,7 @@ public: inline void SetStreamPos( sal_Size nNewStrPos ) { nStrPos = nNewStrPos; } void UpdateStreamPos( XclExpStream& rStrm ); - virtual sal_uInt16 GetNum() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; }; @@ -283,11 +283,11 @@ class ExcBundlesheet : public ExcBundlesheetBase private: OString aName; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: ExcBundlesheet( RootData& rRootData, SCTAB nTab ); - virtual sal_Size GetLen() const; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //--------------------------------------------------------- class ExcDummy_02 - @@ -299,8 +299,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const; - virtual const sal_uInt8* GetData( void ) const; + virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; }; @@ -317,7 +317,7 @@ private: sal_uInt16 mnDocCountry; /// The document country ID. /** Writes the body of the COUNTRY record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -338,7 +338,7 @@ public: explicit XclExpXmlSheetPr( bool bFitToPages, SCTAB nScTab, const Color& rTabColor, XclExpFilterManager* pManager ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: SCTAB mnScTab; @@ -410,7 +410,7 @@ private: sal_uInt8 nOp, double fVal, OUString* pText, bool bSimple = false ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ); @@ -422,7 +422,7 @@ public: bool AddEntry( const ScQueryEntry& rEntry ); bool AddMultiValueEntry( const ScQueryEntry& rEntry ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -435,8 +435,8 @@ public: void AddObjRecs(); - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; bool HasFilterMode() const; diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index 1a6ce47f869b..374f08551dd6 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -63,7 +63,7 @@ protected: public: ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ); virtual ~ExportBiff5(); - FltError Write(); + FltError Write() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/externallinkfragment.hxx b/sc/source/filter/inc/externallinkfragment.hxx index 5aea1766c0c1..1402b9f2112a 100644 --- a/sc/source/filter/inc/externallinkfragment.hxx +++ b/sc/source/filter/inc/externallinkfragment.hxx @@ -44,10 +44,10 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XExternalSheetCache >& rxSheetCache ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; private: /** Imports cell settings from a c element. */ @@ -85,13 +85,13 @@ public: ExternalLink& rExtLink ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: ::oox::core::ContextHandlerRef createSheetDataContext( sal_Int32 nSheetId ); diff --git a/sc/source/filter/inc/extlstcontext.hxx b/sc/source/filter/inc/extlstcontext.hxx index cb15ff40e3a3..4a716312ebac 100644 --- a/sc/source/filter/inc/extlstcontext.hxx +++ b/sc/source/filter/inc/extlstcontext.hxx @@ -21,8 +21,8 @@ class ExtCfRuleContext : public WorksheetContextBase public: explicit ExtCfRuleContext( WorksheetContextBase& rFragment, void* pDataBar ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; private: void* mpTarget; @@ -44,9 +44,9 @@ public: explicit ExtLstLocalContext( WorksheetContextBase& rFragment, void* pTarget ); // until now a ExtLst always extends an existing entry protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; private: void* mpTarget; @@ -61,8 +61,8 @@ public: explicit ExtGlobalContext( WorksheetContextBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; private: }; @@ -77,7 +77,7 @@ public: explicit ExtLstGlobalContext( WorksheetFragment& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; } //namespace xls diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index a7d478b42075..c8c0164c39e1 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -278,36 +278,36 @@ public: ScFormatFilterPluginImpl(); virtual ~ScFormatFilterPluginImpl(); // various import filters - virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW ); - virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ); - virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ); + virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW ) SAL_OVERRIDE; + virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ) SAL_OVERRIDE; + virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) SAL_OVERRIDE; // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren - virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ); + virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) SAL_OVERRIDE; virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, - const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ); - virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ); + const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; + virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) SAL_OVERRIDE; virtual FltError ScImportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, bool bCalcWidthHeight = true, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ); + SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) SAL_OVERRIDE; - virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ); - virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ); - virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ); + virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ) SAL_OVERRIDE; + virtual ScEEAbsImport *CreateHTMLImport( ScDocument* pDocP, const OUString& rBaseURL, const ScRange& rRange, bool bCalcWidthHeight ) SAL_OVERRIDE; + virtual OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ) SAL_OVERRIDE; // various export filters - virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ); + virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel eFormat, rtl_TextEncoding eDest ) SAL_OVERRIDE; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress& rOutPos, const rtl_TextEncoding eDest, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ); + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, - sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ); + sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) SAL_OVERRIDE; virtual FltError ScExportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest, bool bAll, - const OUString& rStreamPath, OUString& rNonConvertibleChars ); - virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ); + const OUString& rStreamPath, OUString& rNonConvertibleChars ) SAL_OVERRIDE; + virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const rtl_TextEncoding eDest ) SAL_OVERRIDE; - virtual ScOrcusFilters* GetOrcusFilters(); + virtual ScOrcusFilters* GetOrcusFilters() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 151017b683ac..2730ad6b2fdb 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -35,7 +35,7 @@ public: const ScHTMLParser* GetParser() const { return (ScHTMLParser*)mpParser; } virtual void WriteToDocument( bool bSizeColsRows = false, double nOutputFactor = 1.0, - SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ); + SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ) SAL_OVERRIDE; static OUString GetHTMLRangeNameList( ScDocument* pDoc, const OUString& rOrigName ); }; diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index 39ca2d8f77a7..e50b0d9e9348 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -88,7 +88,7 @@ public: explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLParser(); - virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) = 0; + virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) SAL_OVERRIDE = 0; ScHTMLStyles& GetStyles(); ScDocument& GetDoc(); @@ -226,8 +226,8 @@ private: public: ScHTMLLayoutParser( EditEngine*, const OUString& rBaseURL, const Size& aPageSize, ScDocument* ); virtual ~ScHTMLLayoutParser(); - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ); - virtual const ScHTMLTable* GetGlobalTable() const; + virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) SAL_OVERRIDE; + virtual const ScHTMLTable* GetGlobalTable() const SAL_OVERRIDE; }; @@ -621,10 +621,10 @@ public: explicit ScHTMLQueryParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLQueryParser(); - virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ); + virtual sal_uLong Read( SvStream& rStrm, const OUString& rBaseURL ) SAL_OVERRIDE; /** Returns the "global table" which contains the entire HTML document. */ - virtual const ScHTMLTable* GetGlobalTable() const; + virtual const ScHTMLTable* GetGlobalTable() const SAL_OVERRIDE; private: /** Handles all possible tags in the HTML document. */ diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index ccc407edf05d..f43a0b82e399 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -208,7 +208,7 @@ public: virtual ~ImportExcel( void ); - virtual FltError Read( void ); + virtual FltError Read( void ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 1778a87aa40e..661b9eb04ce5 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -90,7 +90,7 @@ private: public: LotusToSc( SvStream& aStr, rtl_TextEncoding eSrc, bool b ); virtual ConvErr Convert( const ScTokenArray*& rpErg, sal_Int32& nRest, - const FORMULA_TYPE eFT = FT_CellFormula ); + const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; void Reset( const ScAddress& rEingPos ); inline void SetWK3( void ); diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index 17bcf0fcfd39..f1157a607ddf 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -82,7 +82,7 @@ public: virtual ~ImportLotus(); - FltError Read(); + FltError Read() SAL_OVERRIDE; FltError Read( SvStream& ); // special for *.fm3-Dateien }; diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index 199370aa2e4b..e6adca8cfa9c 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -50,26 +50,26 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- virtual ::rtl::OUString SAL_CALL - getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rService ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // com.sun.star.lang.XInitialization interface ---------------------------- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) - throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // com.sun.star.sheet.XFilterFormulaParser interface ---------------------- virtual ::rtl::OUString SAL_CALL getSupportedNamespace() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // com.sun.star.sheet.XFormulaParser interface ---------------------------- @@ -77,13 +77,13 @@ public: parseFormula( const ::rtl::OUString& rFormula, const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL printFormula( const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& rTokens, const ::com::sun::star::table::CellAddress& rReferencePos ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: typedef ::boost::shared_ptr< OOXMLFormulaParserImpl > ParserImplRef; diff --git a/sc/source/filter/inc/orcusfiltersimpl.hxx b/sc/source/filter/inc/orcusfiltersimpl.hxx index 0db7f6a79b39..c0c61c47f6f0 100644 --- a/sc/source/filter/inc/orcusfiltersimpl.hxx +++ b/sc/source/filter/inc/orcusfiltersimpl.hxx @@ -20,12 +20,12 @@ class ScOrcusFiltersImpl : public ScOrcusFilters public: static OString toSystemPath(const OUString& rPath); - virtual bool importCSV(ScDocument& rDoc, SfxMedium& rMedium) const; - virtual bool importGnumeric(ScDocument& rDoc, SfxMedium& rMedium) const; - virtual bool importXLSX(ScDocument& rDoc, SfxMedium& rMedium) const; - virtual bool importODS(ScDocument& rDoc, SfxMedium& rMedium) const; + virtual bool importCSV(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; + virtual bool importGnumeric(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; + virtual bool importXLSX(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; + virtual bool importODS(ScDocument& rDoc, SfxMedium& rMedium) const SAL_OVERRIDE; - virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const; + virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const OUString& rPath) const SAL_OVERRIDE; }; class ScOrcusXMLContextImpl : public ScOrcusXMLContext @@ -39,9 +39,9 @@ public: ScOrcusXMLContextImpl(ScDocument& rDoc, const OUString& rPath); virtual ~ScOrcusXMLContextImpl(); - virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam); + virtual bool loadXMLStructure(SvTreeListBox& rTreeCtrl, ScOrcusXMLTreeParam& rParam) SAL_OVERRIDE; - virtual bool importXML(const ScOrcusImportXMLParam& rParam); + virtual bool importXML(const ScOrcusImportXMLParam& rParam) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/inc/orcusinterface.hxx b/sc/source/filter/inc/orcusinterface.hxx index ca6027e5ceba..b54f3976c2b9 100644 --- a/sc/source/filter/inc/orcusinterface.hxx +++ b/sc/source/filter/inc/orcusinterface.hxx @@ -43,7 +43,7 @@ class ScOrcusGlobalSettings : public orcus::spreadsheet::iface::import_global_se public: ScOrcusGlobalSettings(ScDocumentImport& rDoc); - virtual void set_origin_date(int year, int month, int day); + virtual void set_origin_date(int year, int month, int day) SAL_OVERRIDE; }; class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_strings @@ -54,21 +54,21 @@ class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_str public: ScOrcusSharedStrings(ScOrcusFactory& rFactory); - virtual size_t append(const char* s, size_t n); - virtual size_t add(const char* s, size_t n); + virtual size_t append(const char* s, size_t n) SAL_OVERRIDE; + virtual size_t add(const char* s, size_t n) SAL_OVERRIDE; - virtual void set_segment_bold(bool b); - virtual void set_segment_italic(bool b); - virtual void set_segment_font(size_t font_index); - virtual void set_segment_font_name(const char* s, size_t n); - virtual void set_segment_font_size(double point); + virtual void set_segment_bold(bool b) SAL_OVERRIDE; + virtual void set_segment_italic(bool b) SAL_OVERRIDE; + virtual void set_segment_font(size_t font_index) SAL_OVERRIDE; + virtual void set_segment_font_name(const char* s, size_t n) SAL_OVERRIDE; + virtual void set_segment_font_size(double point) SAL_OVERRIDE; virtual void set_segment_font_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue); - virtual void append_segment(const char* s, size_t n); + orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + virtual void append_segment(const char* s, size_t n) SAL_OVERRIDE; - virtual size_t commit_segments(); + virtual size_t commit_segments() SAL_OVERRIDE; }; class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet @@ -89,35 +89,35 @@ public: ScOrcusSheet(ScDocumentImport& rDoc, SCTAB nTab, ScOrcusFactory& rFactory); // Orcus import interface - virtual void set_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n); - virtual void set_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex); - virtual void set_value(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double value); - virtual void set_bool(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, bool value); + virtual void set_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE; + virtual void set_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) SAL_OVERRIDE; + virtual void set_value(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double value) SAL_OVERRIDE; + virtual void set_bool(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, bool value) SAL_OVERRIDE; virtual void set_date_time( - orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second); + orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second) SAL_OVERRIDE; - virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index); + virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index) SAL_OVERRIDE; - virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n); - virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n); + virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n) SAL_OVERRIDE; + virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n) SAL_OVERRIDE; virtual void set_shared_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, - const char* p_formula, size_t n_formula); + const char* p_formula, size_t n_formula) SAL_OVERRIDE; virtual void set_shared_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, - const char* p_formula, size_t n_formula, const char* p_range, size_t n_range); + const char* p_formula, size_t n_formula, const char* p_range, size_t n_range) SAL_OVERRIDE; - virtual void set_shared_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex); + virtual void set_shared_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex) SAL_OVERRIDE; virtual void set_array_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, - const char* p, size_t n, orcus::spreadsheet::row_t array_rows, orcus::spreadsheet::col_t array_cols); + const char* p, size_t n, orcus::spreadsheet::row_t array_rows, orcus::spreadsheet::col_t array_cols) SAL_OVERRIDE; virtual void set_array_formula( orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, - const char* p, size_t n, const char* p_range, size_t n_range); + const char* p, size_t n, const char* p_range, size_t n_range) SAL_OVERRIDE; SCTAB getIndex() const { return mnTab; } }; @@ -128,77 +128,77 @@ class ScOrcusStyles : public orcus::spreadsheet::iface::import_styles public: // font - virtual void set_font_count(size_t n); - virtual void set_font_bold(bool b); - virtual void set_font_italic(bool b); - virtual void set_font_name(const char* s, size_t n); - virtual void set_font_size(double point); - virtual void set_font_underline(orcus::spreadsheet::underline_t e); + virtual void set_font_count(size_t n) SAL_OVERRIDE; + virtual void set_font_bold(bool b) SAL_OVERRIDE; + virtual void set_font_italic(bool b) SAL_OVERRIDE; + virtual void set_font_name(const char* s, size_t n) SAL_OVERRIDE; + virtual void set_font_size(double point) SAL_OVERRIDE; + virtual void set_font_underline(orcus::spreadsheet::underline_t e) SAL_OVERRIDE; virtual void set_font_color( orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue); - virtual size_t commit_font(); + orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + virtual size_t commit_font() SAL_OVERRIDE; // fill - virtual void set_fill_count(size_t n); - virtual void set_fill_pattern_type(const char* s, size_t n); - virtual void set_fill_fg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue); - virtual void set_fill_bg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue); - virtual size_t commit_fill(); + virtual void set_fill_count(size_t n) SAL_OVERRIDE; + virtual void set_fill_pattern_type(const char* s, size_t n) SAL_OVERRIDE; + virtual void set_fill_fg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + virtual void set_fill_bg_color(orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + virtual size_t commit_fill() SAL_OVERRIDE; // border - virtual void set_border_count(size_t n); - virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n); + virtual void set_border_count(size_t n) SAL_OVERRIDE; + virtual void set_border_style(orcus::spreadsheet::border_direction_t dir, const char* s, size_t n) SAL_OVERRIDE; virtual void set_border_color(orcus::spreadsheet::border_direction_t dir, orcus::spreadsheet::color_elem_t alpha, orcus::spreadsheet::color_elem_t red, orcus::spreadsheet::color_elem_t green, - orcus::spreadsheet::color_elem_t blue); - virtual size_t commit_border(); + orcus::spreadsheet::color_elem_t blue) SAL_OVERRIDE; + virtual size_t commit_border() SAL_OVERRIDE; // cell protection - virtual void set_cell_hidden(bool b); - virtual void set_cell_locked(bool b); - virtual size_t commit_cell_protection(); + virtual void set_cell_hidden(bool b) SAL_OVERRIDE; + virtual void set_cell_locked(bool b) SAL_OVERRIDE; + virtual size_t commit_cell_protection() SAL_OVERRIDE; // number format - virtual void set_number_format_count(size_t n); - virtual void set_number_format_identifier(size_t n); - virtual void set_number_format_code(const char* s, size_t n); - virtual size_t commit_number_format(); + virtual void set_number_format_count(size_t n) SAL_OVERRIDE; + virtual void set_number_format_identifier(size_t n) SAL_OVERRIDE; + virtual void set_number_format_code(const char* s, size_t n) SAL_OVERRIDE; + virtual size_t commit_number_format() SAL_OVERRIDE; // cell style xf - virtual void set_cell_style_xf_count(size_t n); - virtual size_t commit_cell_style_xf(); + virtual void set_cell_style_xf_count(size_t n) SAL_OVERRIDE; + virtual size_t commit_cell_style_xf() SAL_OVERRIDE; // cell xf - virtual void set_cell_xf_count(size_t n); - virtual size_t commit_cell_xf(); + virtual void set_cell_xf_count(size_t n) SAL_OVERRIDE; + virtual size_t commit_cell_xf() SAL_OVERRIDE; // xf (cell format) - used both by cell xf and cell style xf. - virtual void set_xf_number_format(size_t index); - virtual void set_xf_font(size_t index); - virtual void set_xf_fill(size_t index); - virtual void set_xf_border(size_t index); - virtual void set_xf_protection(size_t index); - virtual void set_xf_style_xf(size_t index); - virtual void set_xf_apply_alignment(bool b); - virtual void set_xf_horizontal_alignment(orcus::spreadsheet::hor_alignment_t align); - virtual void set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_t align); + virtual void set_xf_number_format(size_t index) SAL_OVERRIDE; + virtual void set_xf_font(size_t index) SAL_OVERRIDE; + virtual void set_xf_fill(size_t index) SAL_OVERRIDE; + virtual void set_xf_border(size_t index) SAL_OVERRIDE; + virtual void set_xf_protection(size_t index) SAL_OVERRIDE; + virtual void set_xf_style_xf(size_t index) SAL_OVERRIDE; + virtual void set_xf_apply_alignment(bool b) SAL_OVERRIDE; + virtual void set_xf_horizontal_alignment(orcus::spreadsheet::hor_alignment_t align) SAL_OVERRIDE; + virtual void set_xf_vertical_alignment(orcus::spreadsheet::ver_alignment_t align) SAL_OVERRIDE; // cell style entry - virtual void set_cell_style_count(size_t n); - virtual void set_cell_style_name(const char* s, size_t n); - virtual void set_cell_style_xf(size_t index); - virtual void set_cell_style_builtin(size_t index); - virtual size_t commit_cell_style(); + virtual void set_cell_style_count(size_t n) SAL_OVERRIDE; + virtual void set_cell_style_name(const char* s, size_t n) SAL_OVERRIDE; + virtual void set_cell_style_xf(size_t index) SAL_OVERRIDE; + virtual void set_cell_style_builtin(size_t index) SAL_OVERRIDE; + virtual size_t commit_cell_style() SAL_OVERRIDE; }; class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory @@ -232,13 +232,13 @@ class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory public: ScOrcusFactory(ScDocument& rDoc); - virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length); - virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length); - virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index); - virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings(); - virtual orcus::spreadsheet::iface::import_shared_strings* get_shared_strings(); - virtual orcus::spreadsheet::iface::import_styles* get_styles(); - virtual void finalize(); + virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length) SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length) SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_sheet* get_sheet(orcus::spreadsheet::sheet_t sheet_index) SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings() SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_shared_strings* get_shared_strings() SAL_OVERRIDE; + virtual orcus::spreadsheet::iface::import_styles* get_styles() SAL_OVERRIDE; + virtual void finalize() SAL_OVERRIDE; size_t appendString(const OUString& rStr); size_t addString(const OUString& rStr); diff --git a/sc/source/filter/inc/pivotcachefragment.hxx b/sc/source/filter/inc/pivotcachefragment.hxx index 0a3b093dd193..b35cd1527cba 100644 --- a/sc/source/filter/inc/pivotcachefragment.hxx +++ b/sc/source/filter/inc/pivotcachefragment.hxx @@ -38,10 +38,10 @@ public: PivotCacheField& rCacheField ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: PivotCacheField& mrCacheField; @@ -58,10 +58,10 @@ public: PivotCache& rPivotCache ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void finalizeImport(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; private: PivotCache& mrPivotCache; @@ -78,9 +78,9 @@ public: const PivotCache& rPivotCache ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: void startCacheRecord(); @@ -106,7 +106,7 @@ public: PivotCache& rPivotCache ); /** Imports the entire fragment, returns true, if EOF record has been reached. */ - virtual bool importFragment(); + virtual bool importFragment() SAL_OVERRIDE; private: PivotCache& mrPivotCache; @@ -123,7 +123,7 @@ public: /** Reads the current record from stream and tries to insert a cell into the source data sheet. */ - virtual void importRecord( BiffInputStream& rStrm ); + virtual void importRecord( BiffInputStream& rStrm ) SAL_OVERRIDE; private: void startNextRow(); diff --git a/sc/source/filter/inc/pivottablefragment.hxx b/sc/source/filter/inc/pivottablefragment.hxx index 6c551b8aedd4..7847f2be33fb 100644 --- a/sc/source/filter/inc/pivottablefragment.hxx +++ b/sc/source/filter/inc/pivottablefragment.hxx @@ -40,10 +40,10 @@ public: PivotTableField& rTableField ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: PivotTableField& mrTableField; @@ -59,10 +59,10 @@ public: PivotTableFilter& rTableFilter ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: PivotTableFilter& mrTableFilter; @@ -78,9 +78,9 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: PivotTable& mrPivotTable; diff --git a/sc/source/filter/inc/querytablefragment.hxx b/sc/source/filter/inc/querytablefragment.hxx index d4726e3d7d99..3539639793bc 100644 --- a/sc/source/filter/inc/querytablefragment.hxx +++ b/sc/source/filter/inc/querytablefragment.hxx @@ -37,10 +37,10 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: QueryTable& mrQueryTable; diff --git a/sc/source/filter/inc/richstringcontext.hxx b/sc/source/filter/inc/richstringcontext.hxx index d9229e089e3d..e277f939caa7 100644 --- a/sc/source/filter/inc/richstringcontext.hxx +++ b/sc/source/filter/inc/richstringcontext.hxx @@ -35,8 +35,8 @@ public: explicit RichStringContext( ParentType& rParent, RichStringRef xString ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; private: RichStringRef mxString; /// Processed string. diff --git a/sc/source/filter/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index 7a3d8b68f361..c70a2c590816 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -76,7 +76,7 @@ private: public: ScRTFParser( EditEngine* ); virtual ~ScRTFParser(); - virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ); + virtual sal_uLong Read( SvStream&, const OUString& rBaseURL ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/scenariocontext.hxx b/sc/source/filter/inc/scenariocontext.hxx index a583f983e33a..7eafaf3bec24 100644 --- a/sc/source/filter/inc/scenariocontext.hxx +++ b/sc/source/filter/inc/scenariocontext.hxx @@ -36,11 +36,11 @@ public: explicit ScenarioContext( WorksheetContextBase& rParent, SheetScenarios& rSheetScenarios ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: Scenario& mrScenario; @@ -54,11 +54,11 @@ public: explicit ScenariosContext( WorksheetFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; private: SheetScenarios& mrSheetScenarios; diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index 0c75fbdb47f2..518bad368128 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -534,7 +534,7 @@ public: FaceName[sizeof(FaceName)-1] = 0; } Sc10FontData( SvStream& rStream ); - virtual ScDataObject* Clone() const { return new Sc10FontData(*this); } + virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10FontData(*this); } }; @@ -570,7 +570,7 @@ public : memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10NameData(SvStream& rStream); - virtual ScDataObject* Clone() const { return new Sc10NameData(*this); } + virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10NameData(*this); } }; @@ -623,7 +623,7 @@ public: memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10PatternData(SvStream& rStream); -virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); } +virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10PatternData(*this); } }; @@ -653,7 +653,7 @@ public: memcpy(&DataBaseRec, &rData.DataBaseRec, sizeof(DataBaseRec)); } Sc10DataBaseData(SvStream& rStream); -virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this); } +virtual ScDataObject* Clone() const SAL_OVERRIDE { return new Sc10DataBaseData(*this); } }; @@ -679,7 +679,7 @@ public: Sc10PageData( const Sc10PageFormat& rFormat ) : aPageFormat(rFormat) {} bool operator==( const Sc10PageData& rData ) const { return aPageFormat == rData.aPageFormat; } - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const SAL_OVERRIDE; }; // Seitenformat-Collection diff --git a/sc/source/filter/inc/sharedstringsfragment.hxx b/sc/source/filter/inc/sharedstringsfragment.hxx index a4384c21010b..c7e2633c22cd 100644 --- a/sc/source/filter/inc/sharedstringsfragment.hxx +++ b/sc/source/filter/inc/sharedstringsfragment.hxx @@ -35,11 +35,11 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/sheetdatacontext.hxx b/sc/source/filter/inc/sheetdatacontext.hxx index e352cd0865b5..45593235ba5d 100644 --- a/sc/source/filter/inc/sheetdatacontext.hxx +++ b/sc/source/filter/inc/sheetdatacontext.hxx @@ -69,11 +69,11 @@ public: virtual ~SheetDataContext(); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; private: /** Different types of cell records. */ diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 8c8d5ad5f47c..ff2a8550e315 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -88,9 +88,9 @@ public: explicit ExcelGraphicHelper( const WorkbookHelper& rHelper ); /** Derived classes may implement to resolve a scheme color from the passed XML token identifier. */ - virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const; + virtual sal_Int32 getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE; /** Derived classes may implement to resolve a palette index to an RGB color. */ - virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const; + virtual sal_Int32 getPaletteColor( sal_Int32 nPaletteIdx ) const SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/stylesfragment.hxx b/sc/source/filter/inc/stylesfragment.hxx index e891e6d4f4ca..cdb90041d2bc 100644 --- a/sc/source/filter/inc/stylesfragment.hxx +++ b/sc/source/filter/inc/stylesfragment.hxx @@ -34,8 +34,8 @@ public: explicit IndexedColorsContext( WorkbookFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; }; @@ -48,7 +48,7 @@ public: WorkbookContextBase( rParent ), mxFont( rxFont ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: FontRef mxFont; @@ -64,8 +64,8 @@ public: WorkbookContextBase( rParent ), mxBorder( rxBorder ) {} protected: - virtual void onStartElement( const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: BorderRef mxBorder; @@ -81,7 +81,7 @@ public: WorkbookContextBase( rParent ), mxFill( rxFill ), mfGradPos( -1.0 ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: FillRef mxFill; @@ -98,8 +98,8 @@ public: WorkbookContextBase( rParent ), mxXf( rxXf ), mbCellXf( bCellXf ) {} protected: - virtual void onStartElement( const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: XfRef mxXf; @@ -116,7 +116,7 @@ public: WorkbookContextBase( rParent ), mxDxf( rxDxf ) {} protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: DxfRef mxDxf; @@ -132,11 +132,11 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/tablefragment.hxx b/sc/source/filter/inc/tablefragment.hxx index f6a6a0e3465a..6e5bd4d0cd50 100644 --- a/sc/source/filter/inc/tablefragment.hxx +++ b/sc/source/filter/inc/tablefragment.hxx @@ -37,10 +37,10 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; private: Table& mrTable; diff --git a/sc/source/filter/inc/workbookfragment.hxx b/sc/source/filter/inc/workbookfragment.hxx index 7c15c34b5209..df53df149b8b 100644 --- a/sc/source/filter/inc/workbookfragment.hxx +++ b/sc/source/filter/inc/workbookfragment.hxx @@ -38,13 +38,13 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; private: void importExternalReference( const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/worksheetfragment.hxx b/sc/source/filter/inc/worksheetfragment.hxx index b4c80e913ab3..fdf78f80af02 100644 --- a/sc/source/filter/inc/worksheetfragment.hxx +++ b/sc/source/filter/inc/worksheetfragment.hxx @@ -33,11 +33,11 @@ public: explicit DataValidationsContext( WorksheetFragmentBase& rFragment ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; private: /** Imports the dataValidation element containing data validation settings. */ @@ -59,14 +59,14 @@ public: const OUString& rFragmentPath ); protected: - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; - virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); + virtual ::oox::core::ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; - virtual const ::oox::core::RecordInfo* getRecordInfos() const; - virtual void initializeImport(); - virtual void finalizeImport(); + virtual const ::oox::core::RecordInfo* getRecordInfos() const SAL_OVERRIDE; + virtual void initializeImport() SAL_OVERRIDE; + virtual void finalizeImport() SAL_OVERRIDE; private: /** Imports page settings from a pageSetUpPr element. */ diff --git a/sc/source/filter/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index 21c9837075ca..ba71aa5e039d 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -40,7 +40,7 @@ public: private: /** Overloaded to create a new temporary file and return its stream. */ - virtual SvStream* ImplQueryPictureStream(); + virtual SvStream* ImplQueryPictureStream() SAL_OVERRIDE; private: SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -99,9 +99,9 @@ public: virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, - const Rectangle* pChildAnchor ); - virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ); - virtual EscherExHostAppData* EnterAdditionalTextGroup(); + const Rectangle* pChildAnchor ) SAL_OVERRIDE; + virtual void EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID ) SAL_OVERRIDE; + virtual EscherExHostAppData* EnterAdditionalTextGroup() SAL_OVERRIDE; /// Flush and merge PicStream into EscherStream void EndDocument(); @@ -163,7 +163,7 @@ class XclEscherClientData : public EscherExClientRecord_Base { public: XclEscherClientData() {} - virtual void WriteData( EscherEx& rEx ) const; + virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; }; @@ -186,7 +186,7 @@ public: //! ONLY for the AdditionalText mimic inline void SetXclObj( XclObj* p ) { pXclObj = p; } - virtual void WriteData( EscherEx& rEx ) const; + virtual void WriteData( EscherEx& rEx ) const SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index ff3b51e29397..023d929d0753 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -67,8 +67,8 @@ public: /// close groups and DgContainer opened in ctor void EndSheet(); - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; static void ResetCounters(); @@ -111,7 +111,7 @@ protected: void ImplWriteAnchor( const XclExpRoot& rRoot, const SdrObject* pSdrObj, const Rectangle* pChildAnchor ); // overwritten for writing MSODRAWING record - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; virtual void WriteSubRecs( XclExpStream& rStrm ); void SaveTextRecs( XclExpStream& rStrm ); @@ -154,7 +154,7 @@ public: //! actually writes ESCHER_ClientTextbox void SetText( const XclExpRoot& rRoot, const SdrTextObj& rObj ); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; // --- class XclObjComment ------------------------------------------- @@ -179,8 +179,8 @@ public: const Rectangle& rRect, SdrObject* pCaption, bool bVisible ); - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -191,7 +191,7 @@ class XclObjDropDown : public XclObj private: bool bIsFiltered; - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; protected: public: @@ -214,13 +214,13 @@ public: inline void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; } inline void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; } - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpStringRef mpString; /// Text and formatting data. @@ -239,13 +239,13 @@ private: const SdrObject& rOleObj; SotStorage* pRootStorage; - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclObjOle( XclExpObjectManager& rObjMgr, const SdrObject& rObj ); virtual ~XclObjOle(); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -254,7 +254,7 @@ public: class XclObjAny : public XclObj { protected: - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclObjAny( XclExpObjectManager& rObjMgr, @@ -265,8 +265,8 @@ public: GetShape() const { return mxShape; } - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ); static void WriteFromTo( XclExpXmlStream& rStrm, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, SCTAB nTab ); @@ -284,13 +284,13 @@ protected: sal_uInt32 nFileHistory; // bfh sal_uInt32 nLowestBiffVer; // sfo - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: ExcBof8_Base(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -322,15 +322,15 @@ private: OUString sUnicodeName; XclExpString GetName() const; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: ExcBundlesheet8( RootData& rRootData, SCTAB nTab ); ExcBundlesheet8( const OUString& rString ); - virtual sal_Size GetLen() const; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -339,8 +339,8 @@ public: class XclObproj : public ExcRecord { public: - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -350,12 +350,12 @@ class XclCodename : public ExcRecord { private: XclExpString aName; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclCodename( const OUString& ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -399,17 +399,17 @@ private: bool Append( sal_uInt16 nCol, sal_uInt16 nRow, const OUString& rTxt ); - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; protected: public: ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ); virtual ~ExcEScenario(); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -420,18 +420,18 @@ private: sal_uInt16 nActive; std::vector<ExcEScenario*> aScenes; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; protected: public: ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ); virtual ~ExcEScenarioManager(); - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; @@ -445,7 +445,7 @@ public: explicit XclExpSheetProtectOptions( const XclExpRoot& rRoot, SCTAB nTab ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnOptions; /// Encoded sheet protection options. @@ -460,7 +460,7 @@ public: explicit XclExpSheetEnhancedProtection( const XclExpRoot& rRoot, const ScEnhancedProtection& rProt ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclExpRoot& mrRoot; @@ -474,14 +474,14 @@ class XclCalccount : public ExcRecord private: sal_uInt16 nCount; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclCalccount( const ScDocument& ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -492,14 +492,14 @@ class XclIteration : public ExcRecord private: sal_uInt16 nIter; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclIteration( const ScDocument& ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -510,14 +510,14 @@ class XclDelta : public ExcRecord private: double fDelta; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: XclDelta( const ScDocument& ); - virtual sal_uInt16 GetNum() const; - virtual sal_Size GetLen() const; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -528,7 +528,7 @@ class XclRefmode : public XclExpBoolRecord public: XclRefmode( const ScDocument& ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; @@ -540,7 +540,7 @@ public: virtual ~XclExpFileEncryption(); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclExpRoot& mrRoot; @@ -555,7 +555,7 @@ public: explicit XclExpInterfaceHdr( sal_uInt16 nCodePage ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -568,7 +568,7 @@ public: virtual ~XclExpInterfaceEnd(); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -582,7 +582,7 @@ public: virtual ~XclExpWriteAccess(); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -592,10 +592,10 @@ class XclExpFileSharing : public XclExpRecord public: explicit XclExpFileSharing( const XclExpRoot& rRoot, sal_uInt16 nPasswordHash, bool bRecommendReadOnly ); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpString maUserName; @@ -612,7 +612,7 @@ public: virtual ~XclExpProt4Rev(); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -624,7 +624,7 @@ public: virtual ~XclExpProt4RevPass(); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 45427dcf8d76..4a48d46f9442 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -170,7 +170,7 @@ public: virtual ~XclExpChGroupBase(); /** Saves the header record. Calls WriteSubRecords() to let derived classes write sub records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; /** Derived classes return whether there are any records embedded in this group. */ virtual bool HasSubRecords() const; /** Derived classes implement writing any records embedded in this group. */ @@ -197,7 +197,7 @@ public: XclFutureRecType eRecType, sal_uInt16 nRecId, sal_Size nRecSize = 0 ); /** Writes missing CHFRBLOCKBEGIN records and this record. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; // Frame formatting =========================================================== @@ -211,7 +211,7 @@ public: inline XclChFramePos& GetFramePosData() { return maData; } private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChFramePos maData; /// Position of the frame. @@ -245,7 +245,7 @@ public: bool IsDefault( XclChFrameType eDefFrameType ) const; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChLineFormat maData; /// Contents of the CHLINEFORMAT record. @@ -278,7 +278,7 @@ public: bool IsDefault( XclChFrameType eDefFrameType ) const; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChAreaFormat maData; /// Contents of the CHAREAFORMAT record. @@ -302,17 +302,17 @@ public: bool IsValid() const; /** Writes the CHESCHERFORMAT record group to the stream, if complex formatting is extant. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; /** Returns true, if this record group contains a CHPICFORMAT record. */ - virtual bool HasSubRecords() const; + virtual bool HasSubRecords() const SAL_OVERRIDE; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Inserts a color from the contained Escher property set into the color palette. */ sal_uInt32 RegisterColor( sal_uInt16 nPropId ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChEscherFormat maData; /// Fill properties for complex areas (CHESCHERFORMAT record). @@ -380,12 +380,12 @@ public: bool IsDeleteable() const; /** Writes the entire record group. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChFrame maData; /// Contents of the CHFRAME record. @@ -421,10 +421,10 @@ public: inline bool HasString() const { return mxString && !mxString->IsEmpty(); } /** Writes the CHSOURCELINK record and optionally a CHSTRING record with explicit string data. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChSourceLink maData; /// Contents of the CHSOURCELINK record. @@ -454,7 +454,7 @@ public: explicit XclExpChObjectLink( sal_uInt16 nLinkTarget, const XclChDataPointPos& rPointPos ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChObjectLink maData; /// Contents of the CHOBJECTLINK record. @@ -477,7 +477,7 @@ public: bool bShowPercent, bool bShowBubble ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChFrLabelProps maData; /// Contents of the CHFRLABELPROPS record. @@ -523,9 +523,9 @@ public: explicit XclExpChText( const XclExpChRoot& rRoot ); /** Sets font color and color identifier to internal data structures. */ - virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ); + virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ) SAL_OVERRIDE; /** Sets text rotation to internal data structures. */ - virtual void SetRotation( sal_uInt16 nRotation ); + virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE; /** Converts all text settings of the passed title text object. */ void ConvertTitle( XTitleRef xTitle, sal_uInt16 nTarget, const OUString* pSubTitle = NULL ); @@ -543,10 +543,10 @@ public: sal_uInt16 GetAttLabelFlags() const; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChText maData; /// Contents of the CHTEXT record. @@ -587,7 +587,7 @@ private: /** Registers marker colors in palette and stores color identifiers. */ void RegisterColors( const XclExpChRoot& rRoot ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChMarkerFormat maData; /// Contents of the CHMARKERFORMAT record. @@ -623,7 +623,7 @@ public: void Convert( const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclCh3dDataFormat maData; /// Contents of the CH3DDATAFORMAT record. @@ -667,10 +667,10 @@ public: inline bool IsSeriesFormat() const { return maData.maPointPos.mnPointIdx == EXC_CHDATAFORMAT_ALLPOINTS; } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChDataFormat maData; /// Contents of the CHDATAFORMAT record. @@ -703,7 +703,7 @@ public: inline XclExpChTextRef GetDataLabel() const { return mxLabel; } private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChSerTrendLine maData; /// Contents of the CHSERTRENDLINE record. @@ -725,7 +725,7 @@ public: bool Convert( XclExpChSourceLink& rValueLink, sal_uInt16& rnValueCount, const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChSerErrorBar maData; /// Contents of the CHSERERRORBAR record. @@ -770,7 +770,7 @@ public: void ConvertCategSequence( XLabeledDataSeqRef xCategSeq ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Initializes members of this series to represent a child of the passed series. */ @@ -785,7 +785,7 @@ private: void CreateErrorBar( const ScfPropertySet& rPropSet, const OUString& rShowPropName, sal_uInt8 nBarId ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpChDataFormat > XclExpChDataFormatList; @@ -831,7 +831,7 @@ public: inline const XclChTypeInfo& GetTypeInfo() const { return maTypeInfo; } private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChType maData; /// Contents of the chart type record. @@ -855,7 +855,7 @@ public: inline bool IsClustered() const { return ::get_flag( maData.mnFlags, EXC_CHCHART3D_CLUSTER ); } private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChChart3d maData; /// Contents of the CHCHART3D record. @@ -879,10 +879,10 @@ public: void Convert( const ScfPropertySet& rPropSet ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChLegend maData; /// Contents of the CHLEGEND record. @@ -909,10 +909,10 @@ public: void Convert( const ScfPropertySet& rPropSet ); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChObjectType meObjType; /// Type of the dropbar. @@ -968,7 +968,7 @@ public: inline bool IsCombinable2d() const { return !Is3dChart() && maTypeInfo.mbCombinable2d; } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Returns an unused format index to be used for the next created series. */ @@ -983,7 +983,7 @@ private: bool CreateStockSeries( XDataSeriesRef xDataSeries, const OUString& rValueRole, bool bCloseSymbol ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpChSeries > XclExpChSeriesList; @@ -1019,8 +1019,8 @@ public: { ::set_flag( maLabelData.mnFlags, EXC_CHLABELRANGE_BETWEEN, bTicksBetween ); } private: - virtual void Save( XclExpStream& rStrm ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChLabelRange maLabelData; /// Contents of the CHLABELRANGE record. @@ -1042,7 +1042,7 @@ public: void ConvertAxisPosition( const ScfPropertySet& rPropSet ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChValueRange maData; /// Contents of the CHVALUERANGE record. @@ -1065,7 +1065,7 @@ public: void SetRotation( sal_uInt16 nRotation ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChTick maData; /// Contents of the CHTICK record. @@ -1093,9 +1093,9 @@ public: explicit XclExpChAxis( const XclExpChRoot& rRoot, sal_uInt16 nAxisType ); /** Sets font color and color identifier to internal data structures. */ - virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ); + virtual void SetFont( XclExpChFontRef xFont, const Color& rColor, sal_uInt32 nColorId ) SAL_OVERRIDE; /** Sets text rotation to internal data structures. */ - virtual void SetRotation( sal_uInt16 nRotation ); + virtual void SetRotation( sal_uInt16 nRotation ) SAL_OVERRIDE; /** Converts formatting and scaling settings from the passed axis. */ void Convert( XAxisRef xAxis, XAxisRef xCrossingAxis, @@ -1109,10 +1109,10 @@ public: inline sal_Int32 GetApiAxisDimension() const { return maData.GetApiAxisDimension(); } /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclChAxis maData; /// Contents of the CHAXIS record. @@ -1160,7 +1160,7 @@ public: bool Is3dChart() const; /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Returns first inserted chart type group. */ @@ -1174,7 +1174,7 @@ private: XCoordSystemRef xCoordSystem, const XclChExtTypeInfo& rTypeInfo, sal_Int32 nCrossingAxisDim ); - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpChTypeGroup > XclExpChTypeGroupList; @@ -1220,10 +1220,10 @@ public: void SetManualPlotArea(); /** Writes all embedded records. */ - virtual void WriteSubRecords( XclExpStream& rStrm ); + virtual void WriteSubRecords( XclExpStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpChSeries > XclExpChSeriesList; @@ -1253,7 +1253,7 @@ public: const Size& rChartSize ); virtual ~XclExpChartDrawing(); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: boost::shared_ptr< XclExpObjectManager > mxObjMgr; diff --git a/sc/source/filter/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 314c0846db2f..545ff59f5ddf 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -60,8 +60,8 @@ public: sal_uInt32 Insert( XclExpStringRef xString ); /** Writes the complete SST and EXTSST records. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef boost::scoped_ptr< XclExpSstImpl > XclExpSstImplPtr; @@ -82,8 +82,8 @@ public: sal_uInt32 GetBaseXFId( const ScAddress& rPos ) const; /** Writes the record, if it contains at least one merged cell range. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: ScRangeList maMergedRanges; /// All merged cell ranges of the sheet. @@ -106,7 +106,7 @@ public: /** Returns the cell representation text or 0, if not available. */ inline const OUString* GetRepr() const { return m_Repr.isEmpty() ? 0 : &m_Repr; } - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; virtual void WriteEmbeddedData( XclExpStream& rStrm ); void SetDisplay( bool bDisplay ) { mbSetDisplay = bDisplay; } @@ -119,7 +119,7 @@ private: const OUString& rUrl, const XclExpRoot& rRoot ) const; /** Writes the body of the HLINK record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef boost::scoped_ptr< SvStream > SvStreamPtr; @@ -145,7 +145,7 @@ public: explicit XclExpLabelranges( const XclExpRoot& rRoot ); /** Writes the LABELRANGES record if it contains at least one range. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Fills the specified range list with all label headers of the current sheet. @@ -172,11 +172,11 @@ public: explicit XclExpCF( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority ); virtual ~XclExpCF(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the CF record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef boost::scoped_ptr< XclExpCFImpl > XclExpCFImplPtr; @@ -189,7 +189,7 @@ public: explicit XclExpDateFormat( const XclExpRoot& rRoot, const ScCondDateFormatEntry& rFormatEntry, sal_Int32 nPriority ); virtual ~XclExpDateFormat(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: const ScCondDateFormatEntry& mrFormatEntry; @@ -202,7 +202,7 @@ public: explicit XclExpCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rFormatEntry, const ScAddress& rPos, bool bFirst = true); virtual ~XclExpCfvo() {} - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: const ScColorScaleEntry& mrEntry; ScAddress maSrcPos; @@ -215,7 +215,7 @@ public: explicit XclExpColScaleCol( const XclExpRoot& rRoot, const Color& rColor); virtual ~XclExpColScaleCol(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: const Color& mrColor; }; @@ -236,12 +236,12 @@ public: bool IsValid() const; /** Writes the CONDFMT record with following CF records, if there is valid data. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the CONDFMT record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpRecord > XclExpCFList; @@ -256,7 +256,7 @@ class XclExpColorScale: public XclExpRecord, protected XclExpRoot public: explicit XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpCfvo > XclExpCfvoList; typedef XclExpRecordList< XclExpColScaleCol > XclExpColScaleColList; @@ -271,7 +271,7 @@ class XclExpDataBar : public XclExpRecord, protected XclExpRoot public: explicit XclExpDataBar( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, sal_Int32 nPriority, XclExtLstRef xExtLst ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: boost::scoped_ptr<XclExpCfvo> mpCfvoLowerLimit; boost::scoped_ptr<XclExpCfvo> mpCfvoUpperLimit; @@ -287,7 +287,7 @@ class XclExpIconSet : public XclExpRecord, protected XclExpRoot public: explicit XclExpIconSet( const XclExpRoot& rRoot, const ScIconSetFormat& rFormat, sal_Int32 nPriority ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpCfvo > XclExpCfvoList; @@ -306,8 +306,8 @@ public: explicit XclExpCondFormatBuffer( const XclExpRoot& rRoot, XclExtLstRef xExtLst ); /** Writes all contained CONDFMT records with their CF records. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpCondfmt > XclExpCondfmtList; @@ -335,11 +335,11 @@ public: @return false = Resulting range list empty - do not write this record. */ bool Finalize(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the DV record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: ScRangeList maScRanges; /// Calc range list with all affected cells. @@ -370,15 +370,15 @@ public: void InsertCellRange( const ScRange& rRange, sal_uLong nScHandle ); /** Writes the DVAL record and the DV record list. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Searches for or creates a XclExpDV record object with the specified handle. */ XclExpDV& SearchOrCreateDv( sal_uLong nScHandle ); /** Writes the body of the DVAL record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpDV > XclExpDVList; @@ -406,7 +406,7 @@ public: virtual ~XclExpWebQuery(); /** Writes all needed records for this web query. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpString maDestRange; /// Destination range. diff --git a/sc/source/filter/inc/xeescher.hxx b/sc/source/filter/inc/xeescher.hxx index 660d5f38ceb0..a51e5306341c 100644 --- a/sc/source/filter/inc/xeescher.hxx +++ b/sc/source/filter/inc/xeescher.hxx @@ -54,7 +54,7 @@ public: /** Called from SVX DFF converter. @param rRect The object anchor rectangle to be exported (in twips). */ - virtual void WriteData( EscherEx& rEscherEx, const Rectangle& rRect ); + virtual void WriteData( EscherEx& rEscherEx, const Rectangle& rRect ) SAL_OVERRIDE; private: virtual void ImplSetFlags( const SdrObject& rSdrObj ); @@ -74,8 +74,8 @@ public: explicit XclExpDffSheetAnchor( const XclExpRoot& rRoot ); private: - virtual void ImplSetFlags( const SdrObject& rSdrObj ); - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ); + virtual void ImplSetFlags( const SdrObject& rSdrObj ) SAL_OVERRIDE; + virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) SAL_OVERRIDE; private: SCTAB mnScTab; /// Calc sheet index. @@ -91,8 +91,8 @@ public: const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ); private: - virtual void ImplSetFlags( const SdrObject& rSdrObj ); - virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ); + virtual void ImplSetFlags( const SdrObject& rSdrObj ) SAL_OVERRIDE; + virtual void ImplCalcAnchorRect( const Rectangle& rRect, MapUnit eMapUnit ) SAL_OVERRIDE; private: Size maPageSize; @@ -127,7 +127,7 @@ public: explicit XclExpMsoDrawingBase( XclEscherEx& rEscherEx, sal_uInt16 nRecId ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; protected: XclEscherEx& mrEscherEx; /// Reference to the DFF converter containing the DFF stream. @@ -165,8 +165,8 @@ public: explicit XclExpImgData( const Graphic& rGraphic, sal_uInt16 nRecId ); /** Writes the BITMAP record. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: Graphic maGraphic; /// The VCL graphic. @@ -231,7 +231,7 @@ public: explicit XclExpShapeObj( XclExpObjectManager& rRoot, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); virtual ~XclExpShapeObj(); private: - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -251,7 +251,7 @@ public: sal_uInt32 nStrmStart, sal_uInt32 nStrmSize ); private: - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; private: OUString maClassName; /// Class name of the control. @@ -275,7 +275,7 @@ public: bool SetMacroLink( const ::com::sun::star::script::ScriptEventDescriptor& rEvent ); private: - virtual void WriteSubRecs( XclExpStream& rStrm ); + virtual void WriteSubRecs( XclExpStream& rStrm ) SAL_OVERRIDE; /** Writes a subrecord containing a cell link, or nothing, if no link present. */ void WriteCellLinkSubRec( XclExpStream& rStrm, sal_uInt16 nSubRecId ); @@ -319,8 +319,8 @@ public: virtual ~XclExpChartObj(); /** Writes the OBJ record and the entire chart substream. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; virtual void WriteChartObj( sax_fastparser::FSHelperPtr pDrawing, XclExpXmlStream& rStrm ); void WriteShapeTransformation( sax_fastparser::FSHelperPtr pFS, const XShapeRef& rXShape, bool bFlipH = false, bool bFlipV = false, sal_Int32 nRotation = 0 ); @@ -358,14 +358,14 @@ public: const OUString& rAddText ); /** Writes the NOTE record, if the respective Escher object is present. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; void WriteXml( sal_Int32 nAuthorId, XclExpXmlStream& rStrm ); const XclExpString& GetAuthor() const { return maAuthor; } private: /** Writes the body of the NOTE record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpString maAuthor; /// Name of the author. @@ -397,7 +397,7 @@ public: XclExpComments( SCTAB nTab, XclExpNoteList& rNotes ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: SCTAB mnTab; @@ -464,7 +464,7 @@ public: /** Creates a new DFF client anchor object for embedded objects according to the scaling data passed to the constructor. Caller takes ownership! */ - virtual XclExpDffAnchorBase* CreateDffAnchor() const; + virtual XclExpDffAnchorBase* CreateDffAnchor() const SAL_OVERRIDE; private: Size maPageSize; diff --git a/sc/source/filter/inc/xeextlst.hxx b/sc/source/filter/inc/xeextlst.hxx index c32e23e6f978..82a564c119a7 100644 --- a/sc/source/filter/inc/xeextlst.hxx +++ b/sc/source/filter/inc/xeextlst.hxx @@ -41,7 +41,7 @@ class XclExpExtCfvo : public XclExpRecordBase, protected XclExpRoot { public: XclExpExtCfvo( const XclExpRoot& rRoot, const ScColorScaleEntry& rEntry, const ScAddress& rPos, bool bFirst ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: ScColorScaleEntryType meType; @@ -73,7 +73,7 @@ class XclExpExtDataBar : public XclExpRecordBase, protected XclExpRoot { public: explicit XclExpExtDataBar( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: databar::ScAxisPosition meAxisPosition; @@ -91,7 +91,7 @@ class XclExpExtCfRule : public XclExpRecordBase, protected XclExpRoot { public: XclExpExtCfRule( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: XclExpExtDataBarRef maDataBar; @@ -105,7 +105,7 @@ class XclExpExtConditionalFormatting : public XclExpRecordBase, protected XclExp { public: explicit XclExpExtConditionalFormatting( const XclExpRoot& rRoot, const ScDataBarFormat& rFormat, const ScAddress& rPos, const OString& rId ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: XclExpExtCfRuleRef maCfRule; @@ -118,9 +118,9 @@ class XclExpExtCondFormat : public XclExpExt { public: XclExpExtCondFormat( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; - virtual XclExpExtType GetType() { return XclExpExtDataBarType; } + virtual XclExpExtType GetType() SAL_OVERRIDE { return XclExpExtDataBarType; } void AddRecord( XclExpExtConditionalFormattingRef aFormat ); @@ -132,7 +132,7 @@ class XclExtLst : public XclExpRecordBase, public XclExpRoot { public: explicit XclExtLst( const XclExpRoot& rRoot); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; void AddRecord( XclExpExtRef aEntry ); diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx index c5a5e19cc3ee..01477085c362 100644 --- a/sc/source/filter/inc/xelink.hxx +++ b/sc/source/filter/inc/xelink.hxx @@ -198,7 +198,7 @@ public: const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ); /** Writes the entire Link table. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef boost::shared_ptr< XclExpLinkManagerImpl > XclExpLinkMgrImplPtr; diff --git a/sc/source/filter/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index f607b5e52359..dfe639e2ef53 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -68,8 +68,8 @@ public: bool IsVolatile( sal_uInt16 nNameIdx ) const; /** Writes the entire list of NAME records. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef boost::shared_ptr< XclExpNameManagerImpl > XclExpNameMgrImplRef; diff --git a/sc/source/filter/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index 1972d6324e02..a726b362d01f 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -34,10 +34,10 @@ class XclExpHeaderFooter : public XclExpRecord public: explicit XclExpHeaderFooter( sal_uInt16 nRecId, const OUString& rHdrString ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the header or footer string. Writes an empty record, if no header/footer present. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: OUString maHdrString; /// Header or footer contents. @@ -51,10 +51,10 @@ class XclExpSetup : public XclExpRecord public: explicit XclExpSetup( const XclPageData& rPageData ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the SETUP record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclPageData& mrData; /// Page settings data of current sheet. @@ -72,12 +72,12 @@ public: sal_uInt16 nMaxPos ); /** Writes the record, if the list is not empty. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the page break list. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const ScfUInt16Vec& mrPageBreaks; /// Page settings data of current sheet. @@ -97,8 +97,8 @@ public: inline const XclPageData& GetPageData() const { return maData; } /** Writes all page settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: XclPageData maData; /// Page settings data. @@ -117,7 +117,7 @@ public: inline const XclPageData& GetPageData() const { return maData; } /** Writes all page settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclPageData maData; /// Page settings data. diff --git a/sc/source/filter/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index e5a171a058dc..902d9088dba6 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -55,7 +55,7 @@ public: bool EqualsBool( bool bValue ) const; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnTypeFlag; /// Data type flag. @@ -100,7 +100,7 @@ public: void WriteIndex( XclExpStream& rStrm, sal_uInt32 nSrcRow ) const; /** Writes the pivot cache field and all items and other related records. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpPCItem > XclExpPCItemList; @@ -153,7 +153,7 @@ private: void WriteSxgroupinfo( XclExpStream& rStrm ); /** Writes the contents of the SXFIELD record for this field. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclExpPivotCache& mrPCache; /// Parent pivot cache containing this field. @@ -264,7 +264,7 @@ public: private: /** Writes the SXVI record body describing the pivot table item. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclExpPCItem* mpCacheItem; /// The referred pivot cache item. @@ -310,7 +310,7 @@ public: void WriteSxdi( XclExpStream& rStrm, sal_uInt16 nDataInfoIdx ) const; /** Writes the entire pivot table field. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: @@ -362,8 +362,8 @@ public: sal_uInt16 GetDataFieldIndex( const OUString& rName, sal_uInt16 nDefaultIdx ) const; /** Writes the entire pivot table. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: diff --git a/sc/source/filter/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 1c842644cd98..8f44da3d044c 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -51,7 +51,7 @@ public: XclExpDelegatingRecord( XclExpRecordBase* pRecord ); ~XclExpDelegatingRecord(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: XclExpRecordBase* mpRecord; }; @@ -153,7 +153,7 @@ public: void SetRecHeader( sal_uInt16 nRecId, sal_Size nRecSize ); /** Writes the record header and calls WriteBody(). */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; protected: /** Writes the body of the record (without record header). @@ -203,11 +203,11 @@ public: XclExpValueRecord* SetAttribute( sal_Int32 nId ); /** Write the OOXML attribute and its value */ - void SaveXml( XclExpXmlStream& rStrm ); + void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the record. */ - inline virtual void WriteBody( XclExpStream& rStrm ) { rStrm << maValue; } + inline virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE { rStrm << maValue; } // inlining prevents warning in wntmsci10 private: @@ -263,11 +263,11 @@ public: /** Sets a new Boolean record value. */ inline void SetBool( bool bValue ) { mbValue = bValue; } - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: bool mbValue; /// The record data. @@ -291,7 +291,7 @@ public: private: /** Writes the body of the record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const void* mpData; /// The record data. @@ -306,7 +306,7 @@ public: sal_uInt16 nRecId, sal_Size nRecSize = 0 ); /** Writes the extended record header and calls WriteBody(). */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclFutureRecType meRecType; @@ -369,14 +369,14 @@ public: inline void RemoveAllRecords() { maRecs.clear(); } /** Writes the complete record list. */ - inline virtual void Save( XclExpStream& rStrm ) + inline virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE { // inlining prevents warning in wntmsci10 for( typename RecordVec::iterator aIt = maRecs.begin(), aEnd = maRecs.end(); aIt != aEnd; ++aIt ) (*aIt)->Save( rStrm ); } - inline virtual void SaveXml( XclExpXmlStream& rStrm ) + inline virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE { // inlining prevents warning in wntmsci10 for( typename RecordVec::iterator aIt = maRecs.begin(), aEnd = maRecs.end(); aIt != aEnd; ++aIt ) @@ -397,7 +397,7 @@ public: explicit XclExpSubStream( sal_uInt16 nSubStrmType ); /** Writes the complete substream, including leading BOF and trailing EOF. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnSubStrmType; /// Substream type, stored in leading BOF record. diff --git a/sc/source/filter/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index 8d137ea69a70..f1482c7d7e1a 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -324,14 +324,14 @@ public: OUString* pRelationshipId = NULL ); // ignore - virtual bool exportDocument() throw(); + virtual bool exportDocument() throw() SAL_OVERRIDE; // only needed for import; ignore - virtual bool importDocument() throw(); - virtual oox::vml::Drawing* getVmlDrawing(); - virtual const oox::drawingml::Theme* getCurrentTheme() const; - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); - virtual oox::drawingml::chart::ChartConverter* getChartConverter(); + virtual bool importDocument() throw() SAL_OVERRIDE; + virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; + virtual const oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; + virtual oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; /* Now create all the overloads in a typesafe way (i.e. without varargs) by creating a number of overloads @@ -364,8 +364,8 @@ public: #undef SAX_ARGS_FUNC private: - virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual OUString implGetImplementationName() const; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; + virtual OUString implGetImplementationName() const SAL_OVERRIDE; ScDocShell *getDocShell(); sax_fastparser::FSHelperPtr& WriteAttributesInternal( sal_Int32 nAttribute, ... ); diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index 944b436c1536..507b8d2ec59d 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -112,12 +112,12 @@ public: { return Color( GetColorData( nXclIndex ) ); } /** Saves the PALETTE record, if it differs from the default palette. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the PALETTE record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef boost::shared_ptr< XclExpPaletteImpl > XclExpPaletteImplRef; @@ -178,11 +178,11 @@ public: @param nHash The hash value calculated from the font data. */ virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the FONT record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclFontData maData; /// All font attributes. @@ -199,10 +199,10 @@ public: explicit XclExpBlindFont( const XclExpRoot& rRoot ); /** Returns always false to never find this font while searching the font list. */ - virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const; + virtual bool Equals( const XclFontData& rFontData, sal_uInt32 nHash ) const SAL_OVERRIDE; /** Skips writing this record. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -243,8 +243,8 @@ public: XclExpColorType eColorType, bool bAppFont = false ); /** Writes all FONT records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Initializes the default fonts for the current BIFF version. */ @@ -296,8 +296,8 @@ public: sal_uInt16 Insert( sal_uLong nScNumFmt ); /** Writes all FORMAT records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the FORMAT record with index nXclIx and format string rFormatStr. */ @@ -491,7 +491,7 @@ public: void SetXmlIds( sal_uInt32 nBorderId, sal_uInt32 nFillId ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; protected: explicit XclExpXF( const XclExpRoot& rRoot, bool bCellXF ); @@ -535,7 +535,7 @@ private: void WriteBody8( XclExpStream& rStrm ); /** Writes the contents of the XF record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; }; @@ -567,11 +567,11 @@ public: inline const OUString& GetName() const { return maName; } - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the STYLE record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: OUString maName; /// Name of the cell style. @@ -650,8 +650,8 @@ public: sal_Int32 GetXmlCellIndex( sal_uInt32 nXFId ) const; /** Writes all XF records contained in this buffer. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpXF > XclExpXFList; @@ -735,7 +735,7 @@ public: XclExpFont* pFont, XclExpNumFmt* pNumberFmt, XclExpCellProt* pProt, XclExpColor* pColor); virtual ~XclExpDxf(); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: boost::scoped_ptr<XclExpCellAlign> mpAlign; @@ -754,7 +754,7 @@ public: sal_Int32 GetDxfId(const OUString& rName); - virtual void SaveXml( XclExpXmlStream& rStrm); + virtual void SaveXml( XclExpXmlStream& rStrm) SAL_OVERRIDE; private: typedef boost::ptr_vector<XclExpDxf> DxfContainer; std::map<OUString, sal_Int32> maStyleNameToDxfId; @@ -770,7 +770,7 @@ class XclExpXmlStyleSheet : public XclExpRecordBase, protected XclExpRoot public: explicit XclExpXmlStyleSheet( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 5dd87e43b996..a5173d4a41d0 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -55,7 +55,7 @@ public: explicit XclExpStringRec( const XclExpRoot& rRoot, const OUString& rResult ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpStringRef mxResult; @@ -113,12 +113,12 @@ public: explicit XclExpArray( XclTokenArrayRef xTokArr, const ScRange& rScRange ); /** Creates and returns the token array for a corresponding FORMULA cell record. */ - virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const SAL_OVERRIDE; /** Returns true, if the array formula contains volatile functions. */ - virtual bool IsVolatile() const; + virtual bool IsVolatile() const SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclTokenArrayRef mxTokArr; /// The token array of a matrix formula. @@ -163,12 +163,12 @@ public: void ExtendRange( const ScAddress& rScPos ); /** Creates and returns the token array for a corresponding FORMULA cell record. */ - virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const SAL_OVERRIDE; /** Returns true, if the shared formula contains volatile functions. */ - virtual bool IsVolatile() const; + virtual bool IsVolatile() const SAL_OVERRIDE; private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclTokenArrayRef mxTokArr; /// The token array of a shared formula. @@ -227,18 +227,18 @@ public: void Finalize(); /** Creates and returns the token array for a corresponding FORMULA cell record. */ - virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const; + virtual XclTokenArrayRef CreateCellTokenArray( const XclExpRoot& rRoot ) const SAL_OVERRIDE; /** Returns true, if the multiple operations range is volatile. */ - virtual bool IsVolatile() const; + virtual bool IsVolatile() const SAL_OVERRIDE; /** Writes the record if it is valid. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; private: /** Returns true, if the passed cell position can be appended to this record. */ bool IsAppendable( sal_uInt16 nXclCol, sal_uInt16 nXclRow ) const; /** Writes the contents of the TABLEOP record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnLastAppXclCol;/// Column index of last appended cell. @@ -335,15 +335,15 @@ class XclExpSingleCellBase : public XclExpCellBase { public: /** Returns the last column, which is equal to the first column for single cells. */ - virtual sal_uInt16 GetLastXclCol() const; + virtual sal_uInt16 GetLastXclCol() const SAL_OVERRIDE; /** Return the XF identifier of the cell. */ - virtual sal_uInt32 GetFirstXFId() const; + virtual sal_uInt32 GetFirstXFId() const SAL_OVERRIDE; /** Returns true, if this record does not contain at least one valid cell. */ - virtual bool IsEmpty() const; + virtual bool IsEmpty() const SAL_OVERRIDE; /** Converts the XF identifier into the Excel XF index. */ - virtual void ConvertXFIndexes( const XclExpRoot& rRoot ); + virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) SAL_OVERRIDE; /** Writes cell address, XF index, and calls WriteContents() for each cell. */ - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; protected: explicit XclExpSingleCellBase( sal_uInt16 nRecId, sal_Size nContSize, @@ -361,7 +361,7 @@ protected: private: /** Writes cell address, XF index, and calls WriteContents() for each cell. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; /** Derived classes write the contents of the specified cell (without XF index). */ virtual void WriteContents( XclExpStream& rStrm ) = 0; @@ -382,9 +382,9 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, double fValue ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteContents( XclExpStream& rStrm ); + virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; private: double mfValue; /// The cell value. @@ -402,9 +402,9 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, bool bValue ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteContents( XclExpStream& rStrm ); + virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; private: bool mbValue; /// The cell value. @@ -435,15 +435,15 @@ public: const EditTextObject* pEditText, XclExpHyperlinkHelper& rHlinkHelper ); /** Returns true if the cell contains multi-line text. */ - virtual bool IsMultiLineText() const; + virtual bool IsMultiLineText() const SAL_OVERRIDE; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Initializes the record contents. Called from constructors. */ void Init( const XclExpRoot& rRoot, const ScPatternAttr* pPattern, XclExpStringRef xText ); - virtual void WriteContents( XclExpStream& rStrm ); + virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpStringRef mxText; /// The cell text. @@ -469,11 +469,11 @@ public: XclExpTableopBuffer& rTableopBfr ); /** Writes the FORMULA record and additional records related to the formula. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: - virtual void WriteContents( XclExpStream& rStrm ); + virtual void WriteContents( XclExpStream& rStrm ) SAL_OVERRIDE; private: ScFormulaCell& mrScFmlaCell; /// The Calc formula cell. @@ -499,18 +499,18 @@ class XclExpMultiCellBase : public XclExpCellBase { public: /** Returns the column index of the last cell this record describes. */ - virtual sal_uInt16 GetLastXclCol() const; + virtual sal_uInt16 GetLastXclCol() const SAL_OVERRIDE; /** Return the XF identifier of the first contained cell. */ - virtual sal_uInt32 GetFirstXFId() const; + virtual sal_uInt32 GetFirstXFId() const SAL_OVERRIDE; /** Returns true, if this record does not contain at least one valid cell. */ - virtual bool IsEmpty() const; + virtual bool IsEmpty() const SAL_OVERRIDE; /** Convert all XF identifiers into the Excel XF indexes. */ - virtual void ConvertXFIndexes( const XclExpRoot& rRoot ); + virtual void ConvertXFIndexes( const XclExpRoot& rRoot ) SAL_OVERRIDE; /** Writes the record, calls WriteContents() for each contained cell. @descr May write several records, if unused XF indexes are contained. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; protected: explicit XclExpMultiCellBase( sal_uInt16 nRecId, sal_uInt16 nMulRecId, @@ -569,16 +569,16 @@ public: const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId ); /** Tries to merge the contents of the passed cell to own data. */ - virtual bool TryMerge( const XclExpCellBase& rCell ); + virtual bool TryMerge( const XclExpCellBase& rCell ) SAL_OVERRIDE; /** Inserts the Excel XF index(es) into the passed vector. */ - virtual void GetBlankXFIndexes( ScfUInt16Vec& rXFIndexes ) const; + virtual void GetBlankXFIndexes( ScfUInt16Vec& rXFIndexes ) const SAL_OVERRIDE; /** Tries to remove unused Excel XF index(es). */ - virtual void RemoveUnusedBlankCells( const ScfUInt16Vec& rXFIndexes ); + virtual void RemoveUnusedBlankCells( const ScfUInt16Vec& rXFIndexes ) SAL_OVERRIDE; private: /** Writes the remaining contents of the specified cell (without XF index). */ - virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ); - virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ); + virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) SAL_OVERRIDE; + virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) SAL_OVERRIDE; }; @@ -594,12 +594,12 @@ public: sal_Int32 nRkValue ); /** Tries to merge the contents of the passed cell to own data. */ - virtual bool TryMerge( const XclExpCellBase& rCell ); + virtual bool TryMerge( const XclExpCellBase& rCell ) SAL_OVERRIDE; private: /** Writes the remaining contents of the specified cell (without XF index). */ - virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ); - virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ); + virtual void WriteContents( XclExpStream& rStrm, sal_uInt16 nRelCol ) SAL_OVERRIDE; + virtual void WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress& rAddress, sal_uInt32 nXFId, sal_uInt16 nRelCol ) SAL_OVERRIDE; private: ScfInt32Vec maRkValues; /// The cell values. @@ -681,7 +681,7 @@ public: explicit XclExpGuts( const XclExpRoot& rRoot ); private: - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnColLevels; /// Number of visible column outline levels. @@ -703,10 +703,10 @@ public: sal_uInt16 nFirstUsedXclCol, sal_uInt32 nFirstUsedXclRow, sal_uInt16 nFirstFreeXclCol, sal_uInt32 nFirstFreeXclRow ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the DIMENSIONS record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt32 mnFirstUsedXclRow; /// First used row. @@ -775,11 +775,11 @@ public: /** Returns true, if the column has default format and width. */ bool IsDefault( const XclExpDefcolwidth& rDefColWidth ) const; - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of this COLINFO record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpXFId maXFId; /// The XF identifier for column default format. @@ -812,8 +812,8 @@ public: void Finalize( ScfUInt16Vec& rXFIndexes ); /** Writes all COLINFO records of this buffer. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpColinfo > XclExpColinfoList; @@ -856,7 +856,7 @@ public: XclExpDefaultRowData& GetDefaultData() { return maDefData; } private: /** Writes the contents of the record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclExpDefaultRowData maDefData; /// Record data. @@ -924,8 +924,8 @@ public: void WriteCellList( XclExpStream& rStrm ); /** Writes the ROW record if the row is not disabled (see DisableIfDefault() function). */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; inline sal_uInt32 GetXclRowRpt() const { return mnXclRowRpt; } inline void SetXclRowRpt( sal_uInt32 nRpt ){ mnXclRowRpt = nRpt; } @@ -936,7 +936,7 @@ private: void InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase ); /** Writes the contents of the ROW record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpCellBase > XclExpCellList; @@ -978,8 +978,8 @@ public: void Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt16Vec& rColXFIndexes ); /** Writes the DIMENSIONS record, all ROW records and all cell records. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; XclExpDimensions* GetDimensions(); @@ -1045,8 +1045,8 @@ public: EXC_ID_MERGEDCELLS, EXC_ID_HLINK, EXC_ID_DVAL. */ XclExpRecordRef CreateRecord( sal_uInt16 nRecId ) const; /** Saves the entire cell table. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: typedef XclExpRecordList< XclExpNote > XclExpNoteList; diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index bacfdf1b12d5..cbfb8395f3f3 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -32,11 +32,11 @@ class XclExpWindow1 : public XclExpRecord public: explicit XclExpWindow1( const XclExpRoot& rRoot ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the WINDOW1 record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnFlags; /// Option flags. @@ -54,7 +54,7 @@ public: private: /** Writes the contents of the WINDOW2 record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: Color maGridColor; /// Grid color (<=BIFF5). @@ -77,7 +77,7 @@ private: /** Tries to shorten numerator and denominator by the passed value. */ void Shorten( sal_uInt16 nFactor ); /** Writes the contents of the SCL record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnNum; /// Numerator of the zoom factor. @@ -92,11 +92,11 @@ class XclExpPane : public XclExpRecord public: explicit XclExpPane( const XclTabViewData& rData ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the PANE record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: sal_uInt16 mnSplitX; /// Split X position, or frozen column. @@ -114,10 +114,10 @@ class XclExpSelection : public XclExpRecord public: explicit XclExpSelection( const XclTabViewData& rData, sal_uInt8 nPane ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Writes the contents of the SELECTION record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: XclSelectionData maSelData; /// Selection data. @@ -132,7 +132,7 @@ public: /* virtual void SaveXml( XclExpXmlStream& rStrm ); TODO Fix XML Saving Stream */ private: /** Writes the contents of the SHEETEXT record. */ - virtual void WriteBody( XclExpStream& rStrm ); + virtual void WriteBody( XclExpStream& rStrm ) SAL_OVERRIDE; private: const XclTabViewData& mrTabViewData; /// view settings data of current sheet. @@ -148,8 +148,8 @@ public: explicit XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nScTab ); /** Writes all view settings records to the stream. */ - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: /** Creates selection data for the specified pane. */ diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index d43e12fc8880..3e8a346833af 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -288,9 +288,9 @@ public: explicit XclImpChEscherFormat( const XclImpRoot& rRoot ); /** Reads the CHESCHERFORMAT record (complex fill data) (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHESCHERFORMAT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Converts and writes the contained data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet, @@ -321,7 +321,7 @@ public: explicit XclImpChFrameBase( const XclChFormatInfo& rFmtInfo ); /** Reads a frame formatting record (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Returns true, if the line format is set to automatic. */ inline bool IsAutoLine() const { return !mxLineFmt || mxLineFmt->IsAuto(); } @@ -371,7 +371,7 @@ public: XclChObjectType eObjType ); /** Reads the CHFRAME record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Sets formatting from BIFF3-BIFF5 OBJ record, if own formatting is invisible. */ void UpdateObjFrame( const XclObjLineData& rLineData, const XclObjFillData& rFillData ); @@ -493,16 +493,16 @@ public: explicit XclImpChText( const XclImpChRoot& rRoot ); /** Reads the CHTEXT record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHTEXT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Returns the leading font index for the text object. */ - virtual sal_uInt16 GetFontIndex() const; + virtual sal_uInt16 GetFontIndex() const SAL_OVERRIDE; /** Returns the leading font color for the text object. */ - virtual Color GetFontColor() const; + virtual Color GetFontColor() const SAL_OVERRIDE; /** Returns the rotation value for the text object. */ - virtual sal_uInt16 GetRotation() const; + virtual sal_uInt16 GetRotation() const SAL_OVERRIDE; /** Sets explicit string data for this text object. */ void SetString( const OUString& rString ); @@ -666,9 +666,9 @@ public: explicit XclImpChDataFormat( const XclImpChRoot& rRoot ); /** Reads the CHDATAFORMAT record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHDATAFORMAT group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Sets this object to the specified data point position. */ void SetPointPos( const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx ); @@ -805,9 +805,9 @@ public: explicit XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx ); /** Reads the CHSERIES record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHSERIES group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Sets a data point or series format (CHDATAFORMAT group) for this series. */ void SetDataFormat( const XclImpChDataFormatRef& xDataFmt ); @@ -962,9 +962,9 @@ public: explicit XclImpChLegend( const XclImpChRoot& rRoot ); /** Reads the CHLEGEND record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHLEGEND group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Final processing after reading the entire chart. */ void Finalize(); @@ -993,7 +993,7 @@ public: explicit XclImpChDropBar( sal_uInt16 nDropBar ); /** Reads the CHDROPBAR record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Converts and writes the contained frame data to the passed property set. */ void Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropSet ) const; @@ -1028,9 +1028,9 @@ public: explicit XclImpChTypeGroup( const XclImpChRoot& rRoot ); /** Reads the CHTYPEGROUP record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHTYPEGROUP group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Final processing after reading the entire chart. */ void Finalize(); @@ -1211,18 +1211,18 @@ public: explicit XclImpChAxis( const XclImpChRoot& rRoot, sal_uInt16 nAxisType = EXC_CHAXIS_NONE ); /** Reads the CHAXIS record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHAXIS group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Final processing after reading the entire chart. */ void Finalize(); /** Returns the font index for the axis labels. */ - virtual sal_uInt16 GetFontIndex() const; + virtual sal_uInt16 GetFontIndex() const SAL_OVERRIDE; /** Returns the font color for the axis labels. */ - virtual Color GetFontColor() const; + virtual Color GetFontColor() const SAL_OVERRIDE; /** Returns the rotation value for axis labels. */ - virtual sal_uInt16 GetRotation() const; + virtual sal_uInt16 GetRotation() const SAL_OVERRIDE; /** Returns the type of this axis. */ inline sal_uInt16 GetAxisType() const { return maData.mnType; } @@ -1284,9 +1284,9 @@ public: explicit XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId ); /** Reads the CHAXESSET record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHAXESSET group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Final processing after reading the entire chart. */ void Finalize(); @@ -1368,9 +1368,9 @@ public: virtual ~XclImpChChart(); /** Reads the CHCHART record (called by base class). */ - virtual void ReadHeaderRecord( XclImpStream& rStrm ); + virtual void ReadHeaderRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a record from the CHCHART group (called by base class). */ - virtual void ReadSubRecord( XclImpStream& rStrm ); + virtual void ReadSubRecord( XclImpStream& rStrm ) SAL_OVERRIDE; /** Reads a CHDEFAULTTEXT group (default text formats). */ void ReadChDefaultText( XclImpStream& rStrm ); /** Reads a CHDATAFORMAT group describing a series format or a data point format. */ @@ -1453,9 +1453,9 @@ public: const Rectangle& rChartRect ); /** Calculate the resulting rectangle of the passed anchor. */ - virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const; + virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const SAL_OVERRIDE; /** Called whenever an object has been inserted into the draw page. */ - virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ); + virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) SAL_OVERRIDE; private: Rectangle maChartRect; /// Position and size of the chart shape in 1/100 mm. diff --git a/sc/source/filter/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index bc0f6d4fd30f..4eaf60cd4568 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -238,15 +238,15 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Returns a progress bar size that takes all group children into account. */ - virtual sal_Size DoGetProgressSize() const; + virtual sal_Size DoGetProgressSize() const SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; protected: XclImpDrawObjVector maChildren; /// Grouped objects. @@ -263,13 +263,13 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; protected: XclObjLineData maLineData; /// BIFF5 line formatting. @@ -293,13 +293,13 @@ protected: void ConvertRectStyle( SdrObject& rSdrObj ) const; /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; protected: XclObjFillData maFillData; /// BIFF5 fill formatting. @@ -317,7 +317,7 @@ public: protected: /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; }; @@ -330,13 +330,13 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; protected: XclObjFillData maFillData; /// BIFF5 fill formatting. @@ -357,11 +357,11 @@ protected: void ReadCoordList( XclImpStream& rStrm ); /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; protected: typedef ::std::vector< Point > PointVector; @@ -396,15 +396,15 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; /** Inserts the contained text data at the passed object. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; protected: XclImpObjTextData maTextData; /// Textbox data from BIFF5 OBJ or BIFF8 TXO record. @@ -424,19 +424,19 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Returns the needed size on the progress bar. */ - virtual sal_Size DoGetProgressSize() const; + virtual sal_Size DoGetProgressSize() const SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; /** Converts the chart document. */ - virtual void DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; + virtual void DoPostProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; private: /** Calculates the object anchor of a sheet chart (chart fills one page). */ @@ -462,7 +462,7 @@ public: protected: /** Inserts the note into the document, sets visibility. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; private: ScAddress maScPos; /// Cell position of the note object. @@ -540,9 +540,9 @@ protected: void ConvertLabel( ScfPropertySet& rPropSet ) const; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; /** Additional processing on the SdrObject, calls new virtual function DoProcessControl(). */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; /** Derived classes return the service name of the control component to be created. */ virtual OUString DoGetServiceName() const = 0; @@ -560,11 +560,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; @@ -577,15 +577,15 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: sal_uInt16 mnState; @@ -602,15 +602,15 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: void ApplyGrouping( XclImpOptionButtonObj& rLeader, sal_Int32 nRefVal ); @@ -628,11 +628,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; @@ -645,15 +645,15 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: sal_uInt16 mnGroupBoxFlags; @@ -669,11 +669,11 @@ public: protected: /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; @@ -689,15 +689,15 @@ protected: bool IsNumeric() const; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: sal_uInt16 mnContentType; @@ -719,7 +719,7 @@ protected: void ReadSbs( XclImpStream& rStrm ); /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; protected: sal_uInt16 mnValue; @@ -742,13 +742,13 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; @@ -761,13 +761,13 @@ public: protected: /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; }; @@ -805,15 +805,15 @@ protected: void ReadFullLbsData( XclImpStream& rStrm, sal_Size nRecLeft ); /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: ScfUInt8Vec maSelection; @@ -835,15 +835,15 @@ protected: void ReadFullLbsData( XclImpStream& rStrm ); /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Sets additional properties for the current form control. */ - virtual void DoProcessControl( ScfPropertySet& rPropSet ) const; + virtual void DoProcessControl( ScfPropertySet& rPropSet ) const SAL_OVERRIDE; /** Returns the service name of the control component to be created. */ - virtual OUString DoGetServiceName() const; + virtual OUString DoGetServiceName() const SAL_OVERRIDE; /** Returns the type of the macro event to be created. */ - virtual XclTbxEventType DoGetEventType() const; + virtual XclTbxEventType DoGetEventType() const SAL_OVERRIDE; protected: sal_uInt16 mnLeft; @@ -863,7 +863,7 @@ class XclImpPictureObj : public XclImpRectObj, public XclImpControlHelper public: explicit XclImpPictureObj( const XclImpRoot& rRoot ); /** Returns the ObjectName - can use non-obvious lookup for override in the associated vba document module stream**/ - virtual OUString GetObjName() const; + virtual OUString GetObjName() const SAL_OVERRIDE; /** Returns the graphic imported from the IMGDATA record. */ inline const Graphic& GetGraphic() const { return maGraphic; } @@ -884,17 +884,17 @@ public: protected: /** Reads the contents of the a BIFF3 OBJ record from the passed stream. */ - virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj3( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF4 OBJ record from the passed stream. */ - virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ); + virtual void DoReadObj4( XclImpStream& rStrm, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the a BIFF5 OBJ record from the passed stream. */ - virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ); + virtual void DoReadObj5( XclImpStream& rStrm, sal_uInt16 nNameLen, sal_uInt16 nMacroSize ) SAL_OVERRIDE; /** Reads the contents of the specified subrecord of a BIFF8 OBJ record from stream. */ - virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ); + virtual void DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId, sal_uInt16 nSubRecSize ) SAL_OVERRIDE; /** Creates and returns a new SdrObject from the contained data. Caller takes ownership! */ - virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const; + virtual SdrObject* DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rectangle& rAnchorRect ) const SAL_OVERRIDE; /** Overloaded to do additional processing on the SdrObject. */ - virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const; + virtual void DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& rSdrObj ) const SAL_OVERRIDE; private: /** Reads and sets the picture flags from a BIFF3-BIFF5 OBJ picture record. */ @@ -969,7 +969,7 @@ public: protected: /** Returns a color from the Excel color palette. */ - virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const; + virtual bool GetColorFromPalette( sal_uInt16 nIndex, Color& rColor ) const SAL_OVERRIDE; }; @@ -1021,16 +1021,16 @@ private: SvStream& rDffStrm, DffRecordHeader& rHeader, void* pClientData, - DffObjData& rObjData ); + DffObjData& rObjData ) SAL_OVERRIDE; /** Processes an DFF object, reads properties from DFF stream. */ virtual SdrObject* ProcessObj( SvStream& rDffStrm, DffObjData& rDffObjData, void* pClientData, Rectangle& rTextRect, - SdrObject* pOldSdrObj = 0 ); + SdrObject* pOldSdrObj = 0 ) SAL_OVERRIDE; /** Returns the BLIP stream position, based on the passed DFF stream position. */ - virtual sal_uLong Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong nStreamPos ) const; + virtual sal_uLong Calc_nBLIPPos( sal_uLong nOrgVal, sal_uLong nStreamPos ) const SAL_OVERRIDE; // virtual functions of SvxMSConvertOCXControls @@ -1041,7 +1041,7 @@ private: const ::com::sun::star::awt::Size& rSize, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >* pxShape, - bool bFloatingCtrl ); + bool bFloatingCtrl ) SAL_OVERRIDE; private: /** Data per registered drawing manager, will be stacked for recursive calls. */ @@ -1186,9 +1186,9 @@ public: void ConvertObjects( XclImpDffConverter& rDffConv ); /** Calculate the resulting rectangle of the passed anchor. */ - virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const; + virtual Rectangle CalcAnchorRect( const XclObjAnchor& rAnchor, bool bDffAnchor ) const SAL_OVERRIDE; /** On call, updates the used area of the sheet. */ - virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ); + virtual void OnObjectInserted( const XclImpDrawObjBase& rDrawObj ) SAL_OVERRIDE; private: /** Reads a BIFF3-BIFF5 NOTE record. */ diff --git a/sc/source/filter/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 6ee3d64b20dc..8d551e38db86 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -57,8 +57,8 @@ public: XclImpDecrypterRef Clone() const; /** Implementation of the ::comphelper::IDocPasswordVerifier interface */ - virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ); - virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); + virtual ::comphelper::DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; + virtual ::comphelper::DocPasswordVerifierResult verifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; /** Updates the decrypter on start of a new record or after seeking stream. */ void Update( SvStream& rStrm, sal_uInt16 nRecSize ); @@ -103,15 +103,15 @@ private: explicit XclImpBiff5Decrypter( const XclImpBiff5Decrypter& rSrc ); /** Implementation of cloning this object. */ - virtual XclImpBiff5Decrypter* OnClone() const; + virtual XclImpBiff5Decrypter* OnClone() const SAL_OVERRIDE; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const OUString& rPassword ); - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); + OnVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); + virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) SAL_OVERRIDE; /** Implementation of the decryption. */ - virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ); + virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) SAL_OVERRIDE; private: ::msfilter::MSCodec_XorXLS95 maCodec; /// Crypto algorithm implementation. @@ -134,15 +134,15 @@ private: explicit XclImpBiff8Decrypter( const XclImpBiff8Decrypter& rSrc ); /** Implementation of cloning this object. */ - virtual XclImpBiff8Decrypter* OnClone() const; + virtual XclImpBiff8Decrypter* OnClone() const SAL_OVERRIDE; /** Implements password verification and initialization of the decoder. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > - OnVerifyPassword( const OUString& rPassword ); - virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ); + OnVerifyPassword( const OUString& rPassword ) SAL_OVERRIDE; + virtual bool OnVerifyEncryptionData( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; /** Implementation of updating the decrypter. */ - virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ); + virtual void OnUpdate( sal_Size nOldStrmPos, sal_Size nNewStrmPos, sal_uInt16 nRecSize ) SAL_OVERRIDE; /** Implementation of the decryption. */ - virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ); + virtual sal_uInt16 OnRead( SvStream& rStrm, sal_uInt8* pnData, sal_uInt16 nBytes ) SAL_OVERRIDE; /** Returns the block number corresponding to the passed stream position. */ sal_uInt32 GetBlock( sal_Size nStrmPos ) const; diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index e5a2874d5271..4d1bb08beb17 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -334,7 +334,7 @@ public: virtual ~WorkerThread() {} protected: - virtual void execute() + virtual void execute() SAL_OVERRIDE { processSheetFormulaCells(mrDoc, mrItem, *mpFormatter, mrExternalLinks); } diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index 1f218582bc47..731be0fcd5b2 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -547,8 +547,8 @@ private: private: // finalize token sequence ------------------------------------------------ - virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const; - virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const; + virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const SAL_OVERRIDE; + virtual OUString resolveDefinedName( sal_Int32 nTokenIndex ) const SAL_OVERRIDE; protected: const sal_Int32 mnMaxApiCol; /// Maximum column index in own document. @@ -1246,12 +1246,12 @@ public: virtual ApiTokenSequence importOoxFormula( const CellAddress& rBaseAddr, - const OUString& rFormulaString ); + const OUString& rFormulaString ) SAL_OVERRIDE; virtual ApiTokenSequence importBiff12Formula( const CellAddress& rBaseAddr, FormulaType eType, - SequenceInputStream& rStrm ); + SequenceInputStream& rStrm ) SAL_OVERRIDE; private: // import token contents and create API formula token --------------------- @@ -1852,7 +1852,7 @@ public: virtual ApiTokenSequence importBiffFormula( const CellAddress& rBaseAddr, FormulaType eType, - BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ); + BiffInputStream& rStrm, const sal_uInt16* pnFmlaSize ) SAL_OVERRIDE; private: // import token contents and create API formula token --------------------- diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index 2fb9aad1d4b2..eeb0e06d027d 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -45,7 +45,7 @@ public: Sequence< FormulaToken > parseFormula( const OUString& rFormula, const CellAddress& rReferencePos ); protected: - virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const; + virtual const FunctionInfo* resolveBadFuncName( const OUString& rTokenData ) const SAL_OVERRIDE; private: ApiParserWrapper maApiParser; diff --git a/sc/source/filter/oox/threadpool.cxx b/sc/source/filter/oox/threadpool.cxx index d02095b81ff6..1055e5997de5 100644 --- a/sc/source/filter/oox/threadpool.cxx +++ b/sc/source/filter/oox/threadpool.cxx @@ -21,7 +21,7 @@ public: salhelper::Thread("sheet-import-thread-pool"), mpPool( pPool ) {} - virtual void execute() + virtual void execute() SAL_OVERRIDE { ThreadTask *pTask; while ( ( pTask = waitForWork() ) ) diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx index 149ad06d9768..170348fae63e 100644 --- a/sc/source/filter/oox/workbookfragment.cxx +++ b/sc/source/filter/oox/workbookfragment.cxx @@ -226,7 +226,7 @@ public: { } - virtual void doWork() + virtual void doWork() SAL_OVERRIDE { // We hold the solar mutex in all threads except for // the small safe section of the inner loop in @@ -264,11 +264,11 @@ class ProgressBarTimer : Timer } virtual ~ProgressWrapper() {} // IProgressBar - virtual double getPosition() const { return mfPosition; } - virtual void setPosition( double fPosition ) { mfPosition = fPosition; } + virtual double getPosition() const SAL_OVERRIDE { return mfPosition; } + virtual void setPosition( double fPosition ) SAL_OVERRIDE { mfPosition = fPosition; } // ISegmentProgressBar - virtual double getFreeLength() const { return 0.0; } - virtual ISegmentProgressBarRef createSegment( double /* fLength */ ) + virtual double getFreeLength() const SAL_OVERRIDE { return 0.0; } + virtual ISegmentProgressBarRef createSegment( double /* fLength */ ) SAL_OVERRIDE { return ISegmentProgressBarRef(); } @@ -292,7 +292,7 @@ public: aSegments.push_back( ISegmentProgressBarRef( new ProgressWrapper( xProgress ) ) ); return aSegments.back(); } - virtual void Timeout() + virtual void Timeout() SAL_OVERRIDE { for( size_t i = 0; i < aSegments.size(); i++) static_cast< ProgressWrapper *>( aSegments[ i ].get() )->UpdateBar(); diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 2dceb6c6f891..a2abf59ce175 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -337,11 +337,11 @@ public: void finalizeDrawingImport(); /// Allow the threaded importer to override our progress bar impl. - virtual ISegmentProgressBarRef getRowProgress() + virtual ISegmentProgressBarRef getRowProgress() SAL_OVERRIDE { return mxRowProgress; } - virtual void setCustomRowProgress( const ISegmentProgressBarRef &rxRowProgress ) + virtual void setCustomRowProgress( const ISegmentProgressBarRef &rxRowProgress ) SAL_OVERRIDE { mxRowProgress = rxRowProgress; mbFastRowProgress = true; diff --git a/sc/source/filter/starcalc/collect.hxx b/sc/source/filter/starcalc/collect.hxx index 8e7d3086f488..691d691f8887 100644 --- a/sc/source/filter/starcalc/collect.hxx +++ b/sc/source/filter/starcalc/collect.hxx @@ -42,7 +42,7 @@ public: ScCollection(const ScCollection& rCollection); virtual ~ScCollection(); - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const SAL_OVERRIDE; bool AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject); bool Insert(ScDataObject* pScDataObject); diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index bcfab7b56084..0d316b8e0993 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -1323,10 +1323,10 @@ void XclExpChTr0x014A::SaveXml( XclExpXmlStream& rStrm ) class ExcXmlRecord : public ExcRecord { public: - virtual sal_Size GetLen() const; - virtual sal_uInt16 GetNum() const; - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ) = 0; + virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE; + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE = 0; }; sal_Size ExcXmlRecord::GetLen() const @@ -1353,7 +1353,7 @@ public: }; StartXmlElement( sal_Int32 nElement, sal_Int32 eBehavior ) : mnElement( nElement ), meBehavior( (Behavior) eBehavior ) {} - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: sal_Int32 mnElement; Behavior meBehavior; @@ -1382,7 +1382,7 @@ class EndXmlElement : public ExcXmlRecord sal_Int32 mnElement; public: EndXmlElement( sal_Int32 nElement ) : mnElement( nElement) {} - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; void EndXmlElement::SaveXml( XclExpXmlStream& rStrm ) @@ -1394,7 +1394,7 @@ class EndHeaderElement : public EndXmlElement { public: EndHeaderElement() : EndXmlElement( XML_header ) {} - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; }; void EndHeaderElement::SaveXml( XclExpXmlStream& rStrm ) diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index ef67dcc38246..661f87305c20 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.cxx @@ -540,11 +540,11 @@ class VmlCommentExporter : public VMLExport public: VmlCommentExporter ( sax_fastparser::FSHelperPtr p, ScAddress aScPos, SdrCaptionObj* pCaption, bool bVisible, Rectangle &aFrom, Rectangle &aTo ); protected: - virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ); + virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) SAL_OVERRIDE; using VMLExport::StartShape; - virtual sal_Int32 StartShape(); + virtual sal_Int32 StartShape() SAL_OVERRIDE; using VMLExport::EndShape; - virtual void EndShape( sal_Int32 nShapeElement ); + virtual void EndShape( sal_Int32 nShapeElement ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 337948a1714e..4a4ab5e82059 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -51,13 +51,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; void SetNullDate(const com::sun::star::util::Date& aDate) { aNullDate = aDate; } void SetIterationStatus(const bool bValue) { bIsIterationEnabled = bValue; } void SetIterationCount(const sal_Int32 nValue) { nIterationCount = nValue; } void SetIterationEpsilon(const double fValue) { fIterationEpsilon = fValue; } - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLNullDateContext : public SvXMLImportContext @@ -75,9 +75,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLIterationContext : public SvXMLImportContext @@ -95,9 +95,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index e71bc2b4d93f..cceaaa5e0af1 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -63,8 +63,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 9b866964e186..452bc4e46956 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -39,21 +39,21 @@ public: virtual ~XMLCodeNameProvider(); virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception ); + throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception ); + throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static void set( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& xNameAccess, ScDocument *pDoc ); }; diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index 49f5d6ce7ed2..01480b506a93 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -56,8 +56,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index 87d25aab9a9f..fe61adf1e504 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -41,9 +41,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; struct ScDDELinkCell @@ -81,7 +81,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; void SetApplication(const OUString& sValue) { sApplication = sValue; } void SetTopic(const OUString& sValue) { sTopic = sValue; } @@ -93,7 +93,7 @@ public: void AddCellToRow(const ScDDELinkCell& aCell); void AddRowsToTable(const sal_Int32 nRows); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDDESourceContext : public SvXMLImportContext @@ -114,9 +114,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDDETableContext : public SvXMLImportContext @@ -137,9 +137,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDDEColumnContext : public SvXMLImportContext @@ -160,9 +160,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDDERowContext : public SvXMLImportContext @@ -184,9 +184,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDDECellContext : public SvXMLImportContext @@ -214,9 +214,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index ef099baf3fc2..8bea285e37ab 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -98,8 +98,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -129,8 +129,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -158,8 +158,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index 71092a2492ba..3e6232dc14bb 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -40,9 +40,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index b03132435d88..95c837ddd662 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -81,7 +81,7 @@ class ScMyShapesContainer : ScMyIteratorBase private: ScMyShapeList aShapeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyShapesContainer(); virtual ~ScMyShapesContainer(); @@ -90,8 +90,8 @@ public: void AddNewShape(const ScMyShape& aShape); bool HasShapes() { return !aShapeList.empty(); } const ScMyShapeList* GetShapes() const { return &aShapeList; } - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; @@ -110,7 +110,7 @@ class ScMyNoteShapesContainer : ScMyIteratorBase private: ScMyNoteShapeList aNoteShapeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyNoteShapesContainer(); virtual ~ScMyNoteShapesContainer(); @@ -119,8 +119,8 @@ public: void AddNewNote(const ScMyNoteShape& aNote); bool HasNotes() { return !aNoteShapeList.empty(); } const ScMyNoteShapeList* GetNotes() const { return &aNoteShapeList; } - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; @@ -141,15 +141,15 @@ class ScMyMergedRangesContainer : ScMyIteratorBase private: ScMyMergedRangeList aRangeList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyMergedRangesContainer(); virtual ~ScMyMergedRangesContainer(); void AddRange(const com::sun::star::table::CellRangeAddress aMergedRange); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); // + remove doublets + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; // + remove doublets void SkipTable(SCTAB nSkip); }; @@ -180,7 +180,7 @@ class ScMyAreaLinksContainer : ScMyIteratorBase private: ScMyAreaLinkList aAreaLinkList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyAreaLinksContainer(); virtual ~ScMyAreaLinksContainer(); @@ -189,8 +189,8 @@ public: { aAreaLinkList.push_back( rAreaLink ); } using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; @@ -209,15 +209,15 @@ class ScMyEmptyDatabaseRangesContainer : ScMyIteratorBase private: ScMyEmptyDatabaseRangeList aDatabaseList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyEmptyDatabaseRangesContainer(); virtual ~ScMyEmptyDatabaseRangesContainer(); void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; @@ -240,7 +240,7 @@ class ScMyDetectiveObjContainer : ScMyIteratorBase private: ScMyDetectiveObjList aDetectiveObjList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyDetectiveObjContainer(); virtual ~ScMyDetectiveObjContainer(); @@ -253,8 +253,8 @@ public: bool bHasError ); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; @@ -276,7 +276,7 @@ class ScMyDetectiveOpContainer : ScMyIteratorBase private: ScMyDetectiveOpList aDetectiveOpList; protected: - virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) SAL_OVERRIDE; public: ScMyDetectiveOpContainer(); virtual ~ScMyDetectiveOpContainer(); @@ -284,8 +284,8 @@ public: void AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex ); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; + virtual void Sort() SAL_OVERRIDE; void SkipTable(SCTAB nSkip); }; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 22bd61250e36..44173dc990db 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -245,11 +245,11 @@ public: ScColumnStyles(); ~ScColumnStyles(); - virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields); + virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) SAL_OVERRIDE; sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField, bool& bIsVisible); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex, const bool bIsVisible); - virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) SAL_OVERRIDE; }; class ScRowStyles : public ScColumnRowStylesBase @@ -272,11 +272,11 @@ public: ScRowStyles(); ~ScRowStyles(); - virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields); + virtual void AddNewTable(const sal_Int32 nTable, const sal_Int32 nFields) SAL_OVERRIDE; sal_Int32 GetStyleNameIndex(const sal_Int32 nTable, const sal_Int32 nField); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nField, const sal_Int32 nStringIndex); void AddFieldStyleName(const sal_Int32 nTable, const sal_Int32 nStartField, const sal_Int32 nStringIndex, const sal_Int32 nEndField); - virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); + virtual OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index efe7801e9f13..f4f02f163e5d 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -69,9 +69,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class XMLHeaderFooterRegionContext: public SvXMLImportContext @@ -96,9 +96,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx index 92849f757b26..e38f83244820 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx @@ -41,12 +41,12 @@ protected: virtual void exportHeaderFooterContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >& rText, - bool bAutoStyles, bool bProgress ); + bool bAutoStyles, bool bProgress ) SAL_OVERRIDE; virtual void exportMasterPageContent( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > & rPropSet, - bool bAutoStyles ); + bool bAutoStyles ) SAL_OVERRIDE; public: XMLTableMasterPageExport( ScXMLExport& rExp ); diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index a052d95a6763..41515c89f17f 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -40,7 +40,7 @@ public: void SetLayer(com::sun::star::uno::Reference<com::sun::star::drawing::XShape>& rShape, sal_Int16 nLayerID, const OUString& sType) const; virtual void finishShape(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList >& xAttrList, - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes); + com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes) SAL_OVERRIDE; void SetCell (const ::com::sun::star::table::CellAddress& rAddress) { aStartCell = rAddress; } diff --git a/sc/source/filter/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index 21463a194c8e..529cb26eca84 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -39,9 +39,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 4f61e9869b20..edefbc3c71f2 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -47,9 +47,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index c0ef84be5c25..e80cb8d7d130 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -64,9 +64,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -88,9 +88,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -127,9 +127,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -151,9 +151,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -175,9 +175,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -199,9 +199,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -223,9 +223,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -257,11 +257,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -298,13 +298,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; void CreateTextPContext(sal_Bool bIsNewParagraph); sal_Bool IsEditCell() { return pEditTextObj != 0; } void SetText(const OUString& sTempText) { sText = sTempText; } - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -338,9 +338,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -363,8 +363,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -386,8 +386,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -409,8 +409,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -432,8 +432,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -455,8 +455,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -478,8 +478,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -503,8 +503,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -526,8 +526,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 63d3a1b160c1..60b1717860b0 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -45,8 +45,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/celltextparacontext.hxx b/sc/source/filter/xml/celltextparacontext.hxx index 68adaae1f4ab..9878dbc515b0 100644 --- a/sc/source/filter/xml/celltextparacontext.hxx +++ b/sc/source/filter/xml/celltextparacontext.hxx @@ -25,11 +25,11 @@ class ScXMLCellTextParaContext : public ScXMLImportContext public: ScXMLCellTextParaContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, ScXMLTableRowCellContext& rParent); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; void PushSpan(const OUString& rSpan, const OUString& rStyleName); void PushFieldSheetName(const OUString& rStyleName); @@ -49,11 +49,11 @@ class ScXMLCellTextSpanContext : public ScXMLImportContext public: ScXMLCellTextSpanContext(ScXMLImport& rImport, sal_uInt16 nPrefix, const OUString& rLName, ScXMLCellTextParaContext& rParent); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; /** @@ -68,11 +68,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; /** @@ -87,11 +87,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; /** @@ -106,11 +106,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; /** @@ -127,11 +127,11 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); - virtual void Characters(const OUString& rChars); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters(const OUString& rChars) SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; /** @@ -149,10 +149,10 @@ public: void SetStyleName(const OUString& rStyleName); - virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); - virtual void EndElement(); + virtual void StartElement(const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; virtual SvXMLImportContext* CreateChildContext( - sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); + sal_uInt16 nPrefix, const OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/datastreamimport.hxx b/sc/source/filter/xml/datastreamimport.hxx index c77f235dc69e..ec42fa321fcc 100644 --- a/sc/source/filter/xml/datastreamimport.hxx +++ b/sc/source/filter/xml/datastreamimport.hxx @@ -30,7 +30,7 @@ public: virtual ~ScXMLDataStreamContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index 1bb28ec1da9a..ed45bff4426b 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -78,13 +78,13 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList); + virtual void StartElement(const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 8eec88f0390c..1db3e594732d 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -48,9 +48,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); - virtual void Characters( const OUString& rChars ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 6fbcca51508b..db0cd2f53d2a 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -142,7 +142,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; void PushParagraphSpan(const OUString& rSpan, const OUString& rStyleName); void PushParagraphFieldDate(const OUString& rStyleName); @@ -155,7 +155,7 @@ public: void SetDetectiveObj( const ScAddress& rPosition ); void SetCellRangeSource( const ScAddress& rPosition ); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 6c94cbd82b69..e99040ec86c8 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -46,9 +46,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLTableColsContext : public SvXMLImportContext @@ -77,9 +77,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlcondformat.hxx b/sc/source/filter/xml/xmlcondformat.hxx index a9eac56a608e..fdfb0054c813 100644 --- a/sc/source/filter/xml/xmlcondformat.hxx +++ b/sc/source/filter/xml/xmlcondformat.hxx @@ -34,9 +34,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLConditionalFormatContext : public SvXMLImportContext @@ -54,9 +54,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScConditionalFormat* mpFormat; @@ -79,7 +79,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; private: ScColorScaleFormat* pColorScaleFormat; @@ -102,7 +102,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; private: ScDataBarFormat* mpDataBarFormat; @@ -130,7 +130,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; }; class ScXMLColorScaleFormatEntryContext : public SvXMLImportContext diff --git a/sc/source/filter/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index 4d9355c42a31..dddef5b54d43 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -45,11 +45,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void Characters( const OUString& rChars ); + virtual void Characters( const OUString& rChars ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 15b2cfb3c131..37f6bf621447 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -71,9 +71,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetHelpMessage(const OUString& sTitle, const OUString& sMessage, const sal_Bool bDisplay); void SetErrorMessage(const OUString& sTitle, const OUString& sMessage, const OUString& sMessageType, const sal_Bool bDisplay); @@ -105,9 +105,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLErrorMessageContext : public SvXMLImportContext @@ -136,9 +136,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLErrorMacroContext : public SvXMLImportContext @@ -164,8 +164,8 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index efc6cca4fbc8..a386ad4c01d9 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -45,9 +45,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index e27107bc9719..ca132807b3e7 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -64,9 +64,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotTableContext : public SvXMLImportContext @@ -133,9 +133,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetGrandTotal(::xmloff::token::XMLTokenEnum eOrientation, bool bVisible, const OUString& rDisplayName); void SetDatabaseName(const OUString& sValue) { sDatabaseName = sValue; } @@ -178,9 +178,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDPSourceTableContext : public SvXMLImportContext @@ -203,9 +203,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDPSourceQueryContext : public SvXMLImportContext @@ -228,9 +228,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSourceServiceContext : public SvXMLImportContext @@ -253,9 +253,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext @@ -281,9 +281,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSourceCellRangeContext : public SvXMLImportContext @@ -306,9 +306,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; struct ScXMLDataPilotGroup @@ -356,9 +356,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetShowEmpty(const bool bValue) { if (pDim) pDim->SetShowEmpty(bValue); } void SetSubTotals(const sal_uInt16* pFunctions, const sal_Int16 nCount) { if(pDim) pDim->SetSubTotals(nCount, pFunctions); } @@ -422,9 +422,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotDisplayInfoContext : public SvXMLImportContext @@ -507,9 +507,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void AddFunction(sal_Int16 nFunction); void SetDisplayName(const OUString& rName); }; @@ -534,9 +534,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotMembersContext : public SvXMLImportContext @@ -559,9 +559,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotMemberContext : public SvXMLImportContext @@ -590,9 +590,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotGroupsContext : public SvXMLImportContext @@ -615,9 +615,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDataPilotGroupContext : public SvXMLImportContext @@ -643,9 +643,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void AddMember(const OUString& sMember) { aMembers.push_back(sMember); } }; @@ -672,9 +672,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 5147646fc501..c802a11f0d52 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -55,9 +55,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; struct ScSubTotalRule @@ -117,9 +117,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetDatabaseName(const OUString& sTempDatabaseName) { sDatabaseName = sTempDatabaseName; } void SetConnectionResource(const OUString& sTempConRes) { sConnectionResource = sTempConRes; } @@ -160,9 +160,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSourceTableContext : public SvXMLImportContext @@ -186,9 +186,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSourceQueryContext : public SvXMLImportContext @@ -212,9 +212,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLConResContext : public SvXMLImportContext @@ -237,9 +237,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSubTotalRulesContext : public SvXMLImportContext @@ -262,9 +262,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSortGroupsContext : public SvXMLImportContext @@ -287,9 +287,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLSubTotalRuleContext : public SvXMLImportContext @@ -313,9 +313,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void AddSubTotalColumn(const com::sun::star::sheet::SubTotalColumn aSubTotalColumn) { aSubTotalRule.aSubTotalColumns.realloc(aSubTotalRule.aSubTotalColumns.getLength() + 1); @@ -344,9 +344,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 08af19436996..8799b5887a9d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -435,7 +435,7 @@ public: ~ScXMLShapeExport(); /** is called before a shape element for the given XShape is exported */ - virtual void onExport( const uno::Reference < drawing::XShape >& xShape ); + virtual void onExport( const uno::Reference < drawing::XShape >& xShape ) SAL_OVERRIDE; }; ScXMLShapeExport::~ScXMLShapeExport() diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index d3f89fa9e060..af5c6ee703fa 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -138,13 +138,13 @@ class ScXMLExport : public SvXMLExport void CollectShapesAutoStyles(const sal_Int32 nTableCount); void WriteTablesView(const com::sun::star::uno::Any& aTableView); void WriteView(const com::sun::star::uno::Any& aView); - virtual void _ExportFontDecls(); - virtual void _ExportStyles( bool bUsed ); - virtual void _ExportAutoStyles(); - virtual void _ExportMasterStyles(); - virtual void SetBodyAttributes(); - virtual void _ExportContent(); - virtual void _ExportMeta(); + virtual void _ExportFontDecls() SAL_OVERRIDE; + virtual void _ExportStyles( bool bUsed ) SAL_OVERRIDE; + virtual void _ExportAutoStyles() SAL_OVERRIDE; + virtual void _ExportMasterStyles() SAL_OVERRIDE; + virtual void SetBodyAttributes() SAL_OVERRIDE; + virtual void _ExportContent() SAL_OVERRIDE; + virtual void _ExportMeta() SAL_OVERRIDE; void CollectInternalShape( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xShape ); @@ -232,10 +232,10 @@ class ScXMLExport : public SvXMLExport const ScXMLEditAttributeMap& GetEditAttributeMap() const; protected: - virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); - virtual XMLPageExport* CreatePageExport(); - virtual XMLShapeExport* CreateShapeExport(); - virtual XMLFontAutoStylePool* CreateFontAutoStylePool(); + virtual SvXMLAutoStylePoolP* CreateAutoStylePool() SAL_OVERRIDE; + virtual XMLPageExport* CreatePageExport() SAL_OVERRIDE; + virtual XMLShapeExport* CreateShapeExport() SAL_OVERRIDE; + virtual XMLFontAutoStylePool* CreateFontAutoStylePool() SAL_OVERRIDE; public: ScXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, @@ -255,10 +255,10 @@ public: void SetSourceStream( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xNewStream ); void GetChangeTrackViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps); - virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps); - virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps); + virtual void GetViewSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) SAL_OVERRIDE; + virtual void GetConfigurationSettings(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rProps) SAL_OVERRIDE; - virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape); + virtual void exportAnnotationMeta( const com::sun::star::uno::Reference < com::sun::star::drawing::XShape >& xShape) SAL_OVERRIDE; void CreateSharedData(const sal_Int32 nTableCount); void SetSharedData(ScMySharedData* pTemp) { pSharedData = pTemp; } @@ -266,22 +266,22 @@ public: XMLNumberFormatAttributesExportHelper* GetNumberFormatAttributesExportHelper(); // Export the document. - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ); + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass = ::xmloff::token::XML_TOKEN_INVALID ) SAL_OVERRIDE; // XExporter - virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFilter - virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void DisposingModel(); + virtual void DisposingModel() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 050a751d1ffa..d5b8698d80ac 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -40,9 +40,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; @@ -69,9 +69,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; @@ -93,9 +93,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLImport& mrScImport; ScXMLExternalTabData& mrExternalRefInfo; @@ -118,9 +118,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetCellString(const OUString& rStr); @@ -152,11 +152,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void Characters(const OUString& rChar); + virtual void Characters(const OUString& rChar) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLExternalRefCellContext& mrParent; diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index b84be06e099d..3b3bf78d3e2d 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -73,9 +73,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void OpenConnection(bool b); void CloseConnection(); @@ -104,9 +104,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLOrContext : public SvXMLImportContext @@ -131,9 +131,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLConditionContext : public SvXMLImportContext @@ -165,9 +165,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void GetOperator(const OUString& aOpStr, ScQueryParam& rParam, ScQueryEntry& rEntry) const; void AddSetItem(const ScQueryEntry::Item& rItem); @@ -190,9 +190,9 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; // Datapilot (Core) @@ -230,9 +230,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void SetIsCaseSensitive(const bool bTemp) { bIsCaseSensitive = bTemp; } void SetUseRegularExpressions(const bool bTemp) { if (!bUseRegularExpressions) bUseRegularExpressions = bTemp;} @@ -283,9 +283,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDPOrContext : public SvXMLImportContext @@ -308,9 +308,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLDPConditionContext : public SvXMLImportContext @@ -339,11 +339,11 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; void getOperatorXML( const OUString& sTempOperator, ScQueryOp& aFilterOperator, bool& bUseRegularExpressions) const; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index b145b0e5ca63..b9c5acebdc37 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -268,7 +268,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference<xml::sax::XAttributeList>& xAttrList ); + const uno::Reference<xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; }; ScXMLDocContext_Impl::ScXMLDocContext_Impl( ScXMLImport& rImport, sal_uInt16 nPrfx, @@ -297,7 +297,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, - const uno::Reference<xml::sax::XAttributeList>& i_xAttrList); + const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) SAL_OVERRIDE; }; ScXMLFlatDocContext_Impl::ScXMLFlatDocContext_Impl( ScXMLImport& i_rImport, @@ -344,7 +344,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const uno::Reference< xml::sax::XAttributeList > & xAttrList ); + const uno::Reference< xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; }; ScXMLBodyContext_Impl::ScXMLBodyContext_Impl( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 827d8e9462c1..601be5531b85 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -975,8 +975,8 @@ protected: virtual SvXMLImportContext *CreateContext(sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual XMLShapeImportHelper* CreateShapeImport(); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; + virtual XMLShapeImportHelper* CreateShapeImport() SAL_OVERRIDE; public: // #110680# @@ -1002,7 +1002,7 @@ public: const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); virtual void SetStatistics( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats); + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats) SAL_OVERRIDE; ScDocumentImport& GetDoc(); @@ -1146,8 +1146,8 @@ public: void InsertStyles(); void SetChangeTrackingViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rChangeProps); - virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps); - virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps); + virtual void SetViewSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aViewProps) SAL_OVERRIDE; + virtual void SetConfigurationSettings(const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& aConfigProps) SAL_OVERRIDE; void SetTableStyle(const OUString& rValue) { aTableStyles.push_back(rValue); } std::vector<OUString> GetTableStyle() { return aTableStyles; } @@ -1179,16 +1179,16 @@ public: void SetStylesToRangesFinished(); // XImporter - virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL startDocument(void) - throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endDocument() throw(::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; - virtual void DisposingModel(); + virtual void DisposingModel() SAL_OVERRIDE; /** * Use this class to manage solar mutex locking instead of calling diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index 3ca64e632f97..d176ba067d77 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -45,8 +45,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; @@ -75,8 +75,8 @@ public: sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList - ); - virtual void EndElement(); + ) SAL_OVERRIDE; + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index 34543d7626c2..c99dcf51829f 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -51,7 +51,7 @@ public: { public: GlobalInserter(ScXMLImport& rImport); - virtual void insert(ScMyNamedExpression* pExp); + virtual void insert(ScMyNamedExpression* pExp) SAL_OVERRIDE; private: ScXMLImport& mrImport; }; @@ -65,7 +65,7 @@ public: { public: SheetLocalInserter(ScXMLImport& rImport, SCTAB nTab); - virtual void insert(ScMyNamedExpression* pExp); + virtual void insert(ScMyNamedExpression* pExp) SAL_OVERRIDE; private: ScXMLImport& mrImport; SCTAB mnTab; @@ -82,9 +82,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ::boost::shared_ptr<Inserter> mpInserter; @@ -108,9 +108,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLNamedExpressionsContext::Inserter* mpInserter; @@ -134,9 +134,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; private: ScXMLNamedExpressionsContext::Inserter* mpInserter; diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index 83e13d59cc88..e6934ef9dccd 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -47,9 +47,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; class ScXMLTableRowsContext : public SvXMLImportContext @@ -76,9 +76,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index 0690f08409c3..e59d359fd226 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -54,9 +54,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index de952a48d692..a212b841ee83 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -59,9 +59,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; void AddSortField(const OUString& sFieldNumber, const OUString& sDataType, const OUString& sOrder); }; @@ -90,9 +90,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index 4dc79a202ad9..8ea57bbca5b7 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -109,7 +109,7 @@ protected: bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const; + ::com::sun::star::beans::XPropertySet > rPropSet ) const SAL_OVERRIDE; public: ScXMLCellExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper ); @@ -119,7 +119,7 @@ public: const XMLPropertyState& rProperty, sal_uInt16 nFlags, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const; + sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */ virtual void handleSpecialItem( @@ -128,7 +128,7 @@ public: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const; + sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; }; class ScXMLRowExportPropertyMapper : public SvXMLExportPropertyMapper @@ -139,7 +139,7 @@ protected: bool bEnableFoFontFamily, ::std::vector< XMLPropertyState >& rProperties, ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > rPropSet ) const; + ::com::sun::star::beans::XPropertySet > rPropSet ) const SAL_OVERRIDE; public: ScXMLRowExportPropertyMapper( const UniReference< XMLPropertySetMapper >& rMapper ); @@ -160,7 +160,7 @@ public: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const; + sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; }; class ScXMLTableExportPropertyMapper : public SvXMLExportPropertyMapper @@ -178,7 +178,7 @@ public: const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap, const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const; + sal_uInt32 nIdx = 0 ) const SAL_OVERRIDE; }; class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP @@ -192,7 +192,7 @@ class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP const SvXMLExportPropertyMapper& rPropExp, const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap - ) const; + ) const SAL_OVERRIDE; virtual void exportStyleContent( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > & rHandler, @@ -201,7 +201,7 @@ class ScXMLAutoStylePoolP : public SvXMLAutoStylePoolP const SvXMLExportPropertyMapper& rPropExp , const SvXMLUnitConverter& rUnitConverter, const SvXMLNamespaceMap& rNamespaceMap - ) const; + ) const SAL_OVERRIDE; public: ScXMLAutoStylePoolP(ScXMLExport& rScXMLExport); @@ -212,10 +212,10 @@ class ScXMLStyleExport : public XMLStyleExport { virtual void exportStyleAttributes( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ); + ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE; virtual void exportStyleContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::style::XStyle > & rStyle ); + ::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE; public: ScXMLStyleExport( SvXMLExport& rExp, @@ -229,133 +229,133 @@ class XMLScPropHdlFactory : public XMLPropertyHandlerFactory public: XMLScPropHdlFactory(); virtual ~XMLScPropHdlFactory(); - virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const; + virtual const XMLPropertyHandler* GetPropertyHandler( sal_Int32 nType ) const SAL_OVERRIDE; }; class XmlScPropHdl_CellProtection : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_CellProtection(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_PrintContent : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_PrintContent(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_JustifyMethod : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_JustifyMethod(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_HoriJustify : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustify(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_HoriJustifySource : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustifySource(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_HoriJustifyRepeat : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_HoriJustifyRepeat(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_Orientation : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_Orientation(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_RotateAngle : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_RotateAngle(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_RotateReference : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_RotateReference(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_VertJustify : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_VertJustify(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_BreakBefore : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_BreakBefore(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_IsTextWrapped : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_IsTextWrapped(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_IsEqual : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_IsEqual() {} - virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const { return true; } - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& /* r1 */, const ::com::sun::star::uno::Any& /* r2 */ ) const SAL_OVERRIDE { return true; } + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; class XmlScPropHdl_Vertical : public XMLPropertyHandler { public: virtual ~XmlScPropHdl_Vertical(); - virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const; - virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; - virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const; + virtual bool equals( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 ) const SAL_OVERRIDE; + virtual bool importXML( const OUString& rStrImpValue, ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; + virtual bool exportXML( OUString& rStrExpValue, const ::com::sun::star::uno::Any& rValue, const SvXMLUnitConverter& rUnitConverter ) const SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 58b13ca1c9a0..56047632c540 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -292,7 +292,7 @@ class XMLTableCellPropsContext : public SvXMLPropertySetContext const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList, ::std::vector< XMLPropertyState > &rProperties, - const XMLPropertyState& rProp ); + const XMLPropertyState& rProp ) SAL_OVERRIDE; }; XMLTableCellPropsContext::XMLTableCellPropsContext( diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index 17e63f20aa46..51e73ce10507 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -48,7 +48,7 @@ public: /** This method is called when all attributes have been processed. It may be used to remove items that are incomplete */ virtual void finished( - ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const; + ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const SAL_OVERRIDE; }; class ScXMLRowImportPropertyMapper : public SvXMLImportPropertyMapper @@ -64,7 +64,7 @@ public: /** This method is called when all attributes have been processed. It may be used to remove items that are incomplete */ virtual void finished( - ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const; + ::std::vector< XMLPropertyState >& rProperties, sal_Int32 nStartIndex, sal_Int32 nEndIndex ) const SAL_OVERRIDE; }; class XMLTableStyleContext : public XMLPropStyleContext @@ -85,7 +85,7 @@ protected: virtual void SetAttribute( sal_uInt16 nPrefixKey, const OUString& rLocalName, - const OUString& rValue ); + const OUString& rValue ) SAL_OVERRIDE; public: @@ -100,12 +100,12 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual void FillPropertySet(const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ); + ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; - virtual void SetDefaults(); + virtual void SetDefaults() SAL_OVERRIDE; void AddProperty(sal_Int16 nContextID, const com::sun::star::uno::Any& aValue); XMLPropertyState* FindProperty(const sal_Int16 nContextID); @@ -156,13 +156,13 @@ protected: sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual SvXMLStyleContext *CreateDefaultStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; public: @@ -172,14 +172,14 @@ public: const bool bAutoStyles ); virtual ~XMLTableStylesContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; virtual UniReference < SvXMLImportPropertyMapper > GetImportPropertyMapper( - sal_uInt16 nFamily ) const; + sal_uInt16 nFamily ) const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference < ::com::sun::star::container::XNameContainer > - GetStylesContainer( sal_uInt16 nFamily ) const; - virtual OUString GetServiceName( sal_uInt16 nFamily ) const; + GetStylesContainer( sal_uInt16 nFamily ) const SAL_OVERRIDE; + virtual OUString GetServiceName( sal_uInt16 nFamily ) const SAL_OVERRIDE; sal_Int32 GetIndex(const sal_Int16 nContextID); }; @@ -190,14 +190,14 @@ protected: virtual SvXMLStyleContext *CreateStyleChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual SvXMLStyleContext *CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; - virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const; + virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -208,7 +208,7 @@ public: ::com::sun::star::xml::sax::XAttributeList > & xAttrList); virtual ~ScXMLMasterStylesContext(); - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; namespace com { namespace sun { namespace star { @@ -237,7 +237,7 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE; virtual SvXMLImportContext *CreateHeaderFooterContext( sal_uInt16 nPrefix, @@ -245,9 +245,9 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList, const bool bFooter, const bool bLeft, - const bool bFirst ); + const bool bFirst ) SAL_OVERRIDE; - virtual void Finish( bool bOverwrite ); + virtual void Finish( bool bOverwrite ) SAL_OVERRIDE; }; class ScCellTextStyleContext : public XMLTextStyleContext @@ -269,7 +269,7 @@ public: // overload FillPropertySet to store style information virtual void FillPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > & rPropSet ); + ::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE; }; diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index d88b504f1984..53430add3dbf 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -60,9 +60,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; @@ -82,9 +82,9 @@ public: virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const ::com::sun::star::uno::Reference< - ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); + ::com::sun::star::xml::sax::XAttributeList>& xAttrList ) SAL_OVERRIDE; - virtual void EndElement(); + virtual void EndElement() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index aca4092cf217..32534899b8bd 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -52,10 +52,10 @@ public: ScDPFieldControlBase* pFieldWindow, sal_Int32 nIndex); - virtual void Init(); + virtual void Init() SAL_OVERRIDE; using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; void SetIndex(sal_Int32 nIndex) { mnIndex = nIndex; } void NameChanged(); @@ -65,66 +65,66 @@ protected: virtual ~ScAccessibleDataPilotButton(void); public: // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isVisible( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > - SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -132,26 +132,26 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScDPFieldControlBase* mpFieldWindow; diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 4cff1fcdb057..c42dcbe00fdd 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -258,7 +258,7 @@ public: ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; ///===== IAccessibleParent =============================================== @@ -267,16 +267,16 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException); + ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::accessibility::AccessibleControlShape* GetAccControlShapeFromModel (::com::sun::star::beans::XPropertySet* pSet) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> GetAccessibleCaption (const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xShape) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; ///===== Internal ======================================================== void SetDrawBroadcaster(); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 962082c03aad..de8864972c21 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -517,12 +517,12 @@ public: ///===== IAccessibleViewForwarder ======================================== - virtual bool IsValid (void) const; - virtual Rectangle GetVisibleArea() const; - virtual Point LogicToPixel (const Point& rPoint) const; - virtual Size LogicToPixel (const Size& rSize) const; - virtual Point PixelToLogic (const Point& rPoint) const; - virtual Size PixelToLogic (const Size& rSize) const; + virtual bool IsValid (void) const SAL_OVERRIDE; + virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; + virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; + virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; + virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; + virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; private: ScPreviewShell* mpViewShell; @@ -688,7 +688,7 @@ public: ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; ///===== IAccessibleParent ============================================== @@ -697,7 +697,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& _rxShape, const long _nIndex, const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo - ) throw (::com::sun::star::uno::RuntimeException); + ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; ///===== Internal ======================================================== diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index b1a39c810fb4..3a6f2c18fac0 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -56,10 +56,10 @@ public: ScViewForwarder(ScTabViewShell* pViewShell, ScSplitPos eSplitPos, const ScAddress& rCell); virtual ~ScViewForwarder(); - virtual bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; void SetInvalid(); }; @@ -156,10 +156,10 @@ public: const EditView* _pEditView); virtual ~ScEditObjectViewForwarder(); - virtual bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; void SetInvalid(); }; @@ -255,10 +255,10 @@ public: ScPreviewViewForwarder(ScPreviewShell* pViewShell); virtual ~ScPreviewViewForwarder(); - virtual bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; void SetInvalid(); @@ -386,7 +386,7 @@ public: ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, sal_Bool bHeader); virtual ~ScPreviewHeaderFooterViewForwarder(); - virtual Rectangle GetVisArea() const; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; }; ScPreviewHeaderFooterViewForwarder::ScPreviewHeaderFooterViewForwarder(ScPreviewShell* pViewShell, sal_Bool bHeader) @@ -428,7 +428,7 @@ public: ScAddress aCellPos); virtual ~ScPreviewCellViewForwarder(); - virtual Rectangle GetVisArea() const; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; }; ScPreviewCellViewForwarder::ScPreviewCellViewForwarder(ScPreviewShell* pViewShell, @@ -470,7 +470,7 @@ public: sal_Bool bColHeader); virtual ~ScPreviewHeaderCellViewForwarder(); - virtual Rectangle GetVisArea() const; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; }; ScPreviewHeaderCellViewForwarder::ScPreviewHeaderCellViewForwarder(ScPreviewShell* pViewShell, @@ -514,7 +514,7 @@ public: sal_Bool bNoteMark); virtual ~ScPreviewNoteViewForwarder(); - virtual Rectangle GetVisArea() const; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; }; ScPreviewNoteViewForwarder::ScPreviewNoteViewForwarder(ScPreviewShell* pViewShell, @@ -556,15 +556,15 @@ public: ScEditViewForwarder(EditView* pEditView, Window* pWin); virtual ~ScEditViewForwarder(); - virtual bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; - virtual bool GetSelection( ESelection& rSelection ) const; - virtual bool SetSelection( const ESelection& rSelection ); - virtual bool Copy(); - virtual bool Cut(); - virtual bool Paste(); + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual bool GetSelection( ESelection& rSelection ) const SAL_OVERRIDE; + virtual bool SetSelection( const ESelection& rSelection ) SAL_OVERRIDE; + virtual bool Copy() SAL_OVERRIDE; + virtual bool Cut() SAL_OVERRIDE; + virtual bool Paste() SAL_OVERRIDE; void GrabFocus(); @@ -1662,10 +1662,10 @@ class ScCsvViewForwarder : public SvxViewForwarder public: explicit ScCsvViewForwarder( Window* pWindow, const Rectangle& rBoundBox ); - virtual bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; - virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const SAL_OVERRIDE; void SetInvalid(); }; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 2bc7cf0cdb61..1796a82d9307 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -64,7 +64,7 @@ public: \ : pDlg(p) \ {} \ virtual ~Class(); \ - virtual short Execute() ; + virtual short Execute() SAL_OVERRIDE ; #define DECL_ABSTDLG2_BASE(Class,DialogClass) \ DialogClass* pDlg; \ @@ -73,8 +73,8 @@ public: \ : pDlg(p) \ {} \ virtual ~Class(); \ - virtual void StartExecuteModal( const Link& rEndDialogHdl ); \ - long GetResult(); + virtual void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; \ + long GetResult() SAL_OVERRIDE; #define IMPL_ABSTDLG_BASE(Class) \ Class::~Class() \ @@ -108,63 +108,63 @@ class ScVclAbstractDialog_Impl : public VclAbstractDialog class AbstractScImportAsciiDlg_Impl : public AbstractScImportAsciiDlg { DECL_ABSTDLG_BASE(AbstractScImportAsciiDlg_Impl, ScImportAsciiDlg) - virtual void GetOptions( ScAsciiOptions& rOpt ); - virtual void SaveParameters(); + virtual void GetOptions( ScAsciiOptions& rOpt ) SAL_OVERRIDE; + virtual void SaveParameters() SAL_OVERRIDE; }; class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg { DECL_ABSTDLG_BASE(AbstractScAutoFormatDlg_Impl, ScAutoFormatDlg) - virtual sal_uInt16 GetIndex() const; - virtual OUString GetCurrFormatName(); + virtual sal_uInt16 GetIndex() const SAL_OVERRIDE; + virtual OUString GetCurrFormatName() SAL_OVERRIDE; }; class AbstractScColRowLabelDlg_Impl : public AbstractScColRowLabelDlg { DECL_ABSTDLG_BASE(AbstractScColRowLabelDlg_Impl,ScColRowLabelDlg) - virtual bool IsCol(); - virtual bool IsRow(); + virtual bool IsCol() SAL_OVERRIDE; + virtual bool IsRow() SAL_OVERRIDE; }; class AbstractScCondFormatManagerDlg_Impl : public AbstractScCondFormatManagerDlg { DECL_ABSTDLG_BASE(AbstractScCondFormatManagerDlg_Impl, ScCondFormatManagerDlg) - virtual ScConditionalFormatList* GetConditionalFormatList(); + virtual ScConditionalFormatList* GetConditionalFormatList() SAL_OVERRIDE; - virtual bool CondFormatsChanged(); + virtual bool CondFormatsChanged() SAL_OVERRIDE; }; class AbstractScDataPilotDatabaseDlg_Impl :public AbstractScDataPilotDatabaseDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotDatabaseDlg_Impl, ScDataPilotDatabaseDlg) - virtual void GetValues( ScImportSourceDesc& rDesc ); + virtual void GetValues( ScImportSourceDesc& rDesc ) SAL_OVERRIDE; }; class AbstractScDataPilotSourceTypeDlg_Impl :public AbstractScDataPilotSourceTypeDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotSourceTypeDlg_Impl, ScDataPilotSourceTypeDlg) - virtual bool IsDatabase() const; - virtual bool IsExternal() const; - virtual bool IsNamedRange() const; - virtual OUString GetSelectedNamedRange() const; - virtual void AppendNamedRange(const OUString& rName); + virtual bool IsDatabase() const SAL_OVERRIDE; + virtual bool IsExternal() const SAL_OVERRIDE; + virtual bool IsNamedRange() const SAL_OVERRIDE; + virtual OUString GetSelectedNamedRange() const SAL_OVERRIDE; + virtual void AppendNamedRange(const OUString& rName) SAL_OVERRIDE; }; class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg { DECL_ABSTDLG_BASE(AbstractScDataPilotServiceDlg_Impl, ScDataPilotServiceDlg) - virtual OUString GetServiceName() const; - virtual OUString GetParSource() const; - virtual OUString GetParName() const; - virtual OUString GetParUser() const; - virtual OUString GetParPass() const; + virtual OUString GetServiceName() const SAL_OVERRIDE; + virtual OUString GetParSource() const SAL_OVERRIDE; + virtual OUString GetParName() const SAL_OVERRIDE; + virtual OUString GetParUser() const SAL_OVERRIDE; + virtual OUString GetParPass() const SAL_OVERRIDE; }; class AbstractScDeleteCellDlg_Impl : public AbstractScDeleteCellDlg { DECL_ABSTDLG_BASE(AbstractScDeleteCellDlg_Impl,ScDeleteCellDlg) - virtual DelCellCmd GetDelCellCmd() const; + virtual DelCellCmd GetDelCellCmd() const SAL_OVERRIDE; }; //for dataform @@ -176,67 +176,67 @@ class AbstractScDataFormDlg_Impl : public AbstractScDataFormDlg class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg { DECL_ABSTDLG_BASE( AbstractScDeleteContentsDlg_Impl,ScDeleteContentsDlg) - virtual void DisableObjects(); - virtual sal_uInt16 GetDelContentsCmdBits() const; + virtual void DisableObjects() SAL_OVERRIDE; + virtual sal_uInt16 GetDelContentsCmdBits() const SAL_OVERRIDE; }; class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg { DECL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl, ScFillSeriesDlg) - virtual FillDir GetFillDir() const; - virtual FillCmd GetFillCmd() const; - virtual FillDateCmd GetFillDateCmd() const; - virtual double GetStart() const; - virtual double GetStep() const; - virtual double GetMax() const; - virtual OUString GetStartStr() const; - virtual void SetEdStartValEnabled(bool bFlag=false); + virtual FillDir GetFillDir() const SAL_OVERRIDE; + virtual FillCmd GetFillCmd() const SAL_OVERRIDE; + virtual FillDateCmd GetFillDateCmd() const SAL_OVERRIDE; + virtual double GetStart() const SAL_OVERRIDE; + virtual double GetStep() const SAL_OVERRIDE; + virtual double GetMax() const SAL_OVERRIDE; + virtual OUString GetStartStr() const SAL_OVERRIDE; + virtual void SetEdStartValEnabled(bool bFlag=false) SAL_OVERRIDE; }; class AbstractScGroupDlg_Impl : public AbstractScGroupDlg { DECL_ABSTDLG_BASE( AbstractScGroupDlg_Impl, ScGroupDlg) - virtual bool GetColsChecked() const; + virtual bool GetColsChecked() const SAL_OVERRIDE; }; class AbstractScInsertCellDlg_Impl : public AbstractScInsertCellDlg { DECL_ABSTDLG_BASE( AbstractScInsertCellDlg_Impl, ScInsertCellDlg) - virtual InsCellCmd GetInsCellCmd() const ; + virtual InsCellCmd GetInsCellCmd() const SAL_OVERRIDE ; }; class AbstractScInsertContentsDlg_Impl : public AbstractScInsertContentsDlg { DECL_ABSTDLG_BASE(AbstractScInsertContentsDlg_Impl, ScInsertContentsDlg) - virtual sal_uInt16 GetInsContentsCmdBits() const; - virtual sal_uInt16 GetFormulaCmdBits() const; - virtual bool IsSkipEmptyCells() const; - virtual bool IsLink() const; - virtual void SetFillMode( bool bSet ); - virtual void SetOtherDoc( bool bSet ); - virtual bool IsTranspose() const; - virtual void SetChangeTrack( bool bSet ); - virtual void SetCellShiftDisabled( int nDisable ); - virtual InsCellCmd GetMoveMode(); + virtual sal_uInt16 GetInsContentsCmdBits() const SAL_OVERRIDE; + virtual sal_uInt16 GetFormulaCmdBits() const SAL_OVERRIDE; + virtual bool IsSkipEmptyCells() const SAL_OVERRIDE; + virtual bool IsLink() const SAL_OVERRIDE; + virtual void SetFillMode( bool bSet ) SAL_OVERRIDE; + virtual void SetOtherDoc( bool bSet ) SAL_OVERRIDE; + virtual bool IsTranspose() const SAL_OVERRIDE; + virtual void SetChangeTrack( bool bSet ) SAL_OVERRIDE; + virtual void SetCellShiftDisabled( int nDisable ) SAL_OVERRIDE; + virtual InsCellCmd GetMoveMode() SAL_OVERRIDE; }; class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg { DECL_ABSTDLG_BASE( AbstractScInsertTableDlg_Impl, ScInsertTableDlg) - virtual bool GetTablesFromFile(); - virtual bool GetTablesAsLink(); - virtual const OUString* GetFirstTable( sal_uInt16* pN = NULL ); - virtual ScDocShell* GetDocShellTables(); - virtual bool IsTableBefore(); - virtual sal_uInt16 GetTableCount(); - virtual const OUString* GetNextTable( sal_uInt16* pN = NULL ); + virtual bool GetTablesFromFile() SAL_OVERRIDE; + virtual bool GetTablesAsLink() SAL_OVERRIDE; + virtual const OUString* GetFirstTable( sal_uInt16* pN = NULL ) SAL_OVERRIDE; + virtual ScDocShell* GetDocShellTables() SAL_OVERRIDE; + virtual bool IsTableBefore() SAL_OVERRIDE; + virtual sal_uInt16 GetTableCount() SAL_OVERRIDE; + virtual const OUString* GetNextTable( sal_uInt16* pN = NULL ) SAL_OVERRIDE; }; class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg { DECL_ABSTDLG_BASE( AbstractScSelEntryDlg_Impl, ScSelEntryDlg ) - virtual OUString GetSelectEntry() const; + virtual OUString GetSelectEntry() const SAL_OVERRIDE; }; class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg @@ -245,103 +245,103 @@ class AbstractScLinkedAreaDlg_Impl : public AbstractScLinkedAreaDlg virtual void InitFromOldLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, - sal_uLong nRefresh ); - virtual OUString GetURL(); - virtual OUString GetFilter(); // may be empty - virtual OUString GetOptions(); // filter options - virtual OUString GetSource(); // separated by ";" - virtual sal_uLong GetRefresh(); // 0 if disabled + sal_uLong nRefresh ) SAL_OVERRIDE; + virtual OUString GetURL() SAL_OVERRIDE; + virtual OUString GetFilter() SAL_OVERRIDE; // may be empty + virtual OUString GetOptions() SAL_OVERRIDE; // filter options + virtual OUString GetSource() SAL_OVERRIDE; // separated by ";" + virtual sal_uLong GetRefresh() SAL_OVERRIDE; // 0 if disabled }; class AbstractScMetricInputDlg_Impl : public AbstractScMetricInputDlg { DECL_ABSTDLG_BASE( AbstractScMetricInputDlg_Impl, ScMetricInputDlg) - virtual long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const; + virtual long GetInputValue( FieldUnit eUnit = FUNIT_TWIP ) const SAL_OVERRIDE; }; class AbstractScMoveTableDlg_Impl : public AbstractScMoveTableDlg { DECL_ABSTDLG_BASE( AbstractScMoveTableDlg_Impl, ScMoveTableDlg) - virtual sal_uInt16 GetSelectedDocument () const; - virtual sal_uInt16 GetSelectedTable () const; - virtual bool GetCopyTable () const; - virtual bool GetRenameTable () const; - virtual void GetTabNameString( OUString& rString ) const; - virtual void SetForceCopyTable (); - virtual void EnableCopyTable (bool bFlag=true); - virtual void EnableRenameTable (bool bFlag=true); + virtual sal_uInt16 GetSelectedDocument () const SAL_OVERRIDE; + virtual sal_uInt16 GetSelectedTable () const SAL_OVERRIDE; + virtual bool GetCopyTable () const SAL_OVERRIDE; + virtual bool GetRenameTable () const SAL_OVERRIDE; + virtual void GetTabNameString( OUString& rString ) const SAL_OVERRIDE; + virtual void SetForceCopyTable () SAL_OVERRIDE; + virtual void EnableCopyTable (bool bFlag=true) SAL_OVERRIDE; + virtual void EnableRenameTable (bool bFlag=true) SAL_OVERRIDE; }; class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg { DECL_ABSTDLG_BASE( AbstractScNameCreateDlg_Impl, ScNameCreateDlg) - virtual sal_uInt16 GetFlags() const; + virtual sal_uInt16 GetFlags() const SAL_OVERRIDE; }; class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg { DECL_ABSTDLG_BASE( AbstractScNamePasteDlg_Impl, ScNamePasteDlg ) - virtual std::vector<OUString> GetSelectedNames() const; - virtual bool IsAllSelected() const; + virtual std::vector<OUString> GetSelectedNames() const SAL_OVERRIDE; + virtual bool IsAllSelected() const SAL_OVERRIDE; }; class AbstractScPivotFilterDlg_Impl : public AbstractScPivotFilterDlg { DECL_ABSTDLG_BASE( AbstractScPivotFilterDlg_Impl, ScPivotFilterDlg) - virtual const ScQueryItem& GetOutputItem(); + virtual const ScQueryItem& GetOutputItem() SAL_OVERRIDE; }; class AbstractScDPFunctionDlg_Impl : public AbstractScDPFunctionDlg { DECL_ABSTDLG_BASE( AbstractScDPFunctionDlg_Impl, ScDPFunctionDlg) - virtual sal_uInt16 GetFuncMask() const; - virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const; + virtual sal_uInt16 GetFuncMask() const SAL_OVERRIDE; + virtual ::com::sun::star::sheet::DataPilotFieldReference GetFieldRef() const SAL_OVERRIDE; }; class AbstractScDPSubtotalDlg_Impl : public AbstractScDPSubtotalDlg { DECL_ABSTDLG_BASE( AbstractScDPSubtotalDlg_Impl, ScDPSubtotalDlg) - virtual sal_uInt16 GetFuncMask() const; - virtual void FillLabelData( ScDPLabelData& rLabelData ) const; + virtual sal_uInt16 GetFuncMask() const SAL_OVERRIDE; + virtual void FillLabelData( ScDPLabelData& rLabelData ) const SAL_OVERRIDE; }; class AbstractScDPNumGroupDlg_Impl : public AbstractScDPNumGroupDlg { DECL_ABSTDLG_BASE( AbstractScDPNumGroupDlg_Impl, ScDPNumGroupDlg ) - virtual ScDPNumGroupInfo GetGroupInfo() const; + virtual ScDPNumGroupInfo GetGroupInfo() const SAL_OVERRIDE; }; class AbstractScDPDateGroupDlg_Impl : public AbstractScDPDateGroupDlg { DECL_ABSTDLG_BASE( AbstractScDPDateGroupDlg_Impl, ScDPDateGroupDlg ) - virtual ScDPNumGroupInfo GetGroupInfo() const; - virtual sal_Int32 GetDatePart() const; + virtual ScDPNumGroupInfo GetGroupInfo() const SAL_OVERRIDE; + virtual sal_Int32 GetDatePart() const SAL_OVERRIDE; }; class AbstractScDPShowDetailDlg_Impl : public AbstractScDPShowDetailDlg { DECL_ABSTDLG_BASE( AbstractScDPShowDetailDlg_Impl, ScDPShowDetailDlg) - virtual OUString GetDimensionName() const; + virtual OUString GetDimensionName() const SAL_OVERRIDE; }; class AbstractScNewScenarioDlg_Impl : public AbstractScNewScenarioDlg { DECL_ABSTDLG_BASE( AbstractScNewScenarioDlg_Impl, ScNewScenarioDlg ) virtual void SetScenarioData( const OUString& rName, const OUString& rComment, - const Color& rColor, sal_uInt16 nFlags ); + const Color& rColor, sal_uInt16 nFlags ) SAL_OVERRIDE; virtual void GetScenarioData( OUString& rName, OUString& rComment, - Color& rColor, sal_uInt16& rFlags ) const; + Color& rColor, sal_uInt16& rFlags ) const SAL_OVERRIDE; }; class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg { DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg) - virtual void Insert( const OUString& rString, bool bSelected ); - virtual sal_uInt16 GetSelectEntryCount() const; - virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ); - virtual OUString GetSelectEntry(sal_uInt16 nPos) const; - virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const; + virtual void Insert( const OUString& rString, bool bSelected ) SAL_OVERRIDE; + virtual sal_uInt16 GetSelectEntryCount() const SAL_OVERRIDE; + virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId ) SAL_OVERRIDE; + virtual OUString GetSelectEntry(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual sal_uInt16 GetSelectEntryPos(sal_uInt16 nPos) const SAL_OVERRIDE; }; class AbstractScSortWarningDlg_Impl : public AbstractScSortWarningDlg @@ -352,39 +352,39 @@ class AbstractScSortWarningDlg_Impl : public AbstractScSortWarningDlg class AbstractScStringInputDlg_Impl : public AbstractScStringInputDlg { DECL_ABSTDLG_BASE( AbstractScStringInputDlg_Impl, ScStringInputDlg ) - virtual OUString GetInputString() const; + virtual OUString GetInputString() const SAL_OVERRIDE; }; class AbstractScTabBgColorDlg_Impl : public AbstractScTabBgColorDlg { DECL_ABSTDLG_BASE( AbstractScTabBgColorDlg_Impl, ScTabBgColorDlg ) - virtual void GetSelectedColor( Color& rColor ) const; + virtual void GetSelectedColor( Color& rColor ) const SAL_OVERRIDE; }; class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg { DECL_ABSTDLG_BASE( AbstractScImportOptionsDlg_Impl, ScImportOptionsDlg) - virtual void GetImportOptions( ScImportOptions& rOptions ) const; + virtual void GetImportOptions( ScImportOptions& rOptions ) const SAL_OVERRIDE; }; class AbstractScTextImportOptionsDlg_Impl : public AbstractScTextImportOptionsDlg { DECL_ABSTDLG_BASE( AbstractScTextImportOptionsDlg_Impl, ScTextImportOptionsDlg) - virtual LanguageType GetLanguageType() const; - virtual bool IsDateConversionSet() const; + virtual LanguageType GetLanguageType() const SAL_OVERRIDE; + virtual bool IsDateConversionSet() const SAL_OVERRIDE; }; class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog { DECL_ABSTDLG_BASE( ScAbstractTabDialog_Impl,SfxTabDialog ) - virtual void SetCurPageId( sal_uInt16 nId ); - virtual void SetCurPageId( const OString &rName ); - virtual const SfxItemSet* GetOutputItemSet() const; - virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); - virtual void SetInputSet( const SfxItemSet* pInSet ); + virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE; + virtual void SetCurPageId( const OString &rName ) SAL_OVERRIDE; + virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE; + virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ) SAL_OVERRIDE; + virtual void SetInputSet( const SfxItemSet* pInSet ) SAL_OVERRIDE; //From class Window. - virtual void SetText( const OUString& rStr ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; }; @@ -397,39 +397,39 @@ public: virtual AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, const OUString& aDatName, SvStream* pInStream, - ScImportAsciiCall eCall); + ScImportAsciiCall eCall) SAL_OVERRIDE; - virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent); + virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent) SAL_OVERRIDE; virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg(Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, - ScViewData *pViewData); + ScViewData *pViewData) SAL_OVERRIDE; virtual AbstractScColRowLabelDlg * CreateScColRowLabelDlg (Window* pParent, bool bCol = false, - bool bRow = false); + bool bRow = false) SAL_OVERRIDE; - virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ); + virtual AbstractScSortWarningDlg * CreateScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText ) SAL_OVERRIDE; virtual AbstractScCondFormatManagerDlg* CreateScCondFormatMgrDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormatList* pFormatList, - const ScAddress& rPos, int nId ); + const ScAddress& rPos, int nId ) SAL_OVERRIDE; - virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(Window* pParent); + virtual AbstractScDataPilotDatabaseDlg * CreateScDataPilotDatabaseDlg(Window* pParent) SAL_OVERRIDE; virtual AbstractScDataPilotSourceTypeDlg* CreateScDataPilotSourceTypeDlg(Window* pParent, - bool bEnableExternal); + bool bEnableExternal) SAL_OVERRIDE; virtual AbstractScDataPilotServiceDlg * CreateScDataPilotServiceDlg( Window* pParent, const com::sun::star::uno::Sequence<OUString>& rServices, - int nId ); - virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false ); + int nId ) SAL_OVERRIDE; + virtual AbstractScDeleteCellDlg * CreateScDeleteCellDlg(Window* pParent, bool bDisallowCellMove = false ) SAL_OVERRIDE; //for dataform virtual AbstractScDataFormDlg* CreateScDataFormDlg(Window* pParent, - ScTabViewShell* pTabViewShell); + ScTabViewShell* pTabViewShell) SAL_OVERRIDE; virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, - sal_uInt16 nCheckDefaults = 0); + sal_uInt16 nCheckDefaults = 0) SAL_OVERRIDE; virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window* pParent, ScDocument& rDocument, @@ -439,26 +439,26 @@ public: const OUString& aStartStr, double fStep, double fMax, - sal_uInt16 nPossDir); + sal_uInt16 nPossDir) SAL_OVERRIDE; virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, bool bUnGroup = false, - bool bRows = true); + bool bRows = true) SAL_OVERRIDE; virtual AbstractScInsertCellDlg * CreateScInsertCellDlg( Window* pParent, int nId, - bool bDisallowCellMove = false ); + bool bDisallowCellMove = false ) SAL_OVERRIDE; virtual AbstractScInsertContentsDlg * CreateScInsertContentsDlg( Window* pParent, sal_uInt16 nCheckDefaults = 0, - const OUString* pStrTitle = NULL ); + const OUString* pStrTitle = NULL ) SAL_OVERRIDE; virtual AbstractScInsertTableDlg * CreateScInsertTableDlg(Window* pParent, ScViewData& rViewData, - SCTAB nTabCount, bool bFromFile); + SCTAB nTabCount, bool bFromFile) SAL_OVERRIDE; virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, - const std::vector<OUString> &rEntryList ); + const std::vector<OUString> &rEntryList ) SAL_OVERRIDE; - virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent); + virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) SAL_OVERRIDE; virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, const OString& sDialogName, @@ -469,60 +469,60 @@ public: long nMaximum = 1000, long nMinimum = 0, long nFirst = 1, - long nLast = 100 ); + long nLast = 100 ) SAL_OVERRIDE; virtual AbstractScMoveTableDlg * CreateScMoveTableDlg(Window * pParent, - const OUString& rDefault); + const OUString& rDefault) SAL_OVERRIDE; virtual AbstractScNameCreateDlg * CreateScNameCreateDlg(Window * pParent, - sal_uInt16 nFlags); + sal_uInt16 nFlags) SAL_OVERRIDE; - virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ); + virtual AbstractScNamePasteDlg * CreateScNamePasteDlg ( Window * pParent, ScDocShell* pShell, bool bInsList=true ) SAL_OVERRIDE; virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg(Window* pParent, - const SfxItemSet& rArgSet, sal_uInt16 nSourceTab); + const SfxItemSet& rArgSet, sal_uInt16 nSourceTab) SAL_OVERRIDE; virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, - const ScPivotFuncData& rFuncData ); + const ScPivotFuncData& rFuncData ) SAL_OVERRIDE; virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, - bool bEnableLayout ); + bool bEnableLayout ) SAL_OVERRIDE; virtual AbstractScDPNumGroupDlg * CreateScDPNumGroupDlg( Window* pParent, int nId, - const ScDPNumGroupInfo& rInfo ); + const ScDPNumGroupInfo& rInfo ) SAL_OVERRIDE; virtual AbstractScDPDateGroupDlg * CreateScDPDateGroupDlg( Window* pParent, int nId, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, - const Date& rNullDate ); + const Date& rNullDate ) SAL_OVERRIDE; virtual AbstractScDPShowDetailDlg * CreateScDPShowDetailDlg( Window* pParent, int nId, ScDPObject& rDPObj, - sal_uInt16 nOrient ); + sal_uInt16 nOrient ) SAL_OVERRIDE; virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* pParent, const OUString& rName, - bool bEdit = false, bool bSheetProtected = false ); - virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent); + bool bEdit = false, bool bSheetProtected = false ) SAL_OVERRIDE; + virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent) SAL_OVERRIDE; virtual AbstractScStringInputDlg * CreateScStringInputDlg ( Window* pParent, const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, - const OString& sHelpId, const OString& sEditHelpId ); + const OString& sHelpId, const OString& sEditHelpId ) SAL_OVERRIDE; virtual AbstractScTabBgColorDlg * CreateScTabBgColorDlg ( Window* pParent, const OUString& rTitle, //Dialog Title const OUString& rTabBgColorNoColorText, //Label for no tab color const Color& rDefaultColor, //Currently selected Color - const OString& sHelpId ); + const OString& sHelpId ) SAL_OVERRIDE; virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, bool bAscii = true, @@ -530,39 +530,39 @@ public: const OUString* pStrTitle = NULL, bool bMultiByte = false, bool bOnlyDbtoolsEncodings = false, - bool bImport = true ); + bool bImport = true ) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScAttrDlg( SfxViewFrame* pFrame, Window* pParent, - const SfxItemSet* pCellAttrs ); + const SfxItemSet* pCellAttrs ) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame* pFrame, Window* pParent, const SfxItemSet& rCoreSet, const OUString& rPageStyle, - sal_uInt16 nResId = RID_SCDLG_HFEDIT ); + sal_uInt16 nResId = RID_SCDLG_HFEDIT ) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScStyleDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId, - int nId); + int nId) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScSubTotalDlg( Window* pParent, - const SfxItemSet* pArgSet ); + const SfxItemSet* pArgSet ) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScCharDlg(Window* pParent, - const SfxItemSet* pAttr, const SfxObjectShell* pDocShell); + const SfxItemSet* pAttr, const SfxObjectShell* pDocShell) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScParagraphDlg(Window* pParent, - const SfxItemSet* pAttr); + const SfxItemSet* pAttr) SAL_OVERRIDE; virtual SfxAbstractTabDialog * CreateScValidationDlg(Window* pParent, - const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh); + const SfxItemSet* pArgSet, ScTabViewShell *pTabVwSh) SAL_OVERRIDE; - virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet); + virtual SfxAbstractTabDialog * CreateScSortDlg(Window* pParent, const SfxItemSet* pArgSet) SAL_OVERRIDE; // For TabPage - virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ); + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) SAL_OVERRIDE; - virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ); + virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index deb599d352b2..6fa8b4fac2a5 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2225,7 +2225,6 @@ bool ScImportExport::HTML2Doc( SvStream& rStrm, const OUString& rBaseURL ) #ifndef DISABLE_DYNLOADING -#define RETURN_ERROR { return eERR_INTERN; } class ScFormatFilterMissing : public ScFormatFilterPlugin { public: ScFormatFilterMissing() @@ -2233,27 +2232,27 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin { OSL_FAIL("Missing file filters"); } virtual ~ScFormatFilterMissing() {} - virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding ) RETURN_ERROR - virtual FltError ScImportQuattroPro( SfxMedium &, ScDocument * ) RETURN_ERROR - virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) RETURN_ERROR - virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) RETURN_ERROR + virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, rtl_TextEncoding ) SAL_OVERRIDE { return eERR_INTERN; } + virtual FltError ScImportQuattroPro( SfxMedium &, ScDocument * ) SAL_OVERRIDE { return eERR_INTERN; } + virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ) SAL_OVERRIDE { return eERR_INTERN; } + virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) SAL_OVERRIDE { return eERR_INTERN; } virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress&, - const rtl_TextEncoding, sal_uInt32 ) RETURN_ERROR - virtual FltError ScImportRTF( SvStream&, const OUString&, ScDocument*, ScRange& ) RETURN_ERROR - virtual FltError ScImportHTML( SvStream&, const OUString&, ScDocument*, ScRange&, double, bool, SvNumberFormatter*, bool ) RETURN_ERROR + const rtl_TextEncoding, sal_uInt32 ) SAL_OVERRIDE { return eERR_INTERN; } + virtual FltError ScImportRTF( SvStream&, const OUString&, ScDocument*, ScRange& ) SAL_OVERRIDE { return eERR_INTERN; } + virtual FltError ScImportHTML( SvStream&, const OUString&, ScDocument*, ScRange&, double, bool, SvNumberFormatter*, bool ) SAL_OVERRIDE { return eERR_INTERN; } - virtual ScEEAbsImport *CreateRTFImport( ScDocument*, const ScRange& ) { return NULL; } - virtual ScEEAbsImport *CreateHTMLImport( ScDocument*, const OUString&, const ScRange&, bool ) { return NULL; } - virtual OUString GetHTMLRangeNameList( ScDocument*, const OUString& ) { return OUString(); } + virtual ScEEAbsImport *CreateRTFImport( ScDocument*, const ScRange& ) SAL_OVERRIDE { return NULL; } + virtual ScEEAbsImport *CreateHTMLImport( ScDocument*, const OUString&, const ScRange&, bool ) SAL_OVERRIDE { return NULL; } + virtual OUString GetHTMLRangeNameList( ScDocument*, const OUString& ) SAL_OVERRIDE { return OUString(); } - virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel, rtl_TextEncoding ) RETURN_ERROR - virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress&, const rtl_TextEncoding, sal_uInt32 ) RETURN_ERROR - virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding, sal_uInt32 ) RETURN_ERROR + virtual FltError ScExportExcel5( SfxMedium&, ScDocument*, ExportFormatExcel, rtl_TextEncoding ) SAL_OVERRIDE { return eERR_INTERN; } + virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress&, const rtl_TextEncoding, sal_uInt32 ) SAL_OVERRIDE { return eERR_INTERN; } + virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding, sal_uInt32 ) SAL_OVERRIDE { return eERR_INTERN; } virtual FltError ScExportHTML( SvStream&, const OUString&, ScDocument*, const ScRange&, const rtl_TextEncoding, bool, - const OUString&, OUString& ) RETURN_ERROR - virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding ) RETURN_ERROR + const OUString&, OUString& ) SAL_OVERRIDE { return eERR_INTERN; } + virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange&, const rtl_TextEncoding ) SAL_OVERRIDE { return eERR_INTERN; } - virtual ScOrcusFilters* GetOrcusFilters() { return NULL; } + virtual ScOrcusFilters* GetOrcusFilters() SAL_OVERRIDE { return NULL; } }; extern "C" { static void SAL_CALL thisModule() {} } diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 9d6efe8cadbf..9d31d398c850 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -112,11 +112,11 @@ class VBAProjectListener : public ContainerListenerHelper public: VBAProjectListener( ScMacroManager* pMacroMgr ) : mpMacroMgr( pMacroMgr ) {} // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException, std::exception) {} + virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw(RuntimeException, std::exception) SAL_OVERRIDE {} // XContainerListener - virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception){} - virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) throw(RuntimeException, std::exception) + virtual void SAL_CALL elementInserted( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception) SAL_OVERRIDE {} + virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) throw(RuntimeException, std::exception) SAL_OVERRIDE { OUString sModuleName; Event.Accessor >>= sModuleName; @@ -124,7 +124,7 @@ public: mpMacroMgr->InitUserFuncData(); mpMacroMgr->BroadcastModuleUpdate(sModuleName); } - virtual void SAL_CALL elementRemoved( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception){} + virtual void SAL_CALL elementRemoved( const container::ContainerEvent& /*Event*/ ) throw(RuntimeException, std::exception) SAL_OVERRIDE {} }; diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index fc270c7a2609..82602d9000f0 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -49,7 +49,7 @@ public: m_pObj (pObj) {} - virtual void Update( Graphic& aGraphic ) + virtual void Update( Graphic& aGraphic ) SAL_OVERRIDE { SdrPageView* pPageView = m_pView->GetSdrPageView(); if( pPageView ) diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 86a9bae45288..b25648101c7d 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -66,10 +66,10 @@ private: ScSplitPos eSplitPos, ScAccessibleDocument* pAccDoc); - virtual void Init(); + virtual void Init() SAL_OVERRIDE; using ScAccessibleCellBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: virtual ~ScAccessibleCell(); @@ -90,19 +90,19 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox() const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: ///===== XAccessibleContext ============================================== @@ -111,25 +111,25 @@ public: // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== @@ -137,22 +137,22 @@ public: */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // Override this method to handle cell's ParaIndent attribute specially. virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScTabViewShell* mpViewShell; ScAccessibleDocument* mpAccDoc; @@ -164,7 +164,7 @@ private: ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); virtual bool IsEditable( const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates) SAL_OVERRIDE; bool IsOpaque( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 877368d5b5de..2780f3571d3f 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -50,40 +50,40 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw (); + virtual void SAL_CALL release() throw () SAL_OVERRIDE; ///===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL isVisible() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleContext ============================================== /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: ///===== XAccessibleValue ================================================ @@ -91,19 +91,19 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== @@ -111,20 +111,20 @@ public: */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== /// returns the possible types virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: ScAddress maCellAddress; diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 829b090dd7ae..943fca3c87f3 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -76,52 +76,52 @@ public: const sal_Int16 aRole); virtual void Init(); - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: virtual ~ScAccessibleContextBase(void); public: ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw (); + virtual void SAL_CALL release() throw () SAL_OVERRIDE; ///===== XAccessible ===================================================== /// Return the XAccessibleContext. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext(void) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleContext(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleComponent ============================================ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isShowing( ) throw (::com::sun::star::uno::RuntimeException); @@ -130,63 +130,63 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL getAccessibleRole(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL getAccessibleDescription(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the parents locale or throw exception if this object has no parent yet/anymore. @@ -194,7 +194,7 @@ public: virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(void) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception); + ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; ///===== XAccessibleEventBroadcaster ===================================== @@ -205,25 +205,25 @@ public: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Remove an existing event listener. virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleEventListener ======================================== virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== @@ -231,33 +231,33 @@ public: */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. */ virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== /// returns the possible types virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return this object's description. diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 28435ab7b0e1..153f3c1b9d94 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -65,19 +65,19 @@ public: virtual ~ScAccessibleCsvControl(); using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XAccessibleComponent --------------------------------------------------- /** Returns the child at the specified point (cell returns NULL). */ virtual XAccessibleRef SAL_CALL getAccessibleAtPoint( const AwtPoint& rPoint ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns true, if the control is visible. */ - virtual sal_Bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL isVisible() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Sets the focus to this control. */ - virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // events ----------------------------------------------------------------- public: @@ -99,9 +99,9 @@ public: // helpers ---------------------------------------------------------------- protected: /** Returns this object's current bounding box relative to the desktop. */ - virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns this object's current bounding box relative to the parent object. */ - virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns whether the object is alive. Must be called with locked mutex. */ inline bool implIsAlive() const { return !rBHelper.bDisposed && !rBHelper.bInDispose && mpControl; } @@ -151,124 +151,124 @@ public: // XAccessibleComponent ----------------------------------------------------- virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext ----------------------------------------------------- /** Returns the child count (the ruler does not have children). */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Throws an exception (the ruler does not have children). */ virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the relation to the grid control. */ virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the current set of states. */ virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleText -------------------------------------------------------- /** Return the position of the caret. */ - virtual sal_Int32 SAL_CALL getCaretPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCaretPosition() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Sets the position of the caret. */ virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the specified character. */ virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the attributes of the specified character. */ virtual PropertyValueSeq SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the screen coordinates of the specified character. */ virtual AwtRectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the count of characters. */ - virtual sal_Int32 SAL_CALL getCharacterCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getCharacterCount() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the character index at the specified coordinate (object's coordinate system). */ virtual sal_Int32 SAL_CALL getIndexAtPoint( const AwtPoint& rPoint ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the selected text (ruler returns empty string). */ - virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getSelectedText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the start index of the selection (ruler returns -1). */ - virtual sal_Int32 SAL_CALL getSelectionStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getSelectionStart() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the end index of the selection (ruler returns -1). */ - virtual sal_Int32 SAL_CALL getSelectionEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int32 SAL_CALL getSelectionEnd() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Selects a part of the text (ruler does nothing). */ virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the entire text. */ - virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getText() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the specified range [Start,End) of the text. */ virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the specified text portion. */ - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Copies the specified text range into the clipboard (ruler does nothing). */ virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInterface ------------------------------------------------------------- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeProvider ---------------------------------------------------------- /** Returns a sequence with all supported interface types. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns an implementation ID. */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // events ----------------------------------------------------------------- public: /** Sends a caret changed event to all listeners. */ - virtual void SendCaretEvent(); + virtual void SendCaretEvent() SAL_OVERRIDE; // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; /** Throws an exception, if the specified character position is invalid (outside 0..len-1). */ void ensureValidIndex( sal_Int32 nIndex ) const @@ -323,186 +323,186 @@ public: /** Returns the cell at the specified point. */ virtual XAccessibleRef SAL_CALL getAccessibleAtPoint( const AwtPoint& rPoint ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext ----------------------------------------------------- /** Returns the child count (count of cells in the table). */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the specified child cell. */ virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the relation to the ruler control. */ virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the current set of states. */ virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleTable ------------------------------------------------------- /** Returns the number of rows in the table. */ virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the number of columns in the table. */ virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the description of the specified row in the table. */ virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the description text of the specified column in the table. */ virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the number of rows occupied at a specified row and column. @descr Returns always 1 (Merged cells not supported). */ virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the number of rows occupied at a specified row and column. @descr Returns always 1 (Merged cells not supported). */ virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the row headers as an AccessibleTable. */ virtual XAccessibleTableRef SAL_CALL getAccessibleRowHeaders() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the column headers as an AccessibleTable. */ virtual XAccessibleTableRef SAL_CALL getAccessibleColumnHeaders() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the selected rows as a sequence. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the selected columns as a sequence. */ virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns true, if the specified row is selected. */ virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns true, if the specified column is selected. */ virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the accessible cell object at the specified position. */ virtual XAccessibleRef SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the caption object of the table. */ virtual XAccessibleRef SAL_CALL getAccessibleCaption() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the summary description object of the table. */ virtual XAccessibleRef SAL_CALL getAccessibleSummary() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns true, if the cell at a specified position is selected. */ virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the child index of the cell at the specified position. */ virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the row index of the specified child. */ virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the column index of the specified child. */ virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XAccessibleSelection --------------------------------------------------- /** Selects the specified child (selects the entire column or the entire table). */ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns true, if the specified child is selected. */ virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Deselects all cells. */ virtual void SAL_CALL clearAccessibleSelection() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Selects all cells. */ virtual void SAL_CALL selectAllAccessibleChildren() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the count of selected children. */ virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the child with the specified index in all selected children. */ virtual XAccessibleRef SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Deselects the child with the specified index in all selected children. */ virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInterface ------------------------------------------------------------- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XServiceInfo ----------------------------------------------------------- /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTypeProvider ---------------------------------------------------------- /** Returns a sequence with all supported interface types. */ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns an implementation ID. */ virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // events ----------------------------------------------------------------- public: /** Sends a GetFocus or LoseFocus event to all listeners. */ - virtual void SendFocusEvent( bool bFocused ); + virtual void SendFocusEvent( bool bFocused ) SAL_OVERRIDE; /** Sends a table model changed event for changed cell contents to all listeners. */ - virtual void SendTableUpdateEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn, bool bAllRows ); + virtual void SendTableUpdateEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn, bool bAllRows ) SAL_OVERRIDE; /** Sends a table model changed event for an inserted column to all listeners. */ - virtual void SendInsertColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn ); + virtual void SendInsertColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn ) SAL_OVERRIDE; /** Sends a table model changed event for a removed column to all listeners. */ - virtual void SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn ); + virtual void SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 nLastColumn ) SAL_OVERRIDE; // helpers ---------------------------------------------------------------- private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; /** Throws an exception, if nIndex is not a valid child index. */ void ensureValidIndex( sal_Int32 nIndex ) const @@ -568,40 +568,40 @@ public: virtual ~ScAccessibleCsvCell(); using ScAccessibleCsvControl::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XAccessibleComponent --------------------------------------------------- /** Sets the focus to the column of this cell. */ - virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL grabFocus() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext ----------------------------------------------------- /** Returns the child count. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the specified child. */ virtual XAccessibleRef SAL_CALL getAccessibleChild( sal_Int32 nIndex ) - throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the index of this cell in the table. */ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the relation to the ruler control. */ virtual XAccessibleRelationSetRef SAL_CALL getAccessibleRelationSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns the current set of states. */ virtual XAccessibleStateSetRef SAL_CALL getAccessibleStateSet() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInterface ------------------------------------------------------------- @@ -615,22 +615,22 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // helpers ---------------------------------------------------------------- protected: /** Returns this object's current bounding box relative to the desktop. */ - virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual Rectangle GetBoundingBoxOnScreen() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns this object's current bounding box relative to the parent object. */ - virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual Rectangle GetBoundingBox() const throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: /** Returns this object's name. */ virtual OUString SAL_CALL createAccessibleName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /** Returns this object's description. */ virtual OUString SAL_CALL createAccessibleDescription() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; /** Returns the VCL grid control. Assumes a living object. */ ScCsvGrid& implGetGrid() const; diff --git a/sc/source/ui/inc/AccessibleDataPilotControl.hxx b/sc/source/ui/inc/AccessibleDataPilotControl.hxx index 2085dadfc7c5..583105ae40b8 100644 --- a/sc/source/ui/inc/AccessibleDataPilotControl.hxx +++ b/sc/source/ui/inc/AccessibleDataPilotControl.hxx @@ -36,10 +36,10 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent, ScDPFieldControlBase* pFieldWindow); - virtual void Init(); + virtual void Init() SAL_OVERRIDE; using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; void AddField(sal_Int32 nNewIndex); void MoveField(sal_Int32 nOldIndex, sal_Int32 nNewIndex); @@ -56,37 +56,37 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isVisible( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== @@ -94,7 +94,7 @@ public: */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -102,26 +102,26 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScDPFieldControlBase* mpFieldWindow; diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index 65290c1babbe..bfd81f4deee9 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -64,7 +64,7 @@ public: ScTabViewShell* pViewShell, ScSplitPos eSplitPos); - virtual void Init(); + virtual void Init() SAL_OVERRIDE; DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); @@ -75,99 +75,99 @@ protected: public: - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw (); + virtual void SAL_CALL release() throw () SAL_OVERRIDE; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; ///===== XAccessibleSelection =========================================== virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XSelectionListener ============================================= virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo =================================================== @@ -175,26 +175,26 @@ public: */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== /// returns the possible types virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== IAccessibleViewForwarder ======================================== @@ -204,7 +204,7 @@ public: @return Return <true/> if the view forwarder is valid and <false/> else. */ - virtual bool IsValid (void) const; + virtual bool IsValid (void) const SAL_OVERRIDE; /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -213,7 +213,7 @@ public: The rectangle of the visible part of the document. The values are, contrary to the base class, in internal coordinates. */ - virtual Rectangle GetVisibleArea() const; + virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; /** Transform the specified point from internal coordinates to an absolute screen position. @@ -225,7 +225,7 @@ public: The same point but in screen coordinates relative to the upper left corner of the (current) screen. */ - virtual Point LogicToPixel (const Point& rPoint) const; + virtual Point LogicToPixel (const Point& rPoint) const SAL_OVERRIDE; /** Transform the specified size from internal coordinates to a screen * oriented pixel size. @@ -236,7 +236,7 @@ public: @return The same size but in screen coordinates. */ - virtual Size LogicToPixel (const Size& rSize) const; + virtual Size LogicToPixel (const Size& rSize) const SAL_OVERRIDE; /** Transform the specified point from absolute screen coordinates to internal coordinates. @@ -248,7 +248,7 @@ public: @return The same point but in internal coordinates. */ - virtual Point PixelToLogic (const Point& rPoint) const; + virtual Point PixelToLogic (const Point& rPoint) const SAL_OVERRIDE; /** Transform the specified size from screen coordinates to internal coordinates. @@ -259,7 +259,7 @@ public: @return The same size but in internal coordinates. */ - virtual Size PixelToLogic (const Size& rSize) const; + virtual Size PixelToLogic (const Size& rSize) const SAL_OVERRIDE; ///======== internal ===================================================== @@ -273,20 +273,20 @@ protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScTabViewShell* mpViewShell; @@ -327,15 +327,15 @@ public: //===== XAccessibleGetAccFromXShape ============================================ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL get_AccFlowTo(const ::com::sun::star::uno::Any& rAny, sal_Int32 nType) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - void SwitchViewFireFocus(); + void SwitchViewFireFocus() SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 85c509885801..d793b34e0b8f 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -46,56 +46,56 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleContext ============================================== /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -103,7 +103,7 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== internal ======================================================== @@ -111,22 +111,22 @@ protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: // needed in ScShapeChildren /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 3024c0b19c22..c03a61c22ef2 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -63,7 +63,7 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; virtual void LostFocus(); @@ -72,26 +72,26 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw (); + virtual void SAL_CALL release() throw () SAL_OVERRIDE; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: ///===== XAccessibleContext ============================================== @@ -100,56 +100,56 @@ public: // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleSelection ============================================ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: ///===== XAccessibleEventBroadcaster ===================================== @@ -161,14 +161,14 @@ public: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Remove an existing event listener. virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== @@ -176,7 +176,7 @@ public: */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -184,7 +184,7 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: accessibility::AccessibleTextHelper* mpTextHelper; @@ -204,10 +204,10 @@ private: ///===== XAccessibleComponent ============================================ virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 GetFgBgColor( const rtl::OUString &strPropColor) ; }; diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index e97cf2c727a1..ccc22133b66e 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -43,46 +43,46 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; //===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; } protected: - virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 3c93781fee28..8d5bd256c006 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -49,18 +49,18 @@ public: const EditTextObject* GetEditTextObject() const { return mpEditObj; } using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleContext ============================================== @@ -68,20 +68,20 @@ public: // is overloaded to calculate this on demand virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== @@ -89,14 +89,14 @@ public: */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. In this case that is just the AccessibleContext and Accessible service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -104,14 +104,14 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBox(void) const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: EditTextObject* mpEditObj; diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index d43ceec32866..d67f6570143c 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -46,37 +46,37 @@ protected: public: using ScAccessibleCellBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== // overloaded to calculate this on demand - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -84,11 +84,11 @@ public: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScPreviewShell* mpViewShell; @@ -100,7 +100,7 @@ private: ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); virtual bool IsEditable( const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); + ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates) SAL_OVERRIDE; bool IsOpaque( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index ebf059f4ff2a..7e1cc96208bb 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -55,73 +55,73 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; //===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw (); + virtual void SAL_CALL release() throw () SAL_OVERRIDE; //===== XAccessibleValue ================================================ - virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setCurrentValue( const ::com::sun::star::uno::Any& aNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue() throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getMaximumValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getMinimumValue() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL createAccessibleDescription(void) throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString SAL_CALL createAccessibleName(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual Rectangle GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index f52bbd339246..1d21083ba72a 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -47,137 +47,137 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; //===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw (); + virtual void SAL_CALL release() throw () SAL_OVERRIDE; //===== XAccessibleTable ================================================ virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleColumnCount() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleRowHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleColumnHeaders() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleCaption() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleCaption() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL - getAccessibleSummary() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleSummary() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, - std::exception); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception); + std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XTypeProvider =================================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== internal ======================================================== void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; } protected: - virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL createAccessibleDescription() throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 5f753a9bfa54..3978d47c9283 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -86,7 +86,7 @@ protected: public: using ScAccessibleTableBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; void CompleteSelectionChanged(bool bNewState); @@ -98,47 +98,47 @@ public: private: ///===== SfxListener ===================================================== - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; ///===== XAccessibleTable ================================================ /// Returns the row headers as an AccessibleTable. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Returns the column headers as an AccessibleTable. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Returns the selected rows in a table. virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Returns the selected columns in a table. virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Returns a boolean value indicating whether the specified row is selected. virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; /// Returns a boolean value indicating whether the specified column is selected. virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; /// Returns the Accessible at a specified row and column in the table. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; rtl::Reference<ScAccessibleCell> GetAccessibleCellAt(sal_Int32 nRow, sal_Int32 nColumn); @@ -146,23 +146,23 @@ private: virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IndexOutOfBoundsException, std::exception); + ::com::sun::star::lang::IndexOutOfBoundsException, std::exception) SAL_OVERRIDE; ///===== XAccessibleComponent ============================================ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& rPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleContext ============================================== @@ -170,13 +170,13 @@ private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleSelection =========================================== @@ -184,31 +184,31 @@ private: selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== @@ -216,13 +216,13 @@ private: */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a list of all supported services. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -230,7 +230,7 @@ private: */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleEventBroadcaster ===================================== @@ -241,29 +241,29 @@ private: addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener>& xListener) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleTableSelection ============================================ virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; protected: /// Return the object's current bounding box relative to the desktop. virtual Rectangle GetBoundingBoxOnScreen(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. virtual Rectangle GetBoundingBox(void) const - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScTabViewShell* mpViewShell; ScRangeList* mpMarkedRanges; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 804d37640f7a..e054c8acf3df 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -55,17 +55,17 @@ protected: public: using ScAccessibleContextBase::disposing; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; ///===== XInterface ===================================================== virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw (); + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; - virtual void SAL_CALL release() throw (); + virtual void SAL_CALL release() throw () SAL_OVERRIDE; ///===== XAccessibleTable ================================================ @@ -73,27 +73,27 @@ public: virtual sal_Int32 SAL_CALL getAccessibleRowCount( ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; /// Returns the number of columns in the table. virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; /// Returns the description of the specified row in the table. virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /// Returns the description text of the specified column in the table. virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /** Returns the number of rows occupied by the Accessible at a specified row and column in the table. Returns 1 if it is only a cell and the number of rows the cell is merged if the cell is a merged cell. @@ -102,7 +102,7 @@ public: getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /** Returns the number of columns occupied by the Accessible at a specified row and column in the table. Returns 1 if it is only a cell and the number of columns the cell is merged if the cell is a merged cell. @@ -111,65 +111,65 @@ public: getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /// Returns the row headers as an AccessibleTable. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Returns the column headers as an AccessibleTable. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Returns the selected rows in a table. virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Returns the selected columns in a table. virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Returns a boolean value indicating whether the specified row is selected. virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /// Returns a boolean value indicating whether the specified column is selected. virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /// Returns the Accessible at a specified row and column in the table. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /// Returns the caption for the table. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Returns the summary description of the table. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Returns a boolean value indicating whether the accessible at a specified row and column is selected. virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; ///===== XAccessibleExtendedTable ======================================== @@ -178,21 +178,21 @@ public: getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /// Returns the row number of an index in the table. virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; /// Returns the column number of an index in the table. virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; //===== XAccessibleContext ============================================== @@ -201,7 +201,7 @@ public: virtual sal_Int32 SAL_CALL getAccessibleChildCount(void) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. // is overloaded to calculate this on demand @@ -209,45 +209,45 @@ public: getAccessibleChild(sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; protected: /// Return this object's description. virtual OUString SAL_CALL createAccessibleDescription(void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL createAccessibleName() throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; public: /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. // perhaps sometimes to be implemented virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleSelection =========================================== @@ -255,37 +255,37 @@ public: selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL clearAccessibleSelection( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; ///===== XServiceInfo =================================================== @@ -293,20 +293,20 @@ public: */ virtual OUString SAL_CALL getImplementationName(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== /// returns the possible types virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// contains the range of the table, because it could be a subrange of the complete table diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index 58ab48c97938..cac2365084a8 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -48,7 +48,7 @@ public: virtual ScAccessibleTextData* Clone() const = 0; - virtual void Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ ) {} + virtual void Notify( SfxBroadcaster& /* rBC */, const SfxHint& /* rHint */ ) SAL_OVERRIDE {} virtual SvxTextForwarder* GetTextForwarder() = 0; virtual SvxViewForwarder* GetViewForwarder() = 0; @@ -77,11 +77,11 @@ public: const ScAddress& rP) : ScCellTextData(pDocShellP, rP) {} virtual ~ScAccessibleCellBaseTextData() {} - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { ScCellTextData::Notify(rBC, rHint); } + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE { ScCellTextData::Notify(rBC, rHint); } - virtual void UpdateData() { ScCellTextData::UpdateData(); } - virtual void SetDoUpdate(bool bValue) { ScCellTextData::SetDoUpdate(bValue); } - virtual bool IsDirty() const { return ScCellTextData::IsDirty(); } + virtual void UpdateData() SAL_OVERRIDE { ScCellTextData::UpdateData(); } + virtual void SetDoUpdate(bool bValue) SAL_OVERRIDE { ScCellTextData::SetDoUpdate(bValue); } + virtual bool IsDirty() const SAL_OVERRIDE { return ScCellTextData::IsDirty(); } }; @@ -96,17 +96,17 @@ public: const ScAddress& rP, ScSplitPos eSplitPos, ScAccessibleCell* pAccCell); virtual ~ScAccessibleCellTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ); + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) SAL_OVERRIDE; DECL_LINK( NotifyHdl, EENotify* ); protected: - virtual void GetCellText(const ScAddress& rCellPos, OUString& rText); + virtual void GetCellText(const ScAddress& rCellPos, OUString& rText) SAL_OVERRIDE; private: ScViewForwarder* mpViewForwarder; ScEditViewForwarder* mpEditViewForwarder; @@ -131,17 +131,17 @@ public: ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, bool isClone = false); virtual ~ScAccessibleEditObjectTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ); + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) SAL_OVERRIDE; - virtual void UpdateData() { } - virtual void SetDoUpdate(bool /* bValue */) { } - virtual bool IsDirty() const { return false; } + virtual void UpdateData() SAL_OVERRIDE { } + virtual void SetDoUpdate(bool /* bValue */) SAL_OVERRIDE { } + virtual bool IsDirty() const SAL_OVERRIDE { return false; } DECL_LINK( NotifyHdl, EENotify* ); protected: @@ -163,10 +163,10 @@ public: ScAccessibleEditLineTextData(EditView* pEditView, Window* pWin); virtual ~ScAccessibleEditLineTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ); + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) SAL_OVERRIDE; void Dispose(); void TextChanged(); @@ -188,13 +188,13 @@ public: const ScAddress& rP); virtual ~ScAccessiblePreviewCellTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) { return NULL; } + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) SAL_OVERRIDE { return NULL; } private: ScPreviewViewForwarder* mpViewForwarder; @@ -217,13 +217,13 @@ public: const OUString& rText, const ScAddress& rP, bool bColHeader, bool bRowHeader); virtual ~ScAccessiblePreviewHeaderCellTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) { return NULL; } + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) SAL_OVERRIDE { return NULL; } private: ScPreviewViewForwarder* mpViewForwarder; @@ -249,17 +249,17 @@ public: const EditTextObject* pEditObj, bool bHeader, SvxAdjust eAdjust); virtual ~ScAccessibleHeaderTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) { return NULL; } + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) SAL_OVERRIDE { return NULL; } - virtual void UpdateData() { } - virtual void SetDoUpdate(bool /* bValue */) { } - virtual bool IsDirty() const { return false; } + virtual void UpdateData() SAL_OVERRIDE { } + virtual void SetDoUpdate(bool /* bValue */) SAL_OVERRIDE { } + virtual bool IsDirty() const SAL_OVERRIDE { return false; } private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; @@ -282,17 +282,17 @@ public: const OUString& sText, const ScAddress& aCellPos, bool bMarkNote); virtual ~ScAccessibleNoteTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) { return NULL; } + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool /* bCreate */ ) SAL_OVERRIDE { return NULL; } - virtual void UpdateData() { } - virtual void SetDoUpdate(bool /* bValue */) { } - virtual bool IsDirty() const { return false; } + virtual void UpdateData() SAL_OVERRIDE { } + virtual void SetDoUpdate(bool /* bValue */) SAL_OVERRIDE { } + virtual bool IsDirty() const SAL_OVERRIDE { return false; } private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; @@ -331,17 +331,17 @@ public: const Size& rCellSize ); virtual ~ScAccessibleCsvTextData(); - virtual ScAccessibleTextData* Clone() const; + virtual ScAccessibleTextData* Clone() const SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); - virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ); + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; + virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate ) SAL_OVERRIDE; - virtual void UpdateData() {} - virtual void SetDoUpdate( bool /* bValue */ ) {} - virtual bool IsDirty() const { return false; } + virtual void UpdateData() SAL_OVERRIDE {} + virtual void SetDoUpdate( bool /* bValue */ ) SAL_OVERRIDE {} + virtual bool IsDirty() const SAL_OVERRIDE { return false; } }; diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index be0216f3887d..9246e1dd19a7 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -33,11 +33,11 @@ public: virtual ~ScAnalysisOfVarianceDialog(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; protected: - virtual sal_Int16 GetUndoNameId(); - virtual ScRange ApplyOutput(ScDocShell* pDocShell); + virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index 8709146c3f97..f9166d296a78 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -43,25 +43,25 @@ protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XSelectionChangeListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ____ XServiceInfo ____ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScTabViewShell * m_pViewShell; diff --git a/sc/source/ui/inc/ChildWindowWrapper.hxx b/sc/source/ui/inc/ChildWindowWrapper.hxx index b61853ec02f1..684bf6db8543 100644 --- a/sc/source/ui/inc/ChildWindowWrapper.hxx +++ b/sc/source/ui/inc/ChildWindowWrapper.hxx @@ -59,7 +59,7 @@ public: SfxChildWindow::RegisterChildWindow(pModule, pFactory); } - virtual SfxChildWinInfo GetInfo() const + virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); ((SfxModelessDialog*)GetWindow())->FillInfo( aInfo ); diff --git a/sc/source/ui/inc/CorrelationDialog.hxx b/sc/source/ui/inc/CorrelationDialog.hxx index 24c2aa309302..82bc1675c8a8 100644 --- a/sc/source/ui/inc/CorrelationDialog.hxx +++ b/sc/source/ui/inc/CorrelationDialog.hxx @@ -20,11 +20,11 @@ public: SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, Window* pParent, ScViewData* pViewData); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; protected: - virtual const OUString getLabel(); - virtual const OUString getTemplate(); + virtual const OUString getLabel() SAL_OVERRIDE; + virtual const OUString getTemplate() SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx index 5c4b06311231..539d6ec8bcfb 100644 --- a/sc/source/ui/inc/CovarianceDialog.hxx +++ b/sc/source/ui/inc/CovarianceDialog.hxx @@ -20,12 +20,12 @@ public: SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow, Window* pParent, ScViewData* pViewData); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; protected: - virtual const OUString getLabel(); - virtual const OUString getTemplate(); - virtual sal_Int16 GetUndoNameId(); + virtual const OUString getLabel() SAL_OVERRIDE; + virtual const OUString getTemplate() SAL_OVERRIDE; + virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx index 1ec90687809a..ef57a6a2081c 100644 --- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx +++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx @@ -30,11 +30,11 @@ public: virtual ~ScDescriptiveStatisticsDialog(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; protected: - virtual sal_Int16 GetUndoNameId(); - virtual ScRange ApplyOutput(ScDocShell* pDocShell); + virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index 2df2ee46aa7e..79c06e0bd65c 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -41,11 +41,11 @@ public: virtual ~ScDrawModelBroadcaster(); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::document::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx index feefaba236cf..e010d3132b9b 100644 --- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx +++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx @@ -33,11 +33,11 @@ public: virtual ~ScExponentialSmoothingDialog(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; protected: - virtual sal_Int16 GetUndoNameId(); - virtual ScRange ApplyOutput(ScDocShell* pDocShell); + virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx index 6875c73806e0..c065cdc8f364 100644 --- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx +++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx @@ -32,8 +32,8 @@ public: virtual ~ScMatrixComparisonGenerator(); protected: - virtual sal_Int16 GetUndoNameId(); - virtual ScRange ApplyOutput(ScDocShell* pDocShell); + virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; virtual const OUString getLabel() = 0; virtual const OUString getTemplate() = 0; diff --git a/sc/source/ui/inc/MovingAverageDialog.hxx b/sc/source/ui/inc/MovingAverageDialog.hxx index 0bf6b7aac7f7..8ba10ba643a2 100644 --- a/sc/source/ui/inc/MovingAverageDialog.hxx +++ b/sc/source/ui/inc/MovingAverageDialog.hxx @@ -33,11 +33,11 @@ public: virtual ~ScMovingAverageDialog(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; protected: - virtual sal_Int16 GetUndoNameId(); - virtual ScRange ApplyOutput(ScDocShell* pDocShell); + virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 049b92303cc9..2c97b2994673 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -29,9 +29,9 @@ public: virtual ~ScRandomNumberGeneratorDialog(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual void SetActive(); - virtual bool Close(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; private: // Widgets diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index b736c8c0650a..69a070d9cfeb 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -28,9 +28,9 @@ public: virtual ~ScSamplingDialog(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual void SetActive(); - virtual bool Close(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; private: // Widgets diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 8a316b47e45f..cefe0c54cdfd 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -34,8 +34,8 @@ public: virtual ~ScStatisticsInputOutputDialog(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual void SetActive(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; protected: virtual void CalculateInputAndWriteToOutput(); diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 461539a360a5..de6fcdbc56fe 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -34,8 +34,8 @@ public: virtual ~ScStatisticsTwoVariableDialog(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual void SetActive(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; protected: virtual void CalculateInputAndWriteToOutput(); diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx index 6677a9191243..88734b2a95e8 100644 --- a/sc/source/ui/inc/TTestDialog.hxx +++ b/sc/source/ui/inc/TTestDialog.hxx @@ -22,11 +22,11 @@ public: virtual ~ScTTestDialog(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; protected: - virtual sal_Int16 GetUndoNameId(); - virtual ScRange ApplyOutput(ScDocShell* pDocShell); + virtual sal_Int16 GetUndoNameId() SAL_OVERRIDE; + virtual ScRange ApplyOutput(ScDocShell* pDocShell) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index ca65ae3c908e..2ffec04d762b 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -135,11 +135,11 @@ protected: public: DataRangeByColumnIterator(ScRange aInputRange); - virtual bool hasNext(); - virtual void next(); - virtual ScRange get(); - virtual void reset(); - virtual DataCellIterator iterateCells(); + virtual bool hasNext() SAL_OVERRIDE; + virtual void next() SAL_OVERRIDE; + virtual ScRange get() SAL_OVERRIDE; + virtual void reset() SAL_OVERRIDE; + virtual DataCellIterator iterateCells() SAL_OVERRIDE; }; class DataRangeByRowIterator : public DataRangeIterator @@ -150,11 +150,11 @@ protected: public: DataRangeByRowIterator(ScRange aInputRange); - virtual bool hasNext(); - virtual void next(); - virtual ScRange get(); - virtual void reset(); - virtual DataCellIterator iterateCells(); + virtual bool hasNext() SAL_OVERRIDE; + virtual void next() SAL_OVERRIDE; + virtual ScRange get() SAL_OVERRIDE; + virtual void reset() SAL_OVERRIDE; + virtual DataCellIterator iterateCells() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 16ec2674e3e7..b1998a598570 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -213,10 +213,10 @@ public: void ReInit(ScViewData* ptrViewData); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void Initialize (SfxChildWinInfo* pInfo); - virtual void FillInfo(SfxChildWinInfo&) const; + virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index c269390d63e9..a739b220da48 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -134,8 +134,8 @@ protected: void SetDispatcherLock( bool bLock ); - virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); - virtual void RefInputDone( bool bForced = false ); + virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; + virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; void ShowSimpleReference(const OUString& rStr); void ShowFormulaReference(const OUString& rStr); @@ -148,23 +148,23 @@ public: ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ); virtual ~ScRefHandler(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) = 0; - virtual void AddRefEntry(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE = 0; + virtual void AddRefEntry() SAL_OVERRIDE; - virtual bool IsRefInputMode() const; - virtual bool IsTableLocked() const; - virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const; + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual bool IsTableLocked() const SAL_OVERRIDE; + virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const SAL_OVERRIDE; - virtual void ShowReference(const OUString& rStr); - virtual void HideReference( bool bDoneRefMode = true ); + virtual void ShowReference(const OUString& rStr) SAL_OVERRIDE; + virtual void HideReference( bool bDoneRefMode = true ) SAL_OVERRIDE; - virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); - virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); + virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; + virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; - virtual void ViewShellChanged(); + virtual void ViewShellChanged() SAL_OVERRIDE; void SwitchToDocument(); - virtual void SetActive() = 0; + virtual void SetActive() SAL_OVERRIDE = 0; public: bool EnterRefMode(); @@ -180,8 +180,8 @@ class ScRefHdlModalImpl : public ModalDialog, public ScRefHandler { public: - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nStateChange ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; protected: ScRefHdlModalImpl(Window* pParent, const OString& rID, const OUString& rUIXMLDescription); diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 2965b9a871b4..e9e957a393be 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -38,14 +38,14 @@ public: ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ); ~ScPrintAreasDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual void AddRefEntry(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual void AddRefEntry() SAL_OVERRIDE; - virtual bool IsTableLocked() const; + virtual bool IsTableLocked() const SAL_OVERRIDE; - virtual void SetActive(); - virtual void Deactivate(); - virtual bool Close(); + virtual void SetActive() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; private: ListBox* pLbPrintArea; diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index fea35429a65f..4e54119f0cc6 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -37,7 +37,7 @@ public: ~ScAttrDlg(); protected: - virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ); + virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; private: DECL_LINK( OkHandler, void* ); // for closing by double clicking in TabPages diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index fb4c3736cf77..c8d0bab3bbbd 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -54,8 +54,8 @@ public: void NotifyChange( ScAutoFormatData* pNewData ); protected: - virtual void Paint(const Rectangle& rRect); - virtual void Resize(); + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; private: ScAutoFormatData* pCurData; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 9c2b5c7de6c7..8a332b8423d1 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -48,13 +48,13 @@ public: explicit ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel = 0); virtual ~ScMenuFloatingWindow(); - virtual void PopupModeEnd(); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void Paint(const Rectangle& rRect); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual void PopupModeEnd() SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void addMenuItem(const OUString& rText, bool bEnabled, Action* pAction); void addSeparator(); @@ -204,7 +204,7 @@ class ScCheckListBox : public SvTreeListBox SvTreeListEntry* FindEntry( SvTreeListEntry* pParent, const OUString& sNode ); sal_uInt16 GetCheckedEntryCount() const; void ExpandChildren( SvTreeListEntry* pParent ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; /** * This class implements a popup window for field button, for quick access @@ -238,11 +238,11 @@ public: explicit ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc); virtual ~ScCheckListMenuWindow(); - virtual void MouseMove(const MouseEvent& rMEvt); - virtual bool Notify(NotifyEvent& rNEvt); - virtual void Paint(const Rectangle& rRect); - virtual Window* GetPreferredKeyInputWindow(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool Notify(NotifyEvent& rNEvt) SAL_OVERRIDE; + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void setMemberSize(size_t n); void addDateMember(const OUString& rName, double nVal, bool bVisible); @@ -271,7 +271,7 @@ public: void setPopupEndAction(Action* p); protected: - virtual void handlePopupEnd(); + virtual void handlePopupEnd() SAL_OVERRIDE; private: struct Member @@ -291,7 +291,7 @@ private: public: CancelButton(ScCheckListMenuWindow* pParent); - virtual void Click(); + virtual void Click() SAL_OVERRIDE; private: ScCheckListMenuWindow* mpParent; diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index 8453f874221d..879c6feac487 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -33,10 +33,10 @@ private: SdrModel* pModel; SdrGrafObj* pGrafEdit; - virtual void ObjectAreaChanged(); - virtual void RequestNewObjectArea( Rectangle& ); - virtual void ViewChanged(); - virtual void MakeVisible(); + virtual void ObjectAreaChanged() SAL_OVERRIDE; + virtual void RequestNewObjectArea( Rectangle& ) SAL_OVERRIDE; + virtual void ViewChanged() SAL_OVERRIDE; + virtual void MakeVisible() SAL_OVERRIDE; public: ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ); diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index 2bb2c6845e42..1fc3cffcc659 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -37,23 +37,23 @@ public: ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); ~ScColBar(); - virtual SCCOLROW GetPos() const; - virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const; - virtual OUString GetEntryText( SCCOLROW nEntryNo ) const; + virtual SCCOLROW GetPos() const SAL_OVERRIDE; + virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const SAL_OVERRIDE; + virtual OUString GetEntryText( SCCOLROW nEntryNo ) const SAL_OVERRIDE; - virtual bool IsLayoutRTL() const; + virtual bool IsLayoutRTL() const SAL_OVERRIDE; - virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ); - virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ); + virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ) SAL_OVERRIDE; + virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) SAL_OVERRIDE; - virtual void SetMarking( bool bSet ); - virtual void SelectWindow(); - virtual bool IsDisabled() const; - virtual bool ResizeAllowed() const; + virtual void SetMarking( bool bSet ) SAL_OVERRIDE; + virtual void SelectWindow() SAL_OVERRIDE; + virtual bool IsDisabled() const SAL_OVERRIDE; + virtual bool ResizeAllowed() const SAL_OVERRIDE; - virtual void DrawInvert( long nDragPos ); + virtual void DrawInvert( long nDragPos ) SAL_OVERRIDE; - virtual OUString GetDragHelp( long nVal ); + virtual OUString GetDragHelp( long nVal ) SAL_OVERRIDE; bool UseNumericHeader() const; }; @@ -70,24 +70,24 @@ public: ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ); ~ScRowBar(); - virtual SCCOLROW GetPos() const; - virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const; - virtual OUString GetEntryText( SCCOLROW nEntryNo ) const; + virtual SCCOLROW GetPos() const SAL_OVERRIDE; + virtual sal_uInt16 GetEntrySize( SCCOLROW nEntryNo ) const SAL_OVERRIDE; + virtual OUString GetEntryText( SCCOLROW nEntryNo ) const SAL_OVERRIDE; - virtual bool IsMirrored() const; - virtual SCROW GetHiddenCount( SCROW nEntryNo ) const; + virtual bool IsMirrored() const SAL_OVERRIDE; + virtual SCROW GetHiddenCount( SCROW nEntryNo ) const SAL_OVERRIDE; - virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ); - virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ); + virtual void SetEntrySize( SCCOLROW nPos, sal_uInt16 nNewSize ) SAL_OVERRIDE; + virtual void HideEntries( SCCOLROW nStart, SCCOLROW nEnd ) SAL_OVERRIDE; - virtual void SetMarking( bool bSet ); - virtual void SelectWindow(); - virtual bool IsDisabled() const; - virtual bool ResizeAllowed() const; + virtual void SetMarking( bool bSet ) SAL_OVERRIDE; + virtual void SelectWindow() SAL_OVERRIDE; + virtual bool IsDisabled() const SAL_OVERRIDE; + virtual bool ResizeAllowed() const SAL_OVERRIDE; - virtual void DrawInvert( long nDragPos ); + virtual void DrawInvert( long nDragPos ) SAL_OVERRIDE; - virtual OUString GetDragHelp( long nVal ); + virtual OUString GetDragHelp( long nVal ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 5b8effe5e640..155bbd806524 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -73,8 +73,8 @@ public: const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); - virtual Size GetOptimalSize() const; - virtual void Resize(); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; ScConditionalFormat* GetConditionalFormat() const; void RecalcAll(); @@ -107,7 +107,7 @@ private: DECL_LINK( EdRangeModifyHdl, Edit* ); protected: - virtual void RefInputDone( bool bForced = false ); + virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: @@ -117,10 +117,10 @@ public: SC_DLLPUBLIC ScConditionalFormat* GetConditionalFormat() const; - virtual void SetReference(const ScRange&, ScDocument*); - virtual bool IsRefInputMode() const; - virtual void SetActive(); - virtual bool IsTableLocked() const; + virtual void SetReference(const ScRange&, ScDocument*) SAL_OVERRIDE; + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual bool IsTableLocked() const SAL_OVERRIDE; void InvalidateRefData(); diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index be9bf2833ba3..34c0d29aa9ae 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -67,7 +67,7 @@ public: ScCondFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos ); virtual ~ScCondFrmtEntry(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; bool IsSelected() const; void SetIndex(sal_Int32 nIndex); @@ -94,7 +94,7 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener ScFormatEntry* createConditionEntry() const; - virtual OUString GetExpressionString(); + virtual OUString GetExpressionString() SAL_OVERRIDE; void Init(); DECL_LINK( StyleSelectHdl, void* ); DECL_LINK( ConditionTypeSelectHdl, void* ); @@ -102,14 +102,14 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener public: ScConditionFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); - virtual ScFormatEntry* GetEntry() const; - virtual void SetActive(); - virtual void SetInactive(); + virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual void SetInactive() SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; using ScCondFrmtEntry::Notify; - virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::CONDITION; } + virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::CONDITION; } }; class ScFormulaFrmtEntry : public ScCondFrmtEntry @@ -120,7 +120,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry formula::RefEdit maEdFormula; ScFormatEntry* createFormulaEntry() const; - virtual OUString GetExpressionString(); + virtual OUString GetExpressionString() SAL_OVERRIDE; void Init(); DECL_LINK( StyleSelectHdl, void* ); @@ -128,10 +128,10 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry public: ScFormulaFrmtEntry( Window* pParent, ScDocument* PDoc, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = NULL ); - virtual ScFormatEntry* GetEntry() const; - virtual void SetActive(); - virtual void SetInactive(); - virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::FORMULA; } + virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual void SetInactive() SAL_OVERRIDE; + virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::FORMULA; } }; class ScColorScale2FrmtEntry : public ScCondFrmtEntry @@ -152,16 +152,16 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - virtual OUString GetExpressionString(); + virtual OUString GetExpressionString() SAL_OVERRIDE; void Init(); DECL_LINK( EntryTypeHdl, ListBox* ); public: ScColorScale2FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); - virtual ScFormatEntry* GetEntry() const; - virtual void SetActive(); - virtual void SetInactive(); - virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::COLORSCALE2; } + virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual void SetInactive() SAL_OVERRIDE; + virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::COLORSCALE2; } }; class ScColorScale3FrmtEntry : public ScCondFrmtEntry @@ -185,16 +185,16 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry ScFormatEntry* createColorscaleEntry() const; - virtual OUString GetExpressionString(); + virtual OUString GetExpressionString() SAL_OVERRIDE; void Init(); DECL_LINK( EntryTypeHdl, ListBox* ); public: ScColorScale3FrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = NULL ); - virtual ScFormatEntry* GetEntry() const; - virtual void SetActive(); - virtual void SetInactive(); - virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::COLORSCALE3; } + virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual void SetInactive() SAL_OVERRIDE; + virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::COLORSCALE3; } }; class ScDataBarFrmtEntry : public ScCondFrmtEntry @@ -214,33 +214,33 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry ScFormatEntry* createDatabarEntry() const; - virtual OUString GetExpressionString(); + virtual OUString GetExpressionString() SAL_OVERRIDE; void Init(); DECL_LINK( OptionBtnHdl, void* ); DECL_LINK( DataBarTypeSelectHdl, void* ); public: ScDataBarFrmtEntry( Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL ); - virtual ScFormatEntry* GetEntry() const; - virtual void SetActive(); - virtual void SetInactive(); + virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual void SetInactive() SAL_OVERRIDE; - virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::DATABAR; } + virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::DATABAR; } }; class ScDateFrmtEntry : public ScCondFrmtEntry, public SfxListener { public: ScDateFrmtEntry( Window* pParent, ScDocument* pDoc, const ScCondDateFormatEntry* pFormat = NULL ); - virtual ScFormatEntry* GetEntry() const; - virtual void SetActive(); - virtual void SetInactive(); - virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::DATE; } + virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual void SetInactive() SAL_OVERRIDE; + virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::DATE; } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; using ScCondFrmtEntry::Notify; protected: - virtual OUString GetExpressionString(); + virtual OUString GetExpressionString() SAL_OVERRIDE; private: void Init(); @@ -266,7 +266,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry typedef boost::ptr_vector<ScIconSetFrmtDataEntry> ScIconSetFrmtDataEntriesType; ScIconSetFrmtDataEntriesType maEntries; - virtual OUString GetExpressionString(); + virtual OUString GetExpressionString() SAL_OVERRIDE; void Init(); @@ -274,10 +274,10 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry public: ScIconSetFrmtEntry( Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = NULL ); - virtual ScFormatEntry* GetEntry() const; - virtual void SetActive(); - virtual void SetInactive(); - virtual condformat::entry::ScCondFrmtEntryType GetType() { return condformat::entry::ICONSET; } + virtual ScFormatEntry* GetEntry() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual void SetInactive() SAL_OVERRIDE; + virtual condformat::entry::ScCondFrmtEntryType GetType() SAL_OVERRIDE { return condformat::entry::ICONSET; } }; #endif diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 93a53e7760d0..63ccc323d6ef 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -185,7 +185,7 @@ public: ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ); ~ScConflictsDlg(); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void UpdateView(); }; diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 205ba5b4e491..c244f5334765 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -43,15 +43,15 @@ public: const SfxItemSet& rArgSet ); ~ScConsolidateDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const { return true; } - virtual void SetActive(); + virtual bool IsRefInputMode() const SAL_OVERRIDE { return true; } + virtual void SetActive() SAL_OVERRIDE; - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; protected: - virtual void Deactivate(); + virtual void Deactivate() SAL_OVERRIDE; private: ListBox* pLbFunc; diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index b65ebf42a911..e7c0eaff861e 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -112,27 +112,27 @@ protected: using SvTreeListBox::ExecuteDrop; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); - virtual void DragFinished( sal_Int8 nAction ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nAction ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void InitEntry(SvTreeListEntry*,const OUString&,const Image&,const Image&, SvLBoxButtonKind); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*,const OUString&,const Image&,const Image&, SvLBoxButtonKind) SAL_OVERRIDE; public: ScContentTree( Window* pParent, const ResId& rResId ); ~ScContentTree(); OUString getAltLongDescText(SvTreeListEntry* pEntry, bool isAltText) const; - OUString GetEntryAltText( SvTreeListEntry* pEntry ) const; - OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const; + OUString GetEntryAltText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; + OUString GetEntryLongDescription( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; void ObjectFresh( sal_uInt16 nType, SvTreeListEntry* pEntry = NULL); bool SetNavigatorDlgFlag(bool isInNavigatoeDlg){ return bisInNavigatoeDlg=isInNavigatoeDlg;}; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; void InitWindowBits( bool bButtons ); diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index f5c06a695d1a..649ee89420cf 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -40,11 +40,11 @@ public: ScViewData* ptrViewData ); ~ScColRowNameRangesDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const; - virtual void SetActive(); - virtual bool Close(); + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; private: ListBox* pLbRange; diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 714a656801a8..3537f629920c 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -272,8 +272,8 @@ public: // event handling --------------------------------------------------------- - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; /** Sends a GetFocus or LoseFocus event to the accessibility object. */ void AccSendFocusEvent( bool bFocused ); @@ -409,7 +409,7 @@ public: public: /** Creates and returns the accessible object of this control. Do not overwrite in derived classes, use ImplCreateAccessible() instead. */ - virtual XAccessibleRef CreateAccessible(); + virtual XAccessibleRef CreateAccessible() SAL_OVERRIDE; protected: /** Derived classes create a new accessible object here. */ diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index d0607cd1224e..55a374ff6ea6 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -278,22 +278,22 @@ public: // event handling --------------------------------------------------------- protected: - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ); + virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; // painting --------------------------------------------------------------- protected: - virtual void Paint( const Rectangle& ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; public: /** Redraws the entire data grid. */ @@ -343,7 +343,7 @@ private: // accessibility ---------------------------------------------------------- protected: /** Creates a new accessible object. */ - virtual ScAccessibleCsvControl* ImplCreateAccessible(); + virtual ScAccessibleCsvControl* ImplCreateAccessible() SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index ca78c37811f8..6bef36804068 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -68,7 +68,7 @@ public: virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, - sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); + sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ) SAL_OVERRIDE; /** Apply current layout data to the ruler. */ void ApplyLayout( const ScCsvLayoutData& rOldData ); @@ -124,16 +124,16 @@ private: // event handling --------------------------------------------------------- protected: - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; private: /** Starts tracking at the specified position. */ @@ -146,7 +146,7 @@ private: // painting --------------------------------------------------------------- protected: - virtual void Paint( const Rectangle& ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; public: /** Redraws the entire ruler. */ @@ -181,7 +181,7 @@ private: // accessibility ---------------------------------------------------------- protected: /** Creates a new accessible object. */ - virtual ScAccessibleCsvControl* ImplCreateAccessible(); + virtual ScAccessibleCsvControl* ImplCreateAccessible() SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 8f9d71f82104..c5e33311887c 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -124,9 +124,9 @@ public: inline const Link& GetColTypeHdl() const { return maColTypeHdl; } protected: - virtual void Resize(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual Size GetOptimalSize() const; + virtual void Resize() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; private: SAL_DLLPRIVATE DECL_LINK( CsvCmdHdl, ScCsvControl* ); @@ -136,11 +136,11 @@ private: // accessibility ---------------------------------------------------------- public: /** Creates and returns the accessible object of this control. */ - virtual XAccessibleRef CreateAccessible(); + virtual XAccessibleRef CreateAccessible() SAL_OVERRIDE; protected: /** Creates a new accessible object. */ - virtual ScAccessibleCsvControl* ImplCreateAccessible(); + virtual ScAccessibleCsvControl* ImplCreateAccessible() SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 7011f7edf735..ba51b9e1b98c 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -42,11 +42,11 @@ public: ScViewData* ptrViewData ); ~ScDbNameDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const; - virtual void SetActive(); - virtual bool Close(); + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; private: ComboBox* m_pEdName; diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 88f2ffaec494..7ab516ade8cc 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -168,7 +168,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener protected: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -191,7 +191,7 @@ public: virtual void Deactivate(); virtual ::svl::IUndoManager* - GetUndoManager(); + GetUndoManager() SAL_OVERRIDE; virtual void FillClass( SvGlobalName * pClassName, sal_uInt32 * pFormat, @@ -199,41 +199,41 @@ public: OUString * pFullTypeName, OUString * pShortTypeName, sal_Int32 nFileFormat, - bool bTemplate = false ) const; - - virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); - virtual bool Load( SfxMedium& rMedium ); - virtual bool LoadFrom( SfxMedium& rMedium ); - virtual bool ConvertFrom( SfxMedium &rMedium ); - virtual bool LoadExternal( SfxMedium& rMedium ); - virtual bool Save(); - virtual bool SaveAs( SfxMedium& rMedium ); - virtual bool ConvertTo( SfxMedium &rMedium ); + bool bTemplate = false ) const SAL_OVERRIDE; + + virtual bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) SAL_OVERRIDE; + virtual bool Load( SfxMedium& rMedium ) SAL_OVERRIDE; + virtual bool LoadFrom( SfxMedium& rMedium ) SAL_OVERRIDE; + virtual bool ConvertFrom( SfxMedium &rMedium ) SAL_OVERRIDE; + virtual bool LoadExternal( SfxMedium& rMedium ) SAL_OVERRIDE; + virtual bool Save() SAL_OVERRIDE; + virtual bool SaveAs( SfxMedium& rMedium ) SAL_OVERRIDE; + virtual bool ConvertTo( SfxMedium &rMedium ) SAL_OVERRIDE; virtual bool PrepareClose( sal_Bool bUI = sal_True ) SAL_OVERRIDE; - virtual void PrepareReload(); - virtual bool IsInformationLost(); - virtual void LoadStyles( SfxObjectShell &rSource ); + virtual void PrepareReload() SAL_OVERRIDE; + virtual bool IsInformationLost() SAL_OVERRIDE; + virtual void LoadStyles( SfxObjectShell &rSource ) SAL_OVERRIDE; - virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); // SfxInPlaceObject - virtual bool DoSaveCompleted( SfxMedium * pNewStor); // SfxObjectShell - virtual bool QuerySlotExecutable( sal_uInt16 nSlotId ); + virtual bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ) SAL_OVERRIDE; // SfxInPlaceObject + virtual bool DoSaveCompleted( SfxMedium * pNewStor) SAL_OVERRIDE; // SfxObjectShell + virtual bool QuerySlotExecutable( sal_uInt16 nSlotId ) SAL_OVERRIDE; virtual void Draw( OutputDevice *, const JobSetup & rSetup, - sal_uInt16 nAspect = ASPECT_CONTENT ); + sal_uInt16 nAspect = ASPECT_CONTENT ) SAL_OVERRIDE; - virtual void SetVisArea( const Rectangle & rVisArea ); + virtual void SetVisArea( const Rectangle & rVisArea ) SAL_OVERRIDE; using SfxObjectShell::GetVisArea; - virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const; + virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const SAL_OVERRIDE; - virtual Printer* GetDocumentPrinter(); + virtual Printer* GetDocumentPrinter() SAL_OVERRIDE; - virtual void SetModified( bool = true ); + virtual void SetModified( bool = true ) SAL_OVERRIDE; void SetVisAreaOrSize( const Rectangle& rVisArea, bool bModifyStart ); virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent, - const SfxItemSet &rSet ); + const SfxItemSet &rSet ) SAL_OVERRIDE; void GetDocStat( ScDocStat& rDocStat ); @@ -318,13 +318,13 @@ public: ScDBData* GetOldAutoDBRange(); // has to be deleted by caller! void CancelAutoDBRange(); // called when dialog is cancelled - virtual void ReconnectDdeLink(SfxObjectShell& rServer); - void UpdateLinks(); + virtual void ReconnectDdeLink(SfxObjectShell& rServer) SAL_OVERRIDE; + void UpdateLinks() SAL_OVERRIDE; bool ReloadTabLinks(); void SetFormulaOptions(const ScFormulaOptions& rOpt ); void SetCalcConfig( const ScCalcConfig& rConfig ); - virtual void CheckConfigOptions(); + virtual void CheckConfigOptions() SAL_OVERRIDE; void PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ); @@ -359,7 +359,7 @@ public: DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); - virtual SfxStyleSheetBasePool* GetStyleSheetPool(); + virtual SfxStyleSheetBasePool* GetStyleSheetPool() SAL_OVERRIDE; void SetInplace( bool bInplace ); bool IsEmpty() const; @@ -376,10 +376,10 @@ public: bool& rbFooter ); virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType, - ::com::sun::star::uno::Any & rValue ); + ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; virtual bool DdeSetData( const OUString& rItem, const OUString& rMimeType, - const ::com::sun::star::uno::Any & rValue ); - virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ); + const ::com::sun::star::uno::Any & rValue ) SAL_OVERRIDE; + virtual ::sfx2::SvLinkSource* DdeCreateLinkSource( const OUString& rItem ) SAL_OVERRIDE; const OUString& GetDdeTextFmt() const { return aDdeTextFmt; } @@ -418,7 +418,7 @@ public: void BeforeXMLLoading(); void AfterXMLLoading(bool bRet); - virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ); + virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates ) SAL_OVERRIDE; const ScOptSolverSave* GetSolverSaveData() const { return pSolverSaveData; } // may be null void SetSolverSaveData( const ScOptSolverSave& rData ); @@ -428,11 +428,11 @@ public: // password protection for Calc (derived from SfxObjectShell) // see also: FID_CHG_RECORD, SID_CHG_PROTECT - virtual bool IsChangeRecording() const; - virtual bool HasChangeRecordProtection() const; - virtual void SetChangeRecording( bool bActivate ); - virtual bool SetProtectionPassword( const OUString &rPassword ); - virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ); + virtual bool IsChangeRecording() const SAL_OVERRIDE; + virtual bool HasChangeRecordProtection() const SAL_OVERRIDE; + virtual void SetChangeRecording( bool bActivate ) SAL_OVERRIDE; + 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; diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index e4f2fcf4ac94..dfdca9c8f03f 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -69,8 +69,8 @@ public: virtual ~ScDPNumGroupEditHelper() {} private: - virtual bool ImplGetValue( double& rfValue ) const; - virtual void ImplSetValue( double fValue ); + virtual bool ImplGetValue( double& rfValue ) const SAL_OVERRIDE; + virtual void ImplSetValue( double fValue ) SAL_OVERRIDE; private: ScDoubleField* mpEdValue; @@ -88,8 +88,8 @@ public: virtual ~ScDPDateGroupEditHelper() {} private: - virtual bool ImplGetValue( double& rfValue ) const; - virtual void ImplSetValue( double fValue ); + virtual bool ImplGetValue( double& rfValue ) const SAL_OVERRIDE; + virtual void ImplSetValue( double fValue ) SAL_OVERRIDE; private: DateField* mpEdValue; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index fba5dc0377b9..965ea0faee5c 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -44,7 +44,7 @@ class ScDrawShell : public SfxShell void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ); protected: - virtual void Activate(bool bMDI); + virtual void Activate(bool bMDI) SAL_OVERRIDE; ScViewData* GetViewData() { return pViewData; } public: diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 306c6f8ce7e7..a2acb1b69690 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -47,28 +47,28 @@ class ScDrawView: public FmFormView void UpdateBrowser(); protected: - virtual void ModelHasChanged(); + virtual void ModelHasChanged() SAL_OVERRIDE; // add custom handles (used by other apps, e.g. AnchorPos) - virtual void AddCustomHdl(); + virtual void AddCustomHdl() SAL_OVERRIDE; void ImplClearCalcDropMarker(); // support enhanced text edit for draw objects - virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const; + virtual SdrUndoManager* getSdrUndoManagerForEnhancedTextEdit() const SAL_OVERRIDE; public: ScDrawView( OutputDevice* pOut, ScViewData* pData ); virtual ~ScDrawView(); - virtual void MarkListHasChanged(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void MarkListHasChanged() SAL_OVERRIDE; + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual void DoConnect(SdrOle2Obj* pOleObj); + virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; - virtual void MakeVisible( const Rectangle& rRect, Window& rWin ); + virtual void MakeVisible( const Rectangle& rRect, Window& rWin ) SAL_OVERRIDE; - virtual void DeleteMarked(); + virtual void DeleteMarked() SAL_OVERRIDE; virtual bool SdrBeginTextEdit( SdrObject* pObj, @@ -79,9 +79,9 @@ public: OutlinerView* pGivenOutlinerView = 0L, bool bDontDeleteOutliner = false, bool bOnlyOneView = false, - bool bGrabFocus = true); + bool bGrabFocus = true) SAL_OVERRIDE; - virtual SdrEndTextEditKind SdrEndTextEdit( bool bDontDeleteReally = false ); + virtual SdrEndTextEditKind SdrEndTextEdit( bool bDontDeleteReally = false ) SAL_OVERRIDE; void MarkDropObj( SdrObject* pObj ); diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index aeb73895f94d..02f22f62f307 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -72,12 +72,12 @@ public: const TransferableObjectDescriptor& rDesc ); virtual ~ScDrawTransferObj(); - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, - const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual void DragFinished( sal_Int8 nDropAction ); + const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; SdrModel* GetModel() { return pModel; } @@ -95,7 +95,7 @@ public: sal_uInt32 GetSourceDocID() const { return nSourceDocID; } static ScDrawTransferObj* GetOwnClipboard( Window* pUIWin ); - virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); const ScRangeListVector& GetProtectedChartRangesVector() const { return m_aProtectedChartRangesVector; } diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 14d6fa79b669..6fcbdfb0f043 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -90,16 +90,16 @@ private: protected: - virtual bool Close(); - virtual void Resize(); - virtual void Resizing( Size& rSize ); + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; virtual void SetSize(); - virtual void ToggleFloatingMode(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void ToggleFloatingMode() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual SfxChildAlignment CheckAlignment(SfxChildAlignment, - SfxChildAlignment eAlign); + SfxChildAlignment eAlign) SAL_OVERRIDE; public: ScFunctionDockWin( SfxBindings* pBindings, @@ -110,7 +110,7 @@ public: ~ScFunctionDockWin(); using SfxDockingWindow::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight ) { nLeftSlot = nLeft; nRightSlot = nRight; } @@ -118,7 +118,7 @@ public: void InitLRUList(); void Initialize (SfxChildWinInfo* pInfo); - virtual void FillInfo(SfxChildWinInfo&) const; + virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index f6c7f5004b9d..8442dc8862f4 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -85,7 +85,7 @@ public: { public: ScrollBar(Window* pParent, WinBits nStyle); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; private: Window* mpParent; }; @@ -171,26 +171,26 @@ public: size_t GetFieldIndexByData( const ScPivotFuncData& rData ) const; - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; protected: - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Resize(); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; protected: FieldNames& GetFieldNames(); const FieldNames& GetFieldNames() const; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void FieldFocusChanged(size_t nOldSelected, size_t nFieldSelected); @@ -272,26 +272,26 @@ private: class ScDPHorFieldControl : public ScDPFieldControlBase { protected: - virtual size_t CalcNewFieldIndex(SCsCOL nDX, SCsROW nDY) const; - virtual size_t GetDisplayPosition(size_t nIndex) const; - virtual void Redraw(); + virtual size_t CalcNewFieldIndex(SCsCOL nDX, SCsROW nDY) const SAL_OVERRIDE; + virtual size_t GetDisplayPosition(size_t nIndex) const SAL_OVERRIDE; + virtual void Redraw() SAL_OVERRIDE; public: ScDPHorFieldControl(Window* pParent); virtual ~ScDPHorFieldControl(); - virtual void CalcSize(); - virtual bool IsValidIndex( size_t nIndex ) const; - virtual Point GetFieldPosition(size_t nIndex); - virtual Size GetFieldSize() const; - virtual size_t GetFieldIndex( const Point& rPos ); - virtual OUString GetDescription() const; + virtual void CalcSize() SAL_OVERRIDE; + virtual bool IsValidIndex( size_t nIndex ) const SAL_OVERRIDE; + virtual Point GetFieldPosition(size_t nIndex) SAL_OVERRIDE; + virtual Size GetFieldSize() const SAL_OVERRIDE; + virtual size_t GetFieldIndex( const Point& rPos ) SAL_OVERRIDE; + virtual OUString GetDescription() const SAL_OVERRIDE; - virtual void ScrollToEnd(); - virtual void ScrollToShowSelection(); - virtual void ResetScrollBar(); - virtual void HandleWheelScroll(long nNotch); + virtual void ScrollToEnd() SAL_OVERRIDE; + virtual void ScrollToShowSelection() SAL_OVERRIDE; + virtual void ResetScrollBar() SAL_OVERRIDE; + virtual void HandleWheelScroll(long nNotch) SAL_OVERRIDE; private: bool GetFieldBtnPosSize(size_t nPos, Point& rPos, Size& rSize); @@ -316,8 +316,8 @@ public: ScDPPageFieldControl( Window* pParent ); virtual ~ScDPPageFieldControl(); - virtual ScPivotFieldType GetFieldType() const; - virtual OUString GetDescription() const; + virtual ScPivotFieldType GetFieldType() const SAL_OVERRIDE; + virtual OUString GetDescription() const SAL_OVERRIDE; }; @@ -328,8 +328,8 @@ public: ScDPColFieldControl( Window* pParent ); virtual ~ScDPColFieldControl(); - virtual ScPivotFieldType GetFieldType() const; - virtual OUString GetDescription() const; + virtual ScPivotFieldType GetFieldType() const SAL_OVERRIDE; + virtual OUString GetDescription() const SAL_OVERRIDE; }; @@ -344,23 +344,23 @@ public: virtual ~ScDPRowFieldControl(); - virtual void CalcSize(); - virtual bool IsValidIndex( size_t nIndex ) const; - virtual Point GetFieldPosition( size_t nIndex ); - virtual Size GetFieldSize() const; - virtual size_t GetFieldIndex( const Point& rPos ); - virtual OUString GetDescription() const; - virtual ScPivotFieldType GetFieldType() const; + virtual void CalcSize() SAL_OVERRIDE; + virtual bool IsValidIndex( size_t nIndex ) const SAL_OVERRIDE; + virtual Point GetFieldPosition( size_t nIndex ) SAL_OVERRIDE; + virtual Size GetFieldSize() const SAL_OVERRIDE; + virtual size_t GetFieldIndex( const Point& rPos ) SAL_OVERRIDE; + virtual OUString GetDescription() const SAL_OVERRIDE; + virtual ScPivotFieldType GetFieldType() const SAL_OVERRIDE; - virtual void ScrollToEnd(); - virtual void ScrollToShowSelection(); - virtual void ResetScrollBar(); - virtual void HandleWheelScroll(long nNotch); + virtual void ScrollToEnd() SAL_OVERRIDE; + virtual void ScrollToShowSelection() SAL_OVERRIDE; + virtual void ResetScrollBar() SAL_OVERRIDE; + virtual void HandleWheelScroll(long nNotch) SAL_OVERRIDE; protected: - virtual size_t CalcNewFieldIndex( SCsCOL nDX, SCsROW nDY ) const; - virtual size_t GetDisplayPosition(size_t nIndex) const; - virtual void Redraw(); + virtual size_t CalcNewFieldIndex( SCsCOL nDX, SCsROW nDY ) const SAL_OVERRIDE; + virtual size_t GetDisplayPosition(size_t nIndex) const SAL_OVERRIDE; + virtual void Redraw() SAL_OVERRIDE; private: bool GetFieldBtnPosSize(size_t nPos, Point& rPos, Size& rSize); @@ -383,8 +383,8 @@ public: ScDPSelectFieldControl( Window* pParent ); virtual ~ScDPSelectFieldControl(); - virtual ScPivotFieldType GetFieldType() const; - virtual OUString GetDescription() const; + virtual ScPivotFieldType GetFieldType() const SAL_OVERRIDE; + virtual OUString GetDescription() const SAL_OVERRIDE; }; @@ -395,9 +395,9 @@ public: ScDPDataFieldControl( Window* pParent ); virtual ~ScDPDataFieldControl(); - virtual ScPivotFieldType GetFieldType() const; - virtual Size GetFieldSize() const; - virtual OUString GetDescription() const; + virtual ScPivotFieldType GetFieldType() const SAL_OVERRIDE; + virtual Size GetFieldSize() const SAL_OVERRIDE; + virtual OUString GetDescription() const SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 6ba9480fabb2..0acb2efc9990 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -59,12 +59,12 @@ public: const SfxItemSet& rArgSet ); ~ScFilterDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const; - virtual void SetActive(); + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; void SliderMoved(); size_t GetSliderPos(); void RefreshEditRow( size_t nOffset ); @@ -167,12 +167,12 @@ public: const SfxItemSet& rArgSet ); ~ScSpecialFilterDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const; - virtual void SetActive(); + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; private: ListBox* pLbFilterArea; diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index 475dee99e9cc..9606b7237400 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.hxx @@ -39,7 +39,7 @@ public: void SetDocShell(ScDocShell* pSds) { pScDocShell=pSds;} - virtual void SaveValues(); + virtual void SaveValues() SAL_OVERRIDE; private: ScFormEditData( const ScFormEditData& ); diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 5137ce1852e9..ecc14d2bc7db 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -59,50 +59,50 @@ public: ~ScFormulaDlg(); // IFormulaEditorHelper - virtual void notifyChange(); - virtual void fill(); - virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult); - virtual void doClose(bool _bOk); - virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc); - virtual void showReference(const OUString& _sFormula); - virtual void dispatch(bool _bOK, bool _bMatrixChecked); - virtual void setDispatcherLock( bool bLock ); - virtual void setReferenceInput(const formula::FormEditData* _pData); - virtual void deleteFormData(); - virtual void clear(); - virtual void switchBack(); - virtual formula::FormEditData* getFormEditData() const; - virtual void setCurrentFormula(const OUString& _sReplacement); - virtual void setSelection(sal_Int32 _nStart, sal_Int32 _nEnd); - virtual void getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const; - virtual OUString getCurrentFormula() const; - - virtual formula::IFunctionManager* getFunctionManager(); - virtual ::std::auto_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const; - virtual ::com::sun::star::table::CellAddress getReferencePosition() const; - - virtual bool Close(); + virtual void notifyChange() SAL_OVERRIDE; + virtual void fill() SAL_OVERRIDE; + virtual bool calculateValue(const OUString& _sExpression, OUString& _rResult) SAL_OVERRIDE; + virtual void doClose(bool _bOk) SAL_OVERRIDE; + virtual void insertEntryToLRUList(const formula::IFunctionDescription* pDesc) SAL_OVERRIDE; + virtual void showReference(const OUString& _sFormula) SAL_OVERRIDE; + virtual void dispatch(bool _bOK, bool _bMatrixChecked) SAL_OVERRIDE; + virtual void setDispatcherLock( bool bLock ) SAL_OVERRIDE; + virtual void setReferenceInput(const formula::FormEditData* _pData) SAL_OVERRIDE; + virtual void deleteFormData() SAL_OVERRIDE; + virtual void clear() SAL_OVERRIDE; + virtual void switchBack() SAL_OVERRIDE; + virtual formula::FormEditData* getFormEditData() const SAL_OVERRIDE; + virtual void setCurrentFormula(const OUString& _sReplacement) SAL_OVERRIDE; + virtual void setSelection(sal_Int32 _nStart, sal_Int32 _nEnd) SAL_OVERRIDE; + virtual void getSelection(sal_Int32& _nStart, sal_Int32& _nEnd) const SAL_OVERRIDE; + virtual OUString getCurrentFormula() const SAL_OVERRIDE; + + virtual formula::IFunctionManager* getFunctionManager() SAL_OVERRIDE; + virtual ::std::auto_ptr<formula::FormulaTokenArray> convertToTokenArray(const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken >& _aTokenList) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaParser> getFormulaParser() const SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XFormulaOpCodeMapper> getFormulaOpCodeMapper() const SAL_OVERRIDE; + virtual ::com::sun::star::table::CellAddress getReferencePosition() const SAL_OVERRIDE; + + virtual bool Close() SAL_OVERRIDE; // sc::IAnyRefDialog - virtual void ShowReference(const OUString& _sRef); - virtual void HideReference( bool bDoneRefMode = true ); - virtual void SetReference( const ScRange& rRef, ScDocument* pD ); - - virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); - virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); - virtual void RefInputDone( bool bForced = false ); - virtual bool IsTableLocked() const; - virtual bool IsRefInputMode() const; - - virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const; - virtual void AddRefEntry(); - virtual void SetActive(); - virtual void ViewShellChanged(); + virtual void ShowReference(const OUString& _sRef) SAL_OVERRIDE; + virtual void HideReference( bool bDoneRefMode = true ) SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pD ) SAL_OVERRIDE; + + virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; + virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; + virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; + virtual bool IsTableLocked() const SAL_OVERRIDE; + virtual bool IsRefInputMode() const SAL_OVERRIDE; + + virtual bool IsDocAllowed( SfxObjectShell* pDocSh ) const SAL_OVERRIDE; + virtual void AddRefEntry() SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual void ViewShellChanged() SAL_OVERRIDE; protected: - virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); + virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE; void SaveLRUEntry(const ScFuncDesc* pFuncDesc); bool IsInputHdl(ScInputHandler* pHdl); diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index 2e014ebb19c6..bc1bdb2a7599 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -31,16 +31,16 @@ class FuConstArc : public FuConstruct virtual ~FuConstArc(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt); - virtual bool MouseMove(const MouseEvent& rMEvt); - virtual bool MouseButtonUp(const MouseEvent& rMEvt); - virtual bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/fuconcustomshape.hxx b/sc/source/ui/inc/fuconcustomshape.hxx index 40b1c659f90c..8e0aca1f2f2a 100644 --- a/sc/source/ui/inc/fuconcustomshape.hxx +++ b/sc/source/ui/inc/fuconcustomshape.hxx @@ -34,19 +34,19 @@ public: virtual ~FuConstCustomShape(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt); - virtual bool MouseMove(const MouseEvent& rMEvt); - virtual bool MouseButtonUp(const MouseEvent& rMEvt); - virtual bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject( const sal_uInt16 nID, const Rectangle& rRectangle ); + virtual SdrObject* CreateDefaultObject( const sal_uInt16 nID, const Rectangle& rRectangle ) SAL_OVERRIDE; // #i33136# - virtual bool doConstructOrthogonal() const; + virtual bool doConstructOrthogonal() const SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index c64eb6303abe..ad04cf93aab4 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -33,16 +33,16 @@ class FuConstPolygon : public FuConstruct virtual ~FuConstPolygon(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt); - virtual bool MouseMove(const MouseEvent& rMEvt); - virtual bool MouseButtonUp(const MouseEvent& rMEvt); - virtual bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index 048ab2f9df95..ba87384056fd 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -31,16 +31,16 @@ class FuConstRectangle : public FuConstruct virtual ~FuConstRectangle(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt); - virtual bool MouseMove(const MouseEvent& rMEvt); - virtual bool MouseButtonUp(const MouseEvent& rMEvt); - virtual bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 7327fa38a28f..1ef2c8c2c228 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -32,16 +32,16 @@ class FuConstruct : public FuDraw virtual ~FuConstruct(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt); - virtual bool MouseMove(const MouseEvent& rMEvt); - virtual bool MouseButtonUp(const MouseEvent& rMEvt); - virtual bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_uInt8 Command(const CommandEvent& rCEvt); + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_uInt8 Command(const CommandEvent& rCEvt) SAL_OVERRIDE; bool SimpleMouseButtonUp(const MouseEvent& rMEvt); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; // Returns grid sync offset for rInOutPos, additionally adjusts rInOutPos // by the offset diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index bb0d3259ddd6..643346952154 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -36,16 +36,16 @@ public: virtual ~FuConstUnoControl(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt); - virtual bool MouseMove(const MouseEvent& rMEvt); - virtual bool MouseButtonUp(const MouseEvent& rMEvt); - virtual bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index da8650a4d051..03cc69342024 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -35,16 +35,16 @@ class FuDraw : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuDraw(); - virtual bool KeyInput(const KeyEvent& rKEvt); + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; virtual void ForcePointer(const MouseEvent* pMEvt); - virtual bool MouseMove(const MouseEvent& rMEvt); - virtual bool MouseButtonUp(const MouseEvent& rMEvt); - virtual bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; // II virtual void SelectionHasChanged(); diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index 26e2a89322f5..61aca6d86a59 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -30,8 +30,8 @@ class FuInsertGraphic : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertGraphic(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; }; class FuInsertOLE : public FuPoor @@ -40,8 +40,8 @@ class FuInsertOLE : public FuPoor FuInsertOLE( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; }; class FuInsertChart : public FuPoor @@ -50,8 +50,8 @@ class FuInsertChart : public FuPoor FuInsertChart( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; }; class FuInsertChartFromFile : public FuPoor @@ -60,8 +60,8 @@ class FuInsertChartFromFile : public FuPoor FuInsertChartFromFile( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pView, SdrModel* pDoc, SfxRequest& rReq, const OUString& rURL); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; }; class FuInsertMedia : public FuPoor @@ -71,8 +71,8 @@ class FuInsertMedia : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuInsertMedia(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; }; #endif // _SD_FUINSERT_HXX diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx index 1f831a9679a9..b92d49f8c045 100644 --- a/sc/source/ui/inc/fumark.hxx +++ b/sc/source/ui/inc/fumark.hxx @@ -39,17 +39,17 @@ class FuMarkRect : public FuPoor SdrModel* pDoc, SfxRequest& rReq); virtual ~FuMarkRect(); - virtual bool KeyInput(const KeyEvent& rKEvt); + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; virtual void ForcePointer(const MouseEvent* pMEvt); - virtual bool MouseMove(const MouseEvent& rMEvt); - virtual bool MouseButtonUp(const MouseEvent& rMEvt); - virtual bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_uInt8 Command(const CommandEvent& rCEvt); + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_uInt8 Command(const CommandEvent& rCEvt) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index 531262934020..dbfd90c0ba03 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -33,14 +33,14 @@ public: virtual ~FuSelection(); // Mouse- & Key-Events - virtual bool KeyInput(const KeyEvent& rKEvt); - virtual bool MouseMove(const MouseEvent& rMEvt); - virtual bool MouseButtonUp(const MouseEvent& rMEvt); - virtual bool MouseButtonDown(const MouseEvent& rMEvt); - virtual sal_uInt8 Command(const CommandEvent& rCEvt); - - virtual void Activate(); - virtual void Deactivate(); + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual sal_uInt8 Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; void ActivateNoteHandles(SdrObject* pObj); diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index adb36968c36e..3475f54b3ce4 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -40,17 +40,17 @@ public: virtual ~FuText(); - virtual bool KeyInput(const KeyEvent& rKEvt); - virtual bool MouseMove(const MouseEvent& rMEvt); - virtual bool MouseButtonUp(const MouseEvent& rMEvt); - virtual bool MouseButtonDown(const MouseEvent& rMEvt); + virtual bool KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual bool MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual bool MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; - virtual void ForcePointer(const MouseEvent* pMEvt); + virtual void ForcePointer(const MouseEvent* pMEvt) SAL_OVERRIDE; - virtual void SelectionHasChanged(); + virtual void SelectionHasChanged() SAL_OVERRIDE; void SetInEditMode( SdrObject* pObj = NULL, const Point* pMousePixel = NULL, bool bCursorToEnd = false, const KeyEvent* pInitialKey = NULL ); @@ -58,7 +58,7 @@ public: void StopDragMode(SdrObject* pObject); // Create default drawing objects via keyboard - virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle); + virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; private: SdrOutliner* MakeOutliner(); diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index e0319b1cbf22..4e1091fd88bf 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -288,18 +288,18 @@ class ScGridWindow : public Window, public DropTargetHelper, public DragSourceHe protected: using Window::Resize; virtual void Resize( const Size& rSize ); - virtual void PrePaint(); - virtual void Paint( const Rectangle& rRect ); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void PrePaint() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void RequestHelp( const HelpEvent& rEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; public: enum AutoFilterMode { Normal, Top10, Custom, Empty, NonEmpty, SortAscending, SortDescending }; @@ -311,15 +311,15 @@ public: rtl::Reference<sdr::overlay::OverlayManager> getOverlayManager(); void flushOverlayManager(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void FakeButtonUp(); diff --git a/sc/source/ui/inc/hdrcont.hxx b/sc/source/ui/inc/hdrcont.hxx index 9979af6cf068..13d888263088 100644 --- a/sc/source/ui/inc/hdrcont.hxx +++ b/sc/source/ui/inc/hdrcont.hxx @@ -69,14 +69,14 @@ private: protected: // Overloaded by Window - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; // new methods @@ -98,7 +98,7 @@ protected: virtual OUString GetDragHelp( long nVal ); virtual void DrawInvert( long nDragPos ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; public: ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index 8418d756e6d6..ea5ec9e42dc3 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -37,7 +37,7 @@ protected: const SfxItemSet& rCoreSet, const OUString& rPageStyle, const OString& rID, const OUString& rUIXMLDescription ); public: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) SAL_OVERRIDE; }; class ScHFEditHeaderDlg : public ScHFEditDlg diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index cc113c2dd837..beaaf11a0d7f 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -78,7 +78,7 @@ private: protected: - virtual void RefInputDone( bool bForced = false ); + virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, @@ -86,10 +86,10 @@ public: ~ScHighlightChgDlg(); - virtual void SetActive(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual bool Close(); - virtual bool IsRefInputMode() const; + virtual void SetActive() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; + virtual bool IsRefInputMode() const SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx index 4328162712c8..08df23fbfbf9 100644 --- a/sc/source/ui/inc/hintwin.hxx +++ b/sc/source/ui/inc/hintwin.hxx @@ -33,7 +33,7 @@ private: Font aHeadFont; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 104c03c1bcd6..c10fdb4da73b 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -65,46 +65,46 @@ public: ScTextWnd( Window* pParent, ScTabViewShell* pViewSh ); virtual ~ScTextWnd(); - virtual void SetTextString( const OUString& rString ); - virtual const OUString& GetTextString() const; + virtual void SetTextString( const OUString& rString ) SAL_OVERRIDE; + virtual const OUString& GetTextString() const SAL_OVERRIDE; - bool IsInputActive(); - virtual EditView* GetEditView(); + bool IsInputActive() SAL_OVERRIDE; + virtual EditView* GetEditView() SAL_OVERRIDE; // for function autopilots - virtual void MakeDialogEditView(); + virtual void MakeDialogEditView() SAL_OVERRIDE; - virtual void StartEditEngine(); - virtual void StopEditEngine( bool bAll ); + virtual void StartEditEngine() SAL_OVERRIDE; + virtual void StopEditEngine( bool bAll ) SAL_OVERRIDE; - virtual void TextGrabFocus(); + virtual void TextGrabFocus() SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void SetFormulaMode( bool bSet ); + virtual void SetFormulaMode( bool bSet ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; - virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ); - virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ); + virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; + virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; DECL_LINK( NotifyHdl, void* ); protected: - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual OUString GetText() const; + virtual OUString GetText() const SAL_OVERRIDE; void ImplInitSettings(); void UpdateAutoCorrFlag(); @@ -148,12 +148,12 @@ public: void SetFormulaMode( bool bSet ); protected: - virtual void Select(); - virtual void Modify(); + virtual void Select() SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; private: void FillRangeNames(); @@ -172,15 +172,15 @@ class ScMultiTextWnd : public ScTextWnd public: ScMultiTextWnd( ScInputBarGroup* pParent, ScTabViewShell* pViewSh ); virtual ~ScMultiTextWnd(); - virtual void StartEditEngine(); - virtual void StopEditEngine( bool bAll ); - virtual void Resize(); - virtual EditView* GetEditView(); + virtual void StartEditEngine() SAL_OVERRIDE; + virtual void StopEditEngine( bool bAll ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual EditView* GetEditView() SAL_OVERRIDE; long GetPixelHeightForLines( long nLines ); long GetEditEngTxtHeight(); void DoScroll(); - virtual void SetTextString( const OUString& rString ); + virtual void SetTextString( const OUString& rString ) SAL_OVERRIDE; void SetNumLines( long nLines ); long GetNumLines() { return mnLines; } long GetLastNumExpandedLines() { return mnLastExpandedLines; } @@ -188,7 +188,7 @@ protected: void SetScrollBarRange(); void InitEditEngine(); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; DECL_LINK( NotifyHdl, EENotify* ); DECL_LINK( ModifyHdl, EENotify* ); private: @@ -206,22 +206,22 @@ class ScInputBarGroup : public ScTextWndBase public: ScInputBarGroup( Window* Parent, ScTabViewShell* pViewSh ); virtual ~ScInputBarGroup(); - virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ); - virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ); + virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; + virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ) SAL_OVERRIDE; // virtual void Paint(const Rectangle& rRect ); - void SetTextString( const OUString& rString ); - void StartEditEngine(); - EditView* GetEditView(); + void SetTextString( const OUString& rString ) SAL_OVERRIDE; + void StartEditEngine() SAL_OVERRIDE; + EditView* GetEditView() SAL_OVERRIDE; void SetSize(Size aSize); - virtual void Resize(); - virtual const OUString& GetTextString() const; - virtual void StopEditEngine( bool bAll ); - virtual void TextGrabFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual const OUString& GetTextString() const SAL_OVERRIDE; + virtual void StopEditEngine( bool bAll ) SAL_OVERRIDE; + virtual void TextGrabFocus() SAL_OVERRIDE; void InitEditEngine(SfxObjectShell* pObjSh); - void SetFormulaMode( bool bSet ); + void SetFormulaMode( bool bSet ) SAL_OVERRIDE; bool IsFocus(); - void MakeDialogEditView(); - bool IsInputActive(); + void MakeDialogEditView() SAL_OVERRIDE; + bool IsInputActive() SAL_OVERRIDE; ScrollBar& GetScrollBar() { return aScrollBar; } void IncrementVerticalSize(); void DecrementVerticalSize(); @@ -245,9 +245,9 @@ public: ScInputWindow( Window* pParent, SfxBindings* pBind ); virtual ~ScInputWindow(); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void Select(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; void SetFuncString( const OUString& rString, bool bDoEdit = true ); void SetPosString( const OUString& rStr ); @@ -277,15 +277,15 @@ public: ScInputHandler* GetInputHandler(){ return pInputHdl;} - void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); + void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; bool IsMultiLineInput() { return mbIsMultiLine; } protected: - virtual void SetText( const OUString& rString ); - virtual OUString GetText() const; + virtual void SetText( const OUString& rString ) SAL_OVERRIDE; + virtual OUString GetText() const SAL_OVERRIDE; bool UseSubTotal( ScRangeList* pRangeList ) const; bool IsPointerAtResizePos(); diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 6c9791f9305a..275882a7375a 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -47,7 +47,7 @@ public: ScInsertTableDlg( Window* pParent, ScViewData& rViewData, SCTAB nTabCount, bool bFromFile ); ~ScInsertTableDlg(); - virtual short Execute(); // overloaded to set parent dialog + virtual short Execute() SAL_OVERRIDE; // overloaded to set parent dialog sal_Bool GetTablesFromFile() const { return m_pBtnFromFile->IsChecked(); } sal_Bool GetTablesAsLink() const { return m_pBtnLink->IsChecked(); } diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 17dd3d78a55a..57c528c02e55 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -71,7 +71,7 @@ public: const OUString& rOptions, const OUString& rSource, sal_uLong nRefresh ); - virtual short Execute(); // overwritten to set dialog parent + virtual short Execute() SAL_OVERRIDE; // overwritten to set dialog parent OUString GetURL(); OUString GetFilter(); // may be empty diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx index c22b1e6b56f3..2af6e9b7ace5 100644 --- a/sc/source/ui/inc/lnktrans.hxx +++ b/sc/source/ui/inc/lnktrans.hxx @@ -35,10 +35,10 @@ public: void SetLinkURL( const OUString& rURL, const OUString& rText ); - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual void DragFinished( sal_Int8 nDropAction ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 982b1f6ee330..504e53af47d4 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -60,7 +60,7 @@ protected: virtual ~ScMessagePool(); public: - virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const; + virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 825d0e779ea6..dd6330751b2f 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -70,7 +70,7 @@ private: DECL_LINK( AssignGetFocusHdl, void * ); protected: - virtual void RefInputDone( bool bForced = false ); + virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, @@ -79,11 +79,11 @@ public: virtual ~ScNameDefDlg() {}; - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual bool IsRefInputMode() const; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive(); - virtual bool Close(); + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; void GetNewData( OUString& rName, OUString& rScope ); }; diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 93a204bf2648..12597276fe0f 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -119,7 +119,7 @@ private: DECL_LINK( ScopeChangedHdl, void* ); protected: - virtual void RefInputDone( bool bForced = false ); + virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, @@ -127,11 +127,11 @@ public: const ScAddress& aCursorPos, boost::ptr_map<OUString, ScRangeName>* pRangeMap = NULL ); virtual ~ScNameDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual bool IsRefInputMode() const; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive(); - virtual bool Close(); + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; void GetRangeNames(boost::ptr_map<OUString, ScRangeName>& rRangeMap); void SetEntry(const OUString& rName, const OUString& rScope); diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index 5e5a8ca8a4c0..ec8c30542684 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -57,8 +57,8 @@ public: ScRangeManagerTable( SvSimpleTableContainer& rParent, boost::ptr_map<OUString, ScRangeName>& aTabRangeNames, const ScAddress& rPos ); virtual ~ScRangeManagerTable(); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void addEntry( const ScRangeNameLine& rLine, bool bSetCurEntry = true ); void DeleteSelectedEntries(); diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx index ae855327f5eb..d07b0ba6a51e 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.hxx @@ -36,7 +36,7 @@ public: SfxBindings& rBindings ); protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pItem ); + const SfxPoolItem* pItem ) SAL_OVERRIDE; private: ScNavigatorDlg& rNavigatorDlg; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 924f536eb682..9be37331d3ec 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -66,9 +66,9 @@ public: void UpdateEntries( const std::vector<OUString> &aNewEntryList ); protected: - virtual void Select(); - virtual void DoubleClick(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void Select() SAL_OVERRIDE; + virtual void DoubleClick() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; private: struct ScenarioEntry @@ -107,11 +107,11 @@ public: void SetComment( const OUString& rComment ) { aEdComment.SetText( rComment ); } - void SetSizePixel( const Size& rNewSize ); + void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; private: ScScenarioListBox aLbScenario; @@ -131,12 +131,12 @@ public: void SetCol( SCCOL nColNo ); protected: - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void LoseFocus(); - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Up() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void First() SAL_OVERRIDE; + virtual void Last() SAL_OVERRIDE; private: ScNavigatorDlg& rDlg; @@ -164,8 +164,8 @@ public: void SetRow( SCROW nRow ){ SetValue( nRow ); } protected: - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void LoseFocus(); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; private: ScNavigatorDlg& rDlg; @@ -184,7 +184,7 @@ public: ~ScDocListBox(); protected: - virtual void Select(); + virtual void Select() SAL_OVERRIDE; private: ScNavigatorDlg& rDlg; @@ -204,13 +204,13 @@ public: void UpdateButtons(); void InitImageList(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; DECL_LINK( ToolBoxDropdownClickHdl, void* ); protected: - virtual void Select(); - virtual void Click(); + virtual void Select() SAL_OVERRIDE; + virtual void Click() SAL_OVERRIDE; private: ScNavigatorDlg& rDlg; @@ -315,8 +315,8 @@ private: static void ReleaseFocus(); protected: - virtual void Resize(); - virtual void Paint( const Rectangle& rRect ); + virtual void Resize() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Resizing( Size& rSize ); public: @@ -325,13 +325,13 @@ public: ~ScNavigatorDlg(); using Window::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void CursorPosChanged(); virtual SfxChildAlignment CheckAlignment(SfxChildAlignment,SfxChildAlignment); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; @@ -346,7 +346,7 @@ public: SFX_DECL_CHILDWINDOWCONTEXT(ScNavigatorDialogWrapper) - virtual void Resizing( Size& rSize ); + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; private: ScNavigatorDlg* pNavigator; diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index f3cfe8f4dd88..e8069a1bf76f 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -212,20 +212,20 @@ private: void ScrollRel( long nEntryDiff, long nEntryStart, long nEntryEnd ); protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; public: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 4ed20bac04c2..6fd10b228aa6 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -51,8 +51,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 34d4f83eb0d0..03435f32bd18 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -46,7 +46,7 @@ public: void SetCursorLinks( const Link& rUp, const Link& rDown ); protected: - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; @@ -100,10 +100,10 @@ public: ScDocShell* pDocSh, ScAddress aCursorPos ); ~ScOptSolverDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual bool IsRefInputMode() const; - virtual void SetActive(); - virtual bool Close(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; private: FixedText* m_pFtObjectiveCell; diff --git a/sc/source/ui/inc/overlayobject.hxx b/sc/source/ui/inc/overlayobject.hxx index dca53f0a164a..a9084d11903f 100644 --- a/sc/source/ui/inc/overlayobject.hxx +++ b/sc/source/ui/inc/overlayobject.hxx @@ -28,12 +28,12 @@ public: ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor); virtual ~ScOverlayDashedBorder(); - virtual void Trigger(sal_uInt32 nTime); + virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; private: ::basegfx::B2DRange maRange; diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx index 30d4ec41485d..a37ad3c38e37 100644 --- a/sc/source/ui/inc/popmenu.hxx +++ b/sc/source/ui/inc/popmenu.hxx @@ -29,7 +29,7 @@ private: sal_uInt16 nSel; bool bHit; protected: - virtual void Select(); + virtual void Select() SAL_OVERRIDE; public: ScPopupMenu() : nSel(0),bHit(false) {} diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index f9d1b5c59d9f..ae907c83c1c8 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -104,23 +104,23 @@ private: using Window::SetZoom; protected: - virtual void Paint( const Rectangle& rRect ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; public: ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ); ~ScPreview(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; SC_DLLPUBLIC void DataChanged(bool bNewTime = false); // Instead of calling Invalidate void DoInvalidate(); diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index ebf0ea560f0b..a980a0412710 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -64,20 +64,20 @@ private: void ExitPreview(); protected: - virtual void Activate(bool bMDI); - virtual void Deactivate(bool bMDI); - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); + virtual void Activate(bool bMDI) SAL_OVERRIDE; + virtual void Deactivate(bool bMDI) SAL_OVERRIDE; + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) SAL_OVERRIDE; - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; virtual OUString GetDescription() const; - virtual void WriteUserData(OUString &, bool bBrowse = false); - virtual void ReadUserData(const OUString &, bool bBrowse = false); + virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; + virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; - virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); - virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); + virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; + virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; public: TYPEINFO_VISIBILITY( SC_DLLPUBLIC ); @@ -105,12 +105,12 @@ public: GetSourceData() const { return aSourceData; } sal_uInt8 GetSourceDesignMode() const { return nSourceDesignMode; } - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual SfxPrinter* GetPrinter( bool bCreate = false ); - virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); - virtual bool HasPrintOptionsPage() const; - virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); + virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; + virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ) SAL_OVERRIDE; + virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; + virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; void AddAccessibilityObject( SfxListener& rObject ); void RemoveAccessibilityObject( SfxListener& rObject ); diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index 24ab6c857ec0..153eed4ca1e5 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -47,9 +47,9 @@ class ScPrivatSplit : public Control protected: - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; public: @@ -65,8 +65,8 @@ class ScPrivatSplit : public Control void MoveSplitTo(Point aPos); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetCtrModifiedHdl( const Link& rLink ) { aCtrModifiedLink = rLink; } const Link& GetCtrModifiedHdl() const { return aCtrModifiedLink; } diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index ad1afb983828..820d732bd88f 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -36,7 +36,7 @@ public: explicit ScTableProtectionDlg(Window* pParent); virtual ~ScTableProtectionDlg(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; void SetDialogData(const ScTableProtection& rData); diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 22739e54f648..451a75818520 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -201,7 +201,7 @@ class ScDPShowDetailDlg : public ModalDialog public: explicit ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; /** * @return String internal name of the selected field. Note that this may diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index 3ecbeacd8129..12046580edfe 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -138,11 +138,11 @@ public: ScPivotFieldType GetFieldTypeAtPoint( const Point& rScrPos ) const; protected: - virtual void Deactivate(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual bool IsRefInputMode() const; - virtual void SetActive(); - virtual bool Close(); + virtual void Deactivate() SAL_OVERRIDE; + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; private: /** Returns the localized function name for the specified resource index. */ diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index b3849219c814..be5ad517c77d 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -161,8 +161,8 @@ public: ~ScValidityRefChildWin(); bool LockVisible( bool bLock ){ bool bVis = m_bVisibleLock; m_bVisibleLock = bLock; return bVis; } bool LockFreeWindow( bool bLock ){ bool bFreeWindow = m_bFreeWindowLock; m_bFreeWindowLock = bLock; return bFreeWindow; } - void Hide(){ if( !m_bVisibleLock) SfxChildWindow::Hide(); } - void Show( sal_uInt16 nFlags ){ if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); } + void Hide() SAL_OVERRIDE { if( !m_bVisibleLock) SfxChildWindow::Hide(); } + void Show( sal_uInt16 nFlags ) SAL_OVERRIDE { if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); } }; diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 72cd2e979ec7..3b0d2c99573d 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -47,7 +47,7 @@ public: explicit ScRetypePassDlg(Window* pParent); virtual ~ScRetypePassDlg(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; void SetDataFromDocument(const ScDocument& rDoc); void SetDesiredHash(ScPasswordHash eHash); @@ -129,7 +129,7 @@ public: explicit ScRetypePassInputDlg(Window* pParent, ScPassHashProtectable* pProtected); virtual ~ScRetypePassInputDlg(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; bool IsRemovePassword() const; OUString GetNewPassword() const; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 4e8e4b01b06b..f2a07c12dcbc 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -47,8 +47,8 @@ class EditEngine; class ScHFEditPage : public SfxTabPage { public: - virtual bool FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; void SetNumType(SvxNumType eNumType); void ClearTextAreas(); diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index 5c472044ea15..ec9818801e26 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -66,13 +66,13 @@ public: void SetAnchor( SCCOL nPosX, SCROW nPosY ); void SetAnchorFlag( bool bSet ); - virtual void BeginDrag(); - virtual void CreateAnchor(); - virtual void DestroyAnchor(); - virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ); - virtual bool IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(); + virtual void BeginDrag() SAL_OVERRIDE; + virtual void CreateAnchor() SAL_OVERRIDE; + virtual void DestroyAnchor() SAL_OVERRIDE; + virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) SAL_OVERRIDE; + virtual bool IsSelectionAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; + virtual void DeselectAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; + virtual void DeselectAll() SAL_OVERRIDE; bool SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, bool bScroll ); }; @@ -97,13 +97,13 @@ public: void SetColumn( bool bSet ); void SetWhich( ScSplitPos eNew ); - virtual void BeginDrag(); - virtual void CreateAnchor(); - virtual void DestroyAnchor(); - virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ); - virtual bool IsSelectionAtPoint( const Point& rPointPixel ); - virtual void DeselectAtPoint( const Point& rPointPixel ); - virtual void DeselectAll(); + virtual void BeginDrag() SAL_OVERRIDE; + virtual void CreateAnchor() SAL_OVERRIDE; + virtual void DestroyAnchor() SAL_OVERRIDE; + virtual bool SetCursorAtPoint( const Point& rPointPixel, bool bDontSelectAtCursor = false ) SAL_OVERRIDE; + virtual bool IsSelectionAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; + virtual void DeselectAtPoint( const Point& rPointPixel ) SAL_OVERRIDE; + virtual void DeselectAll() SAL_OVERRIDE; void SetAnchorFlag(bool bSet) { bAnchor = bSet; } }; diff --git a/sc/source/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx index fb411ad751a8..f5487bf0eaf4 100644 --- a/sc/source/ui/inc/seltrans.hxx +++ b/sc/source/ui/inc/seltrans.hxx @@ -64,9 +64,9 @@ public: ScTransferObj* GetCellData(); ScDrawTransferObj* GetDrawData(); - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx index 4bf0c5d14254..bc1d65acb66d 100644 --- a/sc/source/ui/inc/servobj.hxx +++ b/sc/source/ui/inc/servobj.hxx @@ -36,7 +36,7 @@ class ScServerObjectSvtListenerForwarder : public SvtListener public: ScServerObjectSvtListenerForwarder( ScServerObject* pObjP); virtual ~ScServerObjectSvtListenerForwarder(); - virtual void Notify( const SfxHint& rHint ); + virtual void Notify( const SfxHint& rHint ) SAL_OVERRIDE; }; class ScServerObject : public ::sfx2::SvLinkSource, public SfxListener @@ -56,9 +56,9 @@ public: virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, const OUString & rMimeType, - bool bSynchron = false ); + bool bSynchron = false ) SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void EndListeningAll(); }; diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index f156316417b5..79e59806614c 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -68,23 +68,23 @@ private: protected: - virtual void RefInputDone( bool bForced = false ); + virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; public: ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData ); ~ScSimpleRefDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; - virtual bool IsRefInputMode() const; - virtual void SetActive(); - virtual bool Close(); + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; void StartRefInput(); void SetRefString(const OUString &rStr); - virtual void FillInfo(SfxChildWinInfo&) const; + virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; void SetCloseHdl( const Link& rLink ); void SetUnoLinks( const Link& rDone, const Link& rAbort, diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index fcd5f2d0c654..9a12cbd6b73f 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -49,10 +49,10 @@ public: ScAddress aCursorPos ); ~ScSolverDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual bool IsRefInputMode() const; - virtual void SetActive(); - virtual bool Close(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; private: FixedText* m_pFtFormulaCell; diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index 0023d354283d..17bb964e21b6 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -58,14 +58,14 @@ protected: next sentence with spelling errors. While doing so the view mode may be changed and text shapes are set into edit mode. */ - virtual ::svx::SpellPortions GetNextWrongSentence( bool bRecheck ); + virtual ::svx::SpellPortions GetNextWrongSentence( bool bRecheck ) SAL_OVERRIDE; /** This method is responsible for merging corrections made in the spelling dialog back into the document. */ - virtual void ApplyChangedSentence( const ::svx::SpellPortions& rChanged, bool bRecheck ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void ApplyChangedSentence( const ::svx::SpellPortions& rChanged, bool bRecheck ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; private: void Reset(); diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index fa190bad5bff..f90fce409eaa 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -108,20 +108,20 @@ public: XSpellCheckerRef xSpeller ); /** Checks spelling of all cells in the selection or sheet. */ - virtual void ConvertAll( EditView& rEditView ); + virtual void ConvertAll( EditView& rEditView ) SAL_OVERRIDE; protected: /** Callback from edit engine to check the next cell. */ - virtual bool SpellNextDocument(); + virtual bool SpellNextDocument() SAL_OVERRIDE; /** Returns true, if the current text contains a spelling error. */ - virtual bool NeedsConversion(); + virtual bool NeedsConversion() SAL_OVERRIDE; /** Show a query box that asks whether to restart at top of the sheet. @return true = Restart at top, false = Stop the conversion. */ - virtual bool ShowTableWrapDialog(); + virtual bool ShowTableWrapDialog() SAL_OVERRIDE; /** Show a message box stating that spell checking is finished. */ - virtual void ShowFinishDialog(); + virtual void ShowFinishDialog() SAL_OVERRIDE; private: /** Returns the spelling dialog if it is open. */ @@ -142,14 +142,14 @@ public: ScDocument* pRedoDoc ); /** Converts all cells in the selection or sheet according to set language. */ - virtual void ConvertAll( EditView& rEditView ); + virtual void ConvertAll( EditView& rEditView ) SAL_OVERRIDE; protected: /** Callback from edit engine to convert the next cell. */ - virtual bool ConvertNextDocument(); + virtual bool ConvertNextDocument() SAL_OVERRIDE; /** Returns true, if the current text contains text to convert. */ - virtual bool NeedsConversion(); + virtual bool NeedsConversion() SAL_OVERRIDE; private: ScConversionParam maConvParam; /// Conversion parameters. diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index f16bfd8649c9..8294cec46c30 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -34,8 +34,8 @@ public: sal_uInt16 nRscId ); protected: - virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ); - virtual const SfxItemSet* GetRefreshedSet(); + virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) SAL_OVERRIDE; + virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; private: sal_uInt16 nDlgRsc; diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index bf363ff009da..6bf180393fef 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -47,7 +47,7 @@ public: m_pTabBgColorDlg = pTabBgColorDlg; } - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; private: ScTabBgColorDlg* m_pTabBgColorDlg; }; diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index 06fc4042e575..9ea153dabb0c 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -50,20 +50,20 @@ private: void SwitchToPageId(sal_uInt16 nId); protected: - virtual void Select(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Select() SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; - virtual long StartRenaming(); - virtual long AllowRenaming(); - virtual void EndRenaming(); - virtual void Mirror(); + virtual long StartRenaming() SAL_OVERRIDE; + virtual long AllowRenaming() SAL_OVERRIDE; + virtual void EndRenaming() SAL_OVERRIDE; + virtual void Mirror() SAL_OVERRIDE; public: ScTabControl( Window* pParent, ScViewData* pData ); diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index db1fcd58a216..b591f5d303c1 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -50,11 +50,11 @@ public: const ScRefAddress& rCursorPos ); ~ScTabOpDlg(); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); - virtual bool IsRefInputMode() const { return true; } - virtual void SetActive(); + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE; + virtual bool IsRefInputMode() const SAL_OVERRIDE { return true; } + virtual void SetActive() SAL_OVERRIDE; - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; private: FixedText* m_pFtFormulaRange; diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 7dd495b7e07a..ecdcbb545cc2 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -32,12 +32,12 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); static sal_uInt16* GetRanges (); - virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ); - virtual void Reset ( const SfxItemSet& ); + virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& ) SAL_OVERRIDE; protected: using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: ScTabPageProtection( Window* pParent, diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index 616bd0b18c40..d12b822ef8ab 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -32,10 +32,10 @@ private: bool bFixed; protected: - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Splitting( Point& rSplitPos ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Splitting( Point& rSplitPos ) SAL_OVERRIDE; public: ScTabSplitter( Window* pParent, WinBits nWinStyle, @@ -43,7 +43,7 @@ public: ~ScTabSplitter(); void SetFixed(bool bSet); - virtual void Paint( const Rectangle& rPaintRect ); + virtual void Paint( const Rectangle& rPaintRect ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index c05baefffdde..503edd28591b 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -70,15 +70,15 @@ private: bool bAdd; protected: - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: ScCornerButton( Window* pParent, ScViewData* pData, bool bAdditional ); ~ScCornerButton(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 6885e7d381dc..fea48f5c3f78 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -200,35 +200,35 @@ private: DECL_LINK( FormControlActivated, void* ); protected: - virtual void Activate(bool bMDI); - virtual void Deactivate(bool bMDI); + virtual void Activate(bool bMDI) SAL_OVERRIDE; + virtual void Deactivate(bool bMDI) SAL_OVERRIDE; virtual bool PrepareClose( bool bUI = true ) SAL_OVERRIDE; - virtual void ShowCursor(bool bOn); + virtual void ShowCursor(bool bOn) SAL_OVERRIDE; - virtual void Move(); // Benachrichtigung + virtual void Move() SAL_OVERRIDE; // Benachrichtigung - virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ); // alt + virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) SAL_OVERRIDE; // alt - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); // neu - virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); - virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; // neu + virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) SAL_OVERRIDE; + virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) SAL_OVERRIDE; - virtual void QueryObjAreaPixel( Rectangle& rRect ) const; + virtual void QueryObjAreaPixel( Rectangle& rRect ) const SAL_OVERRIDE; - virtual OUString GetSelectionText( bool bWholeWord ); - virtual bool HasSelection( bool bText ) const; + virtual OUString GetSelectionText( bool bWholeWord ) SAL_OVERRIDE; + virtual bool HasSelection( bool bText ) const SAL_OVERRIDE; virtual OUString GetDescription() const; - virtual void WriteUserData(OUString &, bool bBrowse = false); - virtual void ReadUserData(const OUString &, bool bBrowse = false); - virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); - virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); + virtual void WriteUserData(OUString &, bool bBrowse = false) SAL_OVERRIDE; + virtual void ReadUserData(const OUString &, bool bBrowse = false) SAL_OVERRIDE; + virtual void WriteUserDataSequence (::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; + virtual void ReadUserDataSequence (const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ) SAL_OVERRIDE; - virtual void UIDeactivated( SfxInPlaceClient* pClient ); + virtual void UIDeactivated( SfxInPlaceClient* pClient ) SAL_OVERRIDE; - virtual bool KeyInput( const KeyEvent &rKeyEvent ); - virtual SdrView* GetDrawView() const; + virtual bool KeyInput( const KeyEvent &rKeyEvent ) SAL_OVERRIDE; + virtual SdrView* GetDrawView() const SAL_OVERRIDE; public: TYPEINFO_VISIBILITY(SC_DLLPUBLIC); @@ -329,7 +329,7 @@ public: ObjectSelectionType GetCurObjectSelectionType(); - virtual ErrCode DoVerb(long nVerb); + virtual ErrCode DoVerb(long nVerb) SAL_OVERRIDE; void StopEditShell(); @@ -345,17 +345,17 @@ public: void SetEditChartName(const OUString& aStr){aEditChartName=aStr;} - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; ScNavigatorSettings* GetNavigatorSettings(); // Drucken: - virtual SfxPrinter* GetPrinter( bool bCreate = false ); + virtual SfxPrinter* GetPrinter( bool bCreate = false ) SAL_OVERRIDE; virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, - sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false ); + sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsApi=false ) SAL_OVERRIDE; - virtual bool HasPrintOptionsPage() const; - virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); + virtual bool HasPrintOptionsPage() const SAL_OVERRIDE; + virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ) SAL_OVERRIDE; void ConnectObject( SdrOle2Obj* pObj ); bool ActivateObject( SdrOle2Obj* pObj, long nVerb ); diff --git a/sc/source/ui/inc/tbinsert.hxx b/sc/source/ui/inc/tbinsert.hxx index 266832aea11a..b90508a8932b 100644 --- a/sc/source/ui/inc/tbinsert.hxx +++ b/sc/source/ui/inc/tbinsert.hxx @@ -35,11 +35,11 @@ public: ScTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); ~ScTbxInsertCtrl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 8fb746a2b71d..36f8806d18f2 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -34,8 +34,8 @@ public: ScZoomSliderControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~ScZoomSliderControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; }; class ScZoomSliderWnd: public Window @@ -58,9 +58,9 @@ public: void UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ); protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx index abcd88ab5438..793705144cef 100644 --- a/sc/source/ui/inc/textdlgs.hxx +++ b/sc/source/ui/inc/textdlgs.hxx @@ -31,7 +31,7 @@ private: sal_uInt16 m_nNamePageId; sal_uInt16 m_nEffectsPageId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; public: ScCharDlg(Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell); @@ -42,7 +42,7 @@ class ScParagraphDlg : public SfxTabDialog private: sal_uInt16 m_nTabPageId; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage &rPage) SAL_OVERRIDE; public: ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr); diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index e0198eebe11e..71e283af40a5 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -32,7 +32,7 @@ public: ScTextImportOptionsDlg(Window* pParent); virtual ~ScTextImportOptionsDlg(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; LanguageType getLanguageType() const; bool isDateConversionSet() const; diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 155676f1c741..ef92df213d7f 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -37,10 +37,10 @@ class ScTpCalcOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: ScTpCalcOptions( Window* pParent, diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 95478abb662c..6411cf9730f1 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -21,9 +21,9 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreAttrs); - virtual bool FillItemSet(SfxItemSet& rCoreAttrs); - virtual void Reset(const SfxItemSet& rCoreAttrs); - virtual int DeactivatePage(SfxItemSet* pSet = NULL); + virtual bool FillItemSet(SfxItemSet& rCoreAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rCoreAttrs) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: explicit ScTpCompatOptions(Window* pParent, const SfxItemSet& rCoreAttrs); diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 296105f97064..dd1be983e2e9 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -21,9 +21,9 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); - virtual bool FillItemSet(SfxItemSet& rCoreSet); - virtual void Reset(const SfxItemSet& rCoreSet); - virtual int DeactivatePage(SfxItemSet* pSet = NULL); + virtual bool FillItemSet(SfxItemSet& rCoreSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rCoreSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: explicit ScTpDefaultsOptions(Window* pParent, const SfxItemSet& rCoreSet); diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 888870a7cf2e..b0d96966416d 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -35,9 +35,9 @@ public: static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet); - virtual bool FillItemSet(SfxItemSet& rCoreSet); - virtual void Reset( const SfxItemSet& rCoreSet ); - virtual int DeactivatePage(SfxItemSet* pSet = NULL); + virtual bool FillItemSet(SfxItemSet& rCoreSet) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE; private: explicit ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreSet); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 798e4c007b5e..0dc893890571 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -31,8 +31,8 @@ class ScHFPage : public SvxHFPage public: virtual ~ScHFPage(); - virtual void Reset( const SfxItemSet& rSet ); - virtual bool FillItemSet( SfxItemSet& rOutSet ); + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE; void SetPageStyle( const OUString& rName ) { aStrPageStyle = rName; } void SetStyleDlg ( const ScStyleDlg* pDlg ) { pStyleDlg = pDlg; } @@ -42,10 +42,10 @@ protected: const SfxItemSet& rSet, sal_uInt16 nSetId ); - virtual void ActivatePage(); - virtual void DeactivatePage(); - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage() SAL_OVERRIDE; + virtual void DeactivatePage() SAL_OVERRIDE; + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; private: PushButton* m_pBtnEdit; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 64517b0e5e92..c055d29cb4ac 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -69,22 +69,22 @@ public: void SetNumType(SvxNumType eNumType); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; ScHeaderEditEngine* GetEditEngine() const { return pEdEngine; } void SetObjectSelectHdl( const Link& aLink) { aObjectSelectLink = aLink; } void SetLocation(ScEditWindowLocation eLoc) { eLocation = eLoc; } protected: - virtual void Paint( const Rectangle& rRect ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; private: ScHeaderEditEngine* pEdEngine; @@ -113,9 +113,9 @@ private: protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt); - virtual void Click(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void Click() SAL_OVERRIDE; virtual void StartPopup(); @@ -131,7 +131,7 @@ public: void SetMenuHdl( const Link& rLink ) { aMLink = rLink; } const Link& GetMenuHdl() const { return aMLink; } - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; #endif // SC_TPHFEDIT_HXX diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 6b8c013c1b43..1a1f8f67ea9b 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -36,10 +36,10 @@ class ScTpPrintOptions : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet( SfxItemSet& rCoreSet ); - virtual void Reset( const SfxItemSet& rCoreSet ); + virtual bool FillItemSet( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 58d483e2a189..5284b6534aae 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -56,18 +56,18 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; - virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation); - virtual void SetSizePixel(const Size& rAllocation); - virtual void SetPosPixel(const Point& rAllocPos); + virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) SAL_OVERRIDE; + virtual void SetSizePixel(const Size& rAllocation) SAL_OVERRIDE; + virtual void SetPosPixel(const Point& rAllocPos) SAL_OVERRIDE; protected: - virtual void ActivatePage ( const SfxItemSet& rSet ); + virtual void ActivatePage ( const SfxItemSet& rSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = 0); + virtual int DeactivatePage ( SfxItemSet* pSet = 0) SAL_OVERRIDE; private: OUString aStrUndefined; @@ -118,14 +118,14 @@ public: #define SfxTabPage ::SfxTabPage static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; protected: - virtual void ActivatePage ( const SfxItemSet& rSet ); + virtual void ActivatePage ( const SfxItemSet& rSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = 0); + virtual int DeactivatePage ( SfxItemSet* pSet = 0) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 781f79ca6e3d..45eab5f19816 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -39,8 +39,8 @@ private: ~ScDocStatPage(); protected: - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset ( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rSet ) SAL_OVERRIDE; private: FixedText* m_pFtTables; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index bfe60d0031df..e2bda75455f1 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -90,8 +90,8 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -107,8 +107,8 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -124,8 +124,8 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -141,8 +141,8 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); - virtual bool FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; private: CheckBox* pBtnPagebreak; diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index ba00be991832..53bd566a5cbc 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -31,11 +31,11 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); static sal_uInt16* GetRanges (); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); - virtual void DataChanged ( const DataChangedEvent& rDCEvt ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; + virtual void DataChanged ( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: ScTablePage( Window* pParent, const SfxItemSet& rCoreSet ); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index eb4a15b92b6b..0113cbad7ec9 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -37,10 +37,10 @@ class ScTpUserLists : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ); - virtual void Reset ( const SfxItemSet& rCoreAttrs ); + virtual bool FillItemSet ( SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rCoreAttrs ) SAL_OVERRIDE; using SfxTabPage::DeactivatePage; - virtual int DeactivatePage ( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; private: ScTpUserLists( Window* pParent, diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 08cb22c161a7..23e58d3c4b6a 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -75,12 +75,12 @@ class ScTpContentOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; }; @@ -125,12 +125,12 @@ class ScTpLayoutOptions : public SfxTabPage public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rCoreSet ); - virtual bool FillItemSet ( SfxItemSet& rCoreSet ); - virtual void Reset ( const SfxItemSet& rCoreSet ); + virtual bool FillItemSet ( SfxItemSet& rCoreSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual void ActivatePage( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; void SetDocument(ScDocument* pPtr){pDoc = pPtr;} diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index d27556f046a6..a7d01b8de8eb 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -71,12 +71,12 @@ public: ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDescriptor& rDesc ); virtual ~ScTransferObj(); - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, - const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); - virtual void DragFinished( sal_Int8 nDropAction ); + const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; ScDocument* GetDocument() { return pDoc; } // owned by ScTransferObj const ScRange& GetRange() const { return aBlock; } @@ -102,7 +102,7 @@ public: static SC_DLLPUBLIC ScTransferObj* GetOwnClipboard( Window* pUIWin ); static SfxObjectShell* SetDrawClipDoc( bool bAnyOle ); // update ScGlobal::pDrawClipDocShellRef - virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getSomething( const com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static const com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId(); }; diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 3573df0ce437..8db73da30261 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -67,8 +67,8 @@ public: virtual OUString GetValueText() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; const ScAddress& GetPos() const { return aCursorPos; } const ScAddress& GetStartPos() const { return aStartPos; } @@ -162,9 +162,9 @@ public: ~ScSortItem(); virtual OUString GetValueText() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; ScViewData* GetViewData () const { return pViewData; } const ScSortParam& GetSortData () const { return theSortData; } @@ -189,8 +189,8 @@ public: ~ScQueryItem(); virtual OUString GetValueText() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; ScViewData* GetViewData () const { return pViewData; } const ScQueryParam& GetQueryData() const; @@ -220,9 +220,9 @@ public: ~ScSubTotalItem(); virtual OUString GetValueText() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberUd ) const SAL_OVERRIDE; ScViewData* GetViewData () const { return pViewData; } const ScSubTotalParam& GetSubTotalData() const { return theSubTotalData; } @@ -243,8 +243,8 @@ public: ~ScUserListItem(); virtual OUString GetValueText() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; void SetUserList ( const ScUserList& rUserList ); ScUserList* GetUserList () const { return pUserList; } @@ -265,8 +265,8 @@ public: ~ScConsolidateItem(); virtual OUString GetValueText() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; const ScConsolidateParam& GetData() const { return theConsData; } @@ -286,8 +286,8 @@ public: ~ScPivotItem(); virtual OUString GetValueText() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; const ScDPSaveData& GetData() const { return *pSaveData; } const ScRange& GetDestRange() const { return aDestRange; } @@ -311,8 +311,8 @@ public: ~ScSolveItem(); virtual OUString GetValueText() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; const ScSolveParam& GetData() const { return theSolveData; } @@ -332,8 +332,8 @@ public: ~ScTabOpItem(); virtual OUString GetValueText() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; const ScTabOpParam& GetData() const { return theTabOpData; } diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 8999631e06e7..766bc808511e 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -42,7 +42,7 @@ public: ScSimpleUndo( ScDocShell* pDocSh ); virtual ~ScSimpleUndo(); - virtual bool Merge( SfxUndoAction *pNextAction ); + virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; protected: ScDocShell* pDocShell; @@ -177,16 +177,16 @@ public: SfxUndoAction* GetWrappedUndo() { return pWrappedUndo; } void ForgetWrappedUndo(); - virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction); + virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction) SAL_OVERRIDE; - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual bool Merge( SfxUndoAction *pNextAction ); - virtual OUString GetComment() const; - virtual OUString GetRepeatComment(SfxRepeatTarget&) const; - virtual sal_uInt16 GetId() const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetRepeatComment(SfxRepeatTarget&) const SAL_OVERRIDE; + virtual sal_uInt16 GetId() const SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 59b81b87ab95..c67affc28210 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -53,14 +53,14 @@ public: bool bNewPartOfPaste ); virtual ~ScUndoInsertCells(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat( SfxRepeatTarget& rTarget ) SAL_OVERRIDE; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; - virtual bool Merge( SfxUndoAction *pNextAction ); + virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; private: ScRange aEffRange; @@ -86,12 +86,12 @@ public: DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData ); virtual ~ScUndoDeleteCells(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScRange aEffRange; @@ -119,12 +119,12 @@ public: virtual ~ScUndoDeleteMulti(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: bool mbRows:1; @@ -150,12 +150,12 @@ public: ScDocument* pNewUndoDoc ); virtual ~ScUndoCut(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScMarkData aMarkData; @@ -199,12 +199,12 @@ public: const ScUndoPasteOptions* pOptions = NULL); virtual ~ScUndoPaste(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScMarkData aMarkData; @@ -233,12 +233,12 @@ public: bool bScenario ); virtual ~ScUndoDragDrop(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: sal_uInt16 mnPaintExtFlags; @@ -269,12 +269,12 @@ public: sal_uInt16 nNewFlags, bool bObjects ); virtual ~ScUndoDeleteContents(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScRange aRange; @@ -303,12 +303,12 @@ public: sal_uInt16 nFlg, sal_uInt16 nFunc, bool bSkip, bool bLink ); virtual ~ScUndoFillTable(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScRange aRange; @@ -342,12 +342,12 @@ public: const SvxBoxInfoItem* pNewInner = NULL ); virtual ~ScUndoSelectionAttr(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; ScEditDataArray* GetDataArray(); private: @@ -380,12 +380,12 @@ public: bool bNewWidth ); virtual ~ScUndoWidthOrHeight(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScMarkData aMarkData; @@ -415,12 +415,12 @@ public: double fNewStartValue, double fNewStepValue, double fNewMaxValue ); virtual ~ScUndoAutoFill(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScRange aSource; @@ -447,12 +447,12 @@ public: bool bMergeContents, ScDocument* pUndoDoc, SdrUndoAction* pDrawUndo); virtual ~ScUndoMerge(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScCellMergeOption maOption; @@ -474,12 +474,12 @@ public: bool bNewSize, sal_uInt16 nNewFormatNo ); virtual ~ScUndoAutoFormat(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScDocument* pUndoDoc; // deleted data @@ -500,12 +500,12 @@ public: const SvxSearchItem* pItem ); virtual ~ScUndoReplace(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScAddress aCursorPos; @@ -535,12 +535,12 @@ public: ScTabOpParam::Mode eMode ); virtual ~ScUndoTabOp(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScRange aRange; @@ -564,12 +564,12 @@ public: const ScConversionParam& rConvParam ); virtual ~ScUndoConversion(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScMarkData aMarkData; @@ -594,12 +594,12 @@ public: ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc, bool bNewMulti, sal_uInt16 nNewFlag); virtual ~ScUndoRefConversion(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScMarkData aMarkData; @@ -624,12 +624,12 @@ public: ScDocument* pNewUndoDoc, ScDocument* pNewRedoDoc ); virtual ~ScUndoListNames(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScDocument* pUndoDoc; @@ -649,12 +649,12 @@ public: const OUString& rNewName ); virtual ~ScUndoUseScenario(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScDocument* pUndoDoc; @@ -675,13 +675,13 @@ public: ScDocument* pNewUndoDoc ); virtual ~ScUndoSelectionStyle(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; - virtual sal_uInt16 GetId() const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual sal_uInt16 GetId() const SAL_OVERRIDE; private: ScMarkData aMarkData; @@ -701,12 +701,12 @@ public: ScDocument* pNewUndoDoc ); virtual ~ScUndoRefreshLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScDocument* pUndoDoc; @@ -724,12 +724,12 @@ public: const OUString& rForm ); virtual ~ScUndoEnterMatrix(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScDocument* pUndoDoc; @@ -752,12 +752,12 @@ public: sal_uLong nRefreshDelay ); virtual ~ScUndoInsertAreaLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: OUString aDocName; @@ -780,12 +780,12 @@ public: sal_uLong nRefreshDelay ); virtual ~ScUndoRemoveAreaLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: OUString aDocName; @@ -814,12 +814,12 @@ public: bool bDoInsert ); virtual ~ScUndoUpdateAreaLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: OUString aOldDoc; @@ -850,12 +850,12 @@ public: ScDocument* pNewUndoDoc, bool bIncrement ); virtual ~ScUndoIndent(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScMarkData aMarkData; @@ -872,12 +872,12 @@ public: ScDocument* pNewUndoDoc, sal_Int32 nType ); virtual ~ScUndoTransliterate(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScMarkData aMarkData; @@ -894,12 +894,12 @@ public: ScDocument* pNewUndoDoc, const sal_uInt16* pW ); virtual ~ScUndoClearItems(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScMarkData aMarkData; @@ -916,12 +916,12 @@ public: SCTAB nNewTab, ScDocument* pNewUndoDoc ); virtual ~ScUndoRemoveBreaks(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB nTab; @@ -938,12 +938,12 @@ public: ScDocument* pNewUndoDoc ); virtual ~ScUndoRemoveMerge(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: void SetCurTab(); @@ -964,12 +964,12 @@ public: const SvxBoxInfoItem& rNewInner ); virtual ~ScUndoBorder(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScDocument* pUndoDoc; diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index c9297b2f0259..2ace5366e306 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -53,12 +53,12 @@ public: const ScPatternAttr* pApplyPat, bool bAutomatic ); virtual ~ScUndoCursorAttr(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; /** once the objects are passed to this class, their life-cycle is managed by this class; the calling function must pass new'ed @@ -103,12 +103,12 @@ public: virtual ~ScUndoEnterData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ValuesType maOldValues; @@ -133,12 +133,12 @@ public: virtual ~ScUndoEnterValue(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScAddress aPos; @@ -157,11 +157,11 @@ public: virtual ~ScUndoSetCell(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const; - virtual OUString GetComment() const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat( SfxRepeatTarget& rTarget ) SAL_OVERRIDE; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const SAL_OVERRIDE; + virtual OUString GetComment() const SAL_OVERRIDE; private: void SetChangeTrack(); @@ -183,12 +183,12 @@ public: bool bNewColumn, bool bNewInsert ); virtual ~ScUndoPageBreak(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCCOL nCol; @@ -208,12 +208,12 @@ public: sal_uInt16 nOS, sal_uInt16 nOP, sal_uInt16 nNS, sal_uInt16 nNP ); virtual ~ScUndoPrintZoom(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB nTab; @@ -234,12 +234,12 @@ public: const ScCellValue& rOldText, const ScCellValue& rNewText ); virtual ~ScUndoThesaurus(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCCOL nCol; @@ -280,12 +280,12 @@ public: virtual ~ScUndoReplaceNote(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat( SfxRepeatTarget& rTarget ) SAL_OVERRIDE; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: void DoInsertNote( const ScNoteData& rNoteData ); @@ -308,12 +308,12 @@ public: ScUndoShowHideNote( ScDocShell& rDocShell, const ScAddress& rPos, bool bShow ); virtual ~ScUndoShowHideNote(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat( SfxRepeatTarget& rTarget ); - virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat( SfxRepeatTarget& rTarget ) SAL_OVERRIDE; + virtual bool CanRepeat( SfxRepeatTarget& rTarget ) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScAddress maPos; @@ -331,12 +331,12 @@ public: ScDetOpList* pUndoList = NULL ); virtual ~ScUndoDetective(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: bool bIsDelete; @@ -356,12 +356,12 @@ public: ScRangeName* pOld, ScRangeName* pNew , SCTAB nTab = -1); virtual ~ScUndoRangeNames(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScRangeName* pOldRanges; @@ -385,11 +385,11 @@ public: UndoSetCells( ScDocShell* pDocSh, const ScAddress& rTopPos ); virtual ~UndoSetCells(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual bool CanRepeat( SfxRepeatTarget& ) const; - virtual OUString GetComment() const; + virtual bool CanRepeat( SfxRepeatTarget& ) const SAL_OVERRIDE; + virtual OUString GetComment() const SAL_OVERRIDE; CellValues& GetOldValues(); void SetNewValues( const std::vector<double>& rVals ); diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 9d00e52fb534..9b9d4ad7dfdd 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -52,12 +52,12 @@ public: sal_uInt16 nNewLevel, sal_uInt16 nNewEntry, bool bNewShow ); virtual ~ScUndoDoOutline(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCCOLROW nStart; @@ -82,12 +82,12 @@ public: bool bNewColumns, bool bNewMake ); virtual ~ScUndoMakeOutline(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScAddress aBlockStart; @@ -108,12 +108,12 @@ public: bool bNewColumns, sal_uInt16 nNewLevel ); virtual ~ScUndoOutlineLevel(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCCOLROW nStart; @@ -137,12 +137,12 @@ public: bool bNewShow ); virtual ~ScUndoOutlineBlock(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScAddress aBlockStart; @@ -163,12 +163,12 @@ public: ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab ); virtual ~ScUndoRemoveAllOutlines(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScAddress aBlockStart; @@ -188,12 +188,12 @@ public: ScDocument* pNewUndoDoc, ScOutlineTable* pNewUndoTab ); virtual ~ScUndoAutoOutline(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScAddress aBlockStart; @@ -214,12 +214,12 @@ public: ScRangeName* pNewUndoRange, ScDBCollection* pNewUndoDB ); virtual ~ScUndoSubTotals(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB nTab; @@ -243,12 +243,12 @@ public: ScDBCollection* pNewUndoDB, const ScRange* pDest = NULL ); virtual ~ScUndoSort(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB nTab; @@ -270,12 +270,12 @@ public: bool bSize, const ScRange* pAdvSrc ); virtual ~ScUndoQuery(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SdrUndoAction* pDrawUndo; @@ -305,12 +305,12 @@ public: const OUString& rName, bool bSet ); virtual ~ScUndoAutoFilter(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; @@ -322,12 +322,12 @@ public: ScDBCollection* pNewUndoColl, ScDBCollection* pNewRedoColl ); virtual ~ScUndoDBData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScDBCollection* pUndoColl; @@ -346,12 +346,12 @@ public: ScDBData* pNewUndoData, ScDBData* pNewRedoData ); virtual ~ScUndoImportData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB nTab; @@ -379,12 +379,12 @@ public: const ScRange* pOldQ, const ScRange* pNewQ ); virtual ~ScUndoRepeatDB(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScAddress aBlockStart; @@ -411,12 +411,12 @@ public: bool bMove ); virtual ~ScUndoDataPilot(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScDocument* pOldUndoDoc; @@ -438,12 +438,12 @@ public: ScDBData* pData ); virtual ~ScUndoConsolidate(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScArea aDestArea; @@ -468,12 +468,12 @@ public: bool bColHdr, bool bRowHdr, bool bAdd ); virtual ~ScUndoChartData(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: OUString aChartName; @@ -504,12 +504,12 @@ public: ); virtual ~ScUndoDataForm(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: boost::scoped_ptr<ScMarkData> mpMarkData; diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index 0630a0ac3597..3c28fa9a9508 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.hxx @@ -39,16 +39,16 @@ public: SfxUndoAction* GetDrawUndo() { return pDrawUndo; } void ForgetDrawUndo(); - virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction); - - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; - virtual bool Merge( SfxUndoAction *pNextAction ); - virtual OUString GetComment() const; - virtual OUString GetRepeatComment(SfxRepeatTarget&) const; - virtual sal_uInt16 GetId() const; + virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction) SAL_OVERRIDE; + + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; + virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetRepeatComment(SfxRepeatTarget&) const SAL_OVERRIDE; + virtual sal_uInt16 GetId() const SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 86756c2b599f..b2adb32f79fb 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -67,12 +67,12 @@ public: const ScStyleSaveData& rNew ); virtual ~ScUndoModifyStyle(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; class ScUndoApplyPageStyle: public ScSimpleUndo @@ -84,12 +84,12 @@ public: void AddSheetAction( SCTAB nTab, const OUString& rOld ); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: struct ApplyStyleEntry diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 5a465c642d8d..60161d037672 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -55,12 +55,12 @@ public: const OUString& rNewName); virtual ~ScUndoInsertTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: OUString sNewName; @@ -82,12 +82,12 @@ public: std::vector<OUString>& newNameList); virtual ~ScUndoInsertTables(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: @@ -112,12 +112,12 @@ public: ScRefUndoData* pRefData ); virtual ~ScUndoDeleteTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: std::vector<SCTAB> theTabs; @@ -139,12 +139,12 @@ public: const OUString& rNewName); virtual ~ScUndoRenameTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB nTab; @@ -168,12 +168,12 @@ public: virtual ~ScUndoMoveTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs; @@ -197,12 +197,12 @@ public: virtual ~ScUndoCopyTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ::boost::shared_ptr< ::std::vector<SCTAB> > mpOldTabs; @@ -227,12 +227,12 @@ public: const ScUndoTabColorInfo::List& rUndoTabColorList); virtual ~ScUndoTabColor(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: ScUndoTabColorInfo::List aTabColorList; @@ -252,12 +252,12 @@ public: const ScMarkData& rMark ); virtual ~ScUndoMakeScenario(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: boost::scoped_ptr<ScMarkData> mpMarkData; @@ -280,12 +280,12 @@ public: SCTAB nNewTab, SCTAB nNewCount ); virtual ~ScUndoImportTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB nTab; @@ -306,12 +306,12 @@ public: const OUString& rDoc ); virtual ~ScUndoRemoveLink(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: OUString aDocName; @@ -337,12 +337,12 @@ public: bool bNewShow ); virtual ~ScUndoShowHideTab(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: std::vector<SCTAB> undoTabs; @@ -363,12 +363,12 @@ public: SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~ScUndoDocProtect(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -391,12 +391,12 @@ public: SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~ScUndoTabProtect(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB mnTab; @@ -416,12 +416,12 @@ public: ScPrintRangeSaver* pOld, ScPrintRangeSaver* pNew ); virtual ~ScUndoPrintRange(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB nTab; @@ -445,12 +445,12 @@ public: virtual ~ScUndoScenarioFlags(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB nTab; @@ -475,12 +475,12 @@ public: virtual ~ScUndoRenameObject(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: OUString aPersistName; // to find object (works only for OLE objects) @@ -498,12 +498,12 @@ public: ScUndoLayoutRTL( ScDocShell* pShell, SCTAB nNewTab, bool bNewRTL ); virtual ~ScUndoLayoutRTL(); - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual bool CanRepeat(SfxRepeatTarget& rTarget) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rTarget) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& rTarget) const SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; private: SCTAB nTab; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9d360ab054e3..32399983a8cb 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -115,13 +115,13 @@ public: virtual void SetModal( bool bModal ){ ScValidationDlgBase::SetModalInputMode( bModal ); } - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) SAL_OVERRIDE { if ( m_pHandler && m_pSetReferenceHdl ) (m_pHandler->*m_pSetReferenceHdl)( rRef, pDoc ); } - virtual void SetActive() + virtual void SetActive() SAL_OVERRIDE { if ( m_pHandler && m_pSetActiveHdl ) (m_pHandler->*m_pSetActiveHdl)(); @@ -140,7 +140,7 @@ public: bool IsRefInputting(){ return m_bRefInputting; } Window* get_refinput_shrink_parent() { return m_pHBox; } - virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) + virtual void RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ) SAL_OVERRIDE { if( !CanInputStart( pEdit ) ) return; @@ -153,7 +153,7 @@ public: (m_pHandler->*m_pRefInputStartPostHdl)( pEdit, pButton ); } - virtual void RefInputDone( bool bForced = false ) + virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE { if( !CanInputDone( bForced ) ) return; @@ -172,7 +172,7 @@ public: enum { SLOTID = SID_VALIDITY_REFERENCE }; - bool Close(); + bool Close() SAL_OVERRIDE; }; @@ -188,8 +188,8 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rArgSet ); static sal_uInt16* GetRanges(); - virtual bool FillItemSet( SfxItemSet& rArgSet ); - virtual void Reset( const SfxItemSet& rArgSet ); + virtual bool FillItemSet( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rArgSet ) SAL_OVERRIDE; private: void Init(); @@ -235,7 +235,7 @@ private: formula::RefEdit* m_pRefEdit; class ScRefButtonEx:public ::formula::RefButton { - void Click(); + void Click() SAL_OVERRIDE; public: ScRefButtonEx( Window* pParent, const ResId& rResId, formula::RefEdit* pEdit = NULL, ScRefHandler *pRefHdlr = NULL ) @@ -279,8 +279,8 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); static sal_uInt16* GetRanges (); - virtual bool FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; @@ -307,8 +307,8 @@ public: static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet ); static sal_uInt16* GetRanges (); - virtual bool FillItemSet ( SfxItemSet& rArgSet ); - virtual void Reset ( const SfxItemSet& rArgSet ); + virtual bool FillItemSet ( SfxItemSet& rArgSet ) SAL_OVERRIDE; + virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; #endif // SC_VALIDATE_HXX diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index d06257872971..62981f4296aa 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -36,7 +36,7 @@ public: /** Opens dialog if IsDialogEnabled() returns true. @descr If after executing the dialog the checkbox "Do not show again" is set, the method DisableDialog() will be called. */ - virtual sal_Int16 Execute(); + virtual sal_Int16 Execute() SAL_OVERRIDE; /** Called before executing the dialog. If this method returns false, the dialog will not be opened. */ virtual bool IsDialogEnabled(); @@ -54,9 +54,9 @@ public: ScReplaceWarnBox( Window* pParent ); /** Reads the configuration key "ReplaceCellsWarning". */ - virtual bool IsDialogEnabled(); + virtual bool IsDialogEnabled() SAL_OVERRIDE; /** Sets the configuration key "ReplaceCellsWarning" to false. */ - virtual void DisableDialog(); + virtual void DisableDialog() SAL_OVERRIDE; }; diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 30d5a66094eb..06d93f95cc72 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -58,11 +58,11 @@ public: ScXMLSourceDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDoc); - virtual bool IsRefInputMode() const; - virtual void SetReference(const ScRange& rRange, ScDocument* pDoc); - virtual void Deactivate(); - virtual void SetActive(); - virtual bool Close(); + virtual bool IsRefInputMode() const SAL_OVERRIDE; + virtual void SetReference(const ScRange& rRange, ScDocument* pDoc) SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; + virtual void SetActive() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; private: diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 5200e2f9d2b8..478a56da7614 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -45,7 +45,7 @@ public: { m_sWidestAccessString = getWidestTime(*ScGlobal::pLocaleData); } - virtual void Resize() + virtual void Resize() SAL_OVERRIDE { SvSimpleTable::Resize(); if (isInitialLayout(this)) diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index d7f28acabfe3..9d8af3909f21 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -77,7 +77,7 @@ public: void SetDoubleValue( double fNew ) { mbIsDouble = true; mfDoubleValue = fNew; } void SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = nNew; } - virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/) diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 82083cc7dc9b..15bc6f9c5de6 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -38,9 +38,9 @@ public: void SetValue(const OUString &rValue) { maValue = rValue; } - virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + virtual void Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; - virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData); + virtual void InitViewData(SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData) SAL_OVERRIDE; }; void OptionString::InitViewData( diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index ecda42376400..a2d041984556 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -46,16 +46,16 @@ public: SfxBindings* pBindings); virtual void DataChanged( - const DataChangedEvent& rEvent); + const DataChangedEvent& rEvent) SAL_OVERRIDE; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext aContext); + const ::sfx2::sidebar::EnumContext aContext) SAL_OVERRIDE; virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled); + const bool bIsEnabled) SAL_OVERRIDE; SfxBindings* GetBindings(); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index ee253952172e..0847f57e0f65 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -54,16 +54,16 @@ public: SfxBindings* pBindings); virtual void DataChanged( - const DataChangedEvent& rEvent); + const DataChangedEvent& rEvent) SAL_OVERRIDE; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext aContext); + const ::sfx2::sidebar::EnumContext aContext) SAL_OVERRIDE; virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled); + const bool bIsEnabled) SAL_OVERRIDE; SfxBindings* GetBindings(); diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index b23cb9039437..36e14a699366 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -47,7 +47,7 @@ private: public: CellLineStyleControl(Window* pParent, CellAppearancePropertyPanel& rPanel); - void GetFocus(); + void GetFocus() SAL_OVERRIDE; void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis); ValueSet& GetValueSet() diff --git a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx index 971688c7bff8..694cabdb8d9b 100644 --- a/sc/source/ui/sidebar/CellLineStyleValueSet.hxx +++ b/sc/source/ui/sidebar/CellLineStyleValueSet.hxx @@ -38,7 +38,7 @@ public: void SetUnit(const OUString* str); void SetSelItem(sal_uInt16 nSel); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; }; } } // end of namespace svx::sidebar diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 2630204fce71..237ccc5de726 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -43,16 +43,16 @@ public: SfxBindings* pBindings); virtual void DataChanged( - const DataChangedEvent& rEvent); + const DataChangedEvent& rEvent) SAL_OVERRIDE; virtual void HandleContextChange( - const ::sfx2::sidebar::EnumContext aContext); + const ::sfx2::sidebar::EnumContext aContext) SAL_OVERRIDE; virtual void NotifyItemUpdate( const sal_uInt16 nSId, const SfxItemState eState, const SfxPoolItem* pState, - const bool bIsEnabled); + const bool bIsEnabled) SAL_OVERRIDE; SfxBindings* GetBindings(); diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 3e8039acbfbd..2ad51cab9a3e 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -88,36 +88,36 @@ namespace calc DECLARE_XTYPEPROVIDER() // XListEntrySource - virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeListEntryListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::binding::XListEntryListener >& Listener ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper/XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const SAL_OVERRIDE; // ::comphelper::OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void checkDisposed( ) const diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 6a77e0c0b337..9d2a0649b12f 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -94,39 +94,39 @@ namespace calc DECLARE_XTYPEPROVIDER() // XValueBinding - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getSupportedValueTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsType( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getValue( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getSupportedValueTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsType( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getValue( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::form::binding::IncompatibleTypesException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper/XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& _rValue, sal_Int32 _nHandle ) const SAL_OVERRIDE; // ::comphelper::OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void checkDisposed( ) const diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx index b3b6043cfa6c..8aab64be538e 100644 --- a/sc/source/ui/unoobj/exceldetect.hxx +++ b/sc/source/ui/unoobj/exceldetect.hxx @@ -26,13 +26,13 @@ public: virtual ~ScExcelBiffDetect(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception ); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XExtendedFilterDetection virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static com::sun::star::uno::Sequence<OUString> impl_getStaticSupportedServiceNames(); static OUString impl_getStaticImplementationName(); diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index a20cb578bf32..1d759b7cb3c6 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -181,7 +181,7 @@ public: ~ScUnoEditEngine(); virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, - Color*& rTxtColor, Color*& rFldColor ); + Color*& rTxtColor, Color*& rFldColor ) SAL_OVERRIDE; sal_uInt16 CountFields(); SvxFieldData* FindByIndex(sal_uInt16 nIndex); diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index c1a979ab2f89..36c16ecd3b73 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -44,9 +44,9 @@ public: virtual ~ScFilterDetect(); /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException, std::exception ); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /* Helper for XServiceInfo */ static com::sun::star::uno::Sequence<OUString> impl_getStaticSupportedServiceNames(); @@ -61,7 +61,7 @@ public: // XExtendedFilterDetect virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 522f02d15993..d12e22807668 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -94,7 +94,7 @@ public: maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs ); } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception ) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object @@ -139,7 +139,7 @@ public: return maCachedObject.hasValue(); } - ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { SolarMutexGuard aGuard; OSL_TRACE("ScVbaObjectForCodeNameProvider::getByName( %s )", @@ -148,7 +148,7 @@ public: throw ::com::sun::star::container::NoSuchElementException(); return maCachedObject; } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { SolarMutexGuard aGuard; ScDocument* pDoc = mpDocShell->GetDocument(); @@ -167,8 +167,8 @@ public: return aNames; } // XElemenAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception){ return uno::Type(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) { return sal_True; } + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return uno::Type(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return sal_True; } }; @@ -178,7 +178,7 @@ class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNam public: ScVbaCodeNameProvider( ScDocShell& rDocShell ) : mrDocShell(rDocShell) {} // XCodeNameQuery - OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE { SolarMutexGuard aGuard; OUString sCodeName; @@ -218,7 +218,7 @@ public: } OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) - throw( uno::RuntimeException, std::exception ) + throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE { SolarMutexGuard aGuard; uno::Reference<drawing::XDrawPagesSupplier> xSupplier(mrDocShell.GetModel(), uno::UNO_QUERY_THROW); diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 55378f740876..30b32ca7c4b3 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -1385,7 +1385,7 @@ public: virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, - std::exception) + std::exception) SAL_OVERRIDE { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -1423,7 +1423,7 @@ public: // XNameAccess virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) + uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< beans::PropertyValue > aProperties; ScMacroInfo* pInfo = getInfo(); @@ -1447,25 +1447,25 @@ public: return uno::Any( aProperties ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< OUString > aSeq( 1 ); aSeq[ 0 ] = SC_EVENTACC_ONCLICK; return aSeq; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return aName == SC_EVENTACC_ONCLICK; } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw(uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::getCppuType((const uno::Sequence< beans::PropertyValue >*)0); } - virtual sal_Bool SAL_CALL hasElements() throw(uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements() throw(uno::RuntimeException, std::exception) SAL_OVERRIDE { // elements are always present (but contained property sequences may be empty) return sal_True; diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 16da29081d87..e4891fef95c4 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -41,7 +41,7 @@ private: OUString getOfficePath( const OUString& sPath ) throw ( css::uno::RuntimeException ); protected: - virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) SAL_OVERRIDE; public: ScVbaApplication( const css::uno::Reference< css::uno::XComponentContext >& m_xContext ); @@ -53,90 +53,90 @@ public: virtual SfxObjectShell* GetDocShell( const css::uno::Reference< css::frame::XModel >& xModel ) throw (css::uno::RuntimeException); // XExactName - virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XApplication - virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException, std::exception); - - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getDisplayAlerts() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getCalculation() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCalculation( ::sal_Int32 _calculation ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw ( css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDefaultFilePath( const OUString& DefaultFilePath ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getDefaultFilePath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPathSeparator() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLibraryPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTemplatesPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getDisplayAlerts() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayAlerts( sal_Bool displayAlerts ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getCalculation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCalculation( ::sal_Int32 _calculation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL getDisplayFormulaBar() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDisplayFormulaBar(::sal_Bool _displayformulabar) - throw (css::uno::RuntimeException, std::exception); - - virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStatusBar() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnableCancelKey( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception); - - virtual sal_Bool SAL_CALL getDisplayFullScreen() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayFullScreen( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getDisplayScrollBars() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayScrollBars( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getDisplayExcel4Menus() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayExcel4Menus( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception); - - virtual sal_Bool SAL_CALL getDisplayNoteIndicator() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayNoteIndicator( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getShowWindowsInTaskbar() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setShowWindowsInTaskbar( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getIteration() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setIteration( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception); - - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL wait( double time ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL GoTo( const css::uno::Any& Reference, const css::uno::Any& Scroll ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual double SAL_CALL InchesToPoints( double InchesToPoints ) throw (css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) throw (css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL International( sal_Int32 Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Workbooks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Dialogs( const css::uno::Any& DialogIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getCutCopyMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCutCopyMode( const css::uno::Any& _cutcopymode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStatusBar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStatusBar( const css::uno::Any& _statusbar ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getCursor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCursor( ::sal_Int32 _cursor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL OnKey( const OUString& Key, const css::uno::Any& Procedure ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getEnableEvents() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnableEvents( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getEnableCancelKey() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnableCancelKey( sal_Bool bEnable ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual sal_Bool SAL_CALL getDisplayFullScreen() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayFullScreen( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getDisplayScrollBars() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayScrollBars( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getDisplayExcel4Menus() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayExcel4Menus( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual sal_Bool SAL_CALL getDisplayNoteIndicator() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayNoteIndicator( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getShowWindowsInTaskbar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShowWindowsInTaskbar( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getIteration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setIteration( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL wait( double time ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL GoTo( const css::uno::Any& Reference, const css::uno::Any& Scroll ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Calculate() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL InchesToPoints( double InchesToPoints ) throw (css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL Volatile( const css::uno::Any& Volatile ) 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; + virtual css::uno::Any SAL_CALL Caller( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL GetOpenFilename( const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText, const css::uno::Any& rMultiSelect ) throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL GetSaveAsFilename( const css::uno::Any& rInitialFileName, const css::uno::Any& rFileFilter, const css::uno::Any& rFilterIndex, const css::uno::Any& rTitle, const css::uno::Any& rButtonText ) throw (css::uno::RuntimeException); - virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif /* SC_VBA_APPLICATION_HXX */ diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index d917c844db03..d0e44fe2f6ea 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.hxx @@ -42,21 +42,21 @@ public: ScVbaAssistant( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext ); virtual ~ScVbaAssistant(); // XAssistant - virtual sal_Bool SAL_CALL getOn() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setOn( sal_Bool _on ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getAnimation() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getOn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setOn( sal_Bool _on ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTop( ::sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeft( ::sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getAnimation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAnimation( ::sal_Int32 _animation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL Name( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif//SC_VBA_ASSISTANT_HXX diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index cf5d250699fa..7b4b01a234b0 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -45,12 +45,12 @@ class EnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); @@ -112,18 +112,18 @@ public: } } - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) { return mCoordinates.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mCoordinates.size(); } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, ::uno::RuntimeException, std::exception) SAL_OVERRIDE { AxesCoordinate dIndexes = mCoordinates[ Index ]; return uno::makeAny( ScVbaAxes::createAxis( mxChart, mxContext, dIndexes.second, dIndexes.first ) ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<excel::XAxis>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mCoordinates.size() > 0 ); } diff --git a/sc/source/ui/vba/vbaaxes.hxx b/sc/source/ui/vba/vbaaxes.hxx index b8a0bc1f68bc..c7aff87843d8 100644 --- a/sc/source/ui/vba/vbaaxes.hxx +++ b/sc/source/ui/vba/vbaaxes.hxx @@ -30,13 +30,13 @@ class ScVbaAxes : public ScVbaAxes_BASE public: ScVbaAxes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< ov::excel::XChart >& xChart ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::uno::RuntimeException); - virtual css::uno::Any createCollectionObject(const css::uno::Any&); + 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; + css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& aIndex2 ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject(const css::uno::Any&) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; static css::uno::Reference< ov::excel::XAxis > createAxis( const css::uno::Reference< ov::excel::XChart >& xChart, const css::uno::Reference< css::uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( css::uno::RuntimeException ); }; diff --git a/sc/source/ui/vba/vbaaxis.hxx b/sc/source/ui/vba/vbaaxis.hxx index d3fc0a54845e..c68941ba7a7b 100644 --- a/sc/source/ui/vba/vbaaxis.hxx +++ b/sc/source/ui/vba/vbaaxis.hxx @@ -41,51 +41,51 @@ class ScVbaAxis : public ScVbaAxis_BASE public: ScVbaAxis( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, sal_Int32 _nType, sal_Int32 _nGroup ); // Methods - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL getAxisTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayUnit( ::sal_Int32 DisplayUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getDisplayUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCrosses( ::sal_Int32 Crosses ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getCrosses( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCrossesAt( double CrossesAt ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getCrossesAt( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setType( ::sal_Int32 Type ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getType( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHasTitle( ::sal_Bool HasTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getHasTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMinorUnit( double MinorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getMinorUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMinorUnitIsAuto( ::sal_Bool MinorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMinorUnitIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setReversePlotOrder( ::sal_Bool ReversePlotOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getReversePlotOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMajorUnit( double MajorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getMajorUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMajorUnitIsAuto( ::sal_Bool MajorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMajorUnitIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMaximumScale( double MaximumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getMaximumScale( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMaximumScaleIsAuto( ::sal_Bool MaximumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMaximumScaleIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMinimumScale( double MinimumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getMinimumScale( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMinimumScaleIsAuto( ::sal_Bool MinimumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getMinimumScaleIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getAxisGroup( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setScaleType( ::sal_Int32 ScaleType ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getScaleType( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getHeight( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( double height ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getWidth( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( double width ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTop( double top ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::excel::XAxisTitle > SAL_CALL getAxisTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayUnit( ::sal_Int32 DisplayUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getDisplayUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCrosses( ::sal_Int32 Crosses ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getCrosses( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCrossesAt( double CrossesAt ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getCrossesAt( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setType( ::sal_Int32 Type ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getType( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHasTitle( ::sal_Bool HasTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getHasTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMinorUnit( double MinorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getMinorUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMinorUnitIsAuto( ::sal_Bool MinorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMinorUnitIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setReversePlotOrder( ::sal_Bool ReversePlotOrder ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getReversePlotOrder( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMajorUnit( double MajorUnit ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getMajorUnit( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMajorUnitIsAuto( ::sal_Bool MajorUnitIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMajorUnitIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMaximumScale( double MaximumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getMaximumScale( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMaximumScaleIsAuto( ::sal_Bool MaximumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMaximumScaleIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMinimumScale( double MinimumScale ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getMinimumScale( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMinimumScaleIsAuto( ::sal_Bool MinimumScaleIsAuto ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getMinimumScaleIsAuto( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getAxisGroup( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setScaleType( ::sal_Int32 ScaleType ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getScaleType( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getHeight( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( double height ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getWidth( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( double width ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getTop( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTop( double top ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getLeft( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeft( double left ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SC_VBA_AXIS_HXX diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx index b0cbd9e92e95..53c09443bde4 100644 --- a/sc/source/ui/vba/vbaaxistitle.hxx +++ b/sc/source/ui/vba/vbaaxistitle.hxx @@ -30,8 +30,8 @@ class ScVbaAxisTitle : public AxisTitleBase public: ScVbaAxisTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index b9fc1ce982bc..47fb520f4ca6 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -144,11 +144,11 @@ private: } ScVbaBorder(); // no impl protected: - virtual OUString getServiceImplName() + virtual OUString getServiceImplName() SAL_OVERRIDE { return OUString("ScVbaBorder"); } - virtual css::uno::Sequence<OUString> getServiceNames() + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE { static uno::Sequence< OUString > aServiceNames; if ( aServiceNames.getLength() == 0 ) @@ -162,14 +162,14 @@ public: ScVbaBorder( const uno::Reference< beans::XPropertySet > & xProps, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 lineType, ScVbaPalette& rPalette) : ScVbaBorder_Base( uno::Reference< XHelperInterface >( xProps, uno::UNO_QUERY ), xContext ), m_xProps( xProps ), m_LineType( lineType ), m_Palette( rPalette ) {} // XBorder - uno::Any SAL_CALL getColor() throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL getColor() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) return uno::makeAny( OORGBToXLRGB( aBorderLine.Color ) ); throw uno::RuntimeException("No Implementation available", uno::Reference< uno::XInterface >() ); } - void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) + void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nColor = 0; _color >>= nColor; @@ -183,7 +183,7 @@ public: throw uno::RuntimeException("No Implementation available", uno::Reference< uno::XInterface >() ); } - uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nColor = 0; XLRGBToOORGB( getColor() ) >>= nColor; @@ -203,7 +203,7 @@ public: return uno::makeAny(nIndex); } - void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) + void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nColor = 0; _colorindex >>= nColor; @@ -211,7 +211,7 @@ public: nColor = 1; setColor( OORGBToXLRGB( m_Palette.getPalette()->getByIndex( --nColor ) ) ); } - uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL getWeight() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { table::BorderLine aBorderLine; if ( getBorderLine( aBorderLine ) ) @@ -233,7 +233,7 @@ public: } throw uno::RuntimeException("Method failed", uno::Reference< uno::XInterface >() ); } - void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) + void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nWeight = 0; _weight >>= nWeight; @@ -263,12 +263,12 @@ public: throw uno::RuntimeException("Method failed", uno::Reference< uno::XInterface >() ); } - uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL getLineStyle() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // always return xlContinuous; return uno::makeAny( XlLineStyle::xlContinuous ); } - void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) + void SAL_CALL setLineStyle( const uno::Any& _linestyle ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { // Urk no choice but to silently ignore we don't support this attribute // #TODO would be nice to support the excel line styles @@ -322,11 +322,11 @@ public: { } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sizeof( supportedIndexTable ) / sizeof( supportedIndexTable[0] ); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { sal_Int32 nIndex = getTableIndex( Index ); @@ -337,11 +337,11 @@ public: } throw lang::IndexOutOfBoundsException(); } - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<excel::XBorder>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } @@ -359,12 +359,12 @@ class RangeBorderEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: RangeBorderEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index 2bddb31c6275..d1392bec14a9 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -34,7 +34,7 @@ class ScVbaPalette; class ScVbaBorders : public ScVbaBorders_BASE { // XEnumerationAccess - virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any getItemByIntIndex( const sal_Int32 nIndex ) throw (css::uno::RuntimeException) SAL_OVERRIDE; bool bRangeIsSingleCell; css::uno::Reference< css::beans::XPropertySet > m_xProps; public: @@ -42,26 +42,26 @@ public: virtual ~ScVbaBorders() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + 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 - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getLineStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getLineStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLineStyle( const css::uno::Any& _linestyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getWeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWeight( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // xxxxBASE - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SC_VBA_BORDERS_HXX diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 55c2d48252ce..e95369e1168b 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -44,22 +44,22 @@ public: virtual ~ScVbaCharacters() {} // Attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& _font ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Insert( const OUString& String ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception); + 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(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index 6192152d8180..d792ba5d389e 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -68,26 +68,26 @@ public: bool is3D() throw ( css::uno::RuntimeException ); css::uno::Reference< css::beans::XPropertySet > getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( css::script::BasicErrorException ); // Methods - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception); - virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception); - virtual void SAL_CALL Activate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& range, const css::uno::Any& PlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL Location( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLocation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLocation( ::sal_Int32 where, const css::uno::Any& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getHasTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHasTitle( ::sal_Bool bTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getHasLegend( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHasLegend( ::sal_Bool bLegend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPlotBy( ::sal_Int32 xlRowCol ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getPlotBy( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL SeriesCollection(const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getChartType() throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setChartType( ::sal_Int32 _charttype ) throw ( css::uno::RuntimeException, css::script::BasicErrorException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Activate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSourceData( const css::uno::Reference< ::ooo::vba::excel::XRange >& range, const css::uno::Any& PlotBy ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL Location( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLocation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLocation( ::sal_Int32 where, const css::uno::Any& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getHasTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHasTitle( ::sal_Bool bTitle ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getHasLegend( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHasLegend( ::sal_Bool bLegend ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPlotBy( ::sal_Int32 xlRowCol ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getPlotBy( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XChartTitle > SAL_CALL getChartTitle( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Axes( const css::uno::Any& Type, const css::uno::Any& AxisGroup ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index 018f1bc20454..e27cd6f50690 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -49,14 +49,14 @@ class ScVbaChartObject : public ChartObjectImpl_BASE css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException ); public: ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& sName ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException, std::exception ); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& sName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XChart > SAL_CALL getChart() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete() throw ( css::script::BasicErrorException, std::exception ) SAL_OVERRIDE; virtual void Activate() throw ( css::script::BasicErrorException ); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index e545df0c9325..9b6fae7c9a45 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -43,7 +43,7 @@ class ChartObjectEnumerationImpl : public EnumerationHelperImpl public: ChartObjectEnumerationImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier, const uno::Reference< XHelperInterface >& _xParent ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( _xParent, xContext, xEnumeration ), xDrawPageSupplier( _xDrawPageSupplier ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< table::XTableChart > xTableChart( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); // parent Object is sheet diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index 43f28dae54fc..d949a2356412 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -51,17 +51,17 @@ public: void removeByName(const OUString& _sChartName); // XChartObjects - virtual ::com::sun::star::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (::com::sun::star::script::BasicErrorException, std::exception); - virtual void SAL_CALL Delete( ) throw (::com::sun::star::script::BasicErrorException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL Add( double Left, double Top, double Width, double Height ) throw (::com::sun::star::script::BasicErrorException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( ) throw (::com::sun::star::script::BasicErrorException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // ChartObjects_BASE - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx index dec1b7717572..3cd35cf62390 100644 --- a/sc/source/ui/vba/vbacharttitle.hxx +++ b/sc/source/ui/vba/vbacharttitle.hxx @@ -30,8 +30,8 @@ class ScVbaChartTitle : public ChartTitleBase public: ScVbaChartTitle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& _xTitleShape ); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index 65a41b4c37c4..501bcf3f51d1 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -53,20 +53,20 @@ public: virtual ~ScVbaComment() {} // Attributes - virtual OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAuthor( const OUString& _author ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAuthor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAuthor( const OUString& _author ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Next() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL Previous() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL Text( const css::uno::Any& Text, const css::uno::Any& Start, const css::uno::Any& Overwrite ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif /* SC_VBA_COMMENT_HXX */ diff --git a/sc/source/ui/vba/vbacomments.cxx b/sc/source/ui/vba/vbacomments.cxx index 22127b5af6a0..ee965328216c 100644 --- a/sc/source/ui/vba/vbacomments.cxx +++ b/sc/source/ui/vba/vbacomments.cxx @@ -50,7 +50,7 @@ public: mxModel( xModel, uno::UNO_SET_THROW ) {} - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { return AnnotationToComment( m_xEnumeration->nextElement(), m_xContext, mxModel ); } diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx index 431409d4c54e..9f93cd25260b 100644 --- a/sc/source/ui/vba/vbacomments.hxx +++ b/sc/source/ui/vba/vbacomments.hxx @@ -41,13 +41,13 @@ public: virtual ~ScVbaComments() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + 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; // ScVbaComments_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; private: css::uno::Reference< css::frame::XModel > mxModel; diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx index bdf1e75aacbb..7003afbb13ff 100644 --- a/sc/source/ui/vba/vbadialog.hxx +++ b/sc/source/ui/vba/vbadialog.hxx @@ -33,10 +33,10 @@ public: virtual ~ScVbaDialog() {} // Methods - virtual OUString mapIndexToName( sal_Int32 nIndex ); + virtual OUString mapIndexToName( sal_Int32 nIndex ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 47caa25b4a60..e73dbf57d7b9 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/source/ui/vba/vbadialogs.hxx @@ -35,13 +35,13 @@ public: virtual ~ScVbaDialogs() {} // XCollection - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDialogs virtual void SAL_CALL Dummy() throw (css::uno::RuntimeException); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif /* SC_VBA_DIALOGS_HXX */ diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 87e854df89ad..e48e25764714 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -127,28 +127,28 @@ public : void stopControllerListening( const uno::Reference< frame::XController >& rxController ); // XTopWindowListener - virtual void SAL_CALL windowOpened( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL windowClosing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL windowClosed( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL windowMinimized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL windowNormalized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL windowActivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL windowDeactivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL windowOpened( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowClosing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowClosed( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowMinimized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowNormalized( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowActivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowDeactivated( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XWindowListener - virtual void SAL_CALL windowResized( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL windowMoved( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL windowShown( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL windowHidden( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL windowResized( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowMoved( const awt::WindowEvent& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowShown( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowHidden( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XBorderResizeListener - virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL borderWidthsChanged( const uno::Reference< uno::XInterface >& rSource, const frame::BorderWidths& aNewSize ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChangesListener - virtual void SAL_CALL changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL changesOccurred( const util::ChangesEvent& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const lang::EventObject& rEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** Starts listening to the document model. */ diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 284eb782f250..16d226041a55 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -37,13 +37,13 @@ public: const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~ScVbaEventsHelper(); - virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException); - virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException); - virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException); + virtual bool implPrepareEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Any > implBuildArgumentList( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; + virtual void implPostProcessEvent( EventQueue& rEventQueue, const EventHandlerInfo& rInfo, bool bCancel ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString implGetDocumentModuleName( const EventHandlerInfo& rInfo, const css::uno::Sequence< css::uno::Any >& rArgs ) const throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; private: /** Checks if selection has been changed compared to selection of last call. diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index 8725f48709df..e0ebb059aa31 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -46,32 +46,32 @@ public: virtual ~ScVbaFont();// {} // Attributes - virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStandardFontSize() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStandardFont() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStandardFont( const css::uno::Any& _standardfont ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getFontStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFontStyle( const css::uno::Any& _fontstyle ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) ; - virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException, std::exception) ; + virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStandardFontSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStandardFontSize( const css::uno::Any& _standardfontsize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStandardFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStandardFont( const css::uno::Any& _standardfont ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getFontStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFontStyle( const css::uno::Any& _fontstyle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual css::uno::Any SAL_CALL getOutlineFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setOutlineFont( const css::uno::Any& _outlinefont ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; diff --git a/sc/source/ui/vba/vbaformatcondition.hxx b/sc/source/ui/vba/vbaformatcondition.hxx index 35e8c7ede237..303db6837436 100644 --- a/sc/source/ui/vba/vbaformatcondition.hxx +++ b/sc/source/ui/vba/vbaformatcondition.hxx @@ -45,19 +45,19 @@ public: static css::sheet::ConditionOperator retrieveAPIType(sal_Int32 _nVBAType, const css::uno::Reference< css::sheet::XSheetCondition >& _xSheetCondition ) throw( css::script::BasicErrorException ); //Methods - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Modify( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 Operator( sal_Bool ) throw (css::script::BasicErrorException); - virtual ::sal_Int32 SAL_CALL Operator( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ); - virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException ); - virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Modify( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL Type( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 Operator( sal_Bool ) throw (css::script::BasicErrorException) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL Operator( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual void setFormula1( const css::uno::Any& _aFormula1) throw ( css::script::BasicErrorException ) SAL_OVERRIDE; + virtual void setFormula2( const css::uno::Any& _aFormula2) throw ( css::script::BasicErrorException ) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::excel::XInterior > SAL_CALL Interior( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::excel::XFont > SAL_CALL Font( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index ef8dd1279dca..4aff6b71cd22 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -95,12 +95,12 @@ class EnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference<excel::XRange >& xRange, const uno::Reference<uno::XComponentContext >& xContext, const uno::Reference<excel::XStyles >& xStyles, const uno::Reference< excel::XFormatConditions >& xCollection, const uno::Reference<beans::XPropertySet >& xProps ) : m_xIndexAccess( xIndexAccess ), m_xParentRange( xRange ), m_xContext( xContext ), m_xStyles( xStyles ), m_xParentCollection( xCollection ), m_xProps( xProps ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) return xSheetConditionToFormatCondition( uno::Reference< XHelperInterface >( m_xParentRange, uno::UNO_QUERY_THROW ), m_xContext, m_xStyles, m_xParentCollection, m_xProps, m_xIndexAccess->getByIndex( nIndex++ ) ); diff --git a/sc/source/ui/vba/vbaformatconditions.hxx b/sc/source/ui/vba/vbaformatconditions.hxx index d3cc2feae4af..22bc0a99d62b 100644 --- a/sc/source/ui/vba/vbaformatconditions.hxx +++ b/sc/source/ui/vba/vbaformatconditions.hxx @@ -55,15 +55,15 @@ public: void removeFormatCondition( const OUString& _sStyleName, sal_Bool _bRemoveStyle) throw ( css::script::BasicErrorException ); css::uno::Reference< css::sheet::XSheetConditionalEntries > getSheetConditionalEntries() const { return mxSheetConditionalEntries; } // XFormatConditions - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XFormatCondition > SAL_CALL Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XFormatCondition > SAL_CALL Add( ::sal_Int32 Type, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - virtual css::uno::Any createCollectionObject(const css::uno::Any&); + 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; + virtual css::uno::Any createCollectionObject(const css::uno::Any&) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #ifdef _MSC_VER diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index f6ced397a255..11b5e0cab891 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -50,40 +50,40 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc virtual ~ScVbaGlobals(); // XGlobals - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Calculate( ) throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getActiveWorkbook() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWindow > SAL_CALL getActiveWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::XAssistant > SAL_CALL getAssistant() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Calculate( ) throw (::com::sun::star::script::BasicErrorException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getActiveCell() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWorkbook > SAL_CALL getThisWorkbook() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any& RowIndex, const css::uno::Any& ColumnIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getDebug() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL WorkSheets(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL WorkBooks(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL WorksheetFunction( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::excel::XRange > SAL_CALL Rows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Intersect( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Union( const css::uno::Reference< ov::excel::XRange >& Arg1, const css::uno::Reference< ov::excel::XRange >& Arg2, const css::uno::Any& Arg3, const css::uno::Any& Arg4, const css::uno::Any& Arg5, const css::uno::Any& Arg6, const css::uno::Any& Arg7, const css::uno::Any& Arg8, const css::uno::Any& Arg9, const css::uno::Any& Arg10, const css::uno::Any& Arg11, const css::uno::Any& Arg12, const css::uno::Any& Arg13, const css::uno::Any& Arg14, const css::uno::Any& Arg15, const css::uno::Any& Arg16, const css::uno::Any& Arg17, const css::uno::Any& Arg18, const css::uno::Any& Arg19, const css::uno::Any& Arg20, const css::uno::Any& Arg21, const css::uno::Any& Arg22, const css::uno::Any& Arg23, const css::uno::Any& Arg24, const css::uno::Any& Arg25, const css::uno::Any& Arg26, const css::uno::Any& Arg27, const css::uno::Any& Arg28, const css::uno::Any& Arg29, const css::uno::Any& Arg30 ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XApplication > SAL_CALL getExcel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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); + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/vba/vbahyperlink.hxx b/sc/source/ui/vba/vbahyperlink.hxx index dc753eef2444..509cb50d913c 100644 --- a/sc/source/ui/vba/vbahyperlink.hxx +++ b/sc/source/ui/vba/vbahyperlink.hxx @@ -45,19 +45,19 @@ public: virtual ~ScVbaHyperlink(); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAddress() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAddress( const OUString& rAddress ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAddress() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAddress( const OUString& rAddress ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSubAddress() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSubAddress( const OUString& rSubAddress ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getScreenTip() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setScreenTip( const OUString& rScreenTip ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTextToDisplay() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTextToDisplay( const OUString& rTextToDisplay ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::msforms::XShape > SAL_CALL getShape() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index c5c02d516e59..68185d8ed7f8 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -118,12 +118,12 @@ public: void insertHyperlink( const uno::Reference< excel::XHyperlink >& rxHlink ) throw (uno::RuntimeException); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception); - virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception); + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; private: typedef ::std::vector< uno::Reference< excel::XHyperlink > > HyperlinkVector; diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx index 641dfac13a8a..baeca71f49a6 100644 --- a/sc/source/ui/vba/vbahyperlinks.hxx +++ b/sc/source/ui/vba/vbahyperlinks.hxx @@ -117,18 +117,18 @@ public: virtual css::uno::Reference< ov::excel::XHyperlink > SAL_CALL Add( const css::uno::Any& rAnchor, const css::uno::Any& rAddress, const css::uno::Any& rSubAddress, const css::uno::Any& rScreenTip, const css::uno::Any& rTextToDisplay ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; // ScVbaCollectionBase - virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) SAL_OVERRIDE; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE diff --git a/sc/source/ui/vba/vbainterior.hxx b/sc/source/ui/vba/vbainterior.hxx index 65aaa9064672..8f9f66d9c463 100644 --- a/sc/source/ui/vba/vbainterior.hxx +++ b/sc/source/ui/vba/vbainterior.hxx @@ -61,20 +61,20 @@ public: virtual ~ScVbaInterior(){} - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) ; + virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual css::uno::Any SAL_CALL getColorIndex() throw ( css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw ( css::uno::RuntimeException, std::exception ); - virtual css::uno::Any SAL_CALL getPattern() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPattern( const css::uno::Any& _pattern ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getPatternColor() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getColorIndex() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPattern() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPattern( const css::uno::Any& _pattern ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPatternColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPatternColor( const css::uno::Any& _patterncolor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPatternColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPatternColorIndex( const css::uno::Any& _patterncolorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/vba/vbamenu.hxx b/sc/source/ui/vba/vbamenu.hxx index 60334764d228..42d7dc0c4ee1 100644 --- a/sc/source/ui/vba/vbamenu.hxx +++ b/sc/source/ui/vba/vbamenu.hxx @@ -23,15 +23,15 @@ private: public: ScVbaMenu( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException ); - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL MenuItems( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif//SC_VBA_MENU_HXX diff --git a/sc/source/ui/vba/vbamenubar.hxx b/sc/source/ui/vba/vbamenubar.hxx index 3630a3dcbd71..41cc2fa808c1 100644 --- a/sc/source/ui/vba/vbamenubar.hxx +++ b/sc/source/ui/vba/vbamenubar.hxx @@ -23,11 +23,11 @@ private: public: ScVbaMenuBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBar >& xCommandBar ) throw( css::uno::RuntimeException ); - virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Menus( const css::uno::Any& aIndex ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif//SC_VBA_MENUBAR_HXX diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 1a7cdae95bf2..8bb6a2fe9dc0 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -25,11 +25,11 @@ public: MenuBarEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) + virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { // FIXME: should be add menubar if( hasMoreElements() ) diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx index c64c50760af6..a8d3b55dd8cc 100644 --- a/sc/source/ui/vba/vbamenubars.hxx +++ b/sc/source/ui/vba/vbamenubars.hxx @@ -29,15 +29,15 @@ public: virtual ~ScVbaMenuBars(); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + 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; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException); + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& aIndex, const css::uno::Any& /*aIndex2*/ ) throw( css::uno::RuntimeException) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif//SC_VBA_MENUBARS_HXX diff --git a/sc/source/ui/vba/vbamenuitem.hxx b/sc/source/ui/vba/vbamenuitem.hxx index 74dc7e23cc79..c3c3ee295720 100644 --- a/sc/source/ui/vba/vbamenuitem.hxx +++ b/sc/source/ui/vba/vbamenuitem.hxx @@ -23,16 +23,16 @@ private: public: ScVbaMenuItem( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, const css::uno::Reference< ov::XCommandBarControl >& xCommandBarControl ) throw( css::uno::RuntimeException ); - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCaption( const OUString& _caption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setOnAction( const OUString& _onaction ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif//SC_VBA_MENUITEM_HXX diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index eb464e9bedce..20a13b98625e 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -26,11 +26,11 @@ public: MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) + virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { // FIXME: should be add menu if( hasMoreElements() ) diff --git a/sc/source/ui/vba/vbamenuitems.hxx b/sc/source/ui/vba/vbamenuitems.hxx index 5eee79e2e780..f50dd93301f5 100644 --- a/sc/source/ui/vba/vbamenuitems.hxx +++ b/sc/source/ui/vba/vbamenuitems.hxx @@ -26,17 +26,17 @@ public: ScVbaMenuItems( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + 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; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // Methods - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XMenuItem > SAL_CALL Add( const OUString& Caption, const css::uno::Any& OnAction, const css::uno::Any& ShortcutKey, const css::uno::Any& Before, const css::uno::Any& Restore, const css::uno::Any& StatusBar, const css::uno::Any& HelpFile, const css::uno::Any& HelpContextID ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif//SC_VBA_MENUITEMS_HXX diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index 59c42aa3ba85..a0b663838bba 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -25,11 +25,11 @@ public: MenuEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) + virtual sal_Bool SAL_CALL hasMoreElements() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE { return m_xEnumeration->hasMoreElements(); } - virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual uno::Any SAL_CALL nextElement() throw ( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { // FIXME: should be add menu if( hasMoreElements() ) diff --git a/sc/source/ui/vba/vbamenus.hxx b/sc/source/ui/vba/vbamenus.hxx index c767232bf748..b58e70066a2e 100644 --- a/sc/source/ui/vba/vbamenus.hxx +++ b/sc/source/ui/vba/vbamenus.hxx @@ -26,17 +26,17 @@ public: ScVbaMenus( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XCommandBarControls >& xCommandBarControls ) throw( css::uno::RuntimeException ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + 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; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // Methods - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index, const css::uno::Any& /*Index2*/ ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XMenu > SAL_CALL Add( const OUString& Caption, const css::uno::Any& Before, const css::uno::Any& Restore ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif//SC_VBA_MENUS_HXX diff --git a/sc/source/ui/vba/vbaname.hxx b/sc/source/ui/vba/vbaname.hxx index 5acbbed75eb9..7d21401e2fb0 100644 --- a/sc/source/ui/vba/vbaname.hxx +++ b/sc/source/ui/vba/vbaname.hxx @@ -45,31 +45,31 @@ public: virtual ~ScVbaName(); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNameLocal( const OUString &rName ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( const OUString &rValue ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getNameLocal() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNameLocal( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const OUString &rValue ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getRefersTo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRefersTo( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getRefersToLocal() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRefersToLocal( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getRefersToR1C1() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRefersToR1C1( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getRefersToR1C1Local() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRefersToR1C1Local( const OUString &rRefersTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getRefersToRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRefersToRange( const css::uno::Reference< ov::excel::XRange > xRange ) throw (css::uno::RuntimeException); // Methods - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif /* SC_VBA_NAME_HXX */ diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index cbace3bb1450..94460328b676 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -47,7 +47,7 @@ class NamesEnumeration : public EnumerationHelperImpl public: NamesEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel , const uno::Reference< sheet::XNamedRanges >& xNames ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ), m_xParent( xParent ), m_xNames( xNames ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< sheet::XNamedRange > xNamed( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return uno::makeAny( uno::Reference< excel::XName > ( new ScVbaName( m_xParent, m_xContext, xNamed ,m_xNames , m_xModel ) ) ); diff --git a/sc/source/ui/vba/vbanames.hxx b/sc/source/ui/vba/vbanames.hxx index 5a7d90654362..c47f322e3805 100644 --- a/sc/source/ui/vba/vbanames.hxx +++ b/sc/source/ui/vba/vbanames.hxx @@ -47,8 +47,8 @@ public: virtual ~ScVbaNames(); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + 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; // Methods virtual css::uno::Any SAL_CALL Add( const css::uno::Any& aName , @@ -63,13 +63,13 @@ public: const css::uno::Any& aRefersToR1C1, const css::uno::Any& aRefersToR1C1Local ) throw (css::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // ScVbaNames_BASE - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif /* SC_VBA_NAMES_HXX */ diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index e999362baf1f..2965271c2c87 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -32,30 +32,30 @@ class ScVbaOLEObject : public OLEObjectImpl_BASE { protected: css::uno::Reference< css::drawing::XControlShape > m_xControlShape; - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; css::uno::Reference< ov::msforms::XControl> m_xControl; public: ScVbaOLEObject( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, css::uno::Reference< css::drawing::XControlShape > xControlShape ); // XOLEObject Attributes - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getObject() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getEnabled() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnabled( ::sal_Bool _enabled ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( ::sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLinkedCell() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLinkedCell( const OUString& _linkedcell ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif //SC_VBA_OLEOBJECT_HXX diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index eff6730f0f95..b5261fd12b21 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -46,12 +46,12 @@ public: } } - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return vObjects.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -59,12 +59,12 @@ public: } // Methods XElementAcess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<drawing::XControlShape>::get(); } - virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( getCount() > 0 ); } @@ -81,12 +81,12 @@ class EnumWrapper : public EnumerationHelper_BASE public: EnumWrapper( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xParent( xParent ), m_xContext( xContext), m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) { diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx index 074c572c4155..f826aff02d66 100644 --- a/sc/source/ui/vba/vbaoleobjects.hxx +++ b/sc/source/ui/vba/vbaoleobjects.hxx @@ -30,19 +30,19 @@ typedef CollTestImplHelper< ov::excel::XOLEObjects > OLEObjectsImpl_BASE; class ScVbaOLEObjects : public OLEObjectsImpl_BASE { protected: - virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; public: ScVbaOLEObjects( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + 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; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; }; #endif //SC_VBA_OLEOBJECTS_HXX diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx index 0c6ba22251a0..88983af5d0d0 100644 --- a/sc/source/ui/vba/vbaoutline.hxx +++ b/sc/source/ui/vba/vbaoutline.hxx @@ -36,10 +36,10 @@ public: {} virtual ~ScVbaOutline(){} - virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException, std::exception) ; + virtual void SAL_CALL ShowLevels( const css::uno::Any& RowLevels, const css::uno::Any& ColumnLevels ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index aa33b2191469..40e16c2f1383 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -70,8 +70,8 @@ public: virtual ~ScVbaHPageBreak(){} // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; //VPageBreak @@ -88,8 +88,8 @@ public: virtual ~ScVbaVPageBreak(); // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index 237d3a05af29..abe6c7cdb8ff 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -75,15 +75,15 @@ public: uno::Any Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception); - virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception); - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { if( m_bColumn ) return cppu::UnoType<excel::XVPageBreak>::get(); return cppu::UnoType<excel::XHPageBreak>::get(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } @@ -186,12 +186,12 @@ class RangePageBreaksEnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: RangePageBreaksEnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess ) : m_xIndexAccess( xIndexAccess ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) return m_xIndexAccess->getByIndex( nIndex++ ); diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index 487beb31a4e2..f77355a1195c 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.hxx @@ -47,16 +47,16 @@ public: virtual ~ScVbaHPageBreaks(){} // XHPageBreaks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - virtual css::uno::Any createCollectionObject(const css::uno::Any&); + 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; + virtual css::uno::Any createCollectionObject(const css::uno::Any&) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; //VPageBreaks @@ -74,16 +74,16 @@ public: virtual ~ScVbaVPageBreaks(); // XVPageBreaks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception ); + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException ); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw ( css::uno::RuntimeException ); - virtual css::uno::Any createCollectionObject( const css::uno::Any& ); + 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; + virtual css::uno::Any createCollectionObject( const css::uno::Any& ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index 3f1da94a169e..c16ba0075168 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.hxx @@ -42,52 +42,52 @@ public: virtual ~ScVbaPageSetup(){} // Attribute - virtual OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException); - void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException); - double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException); - void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getFitToPagesTall() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getFitToPagesWide() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getOrder() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setOrder( sal_Int32 order ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getFirstPageNumber() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFirstPageNumber( sal_Int32 firstPageNumber ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getCenterVertically() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCenterVertically( sal_Bool centerVertically ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getCenterHorizontally() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCenterHorizontally( sal_Bool centerHorizontally ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getPrintHeadings() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getPrintArea() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPrintArea( const OUString& rAreas ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException) SAL_OVERRIDE; + void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException) SAL_OVERRIDE; + void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getFitToPagesTall() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFitToPagesTall( const css::uno::Any& fitToPagesTall ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getFitToPagesWide() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFitToPagesWide( const css::uno::Any& fitToPagesWide ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setZoom( const css::uno::Any& zoom ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLeftHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeftHeader( const OUString& leftHeader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getCenterHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCenterHeader( const OUString& centerHeader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getRightHeader() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRightHeader( const OUString& rightHeader ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getLeftFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeftFooter( const OUString& leftFooter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getCenterFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCenterFooter( const OUString& centerFooter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getRightFooter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRightFooter( const OUString& rightFooter ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getOrder() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setOrder( sal_Int32 order ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getFirstPageNumber() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFirstPageNumber( sal_Int32 firstPageNumber ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getCenterVertically() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCenterVertically( sal_Bool centerVertically ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getCenterHorizontally() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCenterHorizontally( sal_Bool centerHorizontally ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getPrintHeadings() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPrintHeadings( sal_Bool printHeadings ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::sal_Bool SAL_CALL getPrintGridlines() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPrintGridlines( ::sal_Bool _printgridlines ) throw (css::uno::RuntimeException, std::exception); - virtual ::rtl::OUString SAL_CALL getPrintTitleRows() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) throw (css::uno::RuntimeException, std::exception); - virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getPaperSize() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getPrintGridlines() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPrintGridlines( ::sal_Bool _printgridlines ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::rtl::OUString SAL_CALL getPrintTitleRows() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getPaperSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index 11711defe723..ea792ce4d07a 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -54,12 +54,12 @@ public: DefaultPalette(){} // Methods XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sizeof(spnDefColorTable8) / sizeof(spnDefColorTable8[0]); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -67,11 +67,11 @@ public: } // Methods XElementAcess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::getCppuType( (sal_Int32*)0 ); } - virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx index 6629d521c798..48672ecc8966 100644 --- a/sc/source/ui/vba/vbapane.hxx +++ b/sc/source/ui/vba/vbapane.hxx @@ -38,15 +38,15 @@ public: css::uno::Reference< css::sheet::XViewPane > getViewPane() const { return m_xViewPane; } // XPane attributes - virtual sal_Int32 SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setScrollColumn( sal_Int32 _scrollcolumn ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setScrollRow( sal_Int32 _scrollrow ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setScrollColumn( sal_Int32 _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setScrollRow( sal_Int32 _scrollrow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPane methods - 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 ) throw (css::uno::RuntimeException, std::exception); - 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 ) throw (css::uno::RuntimeException, std::exception); + 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 ) throw (css::uno::RuntimeException, std::exception) SAL_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 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx index 29d59c41ba10..475fba8166c3 100644 --- a/sc/source/ui/vba/vbapivotcache.hxx +++ b/sc/source/ui/vba/vbapivotcache.hxx @@ -33,10 +33,10 @@ class ScVbaPivotCache : public PivotCacheImpl_BASE public: ScVbaPivotCache( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); - virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Refresh() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SC_VBA_PIVOTCACHE_HXX diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx index 574a0db9149b..2bb9bee91eba 100644 --- a/sc/source/ui/vba/vbapivottable.hxx +++ b/sc/source/ui/vba/vbapivottable.hxx @@ -32,10 +32,10 @@ class ScVbaPivotTable : public PivotTableImpl_BASE css::uno::Reference< css::sheet::XDataPilotTable > m_xTable; public: ScVbaPivotTable( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XDataPilotTable >& xTable ); - virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::excel::XPivotCache > SAL_CALL PivotCache( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SC_VBA_PIVOTTABLE_HXX diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index 1e283868fde5..1af9df7e6060 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -36,7 +36,7 @@ class PivotTableEnumeration : public EnumerationHelperImpl public: PivotTableEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { return DataPilotToPivotTable( m_xEnumeration->nextElement(), m_xContext ); } diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index 1baa3ef01a76..f71997899460 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -34,23 +34,23 @@ typedef CollTestImplHelper< ov::excel::XPivotTables > ScVbaPivotTables_BASE; class ScVbaPivotTables : public ScVbaPivotTables_BASE { - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; public: ScVbaPivotTables( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xIndexAccess ); virtual ~ScVbaPivotTables() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + 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 - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; - virtual OUString getServiceImplName(); + virtual OUString getServiceImplName() SAL_OVERRIDE; }; diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 648d23400c63..78224e34256f 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -299,8 +299,8 @@ class SingleRangeEnumeration : public EnumerationHelper_BASE public: SingleRangeEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ) throw ( uno::RuntimeException ) : m_xParent( xParent ), m_xRange( xRange ), mxContext( xContext ), bHasMore( true ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) { return bHasMore; } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return bHasMore; } + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !bHasMore ) throw container::NoSuchElementException(); @@ -323,19 +323,19 @@ private: public: SingleRangeIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< table::XCellRange >& xRange ):mxParent( xParent ), m_xRange( xRange ), mxContext( xContext ) {} // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount() throw (::uno::RuntimeException, std::exception) { return 1; } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount() throw (::uno::RuntimeException, std::exception) SAL_OVERRIDE { return 1; } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index != 0 ) throw lang::IndexOutOfBoundsException(); return uno::makeAny( m_xRange ); } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception){ return cppu::UnoType<table::XCellRange>::get(); } + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<table::XCellRange>::get(); } - virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) { return sal_True; } + virtual ::sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sal_True; } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) { return new SingleRangeEnumeration( mxParent, mxContext, m_xRange ); } + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new SingleRangeEnumeration( mxParent, mxContext, m_xRange ); } }; @@ -348,7 +348,7 @@ class RangesEnumerationImpl : public EnumerationHelperImpl public: RangesEnumerationImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, bool bIsRows, bool bIsColumns ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { return lcl_makeRange( m_xParent, m_xContext, m_xEnumeration->nextElement(), mbIsRows, mbIsColumns ); } @@ -363,16 +363,16 @@ public: ScVbaRangeAreas( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XIndexAccess >& xIndexAccess, bool bIsRows, bool bIsColumns ) : ScVbaCollectionBaseImpl( xParent, xContext, xIndexAccess ), mbIsRows( bIsRows ), mbIsColumns( bIsColumns ) {} // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException); + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration() throw (uno::RuntimeException) SAL_OVERRIDE; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException){ return cppu::UnoType<excel::XRange>::get(); } + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException) SAL_OVERRIDE { return cppu::UnoType<excel::XRange>::get(); } - virtual uno::Any createCollectionObject( const uno::Any& aSource ); + virtual uno::Any createCollectionObject( const uno::Any& aSource ) SAL_OVERRIDE; - virtual OUString getServiceImplName() { return OUString(); } + virtual OUString getServiceImplName() SAL_OVERRIDE { return OUString(); } - virtual uno::Sequence< OUString > getServiceNames() { return uno::Sequence< OUString >(); } + virtual uno::Sequence< OUString > getServiceNames() SAL_OVERRIDE { return uno::Sequence< OUString >(); } }; @@ -632,9 +632,9 @@ public: { } - virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception){ return mCurElem < mMaxElems; } + virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) SAL_OVERRIDE { return mCurElem < mMaxElems; } - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -682,9 +682,9 @@ public: } m_it = m_CellPositions.begin(); } - virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception){ return m_it != m_CellPositions.end(); } + virtual ::sal_Bool SAL_CALL hasMoreElements() throw (::uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_it != m_CellPositions.end(); } - virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -719,8 +719,8 @@ protected: uno::TypeClass mTypeClass; public: CellValueSetter( const uno::Any& aValue ); - virtual bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ); - virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ); + virtual bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE; + virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE; }; @@ -815,9 +815,9 @@ protected: uno::TypeClass mTypeClass; public: CellValueGetter() {} - virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ); - virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue ); - const uno::Any& getValue() const { return maValue; } + virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE; + virtual void processValue( sal_Int32 x, sal_Int32 y, const uno::Any& aValue ) SAL_OVERRIDE; + const uno::Any& getValue() const SAL_OVERRIDE { return maValue; } }; @@ -885,7 +885,7 @@ private: public: CellFormulaValueSetter( const uno::Any& aValue, ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ):CellValueSetter( aValue ), m_pDoc( pDoc ), m_eGrammar( eGram ){} protected: - bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) + bool processValue( const uno::Any& aValue, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE { OUString sFormula; double aDblValue = 0.0; @@ -934,7 +934,7 @@ private: formula::FormulaGrammar::Grammar m_eGrammar; public: CellFormulaValueGetter(ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram ) : CellValueGetter( ), m_pDoc( pDoc ), m_eGrammar( eGram ) {} - virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) + virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE { uno::Any aValue; aValue <<= xCell->getFormula(); @@ -983,7 +983,7 @@ public: aMatrix[index].realloc( nColCount ); maValue <<= aMatrix; } - void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) + void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE { mValueGetter.visitNode( x, y, xCell ); @@ -1006,7 +1006,7 @@ public: aValue >>= aMatrix; nColCount = aMatrix.getLength(); } - virtual void visitNode( sal_Int32 /*x*/, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) + virtual void visitNode( sal_Int32 /*x*/, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE { if ( y < nColCount ) mCellValueSetter.processValue( aMatrix[ y ], xCell ); @@ -1031,7 +1031,7 @@ public: nColCount = aMatrix[0].getLength(); } - virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) + virtual void visitNode( sal_Int32 x, sal_Int32 y, const uno::Reference< table::XCell >& xCell ) SAL_OVERRIDE { if ( x < nRowCount && y < nColCount ) mCellValueSetter.processValue( aMatrix[ x ][ y ], xCell ); @@ -1056,7 +1056,7 @@ class RangeValueProcessor : public RangeProcessor public: RangeValueProcessor( const uno::Any& rVal ):m_aVal( rVal ) {} virtual ~RangeValueProcessor() {} - virtual void process( const uno::Reference< excel::XRange >& xRange ) + virtual void process( const uno::Reference< excel::XRange >& xRange ) SAL_OVERRIDE { xRange->setValue( m_aVal ); } @@ -1068,7 +1068,7 @@ class RangeFormulaProcessor : public RangeProcessor public: RangeFormulaProcessor( const uno::Any& rVal ):m_aVal( rVal ) {} virtual ~RangeFormulaProcessor() {} - virtual void process( const uno::Reference< excel::XRange >& xRange ) + virtual void process( const uno::Reference< excel::XRange >& xRange ) SAL_OVERRIDE { xRange->setFormula( m_aVal ); } @@ -1080,7 +1080,7 @@ class RangeCountProcessor : public RangeProcessor public: RangeCountProcessor():nCount(0){} virtual ~RangeCountProcessor() {} - virtual void process( const uno::Reference< excel::XRange >& xRange ) + virtual void process( const uno::Reference< excel::XRange >& xRange ) SAL_OVERRIDE { nCount = nCount + xRange->getCount(); } diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 0aab60a7af2e..4059a186c883 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -117,7 +117,7 @@ class ScVbaRange : public ScVbaRange_BASE void fireChangeEvent(); protected: - virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ); + virtual ScCellRangesBase* getCellRangesBase() throw ( css::uno::RuntimeException ) SAL_OVERRIDE; virtual SfxItemSet* getCurrentDataSet( ) throw ( css::uno::RuntimeException ); public: ScVbaRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange, bool bIsRows = false, bool bIsColumns = false ) throw ( css::lang::IllegalArgumentException ); @@ -137,7 +137,7 @@ public: static const ScRangeList& getScRangeList( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); virtual ~ScVbaRange(); - virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() { return this; } + virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() SAL_OVERRIDE { return this; } bool isSingleCellRange(); static css::uno::Reference< ov::excel::XRange > getRangeObjectForName( @@ -152,135 +152,135 @@ public: const css::uno::Any &nRowIndex, const css::uno::Any &nColumnIndex ) throw(css::uno::RuntimeException); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( const css::uno::Any& aValue ) throw ( css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFormula( const css::uno::Any& rFormula ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getFormulaArray() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFormulaArray(const css::uno::Any& rFormula) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getFormulaR1C1() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFormulaR1C1( const css::uno::Any &rFormula ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getRow() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getColumn() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& aValue ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getFormula() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormula( const css::uno::Any& rFormula ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getFormulaArray() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormulaArray(const css::uno::Any& rFormula) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getFormulaR1C1() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormulaR1C1( const css::uno::Any &rFormula ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; using ScVbaRange_BASE::setNumberFormat; - virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) throw ( css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getNumberFormat() throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual void SAL_CALL setMergeCells( const css::uno::Any& bMerge ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getMergeCells() throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual void SAL_CALL setWrapText( const css::uno::Any& bIsWrapped ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getWrapText() throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireRow() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireColumn() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL getComment() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getHidden() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getColumnWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColumnWidth( const css::uno::Any& _columnwidth ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL setNumberFormat( const css::uno::Any& rNumberFormat ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getNumberFormat() throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL setMergeCells( const css::uno::Any& bMerge ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getMergeCells() throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL setWrapText( const css::uno::Any& bIsWrapped ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getWrapText() throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getEntireColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL getComment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getHidden() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHidden( const css::uno::Any& _hidden ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getColumnWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColumnWidth( const css::uno::Any& _columnwidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getRowHeight() - throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRowHeight( const css::uno::Any& _rowheight ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRowHeight( const css::uno::Any& _rowheight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getHeight() - throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception); - - virtual css::uno::Reference< ov::excel::XName > SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getWorksheet() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getPageBreak() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XValidation > SAL_CALL getValidation() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getPrefixCharacter() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getShowDetail() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual css::uno::Reference< ov::excel::XName > SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getWorksheet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPageBreak() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPageBreak( const css::uno::Any& _pagebreak ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XValidation > SAL_CALL getValidation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPrefixCharacter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getShowDetail() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShowDetail(const css::uno::Any& aShowDetail) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods bool IsRows() const { return mbIsRows; } bool IsColumns() const { return mbIsColumns; } - virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Clear() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ClearComments() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ClearContents() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ClearFormats() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL HasFormula() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL FillLeft() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL FillRight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL FillUp() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL FillDown() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::excel::XComment > SAL_CALL AddComment( const css::uno::Any& Text ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Clear() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClearComments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClearContents() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClearFormats() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL HasFormula() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL FillLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL FillRight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL FillUp() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL FillDown() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Offset( const css::uno::Any &nRowOffset, const css::uno::Any &nColOffset ) - throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentRegion() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL CurrentArray() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL Characters( const css::uno::Any& nIndex, const css::uno::Any& nCount ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL Address( const css::uno::Any& RowAbsolute, const css::uno::Any& ColumnAbsolute, const css::uno::Any& ReferenceStyle, const css::uno::Any& External, const css::uno::Any& RelativeTo ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) - throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows( const css::uno::Any& nIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any &nIndex ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Copy( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Cut( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows( const css::uno::Any& nIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns( const css::uno::Any &nIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Copy( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Cut( const css::uno::Any& Destination ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Resize( const css::uno::Any& RowSize, const css::uno::Any& ColumnSize ) - throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() throw ( css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) ; - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL Font() throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XInterior > SAL_CALL Interior( ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE ; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< ov::excel::XRange > Range( const css::uno::Any &Cell1, const css::uno::Any &Cell2, bool bForceUseInpuRangeTab ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getCellRange( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; static css::uno::Any getCellRange( const css::uno::Reference< ov::excel::XRange >& rxRange ) throw (css::uno::RuntimeException); - virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod, const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete( const css::uno::Any& Shift ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) throw ( css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL PasteSpecial( const css::uno::Any& Paste, const css::uno::Any& Operation, const css::uno::Any& SkipBlanks, const css::uno::Any& Transpose ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL Replace( const OUString& What, const OUString& Replacement, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat, const css::uno::Any& ReplaceFormat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Find( const css::uno::Any& What, const css::uno::Any& After, const css::uno::Any& LookIn, const css::uno::Any& LookAt, const css::uno::Any& SearchOrder, const css::uno::Any& SearchDirection, const css::uno::Any& MatchCase, const css::uno::Any& MatchByte, const css::uno::Any& SearchFormat ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Sort( const css::uno::Any& Key1, const css::uno::Any& Order1, const css::uno::Any& Key2, const css::uno::Any& Type, const css::uno::Any& Order2, const css::uno::Any& Key3, const css::uno::Any& Order3, const css::uno::Any& Header, const css::uno::Any& OrderCustom, const css::uno::Any& MatchCase, const css::uno::Any& Orientation, const css::uno::Any& SortMethod, const css::uno::Any& DataOption1, const css::uno::Any& DataOption2, const css::uno::Any& DataOption3 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL End( ::sal_Int32 Direction ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( const css::uno::Any& Shift ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Areas( const css::uno::Any& ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Borders( const css::uno::Any& ) throw ( css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL BorderAround( const css::uno::Any& LineStyle, - const css::uno::Any& Weight, const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + const css::uno::Any& Weight, const css::uno::Any& ColorIndex, const css::uno::Any& Color ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL AutoFilter( const css::uno::Any& Field, const css::uno::Any& Criteria1, const css::uno::Any& Operator, const css::uno::Any& Criteria2, const css::uno::Any& VisibleDropDown ) - throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Autofit() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) throw (css::uno::RuntimeException, std::exception) ; - void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL AutoOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const css::uno::Any& row, const css::uno::Any& column ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ClearOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Ungroup( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Group( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Merge( const css::uno::Any& Across ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL UnMerge( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Next() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Previous() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL RemoveSubtotal( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL MergeArea() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Subtotal( ::sal_Int32 GroupBy, ::sal_Int32 Function, const css::uno::Sequence< ::sal_Int32 >& TotalList, const css::uno::Any& Replace, const css::uno::Any& PageBreaks, const css::uno::Any& SummaryBelowData ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Insert( const css::uno::Any& Shift, const css::uno::Any& CopyOrigin ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Autofit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL AutoFill( const css::uno::Reference< ov::excel::XRange >& Destination, const css::uno::Any& Type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + void SAL_CALL Calculate( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL AutoOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Item( const css::uno::Any& row, const css::uno::Any& column ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ClearOutline( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Ungroup( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Group( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Merge( const css::uno::Any& Across ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL UnMerge( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStyle( const css::uno::Any& _style ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Next() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Previous() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL RemoveSubtotal( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL MergeArea() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Subtotal( ::sal_Int32 GroupBy, ::sal_Int32 Function, const css::uno::Sequence< ::sal_Int32 >& TotalList, const css::uno::Any& Replace, const css::uno::Any& PageBreaks, const css::uno::Any& SummaryBelowData ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<ov::excel::XRange>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDefaultMethod - OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException, std::exception); + OUString SAL_CALL getDefaultMethodName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDefaultProperty - OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Value"); } // #TODO completely rewrite ScVbaRange, its become a hackfest @@ -292,13 +292,13 @@ public: // * we shouldn't need hacks like this below static css::uno::Reference< ov::excel::XRange > ApplicationRange( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Any &Cell1, const css::uno::Any &Cell2 ) throw (css::uno::RuntimeException); static bool getCellRangesForAddress( sal_uInt16& rResFlags, const OUString& sAddress, ScDocShell* pDocSh, ScRangeList& rCellRanges, formula::FormulaGrammar::AddressConvention& eConv, char cDelimiter = 0 ); - virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException, std::exception ); + virtual sal_Bool SAL_CALL GoalSeek( const css::uno::Any& Goal, const css::uno::Reference< ov::excel::XRange >& ChangingCell ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL SpecialCells( const css::uno::Any& _oType, const css::uno::Any& _oValue) throw ( css::script::BasicErrorException, std::exception ) SAL_OVERRIDE; // XErrorQuery - virtual ::sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasError( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif /* SC_VBA_RANGE_HXX */ diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 462bc1b4ab64..6a8f6f11d5e9 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -49,17 +49,17 @@ public: virtual ~ScVbaButtonCharacters(); // XCharacters attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& rText ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCharacters methods - virtual void SAL_CALL Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE @@ -90,20 +90,20 @@ public: const css::uno::Reference< css::drawing::XShape >& rxShape ) throw (css::uno::RuntimeException); // XSheetObject attributes - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeft( double fLeft ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTop( double fTop ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( double fWidth ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( double fHeight ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getPlacement() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeft( double fLeft ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTop( double fTop ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( double fWidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( double fHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getPlacement() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPlacement( sal_Int32 nPlacement ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Sets default properties after a new object has been created. */ void setDefaultProperties( sal_Int32 nIndex ) throw (css::uno::RuntimeException); @@ -147,16 +147,16 @@ public: ListenerType eListenerType ) throw (css::uno::RuntimeException); // XSheetObject attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setOnAction( const OUString& rMacroName ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getOnAction() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setOnAction( const OUString& rMacroName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getPrintObject() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPrintObject( sal_Bool bPrintObject ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XControlObject attributes - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: sal_Int32 getModelIndexInForm() const throw (css::uno::RuntimeException); @@ -183,27 +183,27 @@ public: const css::uno::Reference< css::drawing::XControlShape >& rxControlShape ) throw (css::uno::RuntimeException); // XButton attributes - virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getHorizontalAlignment() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHorizontalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getVerticalAlignment() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCaption( const OUString& rCaption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XFont > SAL_CALL getFont() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFont( const css::uno::Reference< ov::excel::XFont >& rxFont ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getHorizontalAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHorizontalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getVerticalAlignment() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVerticalAlignment( sal_Int32 nAlign ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setOrientation( sal_Int32 nOrientation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XButton methods css::uno::Reference< ov::excel::XCharacters > SAL_CALL Characters( - const css::uno::Any& rStart, const css::uno::Any& rLength ) throw (css::uno::RuntimeException, std::exception); + const css::uno::Any& rStart, const css::uno::Any& rLength ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface VBAHELPER_DECL_XHELPERINTERFACE protected: - virtual OUString implGetBaseName() const; - virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); + virtual OUString implGetBaseName() const SAL_OVERRIDE; + virtual void implSetDefaultProperties() throw (css::uno::RuntimeException) SAL_OVERRIDE; }; diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 0ffdf3dce4a6..25878d962a75 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -101,12 +101,12 @@ public: uno::Any getItemByStringIndex( const OUString& rIndex ) throw (uno::RuntimeException); // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception); - virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception); + virtual uno::Type SAL_CALL getElementType() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** Derived classes return true, if the passed shape is supported by the instance. */ @@ -245,7 +245,7 @@ class ScVbaObjectEnumeration : public SimpleEnumerationBase { public: explicit ScVbaObjectEnumeration( const ScVbaObjectContainerRef& rxContainer ); - virtual uno::Any createCollectionObject( const uno::Any& rSource ); + virtual uno::Any createCollectionObject( const uno::Any& rSource ) SAL_OVERRIDE; private: ScVbaObjectContainerRef mxContainer; @@ -359,11 +359,11 @@ public: protected: uno::Reference< container::XIndexContainer > createForm() throw (uno::RuntimeException); - virtual bool implPickShape( const uno::Reference< drawing::XShape >& rxShape ) const; - virtual OUString implGetShapeServiceName() const; + virtual bool implPickShape( const uno::Reference< drawing::XShape >& rxShape ) const SAL_OVERRIDE; + virtual OUString implGetShapeServiceName() const SAL_OVERRIDE; virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const; - virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException); - virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException); + virtual OUString implGetShapeName( const uno::Reference< drawing::XShape >& rxShape ) const throw (uno::RuntimeException) SAL_OVERRIDE; + virtual void implOnShapeCreated( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) SAL_OVERRIDE; protected: uno::Reference< container::XIndexContainer > mxFormIC; @@ -469,8 +469,8 @@ public: const uno::Reference< sheet::XSpreadsheet >& rxSheet ) throw (uno::RuntimeException); protected: - virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException); - virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const; + virtual ScVbaSheetObjectBase* implCreateVbaObject( const uno::Reference< drawing::XShape >& rxShape ) throw (uno::RuntimeException) SAL_OVERRIDE; + virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const SAL_OVERRIDE; }; diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index dadfab59057b..5a5489840761 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -52,14 +52,14 @@ public: void collectShapes() throw (css::uno::RuntimeException); // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; // ScVbaCollectionBase - virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ); - virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any createCollectionObject( const css::uno::Any& rSource ) SAL_OVERRIDE; + virtual css::uno::Any getItemByStringIndex( const OUString& rIndex ) throw (css::uno::RuntimeException) SAL_OVERRIDE; protected: ScVbaObjectContainerRef mxContainer; @@ -82,7 +82,7 @@ public: const css::uno::Any& rLeft, const css::uno::Any& rTop, const css::uno::Any& rWidth, - const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception); + const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index 931b7d8bbd9a..cef34db3319c 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -39,20 +39,20 @@ public: ScVbaStyle( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::beans::XPropertySet >& _xPropertySet, const css::uno::Reference< css::frame::XModel >& _xModel ) throw ( css::script::BasicErrorException, css::uno::RuntimeException ); virtual ~ScVbaStyle(){} static css::uno::Reference< css::container::XNameAccess > getStylesNameContainer( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException ); - virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() { return this; }; + virtual css::uno::Reference< ov::XHelperInterface > thisHelperIface() SAL_OVERRIDE { return this; }; // XStyle Methods - virtual ::sal_Bool SAL_CALL BuiltIn() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL BuiltIn() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& Name ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setNameLocal( const OUString& NameLocal ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getNameLocal() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFormat - virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException); + virtual void SAL_CALL setMergeCells( const css::uno::Any& MergeCells ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getMergeCells( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SC_VBA_AXIS_HXX diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index 9d407b8e60ae..ec24dcb99733 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -75,11 +75,11 @@ class EnumWrapper : public EnumerationHelper_BASE sal_Int32 nIndex; public: EnumWrapper( const uno::Reference< container::XIndexAccess >& xIndexAccess, const uno::Reference<XHelperInterface >& xParent, const uno::Reference<uno::XComponentContext >& xContext, const uno::Reference<frame::XModel >& xModel ) : m_xIndexAccess( xIndexAccess ), m_xParent( xParent ), m_xContext( xContext ), m_xModel( xModel ), nIndex( 0 ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( nIndex < m_xIndexAccess->getCount() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( nIndex < m_xIndexAccess->getCount() ) return lcl_createAPIStyleToVBAObject( m_xIndexAccess->getByIndex( nIndex++ ), m_xParent, m_xContext, m_xModel ); diff --git a/sc/source/ui/vba/vbastyles.hxx b/sc/source/ui/vba/vbastyles.hxx index 8229f256785c..28a12da1103a 100644 --- a/sc/source/ui/vba/vbastyles.hxx +++ b/sc/source/ui/vba/vbastyles.hxx @@ -36,14 +36,14 @@ public: css::uno::Sequence< OUString > getStyleNames() throw ( css::uno::RuntimeException ); void Delete(const OUString& _sStyleName) throw ( css::script::BasicErrorException ); // XStyles - virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::excel::XStyle > SAL_CALL Add( const OUString& Name, const css::uno::Any& BasedOn ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); - virtual css::uno::Any createCollectionObject(const css::uno::Any&); + 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; + virtual css::uno::Any createCollectionObject(const css::uno::Any&) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx index ee66e58f9d26..8c3b3448cacc 100644 --- a/sc/source/ui/vba/vbatextboxshape.hxx +++ b/sc/source/ui/vba/vbatextboxshape.hxx @@ -35,9 +35,9 @@ public: ScVbaTextBoxShape( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); // Attributes - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText( const OUString& _text ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XCharacters > SAL_CALL characters( const css::uno::Any& Start, const css::uno::Any& Length ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif //SC_VBA_TEXTBOX_HXX diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx index b942608a7e40..c6f8289e166d 100644 --- a/sc/source/ui/vba/vbatextframe.hxx +++ b/sc/source/ui/vba/vbatextframe.hxx @@ -31,10 +31,10 @@ public: ScVbaTextFrame( css::uno::Sequence< css::uno::Any > const& aArgs, css::uno::Reference< css::uno::XComponentContext > const& xContext ) throw ( css::lang::IllegalArgumentException ); virtual ~ScVbaTextFrame() {} // Methods - virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx index 42fc7353cd5f..e205a845c28e 100644 --- a/sc/source/ui/vba/vbavalidation.hxx +++ b/sc/source/ui/vba/vbavalidation.hxx @@ -33,31 +33,31 @@ class ScVbaValidation : public ValidationImpl_BASE public: ScVbaValidation( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::table::XCellRange >& xRange ) : ValidationImpl_BASE( xParent, xContext ), m_xRange( xRange) {} // Attributes - virtual ::sal_Bool SAL_CALL getIgnoreBlank() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setIgnoreBlank( ::sal_Bool _ignoreblank ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getInCellDropdown() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setInCellDropdown( ::sal_Bool _incelldropdown ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getShowInput() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setShowInput( ::sal_Bool _showinput ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getShowError() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setShowError( ::sal_Bool _showerror ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException, std::exception) ; - virtual OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getIgnoreBlank() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setIgnoreBlank( ::sal_Bool _ignoreblank ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getInCellDropdown() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInCellDropdown( ::sal_Bool _incelldropdown ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getShowInput() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShowInput( ::sal_Bool _showinput ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getShowError() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShowError( ::sal_Bool _showerror ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getInputTitle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInputTitle( const OUString& _inputtitle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getErrorTitle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setErrorTitle( const OUString& _errortitle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getInputMessage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInputMessage( const OUString& _inputmessage ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getErrorMessage() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setErrorMessage( const OUString& _errormessage ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getFormula1() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual OUString SAL_CALL getFormula2() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Add( const css::uno::Any& Type, const css::uno::Any& AlertStyle, const css::uno::Any& Operator, const css::uno::Any& Formula1, const css::uno::Any& Formula2 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 63f4c6bd3db7..0350f2a888fa 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -75,11 +75,11 @@ public: m_it = m_sheets.begin(); } // XEnumeration - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_it != m_sheets.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) { @@ -129,16 +129,16 @@ public: } //XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new SelectedSheetsEnum( m_xContext, sheets, m_xModel ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return sheets.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || static_cast< Sheets::size_type >( Index ) >= sheets.size() ) @@ -148,18 +148,18 @@ public: } //XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<excel::XWorksheet>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( !sheets.empty() ); } //XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -168,7 +168,7 @@ public: } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< OUString > names( namesToIndices.size() ); OUString* pString = names.getArray(); @@ -179,7 +179,7 @@ public: return names; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index 47e0fd16b043..26778cddef55 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.hxx @@ -63,65 +63,65 @@ public: throw (css::uno::RuntimeException); // XWindow - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getDisplayGridlines() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getDisplayHeadings() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getDisplayHorizontalScrollBar() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getDisplayOutline() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getDisplayVerticalScrollBar() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getDisplayWorkbookTabs() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getFreezePanes() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setFreezePanes( ::sal_Bool _bFreezePanes ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getSplit() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSplit( ::sal_Bool _bSplit ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSplitColumn() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setSplitColumn( sal_Int32 _splitcolumn ) throw (css::uno::RuntimeException, std::exception) ; - virtual double SAL_CALL getSplitHorizontal() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setSplitHorizontal( double _splithorizontal ) throw (css::uno::RuntimeException, std::exception) ; - virtual sal_Int32 SAL_CALL getSplitRow() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setSplitRow( sal_Int32 _splitrow ) throw (css::uno::RuntimeException, std::exception) ; - virtual double SAL_CALL getSplitVertical() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setSplitVertical( double _splitvertical ) throw (css::uno::RuntimeException, std::exception) ; - virtual css::uno::Any SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) throw (css::uno::RuntimeException, std::exception) ; - virtual css::uno::Any SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) ; - virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setZoom(const css::uno::Any& _zoom) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getTabRatio() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setTabRatio( double _tabratio ) throw (css::uno::RuntimeException, std::exception) ; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL ActiveCell( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XPane > SAL_CALL ActivePane() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL ActiveSheet( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCaption( const css::uno::Any& _caption ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getCaption() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getDisplayGridlines() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayGridlines( ::sal_Bool _displaygridlines ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getDisplayHeadings() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayHeadings( ::sal_Bool _bDisplayHeadings ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getDisplayHorizontalScrollBar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayHorizontalScrollBar( ::sal_Bool _bDisplayHorizontalScrollBar ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getDisplayOutline() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayOutline( ::sal_Bool _bDisplayOutline ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getDisplayVerticalScrollBar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayVerticalScrollBar( ::sal_Bool _bDisplayVerticalScrollBar ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getDisplayWorkbookTabs() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayWorkbookTabs( ::sal_Bool _bDisplayWorkbookTabs ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getFreezePanes() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFreezePanes( ::sal_Bool _bFreezePanes ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getSplit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSplit( ::sal_Bool _bSplit ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSplitColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setSplitColumn( sal_Int32 _splitcolumn ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual double SAL_CALL getSplitHorizontal() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setSplitHorizontal( double _splithorizontal ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual sal_Int32 SAL_CALL getSplitRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setSplitRow( sal_Int32 _splitrow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual double SAL_CALL getSplitVertical() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setSplitVertical( double _splitvertical ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual css::uno::Any SAL_CALL getScrollRow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setScrollRow( const css::uno::Any& _scrollrow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual css::uno::Any SAL_CALL getScrollColumn() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setScrollColumn( const css::uno::Any& _scrollcolumn ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual css::uno::Any SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setView( const css::uno::Any& _view ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getVisibleRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getWindowState() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWindowState( const css::uno::Any& _windowstate ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getZoom() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setZoom(const css::uno::Any& _zoom) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getTabRatio() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setTabRatio( double _tabratio ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; // Methods - 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 ) throw (css::uno::RuntimeException, std::exception); - 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 ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& FileName, const css::uno::Any& RouteWorkBook ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Selection( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL RangeSelection() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); + 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 ) throw (css::uno::RuntimeException, std::exception) SAL_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 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL SelectedSheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ScrollWorkbookTabs( const css::uno::Any& Sheets, const css::uno::Any& Position ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Activate( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Close( const css::uno::Any& SaveChanges, const css::uno::Any& FileName, const css::uno::Any& RouteWorkBook ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Selection( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL RangeSelection() throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL PointsToScreenPixelsX(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL PointsToScreenPixelsY(sal_Int32 _points) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any&To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SC_VBA_WINDOW_HXX diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index c229c49fca7b..44e8426f75d7 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -77,12 +77,12 @@ public: m_it = m_components.begin(); } // XEnumeration - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_it != m_components.end(); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) { @@ -98,7 +98,7 @@ class WindowEnumImpl : public WindowComponentEnumImpl public: WindowEnumImpl(const uno::Reference< uno::XComponentContext >& xContext, const Components& components, const uno::Any& aApplication ):WindowComponentEnumImpl( xContext, components ), m_aApplication( aApplication ){} WindowEnumImpl( const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ): WindowComponentEnumImpl( xContext ), m_aApplication( aApplication ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { return ComponentToWindow( WindowComponentEnumImpl::nextElement(), m_xContext, m_aApplication ); } @@ -139,16 +139,16 @@ public: } //XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new WindowComponentEnumImpl( m_xContext, m_windows ); } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_windows.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw ( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( Index < 0 || static_cast< Components::size_type >( Index ) >= m_windows.size() ) @@ -157,18 +157,18 @@ public: } //XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<sheet::XSpreadsheetDocument>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( !m_windows.empty() ); } //XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { NameIndexHash::const_iterator it = namesToIndices.find( aName ); if ( it == namesToIndices.end() ) @@ -177,7 +177,7 @@ public: } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< OUString > names( namesToIndices.size() ); OUString* pString = names.getArray(); @@ -188,7 +188,7 @@ public: return names; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { NameIndexHash::const_iterator it = namesToIndices.find( aName ); return (it != namesToIndices.end()); diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 31573b13a634..da4cad8954db 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -37,18 +37,18 @@ public: virtual ~ScVbaWindows() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + 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); + 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 - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif //SC_VBA_WINDOWS_HXX diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 47adfca37b87..00e78c0840ec 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -40,35 +40,35 @@ public: virtual ~ScVbaWorkbook() {} // Attributes - virtual ::sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getPrecisionAsDisplayed() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getProtectStructure() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getActiveSheet() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getPrecisionAsDisplayed() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPrecisionAsDisplayed( sal_Bool _precisionAsDisplayed ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException); - virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Worksheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Sheets( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Windows( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Protect( const css::uno::Any & aPassword ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL SaveAs( const css::uno::Any& FileName, const css::uno::Any& FileFormat, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& ReadOnlyRecommended, const css::uno::Any& CreateBackup, const css::uno::Any& AccessMode, const css::uno::Any& ConflictResolution, const css::uno::Any& AddToMru, const css::uno::Any& TextCodepage, const css::uno::Any& TextVisualLayout, const css::uno::Any& Local ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ResetColors( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getFileFormat( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) throw ( css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Styles( const css::uno::Any& Item ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ResetColors( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Colors( const css::uno::Any& Index ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getFileFormat( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL SaveCopyAs( const OUString& Filename ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // code name - virtual OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCodeName() throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; // XUnoTunnel - virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception); + virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif /* SC_VBA_WORKBOOK_HXX */ diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index ce8ffdab6bcc..5550f6c01925 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -154,7 +154,7 @@ class WorkBookEnumImpl : public EnumerationHelperImpl public: WorkBookEnumImpl( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Any& aApplication ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_aApplication( aApplication ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< sheet::XSpreadsheetDocument > xDoc( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); return getWorkbook( m_xContext, xDoc, m_xParent ); diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index da13685b86df..25e57ca42d43 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -41,18 +41,18 @@ public: virtual ~ScVbaWorkbooks() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + 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; // ScVbaWorkbooks_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; // XWorkbooks - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Close( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const css::uno::Any& UpdateLinks, const css::uno::Any& ReadOnly, const css::uno::Any& Format, const css::uno::Any& Password, const css::uno::Any& WriteResPassword, const css::uno::Any& IgnoreReadOnlyRecommended, const css::uno::Any& Origin, const css::uno::Any& Delimiter, const css::uno::Any& Editable, const css::uno::Any& Notify, const css::uno::Any& Converter, const css::uno::Any& AddToMru ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif /* SC_VBA_WORKBOOKS_HXX */ diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 87048fc77c57..449e74e7d07a 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -81,87 +81,87 @@ public: css::uno::Reference< ov::excel::XWorksheet > createSheetCopy(css::uno::Reference< ov::excel::XWorksheet> xSheet, bool bAfter); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setVisible( sal_Int32 nVisible ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getStandardHeight() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getProtectionMode() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getProtectContents() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getProtectDrawingObjects() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getProtectScenarios() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getUsedRange() throw (css::uno::RuntimeException, std::exception) ; - virtual css::uno::Any SAL_CALL ChartObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() throw (css::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getEnableSelection() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getAutoFilterMode() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString &rName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( sal_Int32 nVisible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getStandardWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getStandardHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getProtectionMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getProtectContents() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getProtectDrawingObjects() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getProtectScenarios() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL getUsedRange() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual css::uno::Any SAL_CALL ChartObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XOutline > SAL_CALL Outline( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XPageSetup > SAL_CALL PageSetup( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL HPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL VPageBreaks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getNext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XWorksheet > SAL_CALL getPrevious() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getEnableSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEnableSelection( sal_Int32 nSelection ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getAutoFilterMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoFilterMode( sal_Bool bAutoFilterMode ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Paste( const css::uno::Any& Destination, const css::uno::Any& Link ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Protect( const css::uno::Any& Password, const css::uno::Any& DrawingObjects, const css::uno::Any& Contents, const css::uno::Any& Scenarios, const css::uno::Any& UserInterfaceOnly ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Unprotect( const css::uno::Any& Password ) throw (css::uno::RuntimeException, std::exception); - - virtual void SAL_CALL Calculate( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL CheckSpelling( const css::uno::Any& CustomDictionary,const css::uno::Any& IgnoreUppercase,const css::uno::Any& AlwaysSuggest, const css::uno::Any& SpellingLang ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Select() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Range( const css::uno::Any& Cell1, const css::uno::Any& Cell2 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Move( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL Copy( const css::uno::Any& Before, const css::uno::Any& After ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Paste( const css::uno::Any& Destination, const css::uno::Any& Link ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Protect( const css::uno::Any& Password, const css::uno::Any& DrawingObjects, const css::uno::Any& Contents, const css::uno::Any& Scenarios, const css::uno::Any& UserInterfaceOnly ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Unprotect( const css::uno::Any& Password ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual void SAL_CALL Calculate( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL CheckSpelling( const css::uno::Any& CustomDictionary,const css::uno::Any& IgnoreUppercase,const css::uno::Any& AlwaysSuggest, const css::uno::Any& SpellingLang ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Hacks (?) - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - - virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - - virtual css::uno::Any SAL_CALL OLEObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - - virtual css::uno::Any SAL_CALL Buttons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL CheckBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL DropDowns( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL GroupBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Labels( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ListBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL OptionButtons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ScrollBars( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception); - - virtual void SAL_CALL setEnableCalculation( ::sal_Bool EnableCalculation ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ShowDataForm( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Cells( const css::uno::Any &nRow, const css::uno::Any &nCol ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Rows(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::excel::XRange > SAL_CALL Columns(const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual css::uno::Any SAL_CALL Evaluate( const OUString& Name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL PivotTables( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Comments( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Hyperlinks( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Names( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual css::uno::Any SAL_CALL OLEObjects( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Shapes( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual css::uno::Any SAL_CALL Buttons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL CheckBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL DropDowns( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL GroupBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Labels( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ListBoxes( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL OptionButtons( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ScrollBars( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Spinners( const css::uno::Any& rIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + + virtual void SAL_CALL setEnableCalculation( ::sal_Bool EnableCalculation ) throw ( css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getEnableCalculation( ) throw (css::script::BasicErrorException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ShowDataForm( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInvocation - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL invoke( const OUString& aFunctionName, const css::uno::Sequence< css::uno::Any >& aParams, css::uno::Sequence< ::sal_Int16 >& aOutParamIndex, css::uno::Sequence< css::uno::Any >& aOutParam ) throw (css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // CodeName - virtual OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getCodeName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Int16 getSheetID() throw (css::uno::RuntimeException); - virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName, const css::uno::Any& IgnorePrintAreas ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; // XUnoTunnel - virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception); + virtual ::sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif /* SC_VBA_WORKSHEET_HXX */ diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 19ca872ce529..62365f3e96e1 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -69,11 +69,11 @@ class WorkSheetsEnumeration : public SheetEnumeration_BASE SheetMap::iterator mIt; public: WorkSheetsEnumeration( const SheetMap& sMap ) : mSheetMap( sMap ), mIt( mSheetMap.begin() ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mIt != mSheetMap.end() ); } - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasMoreElements() ) throw container::NoSuchElementException(); @@ -89,16 +89,16 @@ class SheetCollectionHelper : public SheetCollectionHelper_BASE public: SheetCollectionHelper( const SheetMap& sMap ) : mSheetMap( sMap ), cachePos(mSheetMap.begin()) {} // XElementAccess - virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) { return cppu::UnoType<sheet::XSpreadsheet>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) { return ( !mSheetMap.empty() ); } + virtual uno::Type SAL_CALL getElementType( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<sheet::XSpreadsheet>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( !mSheetMap.empty() ); } // XNameAcess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName(aName) ) throw container::NoSuchElementException(); return uno::makeAny( *cachePos ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Sequence< OUString > sNames( mSheetMap.size() ); OUString* pString = sNames.getArray(); @@ -112,7 +112,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { cachePos = mSheetMap.begin(); SheetMap::iterator it_end = mSheetMap.end(); @@ -126,8 +126,8 @@ public: } // XElementAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) { return mSheetMap.size(); } - virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return mSheetMap.size(); } + virtual uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw lang::IndexOutOfBoundsException(); @@ -136,7 +136,7 @@ public: } // XEnumerationAccess - virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) + virtual uno::Reference< container::XEnumeration > SAL_CALL createEnumeration( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return new WorkSheetsEnumeration( mSheetMap ); } @@ -148,7 +148,7 @@ class SheetsEnumeration : public EnumerationHelperImpl public: SheetsEnumeration( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< container::XEnumeration >& xEnumeration, const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) : EnumerationHelperImpl( xParent, xContext, xEnumeration ), m_xModel( xModel ) {} - virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + virtual uno::Any SAL_CALL nextElement( ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { uno::Reference< sheet::XSpreadsheet > xSheet( m_xEnumeration->nextElement(), uno::UNO_QUERY_THROW ); uno::Reference< XHelperInterface > xIf = excel::getUnoSheetModuleObj( xSheet ); diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index d75737820458..ce6fb7edcb88 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -40,7 +40,7 @@ class ScVbaWorksheets : public ScVbaWorksheets_BASE css::uno::Reference< css::sheet::XSpreadsheets > m_xSheets; protected: // ScVbaWorksheets_BASE - virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException); + virtual css::uno::Any getItemByStringIndex( const OUString& sIndex ) throw (css::uno::RuntimeException) SAL_OVERRIDE; public: ScVbaWorksheets( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XIndexAccess >& xSheets, const css::uno::Reference< css::frame::XModel >& xModel ); ScVbaWorksheets( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::container::XEnumerationAccess >& xEnum, const css::uno::Reference< css::frame::XModel >& xModel ); @@ -49,25 +49,25 @@ public: bool isSelectedSheets(); // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + 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); - virtual void SAL_CALL setVisible( const css::uno::Any& _visible ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before, const css::uno::Any& After, const css::uno::Any& Count, const css::uno::Any& Type ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); - virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Copy ( const css::uno::Any& Before, const css::uno::Any& After) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::uno::RuntimeException, std::exception); + 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; + virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Before, const css::uno::Any& After, const css::uno::Any& Count, const css::uno::Any& Type ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL PrintOut( const css::uno::Any& From, const css::uno::Any& To, const css::uno::Any& Copies, const css::uno::Any& Preview, const css::uno::Any& ActivePrinter, const css::uno::Any& PrintToFile, const css::uno::Any& Collate, const css::uno::Any& PrToFileName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; + virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Copy ( const css::uno::Any& Before, const css::uno::Any& After) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL PrintPreview( const css::uno::Any& EnableChanges ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ScVbaWorksheets_BASE virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw -(css::uno::RuntimeException); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); +(css::uno::RuntimeException) SAL_OVERRIDE; + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; static bool nameExists( css::uno::Reference <css::sheet::XSpreadsheetDocument>& xSpreadDoc, const OUString & name, SCTAB& nTab ) throw ( css::lang::IllegalArgumentException ); }; diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index 93837ff7dc98..e1027bd3f0e6 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.hxx @@ -34,16 +34,16 @@ public: ScVbaWSFunction( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext); virtual ~ScVbaWSFunction(){} - virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::beans::XIntrospectionAccess > SAL_CALL getIntrospection(void) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL invoke(const OUString& FunctionName, const css::uno::Sequence< css::uno::Any >& Params, css::uno::Sequence< sal_Int16 >& OutParamIndex, css::uno::Sequence< css::uno::Any >& OutParam) throw(css::lang::IllegalArgumentException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue(const OUString& PropertyName, const css::uno::Any& Value) throw(css::beans::UnknownPropertyException, css::script::CannotConvertException, css::reflection::InvocationTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getValue(const OUString& PropertyName) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getExactName( const OUString& aApproximateName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 25e83fcc5329..710f13102af3 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -214,7 +214,7 @@ private: ScFilterBoxMode eMode; protected: - virtual void LoseFocus(); + virtual void LoseFocus() SAL_OVERRIDE; void SelectHdl(); public: @@ -222,8 +222,8 @@ public: SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ); ~ScFilterListBox(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void Select(); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; SCCOL GetCol() const { return nCol; } SCROW GetRow() const { return nRow; } @@ -342,7 +342,7 @@ public: ScFilterFloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); virtual ~ScFilterFloatingWindow(); // required for System FloatingWindows that will not process KeyInput by themselves - virtual Window* GetPreferredKeyInputWindow(); + virtual Window* GetPreferredKeyInputWindow() SAL_OVERRIDE; }; ScFilterFloatingWindow::ScFilterFloatingWindow( Window* pParent, WinBits nStyle ) : @@ -626,7 +626,7 @@ class AutoFilterAction : public ScMenuFloatingWindow::Action public: AutoFilterAction(ScGridWindow* p, ScGridWindow::AutoFilterMode eMode) : mpWindow(p), meMode(eMode) {} - virtual void execute() + virtual void execute() SAL_OVERRIDE { mpWindow->UpdateAutoFilterFromMenu(meMode); } @@ -639,7 +639,7 @@ class AutoFilterPopupEndAction : public ScMenuFloatingWindow::Action public: AutoFilterPopupEndAction(ScGridWindow* p, const ScAddress& rPos) : mpWindow(p), maPos(rPos) {} - virtual void execute() + virtual void execute() SAL_OVERRIDE { mpWindow->RefreshAutoFilterButton(maPos); } diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 03e6d667debe..96727ae6761b 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -399,7 +399,7 @@ public: explicit DPFieldPopupOKAction(ScGridWindow* p) : mpGridWindow(p) {} - virtual void execute() + virtual void execute() SAL_OVERRIDE { mpGridWindow->UpdateDPFromFieldPopupMenu(); } @@ -415,7 +415,7 @@ public: explicit PopupSortAction(const ScAddress& rPos, SortType eType, sal_uInt16 nUserListIndex, ScTabViewShell* pViewShell) : maPos(rPos), meType(eType), mnUserListIndex(nUserListIndex), mpViewShell(pViewShell) {} - virtual void execute() + virtual void execute() SAL_OVERRIDE { switch (meType) { |