diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-03-09 15:10:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-03-09 15:10:32 +0000 |
| commit | 587da420e46fcd54e98a3ead6c16e009ec1fde59 (patch) | |
| tree | ebbcae039d69d5a9d8ffc8b779bcb0baae95737c /reportdesign | |
| parent | dabbcbcb3a3a2f39018c7814187b6eaddb850bdd (diff) | |
#i10000# conflicting return type const sal_Unicode <-> sal_Unicode getSingleToken(..), due to change in IFunctionDescription.hxx by CWS cmcfixes54
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/inc/FunctionHelper.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/misc/FunctionHelper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 735a70083192..9f92f61ffb4a 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -62,7 +62,7 @@ public: virtual const formula::IFunctionCategory* getCategory(sal_uInt32 nPos) const; virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const; virtual const formula::IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const; - virtual const sal_Unicode getSingleToken(const EToken _eToken) const; + virtual sal_Unicode getSingleToken(const EToken _eToken) const; ::boost::shared_ptr< FunctionDescription > get(const ::com::sun::star::uno::Reference< ::com::sun::star::report::meta::XFunctionDescription>& _xFunctionDescription) const; }; diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 3c544867323c..a5293aac7447 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -46,7 +46,7 @@ FunctionManager::FunctionManager(const uno::Reference< report::meta::XFunctionMa FunctionManager::~FunctionManager() { } -const sal_Unicode FunctionManager::getSingleToken(const formula::IFunctionManager::EToken _eToken) const +sal_Unicode FunctionManager::getSingleToken(const formula::IFunctionManager::EToken _eToken) const { switch(_eToken) { |