scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl | 40 ++--- scaddins/source/pricing/pricing.cxx | 20 +- scaddins/source/pricing/pricing.hrc | 34 ++-- scaddins/source/pricing/pricing.hxx | 8 - scaddins/source/pricing/pricing.src | 16 +- scp2/InstallModule_ooo.mk | 19 -- scp2/source/ooo/file_library_ooo.scp | 4 scp2/source/ooo/file_ooo.scp | 94 ++++++------ 8 files changed, 113 insertions(+), 122 deletions(-)
New commits: commit 8d0dbbdad4b06da7d90d39acf1870fb62543d6ea Author: tino <[email protected]> Date: Tue Dec 4 17:26:52 2012 +0000 changed function names and variables to conform with UNO style Change-Id: I3de884b54083a6916a5baed4d475016aa9d4ddec diff --git a/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl b/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl index 495891a..1b0dab5 100644 --- a/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl +++ b/scaddins/idl/com/sun/star/sheet/addin/XPricingFunctions.idl @@ -38,34 +38,36 @@ module addin */ interface XPricingFunctions : com::sun::star::uno::XInterface { - /// opt_barrier() - double getOpt_barrier( [in] double spot, [in] double vol, - [in] double r, [in] double rf, [in] double T, [in] double strike, - [in] double barrier_low, [in] double barrier_up, + /// OPT_BARRIER(), pricing of a barrier option. + double getOptBarrier( [in] double spot, [in] double vol, + [in] double rate, [in] double rateForeign, + [in] double maturity, [in] double strike, + [in] double barrierLow, [in] double barrierUp, [in] double rebate, - [in] string put_call, [in] string in_out, + [in] string putCall, [in] string inOut, [in] string continuous, [in] any greek ) raises( com::sun::star::lang::IllegalArgumentException ); - /// opt_touch() - double getOpt_touch( [in] double spot, [in] double vol, - [in] double r, [in] double rf, [in] double T, - [in] double barrier_low, [in] double barrier_up, - [in] string for_dom, [in] string in_out, + /// OPT_TOUCH(), pricing of a touch/no-touch option. + double getOptTouch( [in] double spot, [in] double vol, + [in] double rate, [in] double rateForeign, + [in] double maturity, + [in] double barrierLow, [in] double barrierUp, + [in] string foreignDomestic, [in] string inOut, [in] string continuous, [in] any greek ) raises( com::sun::star::lang::IllegalArgumentException ); - /// opt_prob_hit() - double getOpt_prob_hit( [in] double spot, [in] double vol, - [in] double mu, [in] double T, - [in] double barrier_low, [in] double barrier_up ) + /// OPT_PROB_HIT(), probability of hitting a barrier. + double getOptProbHit( [in] double spot, [in] double vol, + [in] double mu, [in] double maturity, + [in] double barrierLow, [in] double barrierUp ) raises( com::sun::star::lang::IllegalArgumentException ); - /// opt_prob_inmoney() - double getOpt_prob_inmoney( [in] double spot, [in] double vol, - [in] double mu, [in] double T, - [in] double barrier_low, [in] double barrier_up, - [in] any strike, [in] any put_call ) + /// OPT_PROB_INMONEY(), probability of ending up in-the-money. + double getOptProbInMoney( [in] double spot, [in] double vol, + [in] double mu, [in] double maturity, + [in] double barrierLow, [in] double barrierUp, + [in] any strike, [in] any putCall ) raises( com::sun::star::lang::IllegalArgumentException ); }; diff --git a/scaddins/source/pricing/pricing.cxx b/scaddins/source/pricing/pricing.cxx index ba4cb31..cf65787 100644 --- a/scaddins/source/pricing/pricing.cxx +++ b/scaddins/source/pricing/pricing.cxx @@ -110,10 +110,10 @@ ScaResId::ScaResId( sal_uInt16 nId, ResMgr& rResMgr ) : const ScaFuncDataBase pFuncDataArr[] = { - FUNCDATA( Opt_barrier, 13, ScaCat_Finance, UNIQUE, STDPAR), - FUNCDATA( Opt_touch, 11, ScaCat_Finance, UNIQUE, STDPAR), - FUNCDATA( Opt_prob_hit, 6, ScaCat_Finance, UNIQUE, STDPAR), - FUNCDATA( Opt_prob_inmoney, 8, ScaCat_Finance, UNIQUE, STDPAR) + FUNCDATA( OptBarrier, 13, ScaCat_Finance, UNIQUE, STDPAR), + FUNCDATA( OptTouch, 11, ScaCat_Finance, UNIQUE, STDPAR), + FUNCDATA( OptProbHit, 6, ScaCat_Finance, UNIQUE, STDPAR), + FUNCDATA( OptProbInMoney, 8, ScaCat_Finance, UNIQUE, STDPAR) }; #undef FUNCDATA @@ -645,7 +645,7 @@ bool getinput_greek(bs::types::Greeks& greek, const ANY& anyval) { // OPT_BARRIER(...) -double SAL_CALL ScaPricingAddIn::getOpt_barrier( double spot, double vol, +double SAL_CALL ScaPricingAddIn::getOptBarrier( double spot, double vol, double r, double rf, double T, double strike, double barrier_low, double barrier_up, double rebate, const STRING& put_call, const STRING& in_out, @@ -671,7 +671,7 @@ double SAL_CALL ScaPricingAddIn::getOpt_barrier( double spot, double vol, } // OPT_TOUCH(...) -double SAL_CALL ScaPricingAddIn::getOpt_touch( double spot, double vol, +double SAL_CALL ScaPricingAddIn::getOptTouch( double spot, double vol, double r, double rf, double T, double barrier_low, double barrier_up, const STRING& for_dom, const STRING& in_out, @@ -697,7 +697,7 @@ double SAL_CALL ScaPricingAddIn::getOpt_touch( double spot, double vol, } // OPT_PRB_HIT(...) -double SAL_CALL ScaPricingAddIn::getOpt_prob_hit( double spot, double vol, +double SAL_CALL ScaPricingAddIn::getOptProbHit( double spot, double vol, double mu, double T, double barrier_low, double barrier_up ) THROWDEF_RTE_IAE { @@ -711,13 +711,13 @@ double SAL_CALL ScaPricingAddIn::getOpt_prob_hit( double spot, double vol, RETURN_FINITE( fRet ); } -// OPT_PRB_INMONEY(...) -double SAL_CALL ScaPricingAddIn::getOpt_prob_inmoney( double spot, double vol, +// OPT_PROB_INMONEY(...) +double SAL_CALL ScaPricingAddIn::getOptProbInMoney( double spot, double vol, double mu, double T, double barrier_low, double barrier_up, const ANY& strikeval, const ANY& put_call ) THROWDEF_RTE_IAE { - bs::types::PutCall pc; + bs::types::PutCall pc=bs::types::Call; double K; // read and check input values diff --git a/scaddins/source/pricing/pricing.hrc b/scaddins/source/pricing/pricing.hrc index bf4df21..1f7cf3c 100644 --- a/scaddins/source/pricing/pricing.hrc +++ b/scaddins/source/pricing/pricing.hrc @@ -22,33 +22,33 @@ #define PRICING_RESOURCE_START 1000 -#define RID_PRICING_FUNCTION_DESCRIPTIONS PRICING_RESOURCE_START -#define RID_PRICING_FUNCTION_NAMES (PRICING_RESOURCE_START+1000) -#define RID_PRICING_DEFFUNCTION_NAMES (PRICING_RESOURCE_START+2000) +#define RID_PRICING_FUNCTION_DESCRIPTIONS PRICING_RESOURCE_START +#define RID_PRICING_FUNCTION_NAMES (PRICING_RESOURCE_START+1000) +#define RID_PRICING_DEFFUNCTION_NAMES (PRICING_RESOURCE_START+2000) -#define PRICING_FUNCDESC_START (RID_PRICING_FUNCTION_DESCRIPTIONS+1) +#define PRICING_FUNCDESC_START (RID_PRICING_FUNCTION_DESCRIPTIONS+1) -#define PRICING_FUNCDESC_Opt_barrier (PRICING_FUNCDESC_START) -#define PRICING_FUNCDESC_Opt_touch (PRICING_FUNCDESC_START+1) -#define PRICING_FUNCDESC_Opt_prob_hit (PRICING_FUNCDESC_START+2) -#define PRICING_FUNCDESC_Opt_prob_inmoney (PRICING_FUNCDESC_START+3) +#define PRICING_FUNCDESC_OptBarrier (PRICING_FUNCDESC_START) +#define PRICING_FUNCDESC_OptTouch (PRICING_FUNCDESC_START+1) +#define PRICING_FUNCDESC_OptProbHit (PRICING_FUNCDESC_START+2) +#define PRICING_FUNCDESC_OptProbInMoney (PRICING_FUNCDESC_START+3) -#define PRICING_FUNCNAME_START (RID_PRICING_FUNCTION_NAMES+1) +#define PRICING_FUNCNAME_START (RID_PRICING_FUNCTION_NAMES+1) -#define PRICING_FUNCNAME_Opt_barrier (PRICING_FUNCNAME_START) -#define PRICING_FUNCNAME_Opt_touch (PRICING_FUNCNAME_START+1) -#define PRICING_FUNCNAME_Opt_prob_hit (PRICING_FUNCNAME_START+2) -#define PRICING_FUNCNAME_Opt_prob_inmoney (PRICING_FUNCNAME_START+3) +#define PRICING_FUNCNAME_OptBarrier (PRICING_FUNCNAME_START) +#define PRICING_FUNCNAME_OptTouch (PRICING_FUNCNAME_START+1) +#define PRICING_FUNCNAME_OptProbHit (PRICING_FUNCNAME_START+2) +#define PRICING_FUNCNAME_OptProbInMoney (PRICING_FUNCNAME_START+3) #define PRICING_DEFFUNCNAME_START (RID_PRICING_DEFFUNCTION_NAMES+1) -#define PRICING_DEFFUNCNAME_Opt_barrier (PRICING_DEFFUNCNAME_START) -#define PRICING_DEFFUNCNAME_Opt_touch (PRICING_DEFFUNCNAME_START+1) -#define PRICING_DEFFUNCNAME_Opt_prob_hit (PRICING_DEFFUNCNAME_START+2) -#define PRICING_DEFFUNCNAME_Opt_prob_inmoney (PRICING_DEFFUNCNAME_START+3) +#define PRICING_DEFFUNCNAME_OptBarrier (PRICING_DEFFUNCNAME_START) +#define PRICING_DEFFUNCNAME_OptTouch (PRICING_DEFFUNCNAME_START+1) +#define PRICING_DEFFUNCNAME_OptProbHit (PRICING_DEFFUNCNAME_START+2) +#define PRICING_DEFFUNCNAME_OptProbInMoney (PRICING_DEFFUNCNAME_START+3) #endif diff --git a/scaddins/source/pricing/pricing.hxx b/scaddins/source/pricing/pricing.hxx index 66d2d26..ca02f9c 100644 --- a/scaddins/source/pricing/pricing.hxx +++ b/scaddins/source/pricing/pricing.hxx @@ -389,23 +389,23 @@ public: // methods from own interfaces start here // ---------------------------------------- - virtual double SAL_CALL getOpt_barrier( double spot, double vol, + virtual double SAL_CALL getOptBarrier( double spot, double vol, double r, double rf, double T, double strike, double barrier_low, double barrier_up, double rebate, const STRING& put_call, const STRING& in_out, const STRING& continuous, const ANY& greek ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getOpt_touch( double spot, double vol, + virtual double SAL_CALL getOptTouch( double spot, double vol, double r, double rf, double T, double barrier_low, double barrier_up, const STRING& for_dom, const STRING& in_out, const STRING& barriercont, const ANY& greekstr ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getOpt_prob_hit( double spot, double vol, + virtual double SAL_CALL getOptProbHit( double spot, double vol, double mu, double T, double barrier_low, double barrier_up ) THROWDEF_RTE_IAE; - virtual double SAL_CALL getOpt_prob_inmoney( double spot, double vol, + virtual double SAL_CALL getOptProbInMoney( double spot, double vol, double mu, double T, double barrier_low, double barrier_up, const ANY& strikeval, const ANY& put_call ) THROWDEF_RTE_IAE; diff --git a/scaddins/source/pricing/pricing.src b/scaddins/source/pricing/pricing.src index c85a5d5..6aa1675 100644 --- a/scaddins/source/pricing/pricing.src +++ b/scaddins/source/pricing/pricing.src @@ -23,7 +23,7 @@ // function and parameter description Resource RID_PRICING_FUNCTION_DESCRIPTIONS { - Resource PRICING_FUNCDESC_Opt_barrier + Resource PRICING_FUNCDESC_OptBarrier { String 1 // description { @@ -150,7 +150,7 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS - Resource PRICING_FUNCDESC_Opt_touch + Resource PRICING_FUNCDESC_OptTouch { String 1 // description { @@ -258,7 +258,7 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS }; - Resource PRICING_FUNCDESC_Opt_prob_hit + Resource PRICING_FUNCDESC_OptProbHit { String 1 // description { @@ -321,7 +321,7 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS }; - Resource PRICING_FUNCDESC_Opt_prob_inmoney + Resource PRICING_FUNCDESC_OptProbInMoney { String 1 // description { @@ -410,19 +410,19 @@ Resource RID_PRICING_FUNCTION_DESCRIPTIONS // function names as accessible from cells Resource RID_PRICING_FUNCTION_NAMES { - String PRICING_FUNCNAME_Opt_barrier + String PRICING_FUNCNAME_OptBarrier { Text [ en-US ] = "OPT_BARRIER"; }; - String PRICING_FUNCNAME_Opt_touch + String PRICING_FUNCNAME_OptTouch { Text [ en-US ] = "OPT_TOUCH"; }; - String PRICING_FUNCNAME_Opt_prob_hit + String PRICING_FUNCNAME_OptProbHit { Text [ en-US ] = "OPT_PROB_HIT"; }; - String PRICING_FUNCNAME_Opt_prob_inmoney + String PRICING_FUNCNAME_OptProbInMoney { Text [ en-US ] = "OPT_PROB_INMONEY"; }; commit 4565afec9e87090aef6ced9ae582910e4c46d2d9 Author: Stephan Bergmann <[email protected]> Date: Wed Dec 5 09:50:36 2012 +0100 Clean up scp2 flags Change-Id: Ib4f5c28478d24a97131b6d9b3b1539d4982f762d diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 95ea166..a9c272e 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -33,6 +33,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_CAIRO_CANVAS \ ENABLE_DIRECTX \ ENABLE_EVOAB2 \ + ENABLE_GSTREAMER \ + ENABLE_GSTREAMER_0_10 \ ENABLE_GTK \ ENABLE_GTK3 \ ENABLE_KAB \ @@ -76,6 +78,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_REDLAND \ SYSTEM_SNDFILE \ SYSTEM_STDLIBS \ + WITH_MOZAB4WIN \ + WITH_MYSPELL_DICTS \ )) $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\ @@ -133,27 +137,12 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\ )) $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ - $(if $(filter gcj,$(JDK)),\ - -DGCJ \ - ) \ - $(if $(filter TRUE,$(ENABLE_GSTREAMER)),\ - -DGSTREAMER \ - ) \ - $(if $(filter TRUE,$(ENABLE_GSTREAMER_0_10)),\ - -DGSTREAMER_0_10 \ - ) \ $(if $(WINDOWS_SDK_HOME),\ -DHAVE_WINDOWS_SDK \ ) \ $(if $(filter YES,$(SYSTEM_HSQLDB)),\ -DHSQLDB_JAR=\""$(call gb_Helper_make_path,$(HSQLDB_JAR))"\" \ ) \ - $(if $(filter YES,$(WITH_MOZAB4WIN)),\ - -DWITH_MOZAB4WIN \ - ) \ - $(if $(filter-out YES,$(WITH_MYSPELL_DICTS)),\ - -DWITHOUT_MYSPELL_DICTS \ - ) \ )) ifeq ($(DISABLE_PYTHON),TRUE) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 86dde44..a804041 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1423,10 +1423,10 @@ STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml ) // AVMedia STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia ) -#ifdef GSTREAMER +#if defined ENABLE_GSTREAMER SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst ) #endif -#ifdef GSTREAMER_0_10 +#if defined ENABLE_GSTREAMER_0_10 SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer_0_10, avmediagst_0_10 ) #endif #if defined WNT diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index c4b48d1..e973a58 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1290,7 +1290,7 @@ End // Dictionary extensions -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Af Dir = gid_Brand_Dir_Share_Extensions_Dict_Af; Name = "dict-af.oxt"; @@ -1299,7 +1299,7 @@ File gid_File_Extension_Dictionary_Af End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_An Dir = gid_Brand_Dir_Share_Extensions_Dict_An; Name = "dict-an.oxt"; @@ -1308,7 +1308,7 @@ File gid_File_Extension_Dictionary_An End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ar Dir = gid_Brand_Dir_Share_Extensions_Dict_Ar; Name = "dict-ar.oxt"; @@ -1317,7 +1317,7 @@ File gid_File_Extension_Dictionary_Ar End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Be Dir = gid_Brand_Dir_Share_Extensions_Dict_Be; Name = "dict-be.oxt"; @@ -1326,7 +1326,7 @@ File gid_File_Extension_Dictionary_Be End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Bg Dir = gid_Brand_Dir_Share_Extensions_Dict_Bg; Name = "dict-bg.oxt"; @@ -1335,7 +1335,7 @@ File gid_File_Extension_Dictionary_Bg End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Bn Dir = gid_Brand_Dir_Share_Extensions_Dict_Bn; Name = "dict-bn.oxt"; @@ -1344,7 +1344,7 @@ File gid_File_Extension_Dictionary_Bn End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Br Dir = gid_Brand_Dir_Share_Extensions_Dict_Br; Name = "dict-br.oxt"; @@ -1353,7 +1353,7 @@ File gid_File_Extension_Dictionary_Br End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ca Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca; Name = "dict-ca.oxt"; @@ -1362,7 +1362,7 @@ File gid_File_Extension_Dictionary_Ca End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Cs Dir = gid_Brand_Dir_Share_Extensions_Dict_Cs; Name = "dict-cs.oxt"; @@ -1371,7 +1371,7 @@ File gid_File_Extension_Dictionary_Cs End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Da Dir = gid_Brand_Dir_Share_Extensions_Dict_Da; Name = "dict-da.oxt"; @@ -1380,7 +1380,7 @@ File gid_File_Extension_Dictionary_Da End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_De Dir = gid_Brand_Dir_Share_Extensions_Dict_De; Name = "dict-de.oxt"; @@ -1389,7 +1389,7 @@ File gid_File_Extension_Dictionary_De End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_En Dir = gid_Brand_Dir_Share_Extensions_Dict_En; Name = "dict-en.oxt"; @@ -1398,7 +1398,7 @@ File gid_File_Extension_Dictionary_En End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_El Dir = gid_Brand_Dir_Share_Extensions_Dict_El; Name = "dict-el.oxt"; @@ -1407,7 +1407,7 @@ File gid_File_Extension_Dictionary_El End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Es Dir = gid_Brand_Dir_Share_Extensions_Dict_Es; Name = "dict-es.oxt"; @@ -1416,7 +1416,7 @@ File gid_File_Extension_Dictionary_Es End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Et Dir = gid_Brand_Dir_Share_Extensions_Dict_Et; Name = "dict-et.oxt"; @@ -1425,7 +1425,7 @@ File gid_File_Extension_Dictionary_Et End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Fr Dir = gid_Brand_Dir_Share_Extensions_Dict_Fr; Name = "dict-fr.oxt"; @@ -1434,7 +1434,7 @@ File gid_File_Extension_Dictionary_Fr End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Gd Dir = gid_Brand_Dir_Share_Extensions_Dict_Gd; Name = "dict-gd.oxt"; @@ -1443,7 +1443,7 @@ File gid_File_Extension_Dictionary_Gd End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Gl Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl; Name = "dict-gl.oxt"; @@ -1452,7 +1452,7 @@ File gid_File_Extension_Dictionary_Gl End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Gu Dir = gid_Brand_Dir_Share_Extensions_Dict_Gu; Name = "dict-gu.oxt"; @@ -1461,7 +1461,7 @@ File gid_File_Extension_Dictionary_Gu End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_He Dir = gid_Brand_Dir_Share_Extensions_Dict_He; Name = "dict-he.oxt"; @@ -1470,7 +1470,7 @@ File gid_File_Extension_Dictionary_He End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Hi Dir = gid_Brand_Dir_Share_Extensions_Dict_Hi; Name = "dict-hi.oxt"; @@ -1479,7 +1479,7 @@ File gid_File_Extension_Dictionary_Hi End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Hu Dir = gid_Brand_Dir_Share_Extensions_Dict_Hu; Name = "dict-hu.oxt"; @@ -1488,7 +1488,7 @@ File gid_File_Extension_Dictionary_Hu End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Hr Dir = gid_Brand_Dir_Share_Extensions_Dict_Hr; Name = "dict-hr.oxt"; @@ -1497,7 +1497,7 @@ File gid_File_Extension_Dictionary_Hr End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_It Dir = gid_Brand_Dir_Share_Extensions_Dict_It; Name = "dict-it.oxt"; @@ -1506,7 +1506,7 @@ File gid_File_Extension_Dictionary_It End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ku_Tr Dir = gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr; Name = "dict-ku-TR.oxt"; @@ -1515,7 +1515,7 @@ File gid_File_Extension_Dictionary_Ku_Tr End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Lt Dir = gid_Brand_Dir_Share_Extensions_Dict_Lt; Name = "dict-lt.oxt"; @@ -1524,7 +1524,7 @@ File gid_File_Extension_Dictionary_Lt End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Lv Dir = gid_Brand_Dir_Share_Extensions_Dict_Lv; Name = "dict-lv.oxt"; @@ -1533,7 +1533,7 @@ File gid_File_Extension_Dictionary_Lv End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ne Dir = gid_Brand_Dir_Share_Extensions_Dict_Ne; Name = "dict-ne.oxt"; @@ -1542,7 +1542,7 @@ File gid_File_Extension_Dictionary_Ne End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Nl Dir = gid_Brand_Dir_Share_Extensions_Dict_Nl; Name = "dict-nl.oxt"; @@ -1551,7 +1551,7 @@ File gid_File_Extension_Dictionary_Nl End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_No Dir = gid_Brand_Dir_Share_Extensions_Dict_No; Name = "dict-no.oxt"; @@ -1560,7 +1560,7 @@ File gid_File_Extension_Dictionary_No End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Oc Dir = gid_Brand_Dir_Share_Extensions_Dict_Oc; Name = "dict-oc.oxt"; @@ -1569,7 +1569,7 @@ File gid_File_Extension_Dictionary_Oc End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Pl Dir = gid_Brand_Dir_Share_Extensions_Dict_Pl; Name = "dict-pl.oxt"; @@ -1578,7 +1578,7 @@ File gid_File_Extension_Dictionary_Pl End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Pt_Br Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt_Br; Name = "dict-pt-BR.oxt"; @@ -1587,7 +1587,7 @@ File gid_File_Extension_Dictionary_Pt_Br End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Pt_Pt Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt_Pt; Name = "dict-pt-PT.oxt"; @@ -1596,7 +1596,7 @@ File gid_File_Extension_Dictionary_Pt_Pt End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ro Dir = gid_Brand_Dir_Share_Extensions_Dict_Ro; Name = "dict-ro.oxt"; @@ -1605,7 +1605,7 @@ File gid_File_Extension_Dictionary_Ro End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ru Dir = gid_Brand_Dir_Share_Extensions_Dict_Ru; Name = "dict-ru.oxt"; @@ -1614,7 +1614,7 @@ File gid_File_Extension_Dictionary_Ru End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Si Dir = gid_Brand_Dir_Share_Extensions_Dict_Si; Name = "dict-si.oxt"; @@ -1623,7 +1623,7 @@ File gid_File_Extension_Dictionary_Si End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Sk Dir = gid_Brand_Dir_Share_Extensions_Dict_Sk; Name = "dict-sk.oxt"; @@ -1632,7 +1632,7 @@ File gid_File_Extension_Dictionary_Sk End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Sl Dir = gid_Brand_Dir_Share_Extensions_Dict_Sl; Name = "dict-sl.oxt"; @@ -1641,7 +1641,7 @@ File gid_File_Extension_Dictionary_Sl End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Sr Dir = gid_Brand_Dir_Share_Extensions_Dict_Sr; Name = "dict-sr.oxt"; @@ -1650,7 +1650,7 @@ File gid_File_Extension_Dictionary_Sr End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Sv Dir = gid_Brand_Dir_Share_Extensions_Dict_Sv; Name = "dict-sv.oxt"; @@ -1659,7 +1659,7 @@ File gid_File_Extension_Dictionary_Sv End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Sw Dir = gid_Brand_Dir_Share_Extensions_Dict_Sw; Name = "dict-sw.oxt"; @@ -1668,7 +1668,7 @@ File gid_File_Extension_Dictionary_Sw End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Te Dir = gid_Brand_Dir_Share_Extensions_Dict_Te; Name = "dict-te.oxt"; @@ -1677,7 +1677,7 @@ File gid_File_Extension_Dictionary_Te End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Th Dir = gid_Brand_Dir_Share_Extensions_Dict_Th; Name = "dict-th.oxt"; @@ -1686,7 +1686,7 @@ File gid_File_Extension_Dictionary_Th End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Uk Dir = gid_Brand_Dir_Share_Extensions_Dict_Uk; Name = "dict-uk.oxt"; @@ -1695,7 +1695,7 @@ File gid_File_Extension_Dictionary_Uk End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Vi Dir = gid_Brand_Dir_Share_Extensions_Dict_Vi; Name = "dict-vi.oxt"; @@ -1704,7 +1704,7 @@ File gid_File_Extension_Dictionary_Vi End #endif -#ifndef WITHOUT_MYSPELL_DICTS +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Zu Dir = gid_Brand_Dir_Share_Extensions_Dict_Zu; Name = "dict-zu.oxt"; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
