Commits

obo  committed c81e501

#i10000# conflicting return type const sal_Unicode <-> sal_Unicode getSingleToken(..), due to change in IFunctionDescription.hxx by CWS cmcfixes54

  • Participants
  • Parent commits bbd2297

Comments (0)

Files changed (2)

File reportdesign/source/ui/inc/FunctionHelper.hxx

     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;
 };

File reportdesign/source/ui/misc/FunctionHelper.cxx

 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)
     {