diff options
Diffstat (limited to 'sc')
93 files changed, 757 insertions, 757 deletions
diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx index 69af4f086e26..8f81d3833f32 100644 --- a/sc/inc/ScPanelFactory.hxx +++ b/sc/inc/ScPanelFactory.hxx @@ -47,8 +47,8 @@ public: const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory); static css::uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames_static(); - ScPanelFactory(void); - virtual ~ScPanelFactory(void); + ScPanelFactory(); + virtual ~ScPanelFactory(); // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 1d30cc5833f9..3052b3760a65 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -566,9 +566,9 @@ public: getItems() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // only called from property-functions: - com::sun::star::sheet::DataPilotFieldOrientation getOrientation(void) const; + com::sun::star::sheet::DataPilotFieldOrientation getOrientation() const; void setOrientation(com::sun::star::sheet::DataPilotFieldOrientation Orientation); - com::sun::star::sheet::GeneralFunction getFunction(void) const; + com::sun::star::sheet::GeneralFunction getFunction() const; void setFunction(com::sun::star::sheet::GeneralFunction Function); com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction > getSubtotals() const; void setSubtotals(const com::sun::star::uno::Sequence< com::sun::star::sheet::GeneralFunction >& rFunctions); diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 40d93fd945ce..987daf39e425 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -119,7 +119,7 @@ protected: // scfilt plugin symbol extern "C" { - SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void); + SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * SAL_CALL ScFilterCreate(); } class ScFormatFilter { diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx index 2addfba54403..c4b804f9a0f2 100644 --- a/sc/inc/linkuno.hxx +++ b/sc/inc/linkuno.hxx @@ -135,13 +135,13 @@ public: ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // aus get/setPropertyValue gerufen: - OUString getFileName(void) const; + OUString getFileName() const; void setFileName(const OUString& FileName); - OUString getFilter(void) const; + OUString getFilter() const; void setFilter(const OUString& Filter); - OUString getFilterOptions(void) const; + OUString getFilterOptions() const; void setFilterOptions(const OUString& FilterOptions); - sal_Int32 getRefreshDelay(void) const; + sal_Int32 getRefreshDelay() const; void setRefreshDelay(sal_Int32 nRefreshDelay); // XServiceInfo @@ -286,13 +286,13 @@ public: ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // called from get/setPropertyValue: - OUString getFileName(void) const; + OUString getFileName() const; void setFileName(const OUString& FileName); - OUString getFilter(void) const; + OUString getFilter() const; void setFilter(const OUString& Filter); - OUString getFilterOptions(void) const; + OUString getFilterOptions() const; void setFilterOptions(const OUString& FilterOptions); - sal_Int32 getRefreshDelay(void) const; + sal_Int32 getRefreshDelay() const; void setRefreshDelay(sal_Int32 nRefreshDelay); // XAreaLink diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index 654273ef9583..8ff623364787 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -42,7 +42,7 @@ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ return cppu::supportsService(this, ServiceName); \ } \ ::com::sun::star::uno::Sequence< OUString > \ - SAL_CALL ClassName::getSupportedServiceNames(void) \ + SAL_CALL ClassName::getSupportedServiceNames() \ throw(::com::sun::star::uno::RuntimeException, std::exception) \ { \ ::com::sun::star::uno::Sequence< OUString > aRet(1); \ diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 5d782e99e525..1190895f2277 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -102,8 +102,8 @@ public: bool operator== (const ScRangeData& rData) const; void GetName( OUString& rName ) const { rName = aName; } - const OUString& GetName( void ) const { return aName; } - const OUString& GetUpperName( void ) const { return aUpperName; } + const OUString& GetName() const { return aName; } + const OUString& GetUpperName() const { return aUpperName; } ScAddress GetPos() const { return aPos; } // The index has to be unique. If index=0 a new index value is assigned. void SetIndex( sal_uInt16 nInd ) { nIndex = nInd; } diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index 6fdf66a0dd9b..4182893ddf63 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -170,7 +170,7 @@ public: std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 978cf286557d..433ef8416153 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -83,17 +83,17 @@ public: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames(void) throw( ::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 ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements(void) 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 ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + 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(void) 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; }; class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper3< @@ -116,7 +116,7 @@ public: static void SetLinkTargetBitmap( ::com::sun::star::uno::Any& rRet, sal_uInt16 nType ); // ::com::sun::star::beans::XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue(const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue) throw( ::com::sun::star::beans::UnknownPropertyException, @@ -150,12 +150,12 @@ public: ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::document::XLinkTargetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getLinks() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + 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(void) 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; }; class ScLinkTargetsObj : public ::cppu::WeakImplHelper2< @@ -174,17 +174,17 @@ public: throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getElementNames(void) throw( ::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 ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasElements(void) 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 ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + 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(void) 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; }; #endif diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx index 2b39aacf9544..f4d3afede272 100644 --- a/sc/inc/viewuno.hxx +++ b/sc/inc/viewuno.hxx @@ -196,9 +196,9 @@ private: bool bFilteredRangeSelection; ScViewPaneObj* GetObjectByIndex_Impl(sal_uInt16 nIndex) const; - sal_Int16 GetZoom(void) const; + sal_Int16 GetZoom() const; void SetZoom(sal_Int16 Zoom); - sal_Int16 GetZoomType(void) const; + sal_Int16 GetZoomType() const; void SetZoomType(sal_Int16 ZoomType); com::sun::star::uno::Reference< com::sun::star::uno::XInterface > GetClickedObject(const Point& rPoint) const; diff --git a/sc/source/core/opencl/op_addin.hxx b/sc/source/core/opencl/op_addin.hxx index ecdec028392b..c092eebd9daf 100644 --- a/sc/source/core/opencl/op_addin.hxx +++ b/sc/source/core/opencl/op_addin.hxx @@ -19,14 +19,14 @@ class OpBesselj: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Besselj"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Besselj"; } }; class OpGestep: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE;; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Gestep"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gestep"; } }; }} diff --git a/sc/source/core/opencl/op_array.hxx b/sc/source/core/opencl/op_array.hxx index 410e013a5212..e8d76bef9696 100644 --- a/sc/source/core/opencl/op_array.hxx +++ b/sc/source/core/opencl/op_array.hxx @@ -19,7 +19,7 @@ class OpSumX2MY2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumX2MY2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumX2MY2"; } }; class OpSumX2PY2: public CheckVariables @@ -27,7 +27,7 @@ class OpSumX2PY2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumX2PY2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumX2PY2"; } }; class OpSumXMY2: public CheckVariables @@ -35,7 +35,7 @@ class OpSumXMY2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumXMY2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumXMY2"; } }; }} diff --git a/sc/source/core/opencl/op_database.hxx b/sc/source/core/opencl/op_database.hxx index d64f3bcd37de..30a41618d395 100644 --- a/sc/source/core/opencl/op_database.hxx +++ b/sc/source/core/opencl/op_database.hxx @@ -19,7 +19,7 @@ class OpDmax: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dmax"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dmax"; } }; class OpDmin: public CheckVariables @@ -27,7 +27,7 @@ class OpDmin: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dmin"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dmin"; } }; class OpDproduct: public CheckVariables @@ -35,7 +35,7 @@ class OpDproduct: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dproduct"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dproduct"; } }; class OpDaverage: public CheckVariables @@ -43,7 +43,7 @@ class OpDaverage: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Daverage"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Daverage"; } }; class OpDstdev: public CheckVariables @@ -51,7 +51,7 @@ class OpDstdev: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dstdev"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dstdev"; } }; class OpDstdevp: public CheckVariables @@ -59,7 +59,7 @@ class OpDstdevp: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dstdevp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dstdevp"; } }; class OpDsum: public CheckVariables @@ -67,7 +67,7 @@ class OpDsum: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dsum"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dsum"; } }; class OpDvar: public CheckVariables @@ -75,7 +75,7 @@ class OpDvar: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dvar"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dvar"; } }; class OpDvarp: public CheckVariables @@ -83,7 +83,7 @@ class OpDvarp: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dvarp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dvarp"; } }; class OpDcount: public CheckVariables @@ -91,7 +91,7 @@ class OpDcount: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dcount"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dcount"; } }; class OpDcount2: public CheckVariables @@ -99,7 +99,7 @@ class OpDcount2: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dcount2"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dcount2"; } }; }} diff --git a/sc/source/core/opencl/op_financial.hxx b/sc/source/core/opencl/op_financial.hxx index 0136be7fc4f4..b64d2ee86eee 100644 --- a/sc/source/core/opencl/op_financial.hxx +++ b/sc/source/core/opencl/op_financial.hxx @@ -26,8 +26,8 @@ public: class OpRRI:public RRI { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RRI"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "RRI"; } }; class OpNominal: public Normal @@ -35,131 +35,131 @@ class OpNominal: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NOMINAL_ADD"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NOMINAL_ADD"; } }; class OpDollarde:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dollarde"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dollarde"; } }; class OpDollarfr:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dollarfr"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Dollarfr"; } }; class OpDISC: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, 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 "DISC"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DISC"; } }; class OpINTRATE: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, 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 "INTRATE"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "INTRATE"; } }; class OpFV: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, 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 { + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FV"; } }; class OpIPMT: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, 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 { + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IPMT"; } }; class OpISPMT: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ISPMT"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ISPMT"; } }; class OpDuration: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Duration"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Duration"; } }; class OpDuration_ADD: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, 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 { + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Duration_ADD"; } }; class OpMDuration: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, 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 "MDuration"; } + virtual std::string BinFuncName() const SAL_OVERRIDE {return "MDuration"; } }; class Fvschedule: public Normal @@ -187,8 +187,8 @@ public: class OpIRR: public IRR { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IRR"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IRR"; } }; class XNPV: public Normal @@ -211,7 +211,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SYD"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SYD"; } }; class MIRR: public Normal @@ -224,26 +224,26 @@ public: class OpEffective:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Effect_Add"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Effect_Add"; } }; class OpCumipmt: public Cumipmt { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cumipmt"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cumipmt"; } }; class OpXNPV: public XNPV { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "XNPV"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "XNPV"; } }; @@ -253,28 +253,28 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbilleq"; } + virtual std::string BinFuncName() 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) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "cumprinc"; } }; class OpAccrintm: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() 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) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Accrintm"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Accrintm"; } }; class OpAccrint: public Normal { @@ -282,7 +282,7 @@ class OpAccrint: public Normal 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) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Accrint"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Accrint"; } }; class OpYield: public Normal @@ -290,7 +290,7 @@ class OpYield: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yield"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yield"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -299,14 +299,14 @@ class OpSLN: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SLN"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SLN"; } }; class OpFvschedule: public Fvschedule { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fvschedule"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fvschedule"; } }; class OpYieldmat: public Normal @@ -314,7 +314,7 @@ class OpYieldmat: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yieldmat"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yieldmat"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -323,14 +323,14 @@ class OpPMT: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PMT"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PMT"; } }; class OpNPV: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NPV"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NPV"; } }; class OpPrice: public Normal @@ -339,7 +339,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Price"; } }; class OpNper: public Normal @@ -347,7 +347,7 @@ class OpNper: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NPER"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NPER"; } }; class OpOddlprice: public Normal { @@ -356,7 +356,7 @@ public: 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 "Oddlprice"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Oddlprice"; } }; class OpOddlyield: public Normal { @@ -365,7 +365,7 @@ public: 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 "Oddlyield"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Oddlyield"; } }; class OpPriceDisc: public Normal { @@ -374,7 +374,7 @@ public: 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 "PriceDisc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PriceDisc"; } }; class OpPPMT: public Normal { @@ -382,39 +382,39 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PPMT"; } }; class OpCoupdaybs:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdaybs"; } }; class OpCoupdays:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, 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";} + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdays";} }; class OpCoupdaysnc:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupdaysnc"; } }; @@ -424,7 +424,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Couppcd"; } }; @@ -434,18 +434,18 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupncd"; } }; class OpCoupnum:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coupnum"; } }; class OpDDB:public Normal @@ -454,7 +454,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DDB"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DDB"; } }; class OpDB:public Normal { @@ -462,34 +462,34 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DB"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DB"; } }; class OpAmordegrc:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream& ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Amordegrc"; } }; class OpAmorlinc:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0";} + virtual std::string GetBottom() SAL_OVERRIDE { return "0";} virtual void GenSlidingWindowFunction(std::stringstream& ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Amorlinc"; } }; class OpReceived:public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Received"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Received"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -498,7 +498,7 @@ class OpYielddisc: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Yielddisc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Yielddisc"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -507,15 +507,15 @@ class OpTbillprice: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbillprice"; } + virtual std::string BinFuncName() 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) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PriceMat"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PriceMat"; } }; class RATE: public Normal @@ -527,8 +527,8 @@ public: }; class OpIntrate: public RATE { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "rate"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "rate"; } }; class OpTbillyield: public Normal @@ -537,15 +537,15 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "fTbillyield"; } + virtual std::string BinFuncName() 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) SAL_OVERRIDE { return "0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MIRR"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "MIRR"; } }; class OpPV: public Normal @@ -553,7 +553,7 @@ class OpPV: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "PV"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "PV"; } }; class OpVDB: public CheckVariables @@ -562,7 +562,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VDB"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "VDB"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -572,7 +572,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Xirr"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Xirr"; } }; }} diff --git a/sc/source/core/opencl/op_logical.hxx b/sc/source/core/opencl/op_logical.hxx index be0ba3755fb2..db29889cc815 100644 --- a/sc/source/core/opencl/op_logical.hxx +++ b/sc/source/core/opencl/op_logical.hxx @@ -19,7 +19,7 @@ class OpAnd: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "And"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "And"; } }; class OpOr: public Normal @@ -27,28 +27,28 @@ class OpOr: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Or"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Or"; } }; class OpNot: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Not"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Not"; } }; class OpXor: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Xor"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Xor"; } }; class OpIf:public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IF"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IF"; } }; }} diff --git a/sc/source/core/opencl/op_math.hxx b/sc/source/core/opencl/op_math.hxx index 3929154c698b..6cb1eab34a79 100644 --- a/sc/source/core/opencl/op_math.hxx +++ b/sc/source/core/opencl/op_math.hxx @@ -20,7 +20,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cos"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cos"; } }; class OpSec: public Normal { @@ -28,7 +28,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sec"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sec"; } }; class OpSecH: public Normal { @@ -36,7 +36,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SecH"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SecH"; } }; class OpMROUND: public Normal { @@ -44,7 +44,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MROUND"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "MROUND"; } }; class OpCsc: public Normal @@ -52,16 +52,16 @@ class OpCsc: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Csc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Csc"; } }; class OpSumIfs: public CheckVariables { public: - OpSumIfs(void): CheckVariables(), mNeedReductionKernel(false) {} + OpSumIfs(): CheckVariables(), mNeedReductionKernel(false) {} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumIfs"; } - bool NeedReductionKernel(void) const { return mNeedReductionKernel; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumIfs"; } + bool NeedReductionKernel() const { return mNeedReductionKernel; } protected: bool mNeedReductionKernel; }; @@ -71,43 +71,43 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cosh"; } }; class OpSinh: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sinh"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sinh"; } }; class OpSin: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sin"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sin"; } }; class OpAbs:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScAbs"; } }; class OpArcCos:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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 std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() 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) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "1.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScACosH"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "1.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACosH"; } }; class OpTan: public Normal { @@ -115,7 +115,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Tan"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Tan"; } }; class OpTanH: public Normal { @@ -123,7 +123,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TanH"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TanH"; } }; class OpSqrt: public Normal { @@ -131,36 +131,36 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Sqrt"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Sqrt"; } }; class OpArcCot:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACot"; } }; class OpArcCotHyp:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "2.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScACotH"; } }; class OpArcSin:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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 std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() 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) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScASinH"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScASinH"; } }; class OpTrunc: public Normal { @@ -168,120 +168,120 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Trunc"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Trunc"; } }; class OpArcTan2:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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 std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() 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) SAL_OVERRIDE; - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0.0"; } - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ScATan"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATan"; } }; class OpArcTanH:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScATanH"; } }; class OpBitAnd:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitAnd"; } }; class OpBitOr:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitOr"; } }; class OpBitXor:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitXor"; } }; class OpBitLshift:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitLshift"; } }; class OpBitRshift:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScBitRshift"; } }; class OpLn: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Ln"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Ln"; } }; class OpRound: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Round"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Round"; } }; class OpRoundUp: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RoundUp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "RoundUp"; } }; class OpRoundDown: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "RoundDown"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "RoundDown"; } }; class OpInt: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Int"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Int"; } }; class OpRadians: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Radians"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Radians"; } }; class OpIsEven: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IsEven"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IsEven"; } }; class OpIsOdd: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "IsOdd"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "IsOdd"; } }; class OpCot: public Normal { @@ -289,7 +289,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Cot"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Cot"; } }; class OpSumSQ: public Normal { @@ -297,7 +297,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumSQ"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumSQ"; } }; class OpCoth: public Normal { @@ -306,63 +306,63 @@ public: 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 "Coth"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Coth"; } }; class OpPower: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Power"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Power"; } }; class OpOdd: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Odd"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Odd"; } }; class OpFloor: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Floor"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Floor"; } }; class OpCscH: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CscH"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "CscH"; } }; class OpCeil:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScCeil"; } }; class OpExp: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Exp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Exp"; } }; class OpLog10: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log10"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Log10"; } }; class OpConvert: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Convert"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Convert"; } virtual bool takeString() const SAL_OVERRIDE { return true; } }; @@ -372,21 +372,21 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Even"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Even"; } }; class OpAverageIfs: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AverageIfs"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "AverageIfs"; } }; class OpCountIfs: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "CountIfs"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "CountIfs"; } }; class OpMod: public Normal { @@ -394,14 +394,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Mod"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Mod"; } }; class OpProduct: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Product"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Product"; } }; class OpSqrtPi: public Normal { @@ -409,7 +409,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SqrtPi"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SqrtPi"; } }; class OpCombinA: public Normal @@ -418,7 +418,7 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Combina"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Combina"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpLog: public Normal @@ -427,14 +427,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Log"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Log"; } }; class OpCombin: public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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 "ScCombin"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ScCombin"; } }; class OpAverageIf: public CheckVariables { @@ -442,56 +442,56 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AverageIf"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "AverageIf"; } }; class OpDeg: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Degrees"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Degrees"; } }; class OpCountIf: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Countif"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Countif"; } }; class OpFact: public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream& ss, 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"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0.0"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fact"; } }; class OpSeriesSum: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SeriesSum"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SeriesSum"; } }; class OpSumIf: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "SumIf"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "SumIf"; } }; class OpQuotient: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Quotient"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Quotient"; } }; class OpNegSub: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "NegSub"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "NegSub"; } }; }} diff --git a/sc/source/core/opencl/op_spreadsheet.hxx b/sc/source/core/opencl/op_spreadsheet.hxx index 01795062b616..e787bda0a4cd 100644 --- a/sc/source/core/opencl/op_spreadsheet.hxx +++ b/sc/source/core/opencl/op_spreadsheet.hxx @@ -19,7 +19,7 @@ class OpVLookup: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VLookup"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "VLookup"; } virtual bool takeString() const SAL_OVERRIDE { return true; } }; diff --git a/sc/source/core/opencl/op_statistical.hxx b/sc/source/core/opencl/op_statistical.hxx index 792c486ea6be..0f9eb6478392 100644 --- a/sc/source/core/opencl/op_statistical.hxx +++ b/sc/source/core/opencl/op_statistical.hxx @@ -19,35 +19,35 @@ class OpStandard: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Standard"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Standard"; } }; class OpExponDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ExponDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ExponDist"; } }; class OpVar: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Var"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Var"; } }; class OpSTEYX: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "STEYX"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "STEYX"; } }; class OpVarP: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "VarP"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "VarP"; } }; class OpZTest: public Normal { @@ -55,14 +55,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ZTest"; } }; class OpStDevP: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "StDevP"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "StDevP"; } }; class OpStDev: public Normal @@ -70,28 +70,28 @@ class OpStDev: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "StDev"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "StDev"; } }; class OpSkewp: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Skewp"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Skewp"; } }; class OpSlope: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Slope"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Slope"; } }; class OpWeibull: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Weibull"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Weibull"; } }; class OpFdist: public Normal { @@ -99,14 +99,14 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fdist"; } }; class OpTDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TDist"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpTInv: public Normal @@ -114,7 +114,7 @@ class OpTInv: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TInv"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpTTest: public Normal @@ -122,7 +122,7 @@ class OpTTest: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "TTest"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "TTest"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>&) SAL_OVERRIDE; }; class OpSkew: public Normal @@ -130,14 +130,14 @@ class OpSkew: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Skew"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Skew"; } }; class OpFisher: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Fisher"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Fisher"; } }; class OpFisherInv: public Normal @@ -145,7 +145,7 @@ class OpFisherInv: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "FisherInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FisherInv"; } }; class OpGamma: public Normal @@ -153,7 +153,7 @@ class OpGamma: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Gamma"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gamma"; } }; class OpCorrel: public Normal @@ -161,7 +161,7 @@ class OpCorrel: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Correl"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Correl"; } }; class OpNegbinomdist: public Normal @@ -169,7 +169,7 @@ class OpNegbinomdist: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNegbinomdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNegbinomdist"; } }; class OpPearson: public Normal @@ -177,7 +177,7 @@ class OpPearson: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPearson"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPearson"; } }; class OpGammaLn: public Normal @@ -185,7 +185,7 @@ class OpGammaLn: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GammaLn"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaLn"; } }; class OpGauss: public Normal @@ -195,17 +195,17 @@ public: 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 "Gauss"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Gauss"; } }; class OpGeoMean: public CheckVariables { public: - OpGeoMean(void): CheckVariables(), mNeedReductionKernel(true) {} + OpGeoMean(): CheckVariables(), mNeedReductionKernel(true) {} virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "GeoMean"; } - bool NeedReductionKernel(void) const { return mNeedReductionKernel; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GeoMean"; } + bool NeedReductionKernel() const { return mNeedReductionKernel; } protected: bool mNeedReductionKernel; }; @@ -215,7 +215,7 @@ class OpHarMean: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "HarMean"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "HarMean"; } }; class OpRsq: public Normal @@ -223,124 +223,124 @@ class OpRsq: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpRsq"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpRsq"; } }; class OpNormdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormdist"; } }; class OpMedian:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMedian"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMedian"; } }; class OpNormsdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormsdist"; } }; class OpNorminv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNorminv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNorminv"; } }; class OpNormsinv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpNormsinv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpNormsinv"; } }; class OpPhi:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPhi"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPhi"; } }; class OpKurt: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Kurt"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Kurt"; } }; class OpCovar: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream& ss, const std::string &sSymName, SubArguments& vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Covar"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Covar"; } }; class OpPermut:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPermut"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPermut"; } }; class OpPermutationA:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpPermutationA";} + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPermutationA";} }; class OpConfidence: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, 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 "Confidence"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Confidence"; } }; class OpIntercept: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Intercept"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Intercept"; } }; class OpLogInv: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "LogInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "LogInv"; } }; class OpCritBinom: public Normal { public: - virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } + virtual std::string GetBottom() SAL_OVERRIDE { return "0"; } virtual void GenSlidingWindowFunction(std::stringstream& ss, 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 "CritBinom"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "CritBinom"; } }; class OpForecast: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Forecast"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "Forecast"; } }; class OpLogNormDist: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "LogNormdist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "LogNormdist"; } }; class OpGammaDist: public Normal { @@ -348,34 +348,34 @@ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaDist"; } }; class OpHypGeomDist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpHypGeomDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpHypGeomDist"; } }; class OpChiDist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpChiDist"; } }; class OpBinomdist:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpBinomdist"; } }; class OpChiSqDist: public CheckVariables { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ChiSqDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ChiSqDist"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; @@ -384,7 +384,7 @@ class OpChiSqInv: public CheckVariables public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "ChiSqInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "ChiSqInv"; } virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; class OpChiInv:public Normal{ @@ -392,14 +392,14 @@ class OpChiInv:public Normal{ virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpChiInv"; } }; class OpPoisson:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpPoisson"; } }; class OpGammaInv: public Normal @@ -409,7 +409,7 @@ public: 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 "GammaInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "GammaInv"; } }; class OpFInv: public Normal { @@ -418,7 +418,7 @@ public: 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 "FInv"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FInv"; } }; class OpFTest: public Normal { @@ -427,14 +427,14 @@ public: 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 "FTest"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "FTest"; } }; class OpDevSq: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "DevSq"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "DevSq"; } }; class OpB: public Normal { @@ -443,7 +443,7 @@ public: 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 "B"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "B"; } }; class OpBetaDist: public Normal { @@ -452,21 +452,21 @@ public: 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 "BetaDist"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "BetaDist"; } }; class OpBetainv:public Normal{ public: virtual void GenSlidingWindowFunction(std::stringstream &ss, 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"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpBetainv"; } }; class OpMinA: public Normal { public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMinA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMinA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -475,7 +475,7 @@ class OpCountA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpCountA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpCountA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -484,7 +484,7 @@ class OpMaxA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpMaxA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpMaxA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -493,7 +493,7 @@ class OpVarA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVarA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpVarA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -502,7 +502,7 @@ class OpVarPA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpVarPA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpVarPA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -511,7 +511,7 @@ class OpStDevPA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpStDevPA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpStDevPA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -520,7 +520,7 @@ class OpAverageA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpAverageA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpAverageA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -529,7 +529,7 @@ class OpStDevA: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "OpStDevA"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "OpStDevA"; } virtual bool takeString() const SAL_OVERRIDE { return true; } virtual bool takeNumeric() const SAL_OVERRIDE { return true; } }; @@ -538,7 +538,7 @@ class OpAveDev: public Normal public: virtual void GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) SAL_OVERRIDE; - virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "AveDev"; } + virtual std::string BinFuncName() const SAL_OVERRIDE { return "AveDev"; } }; }} diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx b/sc/source/core/opencl/opinlinefun_finacial.cxx index c18212fdeb58..f062954d4115 100644 --- a/sc/source/core/opencl/opinlinefun_finacial.cxx +++ b/sc/source/core/opencl/opinlinefun_finacial.cxx @@ -272,18 +272,18 @@ std::string DateToDays_new= "}\n"; std::string GetNullDateDecl= -"int GetNullDate(void);\n"; +"int GetNullDate();\n"; std::string GetNullDate= -"int GetNullDate(void)\n" +"int GetNullDate()\n" "{\n" " return DateToDays(30,12,1899 );\n" "}\n"; std::string GetNullDate_newDecl= -"int GetNullDate_new(void);\n"; +"int GetNullDate_new();\n"; std::string GetNullDate_new= -"int GetNullDate_new(void)\n" +"int GetNullDate_new()\n" "{\n" " return DateToDays_new(30,12,1899 );\n" "}\n"; diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 6efb11abba75..f46d25c8d324 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.cxx @@ -253,7 +253,7 @@ DifParser::DifParser( SvStream& rNewIn, const sal_uInt32 nOption, ScDocument& rD pNumFormatter = rDoc.GetFormatTable(); } -TOPIC DifParser::GetNextTopic( void ) +TOPIC DifParser::GetNextTopic() { enum STATE { S_VectorVal, S_Data, S_END, S_START, S_UNKNOWN, S_ERROR_L2 }; @@ -489,7 +489,7 @@ bool DifParser::LookAhead() return bValidStructure; } -DATASET DifParser::GetNextDataset( void ) +DATASET DifParser::GetNextDataset() { DATASET eRet = D_UNKNOWN; OUString aLine; diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index c32262546ddd..b9788d7f8154 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -760,7 +760,7 @@ ExcDocument::~ExcDocument() delete pExpChangeTrack; } -void ExcDocument::ReadDoc( void ) +void ExcDocument::ReadDoc() { InitializeConvert(); diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 72ba7717d759..7b27ddce9323 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -209,35 +209,35 @@ ImportExcel8::~ImportExcel8() { } -void ImportExcel8::Calccount( void ) +void ImportExcel8::Calccount() { ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetIterCount( aIn.ReaduInt16() ); pD->SetDocOptions( aOpt ); } -void ImportExcel8::Precision( void ) +void ImportExcel8::Precision() { ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetCalcAsShown( aIn.ReaduInt16() == 0 ); pD->SetDocOptions( aOpt ); } -void ImportExcel8::Delta( void ) +void ImportExcel8::Delta() { ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetIterEps( aIn.ReadDouble() ); pD->SetDocOptions( aOpt ); } -void ImportExcel8::Iteration( void ) +void ImportExcel8::Iteration() { ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetIter( aIn.ReaduInt16() == 1 ); pD->SetDocOptions( aOpt ); } -void ImportExcel8::Boundsheet( void ) +void ImportExcel8::Boundsheet() { sal_uInt8 nLen; sal_uInt16 nGrbit; @@ -270,7 +270,7 @@ void ImportExcel8::Boundsheet( void ) nBdshtTab++; } -void ImportExcel8::Scenman( void ) +void ImportExcel8::Scenman() { sal_uInt16 nLastDispl; @@ -280,12 +280,12 @@ void ImportExcel8::Scenman( void ) maScenList.nLastScenario = nLastDispl; } -void ImportExcel8::Scenario( void ) +void ImportExcel8::Scenario() { maScenList.aEntries.push_back( new ExcScenario( aIn, *pExcRoot ) ); } -void ImportExcel8::Labelsst( void ) +void ImportExcel8::Labelsst() { XclAddress aXclPos; sal_uInt16 nXF; @@ -305,7 +305,7 @@ void ImportExcel8::Labelsst( void ) } } -void ImportExcel8::FeatHdr( void ) +void ImportExcel8::FeatHdr() { if (!readFrtHeader( aIn, 0x0867)) return; @@ -322,7 +322,7 @@ void ImportExcel8::FeatHdr( void ) GetSheetProtectBuffer().ReadOptions( aIn, GetCurrScTab() ); } -void ImportExcel8::Feat( void ) +void ImportExcel8::Feat() { if (!readFrtHeader( aIn, 0x0868)) return; @@ -370,7 +370,7 @@ void ImportExcel8::Feat( void ) GetSheetProtectBuffer().AppendEnhancedProtection( aProt, GetCurrScTab() ); } -void ImportExcel8::ReadBasic( void ) +void ImportExcel8::ReadBasic() { SfxObjectShell* pShell = GetDocShell(); SotStorageRef xRootStrg = GetRootStorage(); @@ -423,14 +423,14 @@ void ImportExcel8::ReadBasic( void ) } } -void ImportExcel8::EndSheet( void ) +void ImportExcel8::EndSheet() { ImportExcel::EndSheet(); GetCondFormatManager().Apply(); GetValidationManager().Apply(); } -void ImportExcel8::PostDocLoad( void ) +void ImportExcel8::PostDocLoad() { #if HAVE_FEATURE_SCRIPTING // reading basic has been delayed until sheet objects (codenames etc.) are read @@ -483,7 +483,7 @@ void ImportExcel8::LoadDocumentProperties() // autofilter -void ImportExcel8::FilterMode( void ) +void ImportExcel8::FilterMode() { // The FilterMode record exists: if either the AutoFilter // record exists or an Advanced Filter is saved and stored @@ -496,7 +496,7 @@ void ImportExcel8::FilterMode( void ) pData->SetAutoOrAdvanced(); } -void ImportExcel8::AutoFilterInfo( void ) +void ImportExcel8::AutoFilterInfo() { if( !pExcRoot->pAutoFilterBuffer ) return; @@ -508,7 +508,7 @@ void ImportExcel8::AutoFilterInfo( void ) } } -void ImportExcel8::AutoFilter( void ) +void ImportExcel8::AutoFilter() { if( !pExcRoot->pAutoFilterBuffer ) return; diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 7bbe5559f446..2af837e14e0a 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -162,7 +162,7 @@ void ExcDummyRec::Save( XclExpStream& rStrm ) rStrm.Write( GetData(), GetLen() ); // raw write mode } -sal_uInt16 ExcDummyRec::GetNum( void ) const +sal_uInt16 ExcDummyRec::GetNum() const { return 0x0000; } @@ -174,7 +174,7 @@ void ExcBoolRecord::SaveCont( XclExpStream& rStrm ) rStrm << (sal_uInt16)(bVal ? 0x0001 : 0x0000); } -sal_Size ExcBoolRecord::GetLen( void ) const +sal_Size ExcBoolRecord::GetLen() const { return 2; } @@ -191,7 +191,7 @@ ExcBof_Base::ExcBof_Base() //-------------------------------------------------------------- class ExcBof - -ExcBof::ExcBof( void ) +ExcBof::ExcBof() { nDocType = 0x0010; nVers = 0x0500; @@ -202,19 +202,19 @@ void ExcBof::SaveCont( XclExpStream& rStrm ) rStrm << nVers << nDocType << nRupBuild << nRupYear; } -sal_uInt16 ExcBof::GetNum( void ) const +sal_uInt16 ExcBof::GetNum() const { return 0x0809; } -sal_Size ExcBof::GetLen( void ) const +sal_Size ExcBof::GetLen() const { return 8; } //------------------------------------------------------------- class ExcBofW - -ExcBofW::ExcBofW( void ) +ExcBofW::ExcBofW() { nDocType = 0x0005; nVers = 0x0500; @@ -225,58 +225,58 @@ void ExcBofW::SaveCont( XclExpStream& rStrm ) rStrm << nVers << nDocType << nRupBuild << nRupYear; } -sal_uInt16 ExcBofW::GetNum( void ) const +sal_uInt16 ExcBofW::GetNum() const { return 0x0809; } -sal_Size ExcBofW::GetLen( void ) const +sal_Size ExcBofW::GetLen() const { return 8; } //-------------------------------------------------------------- class ExcEof - -sal_uInt16 ExcEof::GetNum( void ) const +sal_uInt16 ExcEof::GetNum() const { return 0x000A; } -sal_Size ExcEof::GetLen( void ) const +sal_Size ExcEof::GetLen() const { return 0; } //--------------------------------------------------------- class ExcDummy_00 - -sal_Size ExcDummy_00::GetLen( void ) const +sal_Size ExcDummy_00::GetLen() const { return nMyLen; } -const sal_uInt8* ExcDummy_00::GetData( void ) const +const sal_uInt8* ExcDummy_00::GetData() const { return pMyData; } //-------------------------------------------------------- class ExcDummy_04x - -sal_Size ExcDummy_040::GetLen( void ) const +sal_Size ExcDummy_040::GetLen() const { return nMyLen; } -const sal_uInt8* ExcDummy_040::GetData( void ) const +const sal_uInt8* ExcDummy_040::GetData() const { return pMyData; } -sal_Size ExcDummy_041::GetLen( void ) const +sal_Size ExcDummy_041::GetLen() const { return nMyLen; } -const sal_uInt8* ExcDummy_041::GetData( void ) const +const sal_uInt8* ExcDummy_041::GetData() const { return pMyData; } @@ -290,7 +290,7 @@ Exc1904::Exc1904( ScDocument& rDoc ) bDateCompatibility = pDate && !( *pDate == Date( 30, 12, 1899 )); } -sal_uInt16 Exc1904::GetNum( void ) const +sal_uInt16 Exc1904::GetNum() const { return 0x0022; } @@ -340,7 +340,7 @@ void ExcBundlesheetBase::UpdateStreamPos( XclExpStream& rStrm ) rStrm.EnableEncryption(); } -sal_uInt16 ExcBundlesheetBase::GetNum( void ) const +sal_uInt16 ExcBundlesheetBase::GetNum() const { return 0x0085; } @@ -368,12 +368,12 @@ sal_Size ExcBundlesheet::GetLen() const //--------------------------------------------------------- class ExcDummy_02 - -sal_Size ExcDummy_02a::GetLen( void ) const +sal_Size ExcDummy_02a::GetLen() const { return nMyLen; } -const sal_uInt8* ExcDummy_02a::GetData( void ) const +const sal_uInt8* ExcDummy_02a::GetData() const { return pMyData; } diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx index 53df97379afe..c23c70dab191 100644 --- a/sc/source/filter/excel/exctools.cxx +++ b/sc/source/filter/excel/exctools.cxx @@ -46,7 +46,7 @@ #include <vector> -RootData::RootData( void ) +RootData::RootData() { eDateiTyp = BiffX; pExtSheetBuff = NULL; diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 5b6bcd8426c0..a08bd1468b3f 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -152,7 +152,7 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ): pD->SetDocOptions( aDocOpt ); } -ImportExcel::~ImportExcel( void ) +ImportExcel::~ImportExcel() { GetDoc().SetSrcCharSet( GetTextEncoding() ); @@ -415,7 +415,7 @@ void ImportExcel::Window1() GetDocViewSettings().ReadWindow1( maStrm ); } -void ImportExcel::Row25( void ) +void ImportExcel::Row25() { sal_uInt16 nRow, nRowHeight; @@ -445,7 +445,7 @@ void ImportExcel::Row25( void ) } } -void ImportExcel::Bof2( void ) +void ImportExcel::Bof2() { sal_uInt16 nSubType; maStrm.DisableDecryption(); @@ -460,14 +460,14 @@ void ImportExcel::Bof2( void ) pExcRoot->eDateiTyp = Biff2; } -void ImportExcel::Eof( void ) +void ImportExcel::Eof() { // POST: cannot be called after an invalid table! EndSheet(); IncCurrScTab(); } -void ImportExcel::SheetPassword( void ) +void ImportExcel::SheetPassword() { if (GetRoot().GetBiff() != EXC_BIFF8) return; @@ -475,7 +475,7 @@ void ImportExcel::SheetPassword( void ) GetRoot().GetSheetProtectBuffer().ReadPasswordHash( aIn, GetCurrScTab() ); } -void ImportExcel::Externsheet( void ) +void ImportExcel::Externsheet() { OUString aUrl, aTabName; bool bSameWorkBook; @@ -484,7 +484,7 @@ void ImportExcel::Externsheet( void ) mnLastRefIdx = pExcRoot->pExtSheetBuff->Add( aUrl, aTabName, bSameWorkBook ); } -void ImportExcel:: WinProtection( void ) +void ImportExcel:: WinProtection() { if (GetRoot().GetBiff() != EXC_BIFF8) return; @@ -492,7 +492,7 @@ void ImportExcel:: WinProtection( void ) GetRoot().GetDocProtectBuffer().ReadWinProtect( aIn ); } -void ImportExcel::Columndefault( void ) +void ImportExcel::Columndefault() {// Default Cell Attributes sal_uInt16 nColMic, nColMac; sal_uInt8 nOpt0; @@ -518,7 +518,7 @@ void ImportExcel::Columndefault( void ) } } -void ImportExcel::Array25( void ) +void ImportExcel::Array25() { sal_uInt16 nFirstRow, nLastRow, nFormLen; sal_uInt8 nFirstCol, nLastCol; @@ -556,7 +556,7 @@ void ImportExcel::Array25( void ) } } -void ImportExcel::Rec1904( void ) +void ImportExcel::Rec1904() { sal_uInt16 n1904; @@ -571,7 +571,7 @@ void ImportExcel::Rec1904( void ) } } -void ImportExcel::Externname25( void ) +void ImportExcel::Externname25() { sal_uInt32 nRes; sal_uInt16 nOpt; @@ -596,7 +596,7 @@ void ImportExcel::Externname25( void ) } } -void ImportExcel::Colwidth( void ) +void ImportExcel::Colwidth() {// Column Width sal_uInt8 nColFirst, nColLast; sal_uInt16 nColWidth; @@ -613,7 +613,7 @@ void ImportExcel::Colwidth( void ) pColRowBuff->SetWidthRange( nColFirst, nColLast, nScWidth ); } -void ImportExcel::Defrowheight2( void ) +void ImportExcel::Defrowheight2() { sal_uInt16 nDefHeight; nDefHeight = maStrm.ReaduInt16(); @@ -621,7 +621,7 @@ void ImportExcel::Defrowheight2( void ) pColRowBuff->SetDefHeight( nDefHeight, EXC_DEFROW_UNSYNCED ); } -void ImportExcel::SheetProtect( void ) +void ImportExcel::SheetProtect() { if (GetRoot().GetBiff() != EXC_BIFF8) return; @@ -629,7 +629,7 @@ void ImportExcel::SheetProtect( void ) GetRoot().GetSheetProtectBuffer().ReadProtect( aIn, GetCurrScTab() ); } -void ImportExcel::DocProtect( void ) +void ImportExcel::DocProtect() { if (GetRoot().GetBiff() != EXC_BIFF8) return; @@ -637,7 +637,7 @@ void ImportExcel::DocProtect( void ) GetRoot().GetDocProtectBuffer().ReadDocProtect( aIn ); } -void ImportExcel::DocPasssword( void ) +void ImportExcel::DocPasssword() { if (GetRoot().GetBiff() != EXC_BIFF8) return; @@ -645,17 +645,17 @@ void ImportExcel::DocPasssword( void ) GetRoot().GetDocProtectBuffer().ReadPasswordHash( aIn ); } -void ImportExcel::Codepage( void ) +void ImportExcel::Codepage() { SetCodePage( maStrm.ReaduInt16() ); } -void ImportExcel::Ixfe( void ) +void ImportExcel::Ixfe() { mnIxfeIndex = maStrm.ReaduInt16(); } -void ImportExcel::DefColWidth( void ) +void ImportExcel::DefColWidth() { // stored as entire characters -> convert to 1/256 of characters (as in COLINFO) double fDefWidth = 256.0 * maStrm.ReaduInt16(); @@ -668,7 +668,7 @@ void ImportExcel::DefColWidth( void ) pColRowBuff->SetDefWidth( nScWidth ); } -void ImportExcel::Colinfo( void ) +void ImportExcel::Colinfo() {// Column Formatting Information sal_uInt16 nColFirst, nColLast, nColWidth, nXF; sal_uInt16 nOpt; @@ -698,7 +698,7 @@ void ImportExcel::Colinfo( void ) pColRowBuff->SetDefaultXF( nColFirst, nColLast, nXF ); } -void ImportExcel::Wsbool( void ) +void ImportExcel::Wsbool() { sal_uInt16 nFlags; nFlags = aIn.ReaduInt16(); @@ -709,7 +709,7 @@ void ImportExcel::Wsbool( void ) GetPageSettings().SetFitToPages( ::get_flag( nFlags, EXC_WSBOOL_FITTOPAGE ) ); } -void ImportExcel::Boundsheet( void ) +void ImportExcel::Boundsheet() { sal_uInt16 nGrbit = 0; @@ -742,7 +742,7 @@ void ImportExcel::Boundsheet( void ) nBdshtTab++; } -void ImportExcel::Country( void ) +void ImportExcel::Country() { sal_uInt16 nUICountry, nDocCountry; nUICountry = maStrm.ReaduInt16(); @@ -769,7 +769,7 @@ void ImportExcel::ReadUsesElfs() } } -void ImportExcel::Hideobj( void ) +void ImportExcel::Hideobj() { sal_uInt16 nHide; ScVObjMode eOle, eChart, eDraw; @@ -804,13 +804,13 @@ void ImportExcel::Hideobj( void ) pD->SetViewOptions( aOpts ); } -void ImportExcel::Standardwidth( void ) +void ImportExcel::Standardwidth() { sal_uInt16 nScWidth = XclTools::GetScColumnWidth( maStrm.ReaduInt16(), GetCharWidth() ); pColRowBuff->SetDefWidth( nScWidth, true ); } -void ImportExcel::Shrfmla( void ) +void ImportExcel::Shrfmla() { switch (mnLastRecId) { @@ -863,7 +863,7 @@ void ImportExcel::Shrfmla( void ) mpLastFormula->mpCell = pCell; } -void ImportExcel::Mulrk( void ) +void ImportExcel::Mulrk() { XclAddress aXclPos; sal_uInt16 nXF; @@ -885,7 +885,7 @@ void ImportExcel::Mulrk( void ) } } -void ImportExcel::Mulblank( void ) +void ImportExcel::Mulblank() { XclAddress aXclPos; sal_uInt16 nXF; @@ -902,7 +902,7 @@ void ImportExcel::Mulblank( void ) } } -void ImportExcel::Rstring( void ) +void ImportExcel::Rstring() { XclAddress aXclPos; sal_uInt16 nXFIdx; @@ -948,7 +948,7 @@ void ImportExcel::Cellmerging() } } -void ImportExcel::Olesize( void ) +void ImportExcel::Olesize() { XclRange aXclOleSize( ScAddress::UNINITIALIZED ); maStrm.Ignore( 2 ); @@ -958,7 +958,7 @@ void ImportExcel::Olesize( void ) GetAddressConverter().ConvertRange( maScOleSize, aXclOleSize, nScTab, nScTab, false ); } -void ImportExcel::Row34( void ) +void ImportExcel::Row34() { sal_uInt16 nRow, nRowHeight, nGrbit, nXF; @@ -988,7 +988,7 @@ void ImportExcel::Row34( void ) } } -void ImportExcel::Bof3( void ) +void ImportExcel::Bof3() { sal_uInt16 nSubType; maStrm.DisableDecryption(); @@ -1006,7 +1006,7 @@ void ImportExcel::Bof3( void ) pExcRoot->eDateiTyp = Biff3; } -void ImportExcel::Array34( void ) +void ImportExcel::Array34() { sal_uInt16 nFirstRow, nLastRow, nFormLen; sal_uInt8 nFirstCol, nLastCol; @@ -1035,7 +1035,7 @@ void ImportExcel::Array34( void ) } } -void ImportExcel::Defrowheight345( void ) +void ImportExcel::Defrowheight345() { sal_uInt16 nFlags, nDefHeight; nFlags = maStrm.ReaduInt16(); @@ -1043,7 +1043,7 @@ void ImportExcel::Defrowheight345( void ) pColRowBuff->SetDefHeight( nDefHeight, nFlags ); } -void ImportExcel::TableOp( void ) +void ImportExcel::TableOp() { sal_uInt16 nFirstRow, nLastRow; sal_uInt8 nFirstCol, nLastCol; @@ -1125,7 +1125,7 @@ void ImportExcel::TableOp( void ) } } -void ImportExcel::Bof4( void ) +void ImportExcel::Bof4() { sal_uInt16 nSubType; maStrm.DisableDecryption(); @@ -1142,7 +1142,7 @@ void ImportExcel::Bof4( void ) pExcRoot->eDateiTyp = Biff4; } -void ImportExcel::Bof5( void ) +void ImportExcel::Bof5() { //POST: eDateiTyp = Type of the file to be read sal_uInt16 nSubType, nVers; @@ -1170,7 +1170,7 @@ void ImportExcel::Bof5( void ) pExcRoot->eDateiTyp = eDatei; } -void ImportExcel::EndSheet( void ) +void ImportExcel::EndSheet() { pExcRoot->pExtSheetBuff->Reset(); @@ -1183,7 +1183,7 @@ void ImportExcel::EndSheet( void ) FinalizeTable(); } -void ImportExcel::NewTable( void ) +void ImportExcel::NewTable() { SCTAB nTab = GetCurrScTab(); if( nTab > 0 && !pD->HasTable( nTab ) ) @@ -1225,7 +1225,7 @@ void ImportExcel::AdjustRowHeight() pDocObj->UpdateAllRowHeights(); } -void ImportExcel::PostDocLoad( void ) +void ImportExcel::PostDocLoad() { /* Set automatic page numbering in Default page style (default is "page number = 1"). Otherwise hidden tables (i.e. for scenarios) which have Default page style will diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index dde5392339eb..098c32eef658 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -182,17 +182,17 @@ bool ExtSheetBuffer::GetLink( const sal_uInt16 nExcIndex, OUString& rAppl, OUStr return true; } -void ExtSheetBuffer::Reset( void ) +void ExtSheetBuffer::Reset() { maEntries.clear(); } -bool ExtName::IsDDE( void ) const +bool ExtName::IsDDE() const { return ( nFlags & 0x0001 ) != 0; } -bool ExtName::IsOLE( void ) const +bool ExtName::IsOLE() const { return ( nFlags & 0x0002 ) != 0; } @@ -228,7 +228,7 @@ const ExtName* ExtNameBuff::GetNameByIndex( sal_Int16 nRefIdx, sal_uInt16 nNameI return ((aIt != maExtNames.end()) && (0 < nNameIdx) && (nNameIdx <= aIt->second.size())) ? &aIt->second[ nNameIdx - 1 ] : 0; } -void ExtNameBuff::Reset( void ) +void ExtNameBuff::Reset() { maExtNames.clear(); } diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index dc7c74e9072a..fe0afcf05c53 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -42,7 +42,7 @@ #include <boost/scoped_ptr.hpp> -FltError ImportExcel::Read( void ) +FltError ImportExcel::Read() { XclImpPageSettings& rPageSett = GetPageSettings(); XclImpTabViewSettings& rTabViewSett = GetTabViewSettings(); @@ -766,7 +766,7 @@ FltError ImportExcel::Read( void ) return eLastErr; } -FltError ImportExcel8::Read( void ) +FltError ImportExcel8::Read() { #ifdef EXC_INCL_DUMPER { diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index cea4a4c4a7ef..7837b6d6046d 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -152,7 +152,7 @@ static sal_uInt16 lcl_canGrow( sal_uInt16 nOld, sal_uInt16 nByMin = 1 ) return static_cast<sal_uInt16>(nNew); } -bool TokenPool::GrowString( void ) +bool TokenPool::GrowString() { sal_uInt16 nP_StrNew = lcl_canGrow( nP_Str); if (!nP_StrNew) @@ -176,7 +176,7 @@ bool TokenPool::GrowString( void ) return true; } -bool TokenPool::GrowDouble( void ) +bool TokenPool::GrowDouble() { sal_uInt16 nP_DblNew = lcl_canGrow( nP_Dbl); if (!nP_DblNew) @@ -198,7 +198,7 @@ bool TokenPool::GrowDouble( void ) /* TODO: in case we had FormulaTokenArray::AddError() */ #if 0 -void TokenPool::GrowError( void ) +void TokenPool::GrowError() { sal_uInt16 nP_ErrNew = lcl_canGrow( nP_Err); if (!nP_ErrNew) @@ -243,7 +243,7 @@ bool TokenPool::GrowTripel( sal_uInt16 nByMin ) return true; } -bool TokenPool::GrowId( void ) +bool TokenPool::GrowId() { sal_uInt16 nP_IdNew = lcl_canGrow( nP_Id); if (!nP_IdNew) @@ -263,7 +263,7 @@ bool TokenPool::GrowId( void ) return true; } -bool TokenPool::GrowElement( void ) +bool TokenPool::GrowElement() { sal_uInt16 nElementNew = lcl_canGrow( nElement); if (!nElementNew) @@ -298,7 +298,7 @@ bool TokenPool::GrowElement( void ) return true; } -bool TokenPool::GrowExt( void ) +bool TokenPool::GrowExt() { sal_uInt16 nNewSize = lcl_canGrow( nP_Ext); if (!nNewSize) @@ -317,7 +317,7 @@ bool TokenPool::GrowExt( void ) return true; } -bool TokenPool::GrowNlf( void ) +bool TokenPool::GrowNlf() { sal_uInt16 nNewSize = lcl_canGrow( nP_Nlf); if (!nNewSize) @@ -336,7 +336,7 @@ bool TokenPool::GrowNlf( void ) return true; } -bool TokenPool::GrowMatrix( void ) +bool TokenPool::GrowMatrix() { sal_uInt16 nNewSize = lcl_canGrow( nP_Matrix); if (!nNewSize) @@ -874,7 +874,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const OUString& rTabNa return static_cast<const TokenId>(nElementAkt); } -void TokenPool::Reset( void ) +void TokenPool::Reset() { nP_IdAkt = nP_IdLast = nElementAkt = nP_StrAkt = nP_DblAkt = nP_ErrAkt = nP_RefTrAkt = nP_ExtAkt = nP_NlfAkt = nP_MatrixAkt = 0; maRangeNames.clear(); diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index f23fdd576c15..cb81d715cb31 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.cxx @@ -363,7 +363,7 @@ ScOrcusFilters* ScFormatFilterPluginImpl::GetOrcusFilters() #endif } -ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void) +ScFormatFilterPlugin * SAL_CALL ScFilterCreate() { return new ScFormatFilterPluginImpl(); } diff --git a/sc/source/filter/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 8ed3448ad60e..357ecdb8c72d 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -82,9 +82,9 @@ private: public: DifParser( SvStream&, const sal_uInt32 nOption, ScDocument&, rtl_TextEncoding ); - TOPIC GetNextTopic( void ); + TOPIC GetNextTopic(); - DATASET GetNextDataset( void ); + DATASET GetNextDataset(); const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, sal_uInt32& rRet ); bool ScanFloatVal( const sal_Unicode* pStart ); @@ -94,7 +94,7 @@ public: static inline bool IsV( const sal_Unicode* pRef ); - inline bool IsPlain( void ) const; + inline bool IsPlain() const; }; inline bool DifParser::IsBOT( const sal_Unicode* pRef ) @@ -137,7 +137,7 @@ inline bool DifParser::IsNumberEnding( const sal_Unicode cChar ) return ( cChar == 0x00 ); } -inline bool DifParser::IsPlain( void ) const +inline bool DifParser::IsPlain() const { return bPlain; } diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx index c1158e8c9f0e..776c9f741a9a 100644 --- a/sc/source/filter/inc/excdoc.hxx +++ b/sc/source/filter/inc/excdoc.hxx @@ -97,7 +97,7 @@ public: explicit ExcDocument( const XclExpRoot& rRoot ); virtual ~ExcDocument(); - void ReadDoc( void ); + void ReadDoc(); void Write( SvStream& rSvStrm ); void WriteXml( XclExpXmlStream& ); }; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index ef59b5fa89af..b8e32b722289 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -38,29 +38,29 @@ class ImportExcel8 : public ImportExcel { public: ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ); - virtual ~ImportExcel8( void ); - - virtual FltError Read( void ) SAL_OVERRIDE; - - void Calccount( void ); // 0x0C - void Precision( void ); // 0x0E - void Delta( void ); // 0x10 - void Iteration( void ); // 0x11 - void Boundsheet( void ); // 0x85 - void FilterMode( void ); // 0x9B - void AutoFilterInfo( void ); // 0x9D - void AutoFilter( void ); // 0x9E - void Scenman( void ); // 0xAE - void Scenario( void ); // 0xAF - void ReadBasic( void ); // 0xD3 - void Labelsst( void ); // 0xFD - - void Hlink( void ); // 0x01B8 - void FeatHdr( void ); // 0x0867 - void Feat( void ); // 0x0868 - - virtual void EndSheet( void ) SAL_OVERRIDE; - virtual void PostDocLoad( void ) SAL_OVERRIDE; + virtual ~ImportExcel8(); + + virtual FltError Read() SAL_OVERRIDE; + + void Calccount(); // 0x0C + void Precision(); // 0x0E + void Delta(); // 0x10 + void Iteration(); // 0x11 + void Boundsheet(); // 0x85 + void FilterMode(); // 0x9B + void AutoFilterInfo(); // 0x9D + void AutoFilter(); // 0x9E + void Scenman(); // 0xAE + void Scenario(); // 0xAF + void ReadBasic(); // 0xD3 + void Labelsst(); // 0xFD + + void Hlink(); // 0x01B8 + void FeatHdr(); // 0x0867 + void Feat(); // 0x0868 + + virtual void EndSheet() SAL_OVERRIDE; + virtual void PostDocLoad() SAL_OVERRIDE; private: void LoadDocumentProperties(); diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index ba74e5a63461..edfb231890e7 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -101,7 +101,7 @@ protected: public: inline ExcBoolRecord( const bool bDefault ) : bVal( bDefault ) {} - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //--------------------------------------------------------- class ExcBof_Base - @@ -115,7 +115,7 @@ protected: sal_uInt16 nRupBuild; sal_uInt16 nRupYear; public: - ExcBof_Base( void ); + ExcBof_Base(); }; //-------------------------------------------------------------- class ExcBof - @@ -126,10 +126,10 @@ class ExcBof : public ExcBof_Base private: virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - ExcBof( void ); + ExcBof(); - virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //------------------------------------------------------------- class ExcBofW - @@ -140,10 +140,10 @@ class ExcBofW : public ExcBof_Base private: virtual void SaveCont( XclExpStream& rStrm ) SAL_OVERRIDE; public: - ExcBofW( void ); + ExcBofW(); - virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //-------------------------------------------------------------- class ExcEof - @@ -152,8 +152,8 @@ class ExcEof : public ExcRecord { private: public: - virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; }; //--------------------------------------------------------- class ExcDummy_00 - @@ -165,8 +165,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; - virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual const sal_uInt8* GetData() const SAL_OVERRIDE; }; // EXC_ID_WINDOWPROTECTION @@ -215,8 +215,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; - virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual const sal_uInt8* GetData() const SAL_OVERRIDE; }; class ExcDummy_041 : public ExcDummyRec @@ -225,8 +225,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; - virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual const sal_uInt8* GetData() const SAL_OVERRIDE; }; //------------------------------------------------------------- class Exc1904 - @@ -235,7 +235,7 @@ class Exc1904 : public ExcBoolRecord { public: Exc1904( ScDocument& rDoc ); - virtual sal_uInt16 GetNum( void ) const SAL_OVERRIDE; + virtual sal_uInt16 GetNum() const SAL_OVERRIDE; virtual void SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE; private: @@ -284,8 +284,8 @@ private: static const sal_uInt8 pMyData[]; static const sal_Size nMyLen; public: - virtual sal_Size GetLen( void ) const SAL_OVERRIDE; - virtual const sal_uInt8* GetData( void ) const SAL_OVERRIDE; + virtual sal_Size GetLen() const SAL_OVERRIDE; + virtual const sal_uInt8* GetData() const SAL_OVERRIDE; }; /** This record contains the Windows country IDs for the UI and document language. */ diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx index 32ab82b1cb23..667108b3b13e 100644 --- a/sc/source/filter/inc/excscen.hxx +++ b/sc/source/filter/inc/excscen.hxx @@ -39,7 +39,7 @@ public: inline void SetValue( const OUString& rVal ) { aValue = rVal; } - inline const OUString& GetValue( void ) const { return aValue; } + inline const OUString& GetValue() const { return aValue; } }; class ExcScenario diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index 2d4b2161610a..87fd1446ecf6 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -53,7 +53,7 @@ public: ImportTyp( ScDocument*, rtl_TextEncoding eSrc ); virtual ~ImportTyp(); - virtual FltError Read( void ); + virtual FltError Read(); }; class XclImpOutlineDataBuffer : protected XclImpRoot @@ -141,69 +141,69 @@ protected: void ReadRk(); void Window1(); - void Formula25( void ); // 0x06 -> excform.cxx - void Row25( void ); // 0x08 - void Bof2( void ); // 0x09 - void Eof( void ); // 0x0A - void DocProtect( void ); // 0x12 - void SheetProtect( void ); // 0x12 Sheet Protection - void DocPasssword( void ); // 0x13 document password - void SheetPassword( void ); // 0x13 sheet password - void Externsheet( void ); // 0x17 - void WinProtection( void ); // 0x19 - void Columndefault( void ); // 0x20 - void Array25( void ); // 0x21 - void Rec1904( void ); // 0x22 - void Externname25( void ); // 0x23 - void Colwidth( void ); // 0x24 - void Defrowheight2( void ); // 0x25 -// void Window1( void ); // 0x3D - void Codepage( void ); // 0x42 - void Ixfe( void ); // 0x44 - void DefColWidth( void ); // 0x55 - void Colinfo( void ); // 0x7D - void Wsbool( void ); // 0x81 - void Boundsheet( void ); // 0x85 - void Country( void ); // 0x8C - void Hideobj( void ); // 0x8D - void Standardwidth( void ); // 0x99 - void Shrfmla( void ); // 0xBC - void Mulrk( void ); // 0xBD - void Mulblank( void ); // 0xBE - void Rstring( void ); // 0xD6 - void Cellmerging( void ); // 0xE5 - void Olesize( void ); // 0xDE + void Formula25(); // 0x06 -> excform.cxx + void Row25(); // 0x08 + void Bof2(); // 0x09 + void Eof(); // 0x0A + void DocProtect(); // 0x12 + void SheetProtect(); // 0x12 Sheet Protection + void DocPasssword(); // 0x13 document password + void SheetPassword(); // 0x13 sheet password + void Externsheet(); // 0x17 + void WinProtection(); // 0x19 + void Columndefault(); // 0x20 + void Array25(); // 0x21 + void Rec1904(); // 0x22 + void Externname25(); // 0x23 + void Colwidth(); // 0x24 + void Defrowheight2(); // 0x25 +// void Window1(); // 0x3D + void Codepage(); // 0x42 + void Ixfe(); // 0x44 + void DefColWidth(); // 0x55 + void Colinfo(); // 0x7D + void Wsbool(); // 0x81 + void Boundsheet(); // 0x85 + void Country(); // 0x8C + void Hideobj(); // 0x8D + void Standardwidth(); // 0x99 + void Shrfmla(); // 0xBC + void Mulrk(); // 0xBD + void Mulblank(); // 0xBE + void Rstring(); // 0xD6 + void Cellmerging(); // 0xE5 + void Olesize(); // 0xDE void ReadUsesElfs(); // 0x0160 - void Formula3( void ); // 0x0206 -> excform.cxx + void Formula3(); // 0x0206 -> excform.cxx // 0x0207 -> 0x07 - void Row34( void ); // 0x0208 - void Bof3( void ); // 0x0209 - void Array34( void ); // 0x0221 - void Defrowheight345( void ); // 0x0225 - void TableOp( void ); // 0x0236 - //void Rk( void ); // 0x027E -> 0x7E - void Formula4( void ); // 0x0406 -> excform.cxx - void Bof4( void ); // 0x0409 - void Bof5( void ); // 0x0809 + void Row34(); // 0x0208 + void Bof3(); // 0x0209 + void Array34(); // 0x0221 + void Defrowheight345(); // 0x0225 + void TableOp(); // 0x0236 + //void Rk(); // 0x027E -> 0x7E + void Formula4(); // 0x0406 -> excform.cxx + void Bof4(); // 0x0409 + void Bof5(); // 0x0809 void Formula( const XclAddress& rXclPos, sal_uInt16 nXF, sal_uInt16 nFormLen, double fCurVal, bool bShrFmla); // -> excform.cxx - virtual void EndSheet( void ); - void NewTable( void ); + virtual void EndSheet(); + void NewTable(); const ScTokenArray* ErrorToFormula( bool bErrOrVal, sal_uInt8 nError, double& rVal ); void AdjustRowHeight(); - virtual void PostDocLoad( void ); + virtual void PostDocLoad(); public: ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ); - virtual ~ImportExcel( void ); + virtual ~ImportExcel(); - virtual FltError Read( void ) SAL_OVERRIDE; + virtual FltError Read() SAL_OVERRIDE; }; #endif diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index aba56e290d82..81f477ee0589 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -37,7 +37,7 @@ private: SvxFontHeightItem* pHeight; SvxColorItem* pColor; sal_Int32 nType; // < 0 -> undefiniert - inline ENTRY( void ) + inline ENTRY() { pTmpName = NULL; pFont = NULL; diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index 37aa95ada8a6..cc819cfdf993 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -93,7 +93,7 @@ public: const FORMULA_TYPE eFT = FT_CellFormula ) SAL_OVERRIDE; void Reset( const ScAddress& rEingPos ); - inline void SetWK3( void ); + inline void SetWK3(); LotusContext& getContext() { return m_rContext; } private: @@ -109,7 +109,7 @@ inline void LotusToSc::ReadCRD( ScComplexRefData& rCRD, sal_uInt8 nRelBit ) ReadSRD( rCRD.Ref2, nRelBit >> 3 ); } -inline void LotusToSc::SetWK3( void ) +inline void LotusToSc::SetWK3() { bWK3 = true; } diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index f177eeb5b75d..4cdd130c8e3f 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -41,26 +41,26 @@ private: sal_Int32 nExtTab; // in WK?-Datei - void Bof( void ); // 0x0000 00 - bool BofFm3( void ); // 0x0000 00 + void Bof(); // 0x0000 00 + bool BofFm3(); // 0x0000 00 void Columnwidth( sal_uInt16 nRecLen ); // 0x0007 07 void Hiddencolumn( sal_uInt16 nRecLen ); // 0x0008 08 - void Userrange( void ); // 0x0009 09 - void Errcell( void ); // 0x0014 20 - void Nacell( void ); // 0x0015 21 - void Labelcell( void ); // 0x0016 22 - void Numbercell( void ); // 0x0017 23 - void Smallnumcell( void ); // 0x0018 24 + void Userrange(); // 0x0009 09 + void Errcell(); // 0x0014 20 + void Nacell(); // 0x0015 21 + void Labelcell(); // 0x0016 22 + void Numbercell(); // 0x0017 23 + void Smallnumcell(); // 0x0018 24 ScFormulaCell* Formulacell( sal_uInt16 nRecLen ); // 0x0019 25 void Formulastring( ScFormulaCell& ); // 0x001a 26 // 0x001b 27 special - void NamedSheet( void ); // 14000 + void NamedSheet(); // 14000 void RowPresentation( sal_uInt16 nRecLen ); // 2007 // in FM?-Datei - void Font_Face( void ); // 174 - void Font_Type( void ); // 176 - void Font_Ysize( void ); // 177 + void Font_Face(); // 174 + void Font_Type(); // 176 + void Font_Ysize(); // 177 void _Row( const sal_uInt16 nRecLen ); // 197 ? inline void Read( ScAddress& ); diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx index 2950e50638a6..62356e25b745 100644 --- a/sc/source/filter/inc/lotrange.hxx +++ b/sc/source/filter/inc/lotrange.hxx @@ -38,7 +38,7 @@ private: SCCOL nColEnd; SCROW nRowEnd; LR_ID nId; - void MakeHash( void ); + void MakeHash(); inline void Copy( const LotusRange& ); inline void SetId( LR_ID nId ); public: @@ -48,7 +48,7 @@ public: inline LotusRange &operator =( const LotusRange& ); inline bool operator ==( const LotusRange& ) const; inline bool operator !=( const LotusRange& ) const; - inline bool IsSingle( void ) const; + inline bool IsSingle() const; }; inline void LotusRange::Copy( const LotusRange& rCpy ) @@ -86,7 +86,7 @@ inline bool LotusRange::operator !=( const LotusRange& rRef ) const nRowEnd != rRef.nRowEnd ); } -inline bool LotusRange::IsSingle( void ) const +inline bool LotusRange::IsSingle() const { return ( nColStart == nColEnd && nRowStart == nRowEnd ); } @@ -103,7 +103,7 @@ private: public: LotusRangeList(LOTUS_ROOT* pLotRoot); - ~LotusRangeList( void ); + ~LotusRangeList(); inline sal_uInt16 GetIndex( SCCOL nCol, SCROW nRow ); inline sal_uInt16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE ); sal_uInt16 GetIndex( const LotusRange& ); diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index 520d5fd5b2fd..ae296aeff136 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -45,14 +45,14 @@ private: static sal_uInt32 MakeHashCode( const OUString& ); public: inline StringHashEntry( const OUString& ); - inline StringHashEntry( void ); + inline StringHashEntry(); inline void operator =( const sal_Char* ); inline void operator =( const OUString& ); inline void operator =( const StringHashEntry& ); inline bool operator ==( const StringHashEntry& ) const; }; -inline StringHashEntry::StringHashEntry( void ) +inline StringHashEntry::StringHashEntry() { } @@ -245,7 +245,7 @@ public: bool IsLink( const sal_uInt16 nExcSheetIndex ) const; bool GetLink( const sal_uInt16 nExcSheetIndex, OUString &rAppl, OUString &rDoc ) const; - void Reset( void ); + void Reset(); }; inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) @@ -260,8 +260,8 @@ struct ExtName inline ExtName( const OUString& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {} - bool IsDDE( void ) const; - bool IsOLE( void ) const; + bool IsDDE() const; + bool IsOLE() const; }; class ExtNameBuff : protected XclImpRoot diff --git a/sc/source/filter/inc/root.hxx b/sc/source/filter/inc/root.hxx index 0dd0e57e0c77..f92b2fd3e132 100644 --- a/sc/source/filter/inc/root.hxx +++ b/sc/source/filter/inc/root.hxx @@ -67,7 +67,7 @@ struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! XclImpRoot* pIR; XclExpRoot* pER; - RootData( void ); // -> exctools.cxx + RootData(); // -> exctools.cxx ~RootData(); // -> exctools.cxx }; diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 9e458d7b0730..bb81bdf93388 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -175,18 +175,18 @@ private: #endif ScTokenArray* pScToken; // Token array - bool GrowString( void ); - bool GrowDouble( void ); + bool GrowString(); + bool GrowDouble(); /* TODO: in case we had FormulaTokenArray::AddError() */ #if 0 - bool GrowError( void ); + bool GrowError(); #endif bool GrowTripel( sal_uInt16 nByMin = 1 ); - bool GrowId( void ); - bool GrowElement( void ); - bool GrowExt( void ); - bool GrowNlf( void ); - bool GrowMatrix( void ); + bool GrowId(); + bool GrowElement(); + bool GrowExt(); + bool GrowNlf(); + bool GrowMatrix(); bool GetElement( const sal_uInt16 nId ); bool GetElementRek( const sal_uInt16 nId ); public: @@ -197,7 +197,7 @@ public: inline TokenPool& operator <<( TokenStack& rStack ); void operator >>( TokenId& rId ); inline void operator >>( TokenStack& rStack ); - inline const TokenId Store( void ); + inline const TokenId Store(); const TokenId Store( const double& rDouble ); // only for Range-Names @@ -216,9 +216,9 @@ public: const TokenId StoreExtRef( sal_uInt16 nFileId, const OUString& rTabName, const ScSingleRefData& rRef ); const TokenId StoreExtRef( sal_uInt16 nFileId, const OUString& rTabName, const ScComplexRefData& rRef ); - inline const TokenId LastId( void ) const; + inline const TokenId LastId() const; inline const ScTokenArray* operator []( const TokenId& rId ); - void Reset( void ); + void Reset(); inline E_TYPE GetType( const TokenId& rId ) const; bool IsSingleOp( const TokenId& rId, const DefTokenId eId ) const; const OUString* GetExternal( const TokenId& rId ) const; @@ -239,13 +239,13 @@ class TokenStack inline TokenStack& operator <<( const TokenId& rNewId ); inline void operator >>( TokenId &rId ); - inline void Reset( void ); + inline void Reset(); inline bool HasMoreTokens() const { return nPos > 0; } - inline const TokenId Get( void ); + inline const TokenId Get(); }; -inline const TokenId TokenStack::Get( void ) +inline const TokenId TokenStack::Get() { OSL_ENSURE( nPos > 0, "*TokenStack::Get(): is empty, is empty, ..." ); @@ -286,7 +286,7 @@ inline void TokenStack::operator >>( TokenId& rId ) } } -inline void TokenStack::Reset( void ) +inline void TokenStack::Reset() { nPos = 0; } @@ -343,7 +343,7 @@ inline void TokenPool::operator >>( TokenStack& rStack ) rStack << nId; } -inline const TokenId TokenPool::Store( void ) +inline const TokenId TokenPool::Store() { TokenId nId; *this >> nId; @@ -355,7 +355,7 @@ inline const TokenId TokenPool::Store( const sal_Int16 nWert ) return Store( ( double ) nWert ); } -inline const TokenId TokenPool::LastId( void ) const +inline const TokenId TokenPool::LastId() const { return static_cast<TokenId>(nElementAkt); // correct, as Ausgabe with Offset 1! } diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index a8a3026165a4..0b49b0f3ca0d 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.cxx @@ -86,7 +86,7 @@ ImportLotus::~ImportLotus() aLotImpSemaphore.release(); } -void ImportLotus::Bof( void ) +void ImportLotus::Bof() { sal_uInt16 nFileCode, nFileSub, nSaveCnt; sal_uInt8 nMajorId, nMinorId, nFlags; @@ -114,7 +114,7 @@ void ImportLotus::Bof( void ) } } -bool ImportLotus::BofFm3( void ) +bool ImportLotus::BofFm3() { sal_uInt16 nFileCode, nFileSub; @@ -181,7 +181,7 @@ void ImportLotus::Hiddencolumn( sal_uInt16 nRecLen ) } } -void ImportLotus::Userrange( void ) +void ImportLotus::Userrange() { sal_uInt16 nRangeType; ScRange aScRange; @@ -199,7 +199,7 @@ void ImportLotus::Userrange( void ) rContext.pLotusRoot->pRngNmBffWK3->Add( aName, aScRange ); } -void ImportLotus::Errcell( void ) +void ImportLotus::Errcell() { ScAddress aA; @@ -211,7 +211,7 @@ void ImportLotus::Errcell( void ) pD->SetString(aA, "#ERR!", &aParam); } -void ImportLotus::Nacell( void ) +void ImportLotus::Nacell() { ScAddress aA; @@ -223,7 +223,7 @@ void ImportLotus::Nacell( void ) pD->SetString(aA, "#NA!", &aParam); } -void ImportLotus::Labelcell( void ) +void ImportLotus::Labelcell() { ScAddress aA; OUString aLabel; @@ -239,7 +239,7 @@ void ImportLotus::Labelcell( void ) pD->SetString(aA, aLabel, &aParam); } -void ImportLotus::Numbercell( void ) +void ImportLotus::Numbercell() { ScAddress aAddr; double fVal; @@ -251,7 +251,7 @@ void ImportLotus::Numbercell( void ) pD->SetValue(aAddr, fVal); } -void ImportLotus::Smallnumcell( void ) +void ImportLotus::Smallnumcell() { ScAddress aAddr; sal_Int16 nVal; @@ -328,7 +328,7 @@ void ImportLotus::RowPresentation( sal_uInt16 nRecLen ) } } -void ImportLotus::NamedSheet( void ) +void ImportLotus::NamedSheet() { sal_uInt16 nTmpTab(0); Read(nTmpTab); @@ -343,7 +343,7 @@ void ImportLotus::NamedSheet( void ) pD->InsertTab(nLTab, aName); } -void ImportLotus::Font_Face( void ) +void ImportLotus::Font_Face() { sal_uInt8 nNum; OUString aName; @@ -359,7 +359,7 @@ void ImportLotus::Font_Face( void ) rContext.pLotusRoot->pFontBuff->SetName( nNum, aName ); } -void ImportLotus::Font_Type( void ) +void ImportLotus::Font_Type() { LotusContext &rContext = aConv.getContext(); for( sal_uInt16 nCnt = 0 ; nCnt < LotusFontBuffer::nSize ; nCnt++ ) @@ -370,7 +370,7 @@ void ImportLotus::Font_Type( void ) } } -void ImportLotus::Font_Ysize( void ) +void ImportLotus::Font_Ysize() { LotusContext &rContext = aConv.getContext(); for( sal_uInt16 nCnt = 0 ; nCnt < LotusFontBuffer::nSize ; nCnt++ ) diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index 3d4081961e04..6bc124c37484 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -337,7 +337,7 @@ SfxUInt32Item* FormCache::NewAttr( sal_uInt8 nFormat, sal_uInt8 nSt ) return new SfxUInt32Item( ATTR_VALUE_FORMAT, ( sal_uInt32 ) nHandle ); } -void LotusRange::MakeHash( void ) +void LotusRange::MakeHash() { // 33222222222211111111110000000000 // 10987654321098765432109876543210 diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index c630040cc0c5..b8e58b6257fd 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -2973,7 +2973,7 @@ throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::R } // ::com::sun::star::xml::sax::XDocumentHandler -void SAL_CALL ScXMLImport::startDocument(void) +void SAL_CALL ScXMLImport::startDocument() throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ) { ScXMLImport::MutexGuard aGuard(*this); diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 479bedf183a9..53435a898aff 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -1185,7 +1185,7 @@ public: // 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) SAL_OVERRIDE; - virtual void SAL_CALL startDocument(void) + virtual void SAL_CALL startDocument() 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, diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 6ad4cc2faebc..337d91b531f1 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -152,7 +152,7 @@ void SAL_CALL ScAccessibleCell::grabFocus( ) } } -Rectangle ScAccessibleCell::GetBoundingBoxOnScreen(void) const +Rectangle ScAccessibleCell::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) { Rectangle aCellRect(GetBoundingBox()); @@ -214,7 +214,7 @@ Rectangle ScAccessibleCell::GetBoundingBox() const //===== XAccessibleContext ============================================== sal_Int32 SAL_CALL - ScAccessibleCell::getAccessibleChildCount(void) + ScAccessibleCell::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { return AccessibleStaticTextBase::getAccessibleChildCount(); @@ -229,7 +229,7 @@ uno::Reference< XAccessible > SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleCell::getAccessibleStateSet(void) + ScAccessibleCell::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -302,14 +302,14 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleCell::getImplementationName(void) +OUString SAL_CALL ScAccessibleCell::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleCell"); } uno::Sequence< OUString> SAL_CALL - ScAccessibleCell::getSupportedServiceNames(void) + ScAccessibleCell::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx index 7024fe57f311..c50a46ed889d 100644 --- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx @@ -196,7 +196,7 @@ void SAL_CALL ScAccessibleCellBase::release() //===== XAccessibleContext ============================================== sal_Int32 - ScAccessibleCellBase::getAccessibleIndexInParent(void) + ScAccessibleCellBase::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -205,7 +205,7 @@ sal_Int32 } OUString SAL_CALL - ScAccessibleCellBase::createAccessibleDescription(void) + ScAccessibleCellBase::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDescription = OUString(ScResId(STR_ACC_CELL_DESCR)); @@ -214,7 +214,7 @@ OUString SAL_CALL } OUString SAL_CALL - ScAccessibleCellBase::createAccessibleName(void) + ScAccessibleCellBase::createAccessibleName() throw (uno::RuntimeException, std::exception) { // Document not needed, because only the cell address, but not the tablename is needed @@ -285,7 +285,7 @@ uno::Any SAL_CALL //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleCellBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleCellBase::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleCellBase"); @@ -300,7 +300,7 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleCellBase::getTypes() } uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleCellBase::getImplementationId(void) + ScAccessibleCellBase::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -315,7 +315,7 @@ bool ScAccessibleCellBase::IsEditable( return bEditable; } -OUString SAL_CALL ScAccessibleCellBase::GetNote(void) +OUString SAL_CALL ScAccessibleCellBase::GetNote() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -364,7 +364,7 @@ OUString SAL_CALL ScAccessibleCellBase::GetNote(void) #include <com/sun/star/table/ShadowFormat.hpp> -OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs(void) +OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -447,7 +447,7 @@ OUString SAL_CALL ScAccessibleCellBase::getShadowAttrs(void) #include <com/sun/star/table/BorderLine.hpp> -OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs(void) +OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs() throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aGuard; @@ -597,7 +597,7 @@ OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs(void) } //end of cell attributes -OUString SAL_CALL ScAccessibleCellBase::GetAllDisplayNote(void) +OUString SAL_CALL ScAccessibleCellBase::GetAllDisplayNote() throw (::com::sun::star::uno::RuntimeException) { OUString strNote; diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 1f5bd3502dcc..9eb6355162d1 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -49,7 +49,7 @@ ScAccessibleContextBase::ScAccessibleContextBase( { } -ScAccessibleContextBase::~ScAccessibleContextBase(void) +ScAccessibleContextBase::~ScAccessibleContextBase() { if (!IsDefunc() && !rBHelper.bInDispose) { @@ -140,7 +140,7 @@ void ScAccessibleContextBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) //===== XAccessible ========================================================= uno::Reference< XAccessibleContext> SAL_CALL - ScAccessibleContextBase::getAccessibleContext(void) + ScAccessibleContextBase::getAccessibleContext() throw (uno::RuntimeException, std::exception) { return this; @@ -258,14 +258,14 @@ uno::Reference<XAccessible> SAL_CALL } uno::Reference<XAccessible> SAL_CALL - ScAccessibleContextBase::getAccessibleParent(void) + ScAccessibleContextBase::getAccessibleParent() throw (uno::RuntimeException, std::exception) { return mxParent; } sal_Int32 SAL_CALL - ScAccessibleContextBase::getAccessibleIndexInParent(void) + ScAccessibleContextBase::getAccessibleIndexInParent() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -299,14 +299,14 @@ sal_Int32 SAL_CALL } sal_Int16 SAL_CALL - ScAccessibleContextBase::getAccessibleRole(void) + ScAccessibleContextBase::getAccessibleRole() throw (uno::RuntimeException, std::exception) { return maRole; } OUString SAL_CALL - ScAccessibleContextBase::getAccessibleDescription(void) + ScAccessibleContextBase::getAccessibleDescription() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -332,7 +332,7 @@ OUString SAL_CALL } OUString SAL_CALL - ScAccessibleContextBase::getAccessibleName(void) + ScAccessibleContextBase::getAccessibleName() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -366,14 +366,14 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleContextBase::getAccessibleStateSet(void) + ScAccessibleContextBase::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { return uno::Reference<XAccessibleStateSet>(); } lang::Locale SAL_CALL - ScAccessibleContextBase::getLocale(void) + ScAccessibleContextBase::getLocale() throw (IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception) { @@ -454,7 +454,7 @@ void SAL_CALL ScAccessibleContextBase::notifyEvent( } //===== XServiceInfo ======================================================== -OUString SAL_CALL ScAccessibleContextBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleContextBase::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleContextBase"); @@ -467,7 +467,7 @@ sal_Bool SAL_CALL ScAccessibleContextBase::supportsService(const OUString& sServ } uno::Sequence< OUString> SAL_CALL - ScAccessibleContextBase::getSupportedServiceNames(void) + ScAccessibleContextBase::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence<OUString> aServiceNames(2); @@ -490,7 +490,7 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleContextBase::getTypes() } uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleContextBase::getImplementationId(void) + ScAccessibleContextBase::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -499,7 +499,7 @@ uno::Sequence<sal_Int8> SAL_CALL //===== internal ============================================================ OUString SAL_CALL - ScAccessibleContextBase::createAccessibleDescription(void) + ScAccessibleContextBase::createAccessibleDescription() throw (uno::RuntimeException) { OSL_FAIL("should be implemented in the abrevated class"); diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index f58d2244e421..4b1c96b071c9 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1445,7 +1445,7 @@ void ScAccessibleDocument::Init() mpChildrenShapes = new ScChildrenShapes(this, mpViewShell, meSplitPos); } -ScAccessibleDocument::~ScAccessibleDocument(void) +ScAccessibleDocument::~ScAccessibleDocument() { if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose) { @@ -1780,7 +1780,7 @@ void SAL_CALL ScAccessibleDocument::grabFocus( ) /// Return the number of currently visible children. sal_Int32 SAL_CALL - ScAccessibleDocument::getAccessibleChildCount(void) + ScAccessibleDocument::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1829,7 +1829,7 @@ uno::Reference<XAccessible> SAL_CALL /// Return the set of current states. uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleDocument::getAccessibleStateSet(void) + ScAccessibleDocument::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1856,7 +1856,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL } OUString SAL_CALL - ScAccessibleDocument::getAccessibleName(void) + ScAccessibleDocument::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -2068,14 +2068,14 @@ void SAL_CALL //===== XServiceInfo ==================================================== OUString SAL_CALL - ScAccessibleDocument::getImplementationName(void) + ScAccessibleDocument::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleDocument"); } uno::Sequence< OUString> SAL_CALL - ScAccessibleDocument::getSupportedServiceNames(void) + ScAccessibleDocument::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); @@ -2096,7 +2096,7 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleDocument::getTypes() } uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleDocument::getImplementationId(void) + ScAccessibleDocument::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -2104,7 +2104,7 @@ uno::Sequence<sal_Int8> SAL_CALL ///===== IAccessibleViewForwarder ======================================== -bool ScAccessibleDocument::IsValid (void) const +bool ScAccessibleDocument::IsValid() const { SolarMutexGuard aGuard; IsObjectValid(); @@ -2198,7 +2198,7 @@ utl::AccessibleRelationSetHelper* ScAccessibleDocument::GetRelationSet(const ScA } OUString SAL_CALL - ScAccessibleDocument::createAccessibleDescription(void) + ScAccessibleDocument::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDescription = OUString(ScResId(STR_ACC_DOC_DESCR)); @@ -2206,7 +2206,7 @@ OUString SAL_CALL } OUString SAL_CALL - ScAccessibleDocument::createAccessibleName(void) + ScAccessibleDocument::createAccessibleName() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx index 3b32481933a1..599c2b65e1d0 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentBase.cxx @@ -32,7 +32,7 @@ ScAccessibleDocumentBase::ScAccessibleDocumentBase( { } -ScAccessibleDocumentBase::~ScAccessibleDocumentBase(void) +ScAccessibleDocumentBase::~ScAccessibleDocumentBase() { } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index c366349add68..08db9aa7fc63 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -491,7 +491,7 @@ public: ///===== IAccessibleViewForwarder ======================================== - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() 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; @@ -526,7 +526,7 @@ ScIAccessibleViewForwarder::~ScIAccessibleViewForwarder() ///===== IAccessibleViewForwarder ======================================== -bool ScIAccessibleViewForwarder::IsValid (void) const +bool ScIAccessibleViewForwarder::IsValid() const { SolarMutexGuard aGuard; return mbValid; @@ -1241,7 +1241,7 @@ ScAccessibleDocumentPagePreview::ScAccessibleDocumentPagePreview( } -ScAccessibleDocumentPagePreview::~ScAccessibleDocumentPagePreview(void) +ScAccessibleDocumentPagePreview::~ScAccessibleDocumentPagePreview() { if (!ScAccessibleDocumentBase::IsDefunc() && !rBHelper.bInDispose) { @@ -1545,7 +1545,7 @@ uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessi } /// Return the set of current states. -uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet(void) +uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1573,13 +1573,13 @@ uno::Reference<XAccessibleStateSet> SAL_CALL ScAccessibleDocumentPagePreview::ge //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleDocumentPagePreview"); } -uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames(void) +uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); @@ -1594,7 +1594,7 @@ uno::Sequence< OUString> SAL_CALL ScAccessibleDocumentPagePreview::getSupportedS //===== XTypeProvider ======================================================= uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleDocumentPagePreview::getImplementationId(void) + ScAccessibleDocumentPagePreview::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); @@ -1602,14 +1602,14 @@ uno::Sequence<sal_Int8> SAL_CALL //===== internal ======================================================== -OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDescription = OUString(ScResId(STR_ACC_PREVIEWDOC_DESCR)); return sDescription; } -OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName(void) +OUString SAL_CALL ScAccessibleDocumentPagePreview::createAccessibleName() throw (uno::RuntimeException, std::exception) { OUString sName = OUString(ScResId(STR_ACC_PREVIEWDOC_NAME)); @@ -1673,7 +1673,7 @@ ScShapeChildren* ScAccessibleDocumentPagePreview::GetShapeChildren() return mpShapeChildren; } -OUString ScAccessibleDocumentPagePreview::getAccessibleName(void) +OUString ScAccessibleDocumentPagePreview::getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) { SolarMutexGuard g; diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index a16028147575..e975bd527912 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -139,13 +139,13 @@ com::sun::star::uno::Any SAL_CALL return aReturn; } void SAL_CALL - ScAccessibleEditObject::acquire (void) + ScAccessibleEditObject::acquire() throw () { ScAccessibleContextBase::acquire (); } void SAL_CALL - ScAccessibleEditObject::release (void) + ScAccessibleEditObject::release() throw () { ScAccessibleContextBase::release (); @@ -171,7 +171,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessibleEditObject::getAccessibleAtPo return xRet; } -Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen(void) const +Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen() const throw (uno::RuntimeException, std::exception) { Rectangle aScreenBounds; @@ -200,7 +200,7 @@ Rectangle ScAccessibleEditObject::GetBoundingBoxOnScreen(void) const return aScreenBounds; } -Rectangle ScAccessibleEditObject::GetBoundingBox(void) const +Rectangle ScAccessibleEditObject::GetBoundingBox() const throw (uno::RuntimeException, std::exception) { Rectangle aBounds( GetBoundingBoxOnScreen() ); @@ -235,7 +235,7 @@ Rectangle ScAccessibleEditObject::GetBoundingBox(void) const //===== XAccessibleContext ============================================== sal_Int32 SAL_CALL - ScAccessibleEditObject::getAccessibleChildCount(void) + ScAccessibleEditObject::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -258,7 +258,7 @@ uno::Reference< XAccessible > SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleEditObject::getAccessibleStateSet(void) + ScAccessibleEditObject::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -286,7 +286,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL } OUString SAL_CALL - ScAccessibleEditObject::createAccessibleDescription(void) + ScAccessibleEditObject::createAccessibleDescription() throw (uno::RuntimeException) { // OSL_FAIL("Should never be called, because is set in the constructor.") @@ -294,7 +294,7 @@ OUString SAL_CALL } OUString SAL_CALL - ScAccessibleEditObject::createAccessibleName(void) + ScAccessibleEditObject::createAccessibleName() throw (uno::RuntimeException, std::exception) { OSL_FAIL("Should never be called, because is set in the constructor."); @@ -329,7 +329,7 @@ void SAL_CALL //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) +OUString SAL_CALL ScAccessibleEditObject::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleEditObject"); @@ -338,7 +338,7 @@ OUString SAL_CALL ScAccessibleEditObject::getImplementationName(void) //===== XTypeProvider ======================================================= uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleEditObject::getImplementationId(void) + ScAccessibleEditObject::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index 5749093d83e3..936a8fce7561 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -331,14 +331,14 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePageHeader::getSupportedServiceName //==== internal ========================================================= -OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePageHeader::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDesc(SC_RESSTR(mbHeader ? STR_ACC_HEADER_DESCR : STR_ACC_FOOTER_DESCR)); return sDesc.replaceFirst("%1", SC_RESSTR(SCSTR_UNKNOWN)); } -OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePageHeader::createAccessibleName() throw (uno::RuntimeException, std::exception) { OUString sName(SC_RESSTR(mbHeader ? STR_ACC_HEADER_NAME : STR_ACC_FOOTER_NAME)); diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx index 88403d803f26..a4370fe3a56c 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx @@ -65,7 +65,7 @@ ScAccessiblePageHeaderArea::ScAccessiblePageHeaderArea( mpViewShell->AddAccessibilityObject(*this); } -ScAccessiblePageHeaderArea::~ScAccessiblePageHeaderArea(void) +ScAccessiblePageHeaderArea::~ScAccessiblePageHeaderArea() { if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose) { @@ -136,7 +136,7 @@ uno::Reference< XAccessible > SAL_CALL ScAccessiblePageHeaderArea::getAccessible //===== XAccessibleContext ============================================== sal_Int32 SAL_CALL - ScAccessiblePageHeaderArea::getAccessibleChildCount(void) + ScAccessiblePageHeaderArea::getAccessibleChildCount() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -159,7 +159,7 @@ uno::Reference< XAccessible > SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessiblePageHeaderArea::getAccessibleStateSet(void) + ScAccessiblePageHeaderArea::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -187,14 +187,14 @@ uno::Reference<XAccessibleStateSet> SAL_CALL //===== XServiceInfo ======================================================== OUString SAL_CALL - ScAccessiblePageHeaderArea::getImplementationName(void) + ScAccessiblePageHeaderArea::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessiblePageHeaderArea"); } uno::Sequence< OUString> SAL_CALL - ScAccessiblePageHeaderArea::getSupportedServiceNames(void) + ScAccessiblePageHeaderArea::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleContextBase::getSupportedServiceNames(); @@ -209,14 +209,14 @@ uno::Sequence< OUString> SAL_CALL //===== XTypeProvider ======================================================= uno::Sequence<sal_Int8> SAL_CALL - ScAccessiblePageHeaderArea::getImplementationId(void) + ScAccessiblePageHeaderArea::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } //===== internal ============================================================== -OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription() throw(uno::RuntimeException) { OUString sDesc; @@ -238,7 +238,7 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleDescription(void) return sDesc; } -OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) +OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName() throw (uno::RuntimeException, std::exception) { OUString sName; @@ -260,7 +260,7 @@ OUString SAL_CALL ScAccessiblePageHeaderArea::createAccessibleName(void) return sName; } -Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen(void) const +Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen() const throw(::com::sun::star::uno::RuntimeException, std::exception) { Rectangle aRect; @@ -277,7 +277,7 @@ Rectangle ScAccessiblePageHeaderArea::GetBoundingBoxOnScreen(void) const return aRect; } -Rectangle ScAccessiblePageHeaderArea::GetBoundingBox(void) const +Rectangle ScAccessiblePageHeaderArea::GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) { Rectangle aRect; diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index df7fb5749e5e..810befd1f879 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -202,7 +202,7 @@ uno::Sequence<OUString> SAL_CALL ScAccessiblePreviewCell::getSupportedServiceNam //===== XTypeProvider ======================================================= uno::Sequence<sal_Int8> SAL_CALL - ScAccessiblePreviewCell::getImplementationId(void) + ScAccessiblePreviewCell::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index cea59f9facf5..90e5e91bbd31 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -322,7 +322,7 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessiblePreviewHeaderCell::getTypes() } uno::Sequence<sal_Int8> SAL_CALL - ScAccessiblePreviewHeaderCell::getImplementationId(void) + ScAccessiblePreviewHeaderCell::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index db7790cf3bb6..fcac4494089c 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -603,7 +603,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScAccessiblePreviewTable::getImplementationId() //==== internal ========================================================= -OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription(void) +OUString SAL_CALL ScAccessiblePreviewTable::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDesc(ScResId(STR_ACC_TABLE_DESCR)); diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index f1c5b4402317..e46e6df7444e 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1039,7 +1039,7 @@ sal_Int32 SAL_CALL ScAccessibleSpreadsheet::getBackground( ) //===== XAccessibleContext ============================================== -uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleRelationSet(void) +uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAccessibleRelationSet() throw (::com::sun::star::uno::RuntimeException, std::exception) { utl::AccessibleRelationSetHelper* pRelationSet = NULL; @@ -1051,7 +1051,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL ScAccessibleSpreadsheet::getAcce } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleSpreadsheet::getAccessibleStateSet(void) + ScAccessibleSpreadsheet::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1308,14 +1308,14 @@ void ScAccessibleSpreadsheet::AddMarkedRange(const ScRange& rRange) //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName(void) +OUString SAL_CALL ScAccessibleSpreadsheet::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleSpreadsheet"); } uno::Sequence< OUString> SAL_CALL - ScAccessibleSpreadsheet::getSupportedServiceNames (void) + ScAccessibleSpreadsheet::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSequence = ScAccessibleTableBase::getSupportedServiceNames(); @@ -1330,7 +1330,7 @@ uno::Sequence< OUString> SAL_CALL //===== XTypeProvider ======================================================= uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleSpreadsheet::getImplementationId(void) + ScAccessibleSpreadsheet::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index be6ab391cb72..5b483c3b9c90 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -364,7 +364,7 @@ uno::Reference< XAccessible > SAL_CALL } OUString SAL_CALL - ScAccessibleTableBase::createAccessibleDescription(void) + ScAccessibleTableBase::createAccessibleDescription() throw (uno::RuntimeException) { OUString sDesc(ScResId(STR_ACC_TABLE_DESCR)); @@ -382,7 +382,7 @@ OUString SAL_CALL ScAccessibleTableBase::createAccessibleName() } uno::Reference<XAccessibleRelationSet> SAL_CALL - ScAccessibleTableBase::getAccessibleRelationSet(void) + ScAccessibleTableBase::getAccessibleRelationSet() throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); @@ -390,7 +390,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL } uno::Reference<XAccessibleStateSet> SAL_CALL - ScAccessibleTableBase::getAccessibleStateSet(void) + ScAccessibleTableBase::getAccessibleStateSet() throw (uno::RuntimeException, std::exception) { OSL_FAIL("should be implemented in the abrevated class"); @@ -449,7 +449,7 @@ void SAL_CALL ScAccessibleTableBase::deselectAccessibleChild( sal_Int32 /* nSele //===== XServiceInfo ==================================================== -OUString SAL_CALL ScAccessibleTableBase::getImplementationName(void) +OUString SAL_CALL ScAccessibleTableBase::getImplementationName() throw (uno::RuntimeException, std::exception) { return OUString("ScAccessibleTableBase"); @@ -464,7 +464,7 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleTableBase::getTypes() } uno::Sequence<sal_Int8> SAL_CALL - ScAccessibleTableBase::getImplementationId(void) + ScAccessibleTableBase::getImplementationId() throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index edada20f2da6..d880f372433c 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -400,7 +400,7 @@ void ScDrawShell::Activate (const bool bMDI) GetSidebarContextName())); } -::rtl::OUString ScDrawShell::GetSidebarContextName (void) +::rtl::OUString ScDrawShell::GetSidebarContextName() { return sfx2::sidebar::EnumContext::GetContextName( ::svx::sidebar::SelectionAnalyzer::GetContextForSelection_SC( diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 5dbce7033f37..75bd457b4ad0 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -96,7 +96,7 @@ public: protected: /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen(void) const + virtual Rectangle GetBoundingBoxOnScreen() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current bounding box relative to the parent object. @@ -109,7 +109,7 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. @@ -122,7 +122,7 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< @@ -135,13 +135,13 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() 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) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 779d166525d2..3094541c0af4 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -70,18 +70,18 @@ public: /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent(void) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName(void) + createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: @@ -109,7 +109,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -122,7 +122,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: @@ -137,14 +137,14 @@ private: const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); protected: - OUString SAL_CALL GetNote(void) + OUString SAL_CALL GetNote() throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL GetAllDisplayNote(void) + OUString SAL_CALL GetAllDisplayNote() throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL getShadowAttrs(void) + OUString SAL_CALL getShadowAttrs() throw (::com::sun::star::uno::RuntimeException); - OUString SAL_CALL getBorderAttrs(void) + OUString SAL_CALL getBorderAttrs() throw (::com::sun::star::uno::RuntimeException); public: const ScAddress& GetCellAddress() const { return maCellAddress; } diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 0eecb33385b7..61f1cbcca487 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -76,7 +76,7 @@ public: virtual void Init(); virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: - virtual ~ScAccessibleContextBase(void); + virtual ~ScAccessibleContextBase(); public: bool SAL_CALL isShowing( ) @@ -103,7 +103,7 @@ public: /// 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) SAL_OVERRIDE; + getAccessibleContext() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleComponent ============================================ @@ -152,27 +152,27 @@ public: /// Return a reference to the parent. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL - getAccessibleParent(void) + getAccessibleParent() 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) + getAccessibleIndexInParent() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. virtual sal_Int16 SAL_CALL - getAccessibleRole(void) + getAccessibleRole() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's description. virtual OUString SAL_CALL - getAccessibleDescription(void) + getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - getAccessibleName(void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return NULL to indicate that an empty relation set. @@ -184,14 +184,14 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() 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. */ virtual ::com::sun::star::lang::Locale SAL_CALL - getLocale(void) + getLocale() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::accessibility::IllegalAccessibleComponentStateException, std::exception) SAL_OVERRIDE; @@ -229,7 +229,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return whether the specified service is supported by this class. @@ -242,7 +242,7 @@ public: the AccessibleContext and Accessible service. */ virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL - getSupportedServiceNames(void) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -255,18 +255,18 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException); /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName(void) + createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception); diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index a450fa38e836..0d47e004205c 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -67,7 +67,7 @@ public: DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); protected: - virtual ~ScAccessibleDocument(void); + virtual ~ScAccessibleDocument(); using ScAccessibleDocumentBase::IsDefunc; @@ -103,7 +103,7 @@ public: /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. @@ -115,11 +115,11 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL - getAccessibleName(void) + getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() @@ -172,13 +172,13 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() 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) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -191,7 +191,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== IAccessibleViewForwarder ======================================== @@ -202,7 +202,7 @@ public: @return Return <true/> if the view forwarder is valid and <false/> else. */ - virtual bool IsValid (void) const SAL_OVERRIDE; + virtual bool IsValid() const SAL_OVERRIDE; /** Returns the area of the underlying document that is visible in the * corresponding window. @@ -270,20 +270,20 @@ public: protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName(void) + createAccessibleName() 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 + virtual Rectangle GetBoundingBoxOnScreen() const 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 + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx index 7ab210daf913..de147514f252 100644 --- a/sc/source/ui/inc/AccessibleDocumentBase.hxx +++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx @@ -32,7 +32,7 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent); virtual void SwitchViewFireFocus(); protected: - virtual ~ScAccessibleDocumentBase (void); + virtual ~ScAccessibleDocumentBase(); }; #endif diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 6aa038504325..0a05bb781089 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -38,7 +38,7 @@ public: ::com::sun::star::accessibility::XAccessible>& rxParent, ScPreviewShell* pViewShell ); protected: - virtual ~ScAccessibleDocumentPagePreview(void); + virtual ~ScAccessibleDocumentPagePreview(); using ScAccessibleDocumentBase::IsDefunc; @@ -77,23 +77,23 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getAccessibleName(void) + virtual OUString SAL_CALL getAccessibleName() 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) + getImplementationName() 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) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -101,7 +101,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== internal ======================================================== @@ -109,22 +109,22 @@ public: protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName(void) + createAccessibleName() 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 + virtual Rectangle GetBoundingBoxOnScreen() const 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 + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index b9c2fdf85a4d..919a896a561f 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -85,11 +85,11 @@ public: protected: /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen(void) const + virtual Rectangle GetBoundingBoxOnScreen() const 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 + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: @@ -98,7 +98,7 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. @@ -111,7 +111,7 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleSelection ============================================ @@ -142,12 +142,12 @@ public: protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. virtual OUString SAL_CALL - createAccessibleName(void) + createAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; public: @@ -174,7 +174,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -182,7 +182,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index 2e1739db3757..5e00d62fc8c1 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -77,11 +77,11 @@ public: void SetCurrentIndexInParent(sal_Int32 nNew) { mnIndex = nNew; } protected: - 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 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) SAL_OVERRIDE; - 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; + 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/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 2a9bbd1b3c23..123e9b8bd643 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -43,7 +43,7 @@ public: bool bHeader, SvxAdjust eAdjust); protected: - virtual ~ScAccessiblePageHeaderArea (void); + virtual ~ScAccessiblePageHeaderArea(); public: const EditTextObject* GetEditTextObject() const { return mpEditObj; } @@ -66,7 +66,7 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the specified child or NULL if index is invalid. @@ -79,7 +79,7 @@ public: /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL - getAccessibleStateSet(void) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XServiceInfo ==================================================== @@ -87,14 +87,14 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() 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) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -102,15 +102,15 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - 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 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) SAL_OVERRIDE; - 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; + 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: EditTextObject* mpEditObj; diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index 68dd70e5f40e..8615b6386e76 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -82,7 +82,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index c399e4ebb098..4b8d2c9c980e 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -112,12 +112,12 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - 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 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) SAL_OVERRIDE; 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; diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index ba281afb8867..29b524b8e0d7 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -175,7 +175,7 @@ protected: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual Rectangle GetBoundingBoxOnScreen(void) const throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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: diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 9ec6ecb60195..b74360f5c743 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -168,13 +168,13 @@ private: /// Return NULL to indicate that an empty relation set. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL - getAccessibleRelationSet(void) + getAccessibleRelationSet() 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) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleSelection =========================================== @@ -214,13 +214,13 @@ private: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() 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) + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -228,7 +228,7 @@ private: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleEventBroadcaster ===================================== @@ -257,11 +257,11 @@ private: protected: /// Return the object's current bounding box relative to the desktop. - virtual Rectangle GetBoundingBoxOnScreen(void) const + virtual Rectangle GetBoundingBoxOnScreen() const 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 + virtual Rectangle GetBoundingBox() const throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ScTabViewShell* mpViewShell; diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index ff3659e083df..7e923c1ec92a 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -198,7 +198,7 @@ public: /// Return the number of currently visible children. /// override to calculate this on demand virtual sal_Int32 SAL_CALL - getAccessibleChildCount(void) + getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -225,7 +225,7 @@ public: protected: /// Return this object's description. virtual OUString SAL_CALL - createAccessibleDescription(void) + createAccessibleDescription() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Return the object's current name. @@ -238,14 +238,14 @@ 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) + getAccessibleRelationSet() 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) + getAccessibleStateSet() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XAccessibleSelection =========================================== @@ -291,7 +291,7 @@ public: /** Returns an identifier for the implementation of this object. */ virtual OUString SAL_CALL - getImplementationName(void) + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ///===== XTypeProvider =================================================== @@ -304,7 +304,7 @@ public: /** Returns a implementation id. */ virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId(void) + getImplementationId() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 50b90bcf4b6d..3f12fe64bb86 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -88,7 +88,7 @@ public: bool AreAllObjectsOnLayer(sal_uInt16 nLayerNo,const SdrMarkList& rMark); void GetDrawAttrStateForIFBX( SfxItemSet& rSet ); - ::rtl::OUString GetSidebarContextName (void); + ::rtl::OUString GetSidebarContextName(); }; #endif diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index af0bfe8fbe90..38c0154d3785 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -56,7 +56,7 @@ svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellLineStylePopu return new CellLineStyleControl(pParent, *this); } -void CellAppearancePropertyPanel::EndCellLineStylePopupMode(void) +void CellAppearancePropertyPanel::EndCellLineStylePopupMode() { if(mpCellLineStylePopup.get()) { @@ -69,7 +69,7 @@ svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellBorderStylePo return new CellBorderStyleControl(pParent, *this); } -void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void) +void CellAppearancePropertyPanel::EndCellBorderStylePopupMode() { if(mpCellBorderStylePopup.get()) { diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index f8da7a59bfb9..eb9e7dc45eb7 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -139,11 +139,11 @@ private: // for CellLineStyle popup svx::sidebar::PopupControl* CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent); - void EndCellLineStylePopupMode(void); + void EndCellLineStylePopupMode(); // for CellBorderStyle popup svx::sidebar::PopupControl* CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent); - void EndCellBorderStylePopupMode(void); + void EndCellBorderStylePopupMode(); // constructor/destuctor CellAppearancePropertyPanel( diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 08f7417bea08..ad6507dcda71 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -56,7 +56,7 @@ CellBorderStyleControl::CellBorderStyleControl(vcl::Window* pParent, CellAppeara FreeResource(); } -CellBorderStyleControl::~CellBorderStyleControl(void) +CellBorderStyleControl::~CellBorderStyleControl() { delete[] mpImageList; } diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index 7cf04e2d68fd..cf0db80ae3ef 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -47,7 +47,7 @@ private: public: CellBorderStyleControl(vcl::Window* pParent, CellAppearancePropertyPanel& rPanel); - virtual ~CellBorderStyleControl(void); + virtual ~CellBorderStyleControl(); }; } } // end of namespace svx::sidebar diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.cxx b/sc/source/ui/sidebar/CellBorderStylePopup.cxx index ae491f611005..1a27c25e6a55 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.cxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.cxx @@ -29,7 +29,7 @@ CellBorderStylePopup::CellBorderStylePopup ( { } -CellBorderStylePopup::~CellBorderStylePopup (void) +CellBorderStylePopup::~CellBorderStylePopup() { } diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.hxx b/sc/source/ui/sidebar/CellBorderStylePopup.hxx index de5b3727cafd..62899d555ae8 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.hxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.hxx @@ -30,7 +30,7 @@ public : CellBorderStylePopup( vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); - virtual ~CellBorderStylePopup(void); + virtual ~CellBorderStylePopup(); }; } } // end of namespace sc::sidebar diff --git a/sc/source/ui/sidebar/CellLineStylePopup.cxx b/sc/source/ui/sidebar/CellLineStylePopup.cxx index 1409037bb5b2..a65cc219a3f5 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.cxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.cxx @@ -29,7 +29,7 @@ CellLineStylePopup::CellLineStylePopup ( { } -CellLineStylePopup::~CellLineStylePopup (void) +CellLineStylePopup::~CellLineStylePopup() { } diff --git a/sc/source/ui/sidebar/CellLineStylePopup.hxx b/sc/source/ui/sidebar/CellLineStylePopup.hxx index cfca1afe76b7..757a86a8af2c 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.hxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.hxx @@ -30,7 +30,7 @@ public : CellLineStylePopup( vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); - virtual ~CellLineStylePopup(void); + virtual ~CellLineStylePopup(); void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis); }; diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index b0d4c8fdd4ed..cb1c23852bdc 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -67,12 +67,12 @@ css::uno::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames_s } -ScPanelFactory::ScPanelFactory (void) +ScPanelFactory::ScPanelFactory() : PanelFactoryInterfaceBase(m_aMutex) { } -ScPanelFactory::~ScPanelFactory (void) +ScPanelFactory::~ScPanelFactory() { } diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index bec0c4d25302..13772e37070e 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -273,7 +273,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSheetLinkObj ) // internal: -OUString ScSheetLinkObj::getFileName(void) const +OUString ScSheetLinkObj::getFileName() const { SolarMutexGuard aGuard; return aFileName; @@ -316,7 +316,7 @@ void ScSheetLinkObj::setFileName(const OUString& rNewName) } } -OUString ScSheetLinkObj::getFilter(void) const +OUString ScSheetLinkObj::getFilter() const { SolarMutexGuard aGuard; OUString aRet; @@ -337,7 +337,7 @@ void ScSheetLinkObj::setFilter(const OUString& Filter) } } -OUString ScSheetLinkObj::getFilterOptions(void) const +OUString ScSheetLinkObj::getFilterOptions() const { SolarMutexGuard aGuard; OUString aRet; @@ -358,7 +358,7 @@ void ScSheetLinkObj::setFilterOptions(const OUString& FilterOptions) } } -sal_Int32 ScSheetLinkObj::getRefreshDelay(void) const +sal_Int32 ScSheetLinkObj::getRefreshDelay() const { SolarMutexGuard aGuard; sal_Int32 nRet = 0; @@ -819,7 +819,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAreaLinkObj ) // internal: -OUString ScAreaLinkObj::getFileName(void) const +OUString ScAreaLinkObj::getFileName() const { SolarMutexGuard aGuard; OUString aRet; @@ -835,7 +835,7 @@ void ScAreaLinkObj::setFileName(const OUString& rNewName) Modify_Impl( &rNewName, NULL, NULL, NULL, NULL ); } -OUString ScAreaLinkObj::getFilter(void) const +OUString ScAreaLinkObj::getFilter() const { SolarMutexGuard aGuard; OUString aRet; @@ -851,7 +851,7 @@ void ScAreaLinkObj::setFilter(const OUString& Filter) Modify_Impl( NULL, &Filter, NULL, NULL, NULL ); } -OUString ScAreaLinkObj::getFilterOptions(void) const +OUString ScAreaLinkObj::getFilterOptions() const { SolarMutexGuard aGuard; OUString aRet; @@ -867,7 +867,7 @@ void ScAreaLinkObj::setFilterOptions(const OUString& FilterOptions) Modify_Impl( NULL, NULL, &FilterOptions, NULL, NULL ); } -sal_Int32 ScAreaLinkObj::getRefreshDelay(void) const +sal_Int32 ScAreaLinkObj::getRefreshDelay() const { SolarMutexGuard aGuard; sal_Int32 nRet = 0; diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index a3d18ebe8bc0..9f187786be2a 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -230,7 +230,7 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceNa } ::com::sun::star::uno::Sequence< OUString > - SAL_CALL ScIndexEnumeration::getSupportedServiceNames(void) + SAL_CALL ScIndexEnumeration::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) { ::com::sun::star::uno::Sequence< OUString > aRet(1); diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 6b8c897fdde7..09dce6220125 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -104,7 +104,7 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames() throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aRet(SC_LINKTARGETTYPE_COUNT); OUString* pArray = aRet.getArray(); @@ -124,12 +124,12 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( // container::XElementAccess -uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements() throw( uno::RuntimeException, std::exception ) { return sal_True; } @@ -159,7 +159,7 @@ void ScLinkTargetTypeObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // document::XLinkTargetSupplier -uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks() throw( uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xCollection; @@ -190,7 +190,7 @@ uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks // beans::XPropertySet -uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetLinkTargetMap() )); @@ -270,7 +270,7 @@ uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName) // return uno::Any(); } -uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames(void) throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames() throw( uno::RuntimeException, std::exception ) { return xCollection->getElementNames(); } @@ -282,12 +282,12 @@ sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) throw( uno: // container::XElementAccess -uno::Type SAL_CALL ScLinkTargetsObj::getElementType(void) throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL ScLinkTargetsObj::getElementType() throw( uno::RuntimeException, std::exception ) { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SAL_CALL ScLinkTargetsObj::hasElements(void) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetsObj::hasElements() throw( uno::RuntimeException, std::exception ) { return xCollection->hasElements(); } diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 494b2c58c231..1d5647143def 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -1426,7 +1426,7 @@ void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference< EndActivationListening(); } -sal_Int16 ScTabViewObj::GetZoom(void) const +sal_Int16 ScTabViewObj::GetZoom() const { ScTabViewShell* pViewSh = GetViewShell(); if (pViewSh) @@ -1463,7 +1463,7 @@ void ScTabViewObj::SetZoom(sal_Int16 nZoom) } } -sal_Int16 ScTabViewObj::GetZoomType(void) const +sal_Int16 ScTabViewObj::GetZoomType() const { sal_Int16 aZoomType = view::DocumentZoomType::OPTIMAL; ScTabViewShell* pViewSh = GetViewShell(); diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 76aa0297bf4d..c70c9eef8640 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -53,7 +53,7 @@ public: 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) SAL_OVERRIDE; + 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& 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; diff --git a/sc/source/ui/vba/vbawsfunction.cxx b/sc/source/ui/vba/vbawsfunction.cxx index 0a70bb60bb73..3635a198809f 100644 --- a/sc/source/ui/vba/vbawsfunction.cxx +++ b/sc/source/ui/vba/vbawsfunction.cxx @@ -72,7 +72,7 @@ ScVbaWSFunction::ScVbaWSFunction( const uno::Reference< XHelperInterface >& xPar } uno::Reference< beans::XIntrospectionAccess > -ScVbaWSFunction::getIntrospection(void) throw(uno::RuntimeException, std::exception) +ScVbaWSFunction::getIntrospection() throw(uno::RuntimeException, std::exception) { return uno::Reference<beans::XIntrospectionAccess>(); } diff --git a/sc/source/ui/vba/vbawsfunction.hxx b/sc/source/ui/vba/vbawsfunction.hxx index 1f8094bcd91e..69f9e961b66f 100644 --- a/sc/source/ui/vba/vbawsfunction.hxx +++ b/sc/source/ui/vba/vbawsfunction.hxx @@ -34,7 +34,7 @@ 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) SAL_OVERRIDE; + 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& 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; diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx index 822528d8a561..6e5033bc5a8d 100644 --- a/sc/workben/addin.hxx +++ b/sc/workben/addin.hxx @@ -48,7 +48,7 @@ public: // SMART_UNO_DECLARATION( ScTestAddIn, UsrObject ); // friend Reflection * ScTestAddIn_getReflection(); // virtual BOOL queryInterface( Uik, XInterfaceRef& ); -// virtual XIdlClassRef getIdlClass(void); +// virtual XIdlClassRef getIdlClass(); static UString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 3d36f50db40a..7e6688c01b22 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -95,7 +95,7 @@ public: SMART_UNO_DECLARATION( ScTestListener, UsrObject ); virtual XInterface * queryInterface( UsrUik ); - virtual XIdlClassRef getIdlClass(void); + virtual XIdlClassRef getIdlClass(); virtual void disposing(const EventObject& Source); @@ -124,7 +124,7 @@ XInterface* ScTestListener::queryInterface( UsrUik aUIK ) return UsrObject::queryInterface( aUIK ); } -XIdlClassRef ScTestListener::getIdlClass(void) +XIdlClassRef ScTestListener::getIdlClass() { static XIdlClassRef xClass = createStandardClass( L"ScTestListener", UsrObject::getUsrObjectIdlClass(), |