diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:32:01 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:32:01 +0000 |
commit | ed82fa6ad09f761185bddce7a2d3149fb4cbcbdc (patch) | |
tree | 39effb0455b0de9d5d40add0d2c057b1bd4ed8cf /chart2/source/view | |
parent | 2cd610a548ee24af97510d29b203a952eefb6fa1 (diff) |
CWS-TOOLING: integrate CWS sb102
2008-12-11 16:18:12 +0100 sb r265332 : #i95065# cleanup, to make Windows linking work
2008-12-11 16:16:03 +0100 sb r265331 : #i95065# missing SAL_DLLPUBLIC_EXPORT
2008-12-09 17:40:28 +0100 sb r265122 : #i94469# move CJK specific configuration data to brand layer
2008-12-09 16:09:08 +0100 sb r265112 : #i96959# use PTHREAD_MUTEX_RECURSIVE on all platforms
2008-12-09 15:54:31 +0100 sb r265110 : #i95065# do not derive apphelper::LifeTimeGuard from osl::ResettableMutexGuard to avoid problems with VISIBILITY_HIDDEN=TRUE on MSC
2008-12-09 15:40:51 +0100 sb r265104 : #i95065# add VISIBILITY_HIDDEN=TRUE to connectivity/source/drivers/mozab
2008-12-09 15:36:21 +0100 sb r265102 : #i95501# updated SDK_HOME
2008-12-09 15:31:46 +0100 sb r265099 : typo (temppath vs. tmppath)
2008-12-08 11:48:08 +0100 sb r264979 : #i95065# removed spurious ExplicitCategoriesProvider.obj (ExplicitCategoriesProvider.cxx is not in this directory)
2008-12-07 19:41:07 +0100 sb r264960 : #i96994# erroneously doubled backslash caused visibility feature to be disabled for all GCC versions on Mac OS X
2008-12-06 23:54:49 +0100 sb r264948 : changes from trunk that CWS-TOOLING's rebase to DEV300:m37 (r264891) had missed, as files had been moved around on this CWS
2008-12-05 20:29:23 +0100 sb r264919 : #i85508# versions of flex apparently differ in whether input() resp. yyinput() returns zero or EOF upon end of file
2008-12-05 15:37:23 +0100 sb r264908 : #i95315# removed obsolete jut
2008-12-05 15:34:59 +0100 sb r264907 : #i95531# removed empty obsolete directories
2008-12-05 10:09:23 +0100 sb r264891 : CWS-TOOLING: rebase CWS sb102 to trunk@264807 (milestone: DEV300:m37)
2008-12-04 14:50:20 +0100 sb r264845 : #i95065# introduced VISIBILITY_HIDDEN makefile flag to reduce duplications; made additional libraries use VISIBILITY_HIDDEN=TRUE to avoid warnings with recent GCC 4 versions (had to split certain code directories to make changes that would otherwise erroneously affect multiple libraries built in the same makefile); changed connectivity::ORefVector to no longer derive from std::vector, as that caused problems with the MSC implementation of VISIBILITY_HIDDEN=TRUE; replaced uses of JNIEXPORT with SAL_DLLPUBLIC_EXPORT, as the former does not expand to visibility attributes on some platforms where the latter does
2008-12-03 11:29:38 +0100 sb r264759 : #i94583# remove unnecessary (and wrong) assertion check for rtl_getAppCommandArg return value (which is guaranteed to return osl_Process_E_None or not return at all)
2008-12-02 17:18:31 +0100 sb r264724 : #i96809# silenced GCC 4.3.2 warning
2008-12-02 13:29:34 +0100 sb r264695 : #i96797# make get_tmp_dir fail less often
2008-11-28 17:19:24 +0100 sb r264566 : #i95691# inadvertently missing from -c 264564
2008-11-28 17:07:50 +0100 sb r264564 : #i95691# only structs of exactly 1, 2, 4, or 8 bytes are returned through registers
2008-11-25 13:28:08 +0100 sb r264291 : #i96427# support for SAL_EXCEPTION_DLLPUBLIC_EXPORT (patch by np)
2008-11-21 14:45:22 +0100 sb r264140 : #i95428# added SAL_EXCEPTION_DLLPUBLIC_EXPORT and SAL_EXCEPTION_DLLPRIVATE
2008-11-19 13:19:37 +0100 sb r263984 : #i95525# removed erroneous application/octet-stream svn:mime-type properties
Diffstat (limited to 'chart2/source/view')
-rw-r--r-- | chart2/source/view/axes/makefile.mk | 3 | ||||
-rw-r--r-- | chart2/source/view/charttypes/makefile.mk | 1 | ||||
-rw-r--r-- | chart2/source/view/diagram/makefile.mk | 1 | ||||
-rw-r--r-- | chart2/source/view/main/_serviceregistration_view.cxx | 6 | ||||
-rw-r--r-- | chart2/source/view/main/makefile.mk | 1 | ||||
-rw-r--r-- | chart2/source/view/makefile.mk | 1 |
6 files changed, 9 insertions, 4 deletions
diff --git a/chart2/source/view/axes/makefile.mk b/chart2/source/view/axes/makefile.mk index ebf6d4a9054c..52996a78c8cd 100644 --- a/chart2/source/view/axes/makefile.mk +++ b/chart2/source/view/axes/makefile.mk @@ -39,6 +39,8 @@ ENABLE_EXCEPTIONS= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE: $(PRJ)$/chartview.pmk + #.IF "$(GUI)" == "WNT" #CFLAGS+=-GR #.ENDIF @@ -61,7 +63,6 @@ SLOFILES = \ $(SLO)$/VPolarRadiusAxis.obj \ $(SLO)$/VPolarGrid.obj \ $(SLO)$/VPolarCoordinateSystem.obj \ - $(SLO)$/ExplicitCategoriesProvider.obj \ $(SLO)$/VCoordinateSystem.obj # --- Targets ----------------------------------------------------------------- diff --git a/chart2/source/view/charttypes/makefile.mk b/chart2/source/view/charttypes/makefile.mk index 2eab57590554..434db9304788 100644 --- a/chart2/source/view/charttypes/makefile.mk +++ b/chart2/source/view/charttypes/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE: $(PRJ)$/chartview.pmk # --- export library ------------------------------------------------- diff --git a/chart2/source/view/diagram/makefile.mk b/chart2/source/view/diagram/makefile.mk index 94a4ad939cb0..0be65486a0c5 100644 --- a/chart2/source/view/diagram/makefile.mk +++ b/chart2/source/view/diagram/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE: $(PRJ)$/chartview.pmk # --- export library ------------------------------------------------- diff --git a/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx index 472d90a81ec1..7a0cde2ab3fb 100644 --- a/chart2/source/view/main/_serviceregistration_view.cxx +++ b/chart2/source/view/main/_serviceregistration_view.cxx @@ -51,20 +51,20 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_view[] = extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries_chart2_view ); } //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/chart2/source/view/main/makefile.mk b/chart2/source/view/main/makefile.mk index 22ad29caa86c..8726b7e03f1a 100644 --- a/chart2/source/view/main/makefile.mk +++ b/chart2/source/view/main/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: settings.mk +.INCLUDE: $(PRJ)$/chartview.pmk # --- export library ------------------------------------------------- diff --git a/chart2/source/view/makefile.mk b/chart2/source/view/makefile.mk index 538b53c5d53a..4f74241075fe 100644 --- a/chart2/source/view/makefile.mk +++ b/chart2/source/view/makefile.mk @@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS= TRUE # --- Settings ----------------------------------------------------- .INCLUDE: $(PRJ)$/util$/makefile.pmk +.INCLUDE: $(PRJ)$/chartview.pmk # --- export library ------------------------------------------------- |