bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx | 2 bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx | 2 connectivity/prj/build.lst | 2 forms/source/xforms/NameContainer.hxx | 2 instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt | 4 - instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 22 +++++----- instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt | 10 +--- instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt | 2 instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt | 5 -- scaddins/source/analysis/analysishelper.hxx | 2 scp2/source/ooo/makefile.mk | 4 + sw/source/ui/config/optload.src | 6 +- wizards/source/euro/euro.src | 2 13 files changed, 33 insertions(+), 32 deletions(-)
New commits: commit 29c237419d9a605fa5b44ff05d3edc181e4ab987 Author: Matthias Seidel <[email protected]> Date: Mon Oct 2 09:46:22 2017 +0000 Fixed typo (existant -> existent) diff --git a/forms/source/xforms/NameContainer.hxx b/forms/source/xforms/NameContainer.hxx index e8bbc7c13454..33e148d8dbff 100644 --- a/forms/source/xforms/NameContainer.hxx +++ b/forms/source/xforms/NameContainer.hxx @@ -65,7 +65,7 @@ protected: T getItem( const rtl::OUString& rName ) { - OSL_ENSURE( hasItem( rName ), "can't get non-existant item" ); + OSL_ENSURE( hasItem( rName ), "can't get non-existent item" ); return maItems[ rName ]; } diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src index 1594515dafc5..1e72040ca21a 100644 --- a/wizards/source/euro/euro.src +++ b/wizards/source/euro/euro.src @@ -233,7 +233,7 @@ Text [ en-US ] = "Select target directory"; String MESSAGES + 4 { -Text [ en-US ] = "non-existant"; +Text [ en-US ] = "non-existent"; }; commit 4d07e8e8ef783162f0bfbf44eeec197b609b2cc5 Author: Matthias Seidel <[email protected]> Date: Sun Oct 1 20:46:14 2017 +0000 Minor change to dialog for Writer diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src index 3285c00718b3..856343037024 100644 --- a/sw/source/ui/config/optload.src +++ b/sw/source/ui/config/optload.src @@ -73,21 +73,21 @@ TabPage TP_OPTLOAD_PAGE }; FixedText FT_FIELD { - Pos = MAP_APPFONT ( 140 , 14 ) ; + Pos = MAP_APPFONT ( 130 , 26 ) ; Size = MAP_APPFONT ( 124 , 8 ) ; Text [ en-US ] = "Automatically"; }; CheckBox CB_AUTO_UPDATE_FIELDS { HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS"; - Pos = MAP_APPFONT ( 146 , 26) ; + Pos = MAP_APPFONT ( 136 , 39) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~Fields"; }; CheckBox CB_AUTO_UPDATE_CHARTS { HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS"; - Pos = MAP_APPFONT ( 146 , 39) ; + Pos = MAP_APPFONT ( 136 , 52) ; Size = MAP_APPFONT ( 109 , 10 ) ; Text [ en-US ] = "~Charts"; }; commit ba437140dab6daef99efcfe5c9d46593e96882dc Author: Pedro Giffuni <[email protected]> Date: Sun Oct 1 05:00:24 2017 +0000 freebsd-powerpc: obvious fix. diff --git a/bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx index 65b402b492a2..19194d614e64 100644 --- a/bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#include <malloc.h> +#include <stdlib.h> #include <com/sun/star/uno/genfunc.hxx> #include <uno/data.h> commit cf9026c08b964e5e2b80158b811865059e4a9e89 Author: Pedro Giffuni <[email protected]> Date: Sun Oct 1 04:53:39 2017 +0000 freebsd-arm: obvious fix. diff --git a/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx index 7ab52372d5ab..8bfea900e1dc 100644 --- a/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx @@ -21,7 +21,7 @@ -#include <malloc.h> +#include <stdlib.h> #include <hash_map> #include <rtl/alloc.h> commit dc552bd0fb90529f10743b6af87aa80f061cd330 Author: Matthias Seidel <[email protected]> Date: Fri Sep 29 22:32:23 2017 +0000 Minor changes to Windows installer (SetupType) diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 43bf55cbc522..de216916aaab 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -338,16 +338,16 @@ SetupType Back PushButton 164 243 66 17 3 OOO_CONTROL_251 Next SetupType Banner Bitmap 0 0 374 44 1 BannerBmp SetupType BannerLine Line 0 44 376 0 1 SetupType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_254 RadioGroup -SetupType CompleteIco Icon 34 94 24 24 5242881 SetupCompleteIco -SetupType CompText Text 80 94 246 35 3 OOO_CONTROL_255 -SetupType CustomIco Icon 34 154 24 24 5242881 SetupPartialIco -SetupType CustText Text 80 154 246 35 3 OOO_CONTROL_256 +SetupType CompleteIco Icon 35 95 24 24 5242881 SetupCompleteIco +SetupType CompText Text 80 95 270 35 3 OOO_CONTROL_255 +SetupType CustomIco Icon 35 155 24 24 5242881 SetupPartialIco +SetupType CustText Text 80 155 270 35 3 OOO_CONTROL_256 SetupType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_257 SetupType DlgLine Line 0 234 376 0 1 SetupType DlgText Text 21 51 326 10 3 OOO_CONTROL_258 SetupType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_259 SetupType Next PushButton 230 243 66 17 3 OOO_CONTROL_260 Cancel -SetupType RadioGroup RadioButtonGroup 21 79 264 120 3 _IsSetupTypeMin Back +SetupType RadioGroup RadioButtonGroup 21 80 264 120 3 _IsSetupTypeMin Back SplashBitmap Back PushButton 164 243 66 17 1 OOO_CONTROL_262 Next SplashBitmap Cancel PushButton 301 243 66 17 3 OOO_CONTROL_265 Back SplashBitmap DlgLine Line 0 234 376 0 1 commit 727dc972b8eaf5042369162cca3135dd9142efd7 Author: Don Lewis <[email protected]> Date: Fri Sep 29 08:32:26 2017 +0000 Pass SYSTEM_APACHE_COMMONS all the way down so that we don't try to package the non-existant commons-lang3-3.3.jar file if --with-system-apache-commons=yes was passed to configure. diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 163d028968b7..a5a0baeaa7f4 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -302,6 +302,10 @@ SCPDEFS+=-DSYSTEM_LIBJPEG SCPDEFS+=-DSYSTEM_PANGO .ENDIF +.IF "$(SYSTEM_APACHE_COMMONS)" == "YES" +SCPDEFS+=-DSYSTEM_APACHE_COMMONS +.ENDIF + .IF "${MACOSX_DEPLOYMENT_TARGET}" != "" SCPDEFS+=-DMACOSX_DEPLOYMENT_TARGET_NUM=${MACOSX_DEPLOYMENT_TARGET:s/.//} .ENDIF commit 08a769ff3fecea19ae577aaac36bb366189f7989 Author: Don Lewis <[email protected]> Date: Fri Sep 29 08:28:03 2017 +0000 We don't need to build the apache-commons module if --with-system-apache-commons=yes was passed to configure. diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index 9244df25ed97..6727f518577f 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity : shell L10N:l10n comphelper SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg LIBXSLT:libxslt apache-commons NULL +cn connectivity : shell L10N:l10n comphelper SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg LIBXSLT:libxslt APACHE_COMMONS:apache-commons NULL cn connectivity usr1 - all cn_mkout NULL cn connectivity\inc nmake - all cn_inc NULL cn connectivity\java\sdbc_hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL commit 268b5733b5d3e89bc4472e2798babdadc6200354 Author: Don Lewis <[email protected]> Date: Thu Sep 28 07:12:46 2017 +0000 Fix build with modern boost which has dropped the old tr1 headers. Support for the native <complex> include file has been around on Linux since at least CentOS 5. diff --git a/scaddins/source/analysis/analysishelper.hxx b/scaddins/source/analysis/analysishelper.hxx index 655670ad45dd..c16424f35ce8 100644 --- a/scaddins/source/analysis/analysishelper.hxx +++ b/scaddins/source/analysis/analysishelper.hxx @@ -35,7 +35,7 @@ #include <math.h> -#include <boost/tr1/complex.hpp> +#include <complex> #ifndef double_complex typedef std::complex<double> double_complex; #endif commit b3595adef084e3c12bf55c4fa76042fd0716b8d2 Author: Matthias Seidel <[email protected]> Date: Wed Sep 27 16:42:11 2017 +0000 Minor change to dialog for Writer diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src index d13d6ea5ad70..3285c00718b3 100644 --- a/sw/source/ui/config/optload.src +++ b/sw/source/ui/config/optload.src @@ -73,21 +73,21 @@ TabPage TP_OPTLOAD_PAGE }; FixedText FT_FIELD { - Pos = MAP_APPFONT ( 130 , 14 ) ; + Pos = MAP_APPFONT ( 140 , 14 ) ; Size = MAP_APPFONT ( 124 , 8 ) ; Text [ en-US ] = "Automatically"; }; CheckBox CB_AUTO_UPDATE_FIELDS { HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS"; - Pos = MAP_APPFONT ( 136 , 26) ; + Pos = MAP_APPFONT ( 146 , 26) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~Fields"; }; CheckBox CB_AUTO_UPDATE_CHARTS { HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS"; - Pos = MAP_APPFONT ( 136 , 39) ; + Pos = MAP_APPFONT ( 146 , 39) ; Size = MAP_APPFONT ( 109 , 10 ) ; Text [ en-US ] = "~Charts"; }; commit ca51acaf0ce3ac91a058beaa45ee10b58faa40ef Author: Matthias Seidel <[email protected]> Date: Tue Sep 26 19:00:07 2017 +0000 Minor changes to Windows SDK installer (MaintenanceType) diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt index 2d0f5036e025..9672d8107b9f 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt @@ -190,8 +190,8 @@ MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupRepairIco MaintenanceType Ico2 Icon 35 135 24 24 5242881 TrashcanIco MaintenanceType Next PushButton 230 243 66 17 3 OOO_CONTROL_141 Cancel MaintenanceType RadioGroup RadioButtonGroup 21 55 290 170 3 _IsMaintenance Back -MaintenanceType Text1 Text 80 72 260 35 3 OOO_CONTROL_144 -MaintenanceType Text2 Text 80 135 260 35 3 OOO_CONTROL_145 +MaintenanceType Text1 Text 80 75 270 35 3 OOO_CONTROL_144 +MaintenanceType Text2 Text 80 135 270 35 3 OOO_CONTROL_145 MaintenanceWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_146 Next MaintenanceWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_147 Back MaintenanceWelcome DlgLine Line 0 234 376 0 1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 866ab20b5572..43bf55cbc522 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -195,14 +195,14 @@ MaintenanceType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 RadioGroup MaintenanceType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_139 MaintenanceType DlgLine Line 0 234 376 0 1 MaintenanceType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_140 -MaintenanceType Ico1 Icon 34 75 24 24 5242881 SetupPartialIco -MaintenanceType Ico2 Icon 34 135 24 24 5242881 SetupRepairIco -MaintenanceType Ico3 Icon 34 195 24 24 5242881 TrashcanIco +MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupPartialIco +MaintenanceType Ico2 Icon 35 135 24 24 5242881 SetupRepairIco +MaintenanceType Ico3 Icon 35 195 24 24 5242881 TrashcanIco MaintenanceType Next PushButton 230 243 66 17 3 OOO_CONTROL_141 Cancel MaintenanceType RadioGroup RadioButtonGroup 21 55 290 170 3 _IsMaintenance Back -MaintenanceType Text1 Text 80 72 260 35 3 OOO_CONTROL_143 -MaintenanceType Text2 Text 80 135 260 35 3 OOO_CONTROL_144 -MaintenanceType Text3 Text 80 192 260 35 3 OOO_CONTROL_145 +MaintenanceType Text1 Text 80 75 270 35 3 OOO_CONTROL_143 +MaintenanceType Text2 Text 80 135 270 35 3 OOO_CONTROL_144 +MaintenanceType Text3 Text 80 195 270 35 3 OOO_CONTROL_145 MaintenanceWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_146 Next MaintenanceWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_147 Back MaintenanceWelcome DlgLine Line 0 234 376 0 1 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt index e5b502565256..c4b7f73549a6 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt @@ -181,14 +181,12 @@ MaintenanceType Cancel PushButton 301 243 66 17 3 OOO_CONTROL_138 RadioGroup MaintenanceType DlgDesc Text 21 23 249 25 65539 OOO_CONTROL_139 MaintenanceType DlgLine Line 0 234 376 0 1 MaintenanceType DlgTitle Text 13 6 257 25 65539 OOO_CONTROL_140 -MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupPartialIco -MaintenanceType Ico2 Icon 35 135 24 24 5242881 SetupRepairIco -MaintenanceType Ico3 Icon 35 195 24 24 5242881 TrashcanIco +MaintenanceType Ico1 Icon 35 75 24 24 5242881 SetupRepairIco +MaintenanceType Ico2 Icon 35 135 24 24 5242881 TrashcanIco MaintenanceType Next PushButton 230 243 66 17 3 OOO_CONTROL_141 Cancel MaintenanceType RadioGroup RadioButtonGroup 21 55 290 170 3 _IsMaintenance Back -MaintenanceType Text1 Text 80 72 260 35 3 OOO_CONTROL_143 -MaintenanceType Text2 Text 80 135 260 35 3 OOO_CONTROL_144 -MaintenanceType Text3 Text 80 192 260 35 3 OOO_CONTROL_145 +MaintenanceType Text1 Text 80 75 270 35 3 OOO_CONTROL_144 +MaintenanceType Text2 Text 80 135 270 35 3 OOO_CONTROL_145 MaintenanceWelcome Back PushButton 164 243 66 17 1 OOO_CONTROL_146 Next MaintenanceWelcome Cancel PushButton 301 243 66 17 3 OOO_CONTROL_147 Back MaintenanceWelcome DlgLine Line 0 234 376 0 1 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt index 6514eaaeca95..cf1bdd036bb6 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt @@ -1,7 +1,7 @@ Property Value s72 l0 WINDOWSENCODINGTEMPLATE Property Property -_IsMaintenance Change +_IsMaintenance Reinstall _IsSetupTypeMin Typical AgreeToLicense No ApplicationUsers AllUsers diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt index e1d000070427..ddbf7e1ccb8c 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RadioBut.idt @@ -1,9 +1,8 @@ Property Order Value X Y Width Height Text Help s72 i2 s64 i2 i2 i2 i2 L64 L50 WINDOWSENCODINGTEMPLATE RadioButton Property Order -_IsMaintenance 1 Change 0 0 290 14 OOO_RADIOBUTTON_1 -_IsMaintenance 2 Reinstall 0 60 290 14 OOO_RADIOBUTTON_2 -_IsMaintenance 3 Remove 0 120 290 14 OOO_RADIOBUTTON_3 +_IsMaintenance 1 Reinstall 0 0 290 14 OOO_RADIOBUTTON_2 +_IsMaintenance 2 Remove 0 60 290 14 OOO_RADIOBUTTON_3 _IsSetupTypeMin 1 Typical 0 0 264 14 OOO_RADIOBUTTON_4 _IsSetupTypeMin 2 Custom 0 60 264 14 OOO_RADIOBUTTON_5 AgreeToLicense 1 No 0 15 295 15 OOO_RADIOBUTTON_6 _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
