scaddins/source/analysis/analysis.cxx | 1 +
scaddins/source/analysis/analysis.hxx | 13 +++++++------
scaddins/source/analysis/analysishelper.cxx | 5 +++--
scaddins/source/analysis/analysishelper.hxx | 13 +++++--------
scaddins/source/analysis/financial.cxx | 1 +
5 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit 9a3f8cc7fc015443007395dffbde38adf7483c84
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Mar 3 15:51:05 2015 +0100
Improve previous commit to disambiguate FuncData types
...by making more liberal use of already existing sca::analysis namespace
instead.
Change-Id: I17355b3aca3a5f415db1de718feba9153012bb2a
diff --git a/scaddins/source/analysis/analysis.cxx
b/scaddins/source/analysis/analysis.cxx
index de02b1c..6d55716 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -38,6 +38,7 @@
#define MY_IMPLNAME "com.sun.star.sheet.addin.AnalysisImpl"
using namespace ::com::sun::star;
+using namespace sca::analysis;
using namespace std;
extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL analysis_component_getFactory(
diff --git a/scaddins/source/analysis/analysis.hxx
b/scaddins/source/analysis/analysis.hxx
index f2d4247..a1ef342 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -35,9 +35,10 @@
#include "analysisdefs.hxx"
#include "analysishelper.hxx"
-
-class FuncDataList;
-class ConvertDataList;
+namespace sca { namespace analysis {
+ class FuncDataList;
+ class ConvertDataList;
+} }
class ResMgr;
@@ -54,12 +55,12 @@ class AnalysisAddIn : public cppu::WeakImplHelper5<
private:
css::lang::Locale aFuncLoc;
css::lang::Locale* pDefLocales;
- FuncDataList* pFD;
+ sca::analysis::FuncDataList* pFD;
double* pFactDoubles;
- ConvertDataList* pCDL;
+ sca::analysis::ConvertDataList* pCDL;
ResMgr* pResMgr;
- ScaAnyConverter aAnyConv;
+ sca::analysis::ScaAnyConverter aAnyConv;
ResMgr& GetResMgr( void ) throw(
css::uno::RuntimeException );
OUString GetDisplFuncStr( sal_uInt16 nFuncNum )
throw( css::uno::RuntimeException );
diff --git a/scaddins/source/analysis/analysishelper.cxx
b/scaddins/source/analysis/analysishelper.cxx
index 114c9b5..0ee40d4 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -30,6 +30,7 @@
#include "analysis.hrc"
using namespace ::com::sun::star;
+using namespace sca::analysis;
#define UNIQUE false // function name does not exist in Calc
#define DOUBLE true // function name exists in Calc
@@ -148,6 +149,7 @@ const FuncDataBase pFuncDatas[] =
};
#undef FUNCDATA
+namespace sca { namespace analysis {
sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
{
@@ -2964,7 +2966,6 @@ sal_Int32 ScaAnyConverter::getInt32(
return nResult;
}
-
-
+} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/analysishelper.hxx
b/scaddins/source/analysis/analysishelper.hxx
index 6c33d45..c0fadc5 100644
--- a/scaddins/source/analysis/analysishelper.hxx
+++ b/scaddins/source/analysis/analysishelper.hxx
@@ -39,6 +39,9 @@
class ResMgr;
+
+namespace sca { namespace analysis {
+
class SortedIndividualInt32List;
class ScaAnyConverter;
@@ -168,7 +171,7 @@ struct FuncDataBase
};
-class SAL_DLLPRIVATE FuncData
+class FuncData
{
private:
OUString aIntName;
@@ -448,8 +451,6 @@ enum ConvertDataClass
class ConvertDataList;
-namespace analysis {
-
class ConvertData
{
protected:
@@ -485,10 +486,6 @@ public:
inline bool IsPrefixSupport( void ) const;
};
-} // namespace analysis
-
-using namespace ::analysis;
-
class ConvertDataLinear : public ConvertData
{
protected:
@@ -883,7 +880,7 @@ public:
throw( css::uno::RuntimeException,
css::lang::IllegalArgumentException );
};
-
+} }
#endif
diff --git a/scaddins/source/analysis/financial.cxx
b/scaddins/source/analysis/financial.cxx
index 81cf3c4..309f044 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -21,6 +21,7 @@
#include "analysishelper.hxx"
#include <rtl/math.hxx>
+using namespace sca::analysis;
double SAL_CALL AnalysisAddIn::getAmordegrc( const css::uno::Reference<
css::beans::XPropertySet >& xOpt,
double fCost, sal_Int32 nDate, sal_Int32 nFirstPer, double fRestVal,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
