[Libreoffice-commits] .: solenv/bin
solenv/bin/concat-deps.c |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit b23f2d78c4d3ca9a79027c6251f3933a85f88053 Author: Robert Nagy rob...@openbsd.org Date: Sun Dec 18 11:18:28 2011 +0100 use the same memory alignment for *BSD as on Linux diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index fc23433..a0eda43 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -36,7 +36,9 @@ #define USE_MEMORY_ALIGNMENT 64 /* big value - no alignment */ #endif /* Def __CYGWIN__ */ -#ifdef __linux +#if defined(__linux) || defined(__OpenBSD__) || \ +defined(__FreeBSD__) || defined(__NetBSD__) || \ +defined(__DragonFly__) #if __BYTE_ORDER == __LITTLE_ENDIAN #define CORE_BIG_ENDIAN 0 #define CORE_LITTLE_ENDIAN 1 @@ -48,7 +50,7 @@ #define USE_MEMORY_ALIGNMENT 4 #endif /* __BYTE_ORDER == __BIG_ENDIAN */ #endif /* !(__BYTE_ORDER == __LITTLE_ENDIAN) */ -#endif /* Def __linux */ +#endif /* Def __linux || Def *BSD */ #ifdef __sun #ifdef __sparc ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/head/feature/gbuild'
___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/head/feature/gbuild' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/gbuild'
New branch 'feature/gbuild' available with the following commits: commit df889b0a3f8d555be218723e8420e14b0af4481b Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 18:43:20 2011 -0500 add idl to tail_build commit 12771b1257627e687c2801b3c7d4a506bce97c7a Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 18:40:01 2011 -0500 add dtrans to tail_build commit bffad422f9060973c73b4c455f27a3e58b973c6a Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 18:36:35 2011 -0500 add xmloff to tail_build commit c01d7eeed3457e32cc2cada3df95a8c2e0a3076f Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 18:28:25 2011 -0500 add editeng to tail_build commit 2b81f014536c30239cca20ed6c5858de74044bda Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 18:26:42 2011 -0500 add canvas to tail_build commit 541da5f4ef658588821332976df3fa17740021ff Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 18:21:39 2011 -0500 add scaddins to tail_build commit b53b3cc710d7d22bc47e8ab5bc02737522cabb49 Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 18:18:06 2011 -0500 add cppcanvas to tail_build commit 8a507ba076db0bfa4781c12edd9bfd89b9dcb66c Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 18:15:07 2011 -0500 add sfx2 to tail_build commit 635ec95713cf878a2c0d0822f1b0bd8ec889a636 Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 18:09:19 2011 -0500 add avmedia to tail_build commit c66a882a02cb26c6696c549a78382ee1cae4a27f Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 16:53:06 2011 -0500 add drawinglayer to tail_build commit 7c37eadd4f3a3d5e400a48851010378f8338ce11 Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 16:49:28 2011 -0500 add svx to tail_build commit d645f2ada6d859ca50df3fb7c67854da88d084f1 Author: Peter Foley pefol...@verizon.net Date: Mon Oct 10 00:39:06 2011 + convert extensions to gbuild and add to tail_build commit 9b974c031b754d8fc46541408b4ce61d59bef34e Merge: f85fb6272fa1fd2d7c7820104a864ae01978e7d2 05e787fb5e32880ff51902137cfd8da9820cd870 Author: Peter Foley pefol...@verizon.net Date: Sat Dec 17 16:35:17 2011 -0500 Merge branch 'master' into feature/gbuild commit f85fb6272fa1fd2d7c7820104a864ae01978e7d2 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Dec 17 14:18:58 2011 +0100 sal: add more unit tests commit 9464e225225fbc01df914fc25f9364e79957ad03 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Dec 17 13:22:02 2011 +0100 sal: add visibility symbols commit 006649cc2790b98e6f4d9f65be3d97fcdad0c5b6 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Dec 17 13:13:11 2011 +0100 sal: convert to gbuild commit 0ff2a6697863f110fcf08d88f9914009d737bcaf Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Dec 17 16:46:22 2011 +0100 cppu: add visibility symbols commit 05c20d7f582309e495f8e403060a38130d27ed45 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Dec 17 14:55:08 2011 +0100 cppu: convert to gbuild There are missing unit tests ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gbuild' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/gbuild'
New branch 'feature/gbuild' available with the following commits: commit 015dad0d748a1cec188e7ae2651b219206107d93 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Dec 17 14:18:58 2011 +0100 sal: add more unit tests commit 288064cdc28f768e32a07d420e174763d0c20a64 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Dec 17 13:22:02 2011 +0100 sal: add visibility symbols commit c9685afcb0c7305b8d05f64a2de1a84dab08fc7f Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Dec 17 13:13:11 2011 +0100 sal: convert to gbuild commit e20ac2ea129257490ef1d0c8355e376bc6bf0ef2 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Dec 18 04:56:57 2011 +0100 cppu: add visibility symbols commit be07ffba7b5a59f045b99f672d690f36792b2424 Author: Matúš Kukan matus.ku...@gmail.com Date: Sat Dec 17 14:55:08 2011 +0100 cppu: convert to gbuild Because of unit tests is here custom target where are idl files processed. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf download ooo.lst.in scp2/source scp2/util set_soenv.in setup_native/source
configure.in| 50 distro-configs/OxygenOfficeLinux.conf |1 distro-configs/OxygenOfficeWin32.conf |1 download|2 ooo.lst.in |3 scp2/source/extensions/directory_extensions.scp | 14 scp2/source/extensions/file_extensions.scp | 15 scp2/source/extensions/makefile.mk |4 scp2/source/extensions/module_extensions.scp| 13 scp2/source/extensions/module_extensions.ulf|6 scp2/source/extensions/module_extensions_lightproof.scp | 52 scp2/source/extensions/module_extensions_lightproof.ulf | 695 -- scp2/source/templates/makefile.mk |2 scp2/source/templates/module_langpack_extensions_lightproof.sct | 49 scp2/util/makefile.mk |1 set_soenv.in|4 setup_native/source/packinfo/packinfo_extensions.txt| 16 setup_native/source/packinfo/packinfo_office_lang.txt | 16 18 files changed, 3 insertions(+), 941 deletions(-) New commits: commit 058d872a2e07311c5c2e68ae0e3150fcea9ce468 Author: Andras Timar ati...@suse.com Date: Sun Dec 18 19:22:02 2011 +0100 remove obsolete (OxygenOffice-style) Lightproof integration diff --git a/configure.in b/configure.in index 40cf257..84d7b50 100644 --- a/configure.in +++ b/configure.in @@ -327,14 +327,6 @@ AC_ARG_ENABLE(ext-languagetool, [Enable the LanguageTool extension.]) ) -AC_ARG_ENABLE(ext-lightproof, -AS_HELP_STRING([--enable-ext-lightproof], -[Enable the Lightproof extension. The enable switch can contain only - the desired languages: --enable-lightproof=en hu ru]), -[enable_ext_lightproof=$enableval], -[enable_ext_lightproof=no] -) - AC_ARG_ENABLE(ext-mysql-connector, AS_HELP_STRING([--enable-ext-mysql-connector], [Enable the build of the MySQL Connector extension.]) @@ -8124,48 +8116,6 @@ fi AC_SUBST(WITH_EXTENSION_INTEGRATION) dnl === -dnl Test whether to include Lightproof extensions -dnl === -AC_MSG_CHECKING([for Lightproof extensions integration (only supported languages displayed)]) -LIGHTPROOF_LANG= -LIGHTPROOF_HU_PACK= -LIGHTPROOF_RU_PACK= -LIGHTPROOF_EN_US_PACK= -if test x$enable_ext_lightproof = xno -o x$enable_extension_integration = xno; then -AC_MSG_RESULT([no integration]) -else -SCPDEFS=$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF -if test x$enable_ext_lightproof = xyes -o x$enable_ext_lightproof = x; then -wanted_lightproof=en-US hu ru -else -for lang in $enable_ext_lightproof ; do -case $lang in -en-US|hu|ru) -wanted_lightproof=$wanted_lightproof $lang -;; -*) -AC_MSG_ERROR([Unknown value for --enable-ext-lightproof: $lang]) -;; -esac -done -fi -for lang in $wanted_lightproof ; do -LIGHTPROOF_LANG=$LIGHTPROOF_LANG $lang -case $lang in -en-US) LIGHTPROOF_EN_US_PACK=0ab55ac8e88f04258f1d3e79e984382f-lightproof-en_US-0.1.oxt ;; -hu) LIGHTPROOF_HU_PACK=76345f925e34fef2d29bade4f29108e9-lightproof-hu_1.3.oxt ;; -ru) LIGHTPROOF_RU_PACK=673860e8649cff2ebdc68bd46f2f7f1a-lightproof-ru_0.1.oxt ;; -*) AC_MSG_ERROR([Unknown value for --enable-ext-lightproof: $lang]) ;; -esac -done -AC_MSG_RESULT([$LIGHTPROOF_LANG]) -fi -AC_SUBST(LIGHTPROOF_LANG) -AC_SUBST(LIGHTPROOF_HU_PACK) -AC_SUBST(LIGHTPROOF_RU_PACK) -AC_SUBST(LIGHTPROOF_EN_US_PACK) - -dnl === dnl Test whether to include Watch Window extension dnl === AC_MSG_CHECKING([for Watch Window extension integration]) diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 16b065b..aacd3ba 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -36,7 +36,6 @@ --enable-ext-scripting-javascript --enable-ext-google-docs --enable-ext-hunart ---enable-ext-lightproof --enable-ext-nlpsolver --enable-ext-numbertext --enable-ext-typo diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf index c46bdde..04b92dd 100644 --- a/distro-configs/OxygenOfficeWin32.conf +++ b/distro-configs/OxygenOfficeWin32.conf @@ -23,7 +23,6 @@ --enable-ext-scripting-javascript --enable-ext-google-docs
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in distro-configs/OxygenOfficeLinux.conf distro-configs/OxygenOfficeWin32.conf download ooo.lst.in scp2/source scp2/util set_soenv.in setu
configure.in| 50 distro-configs/OxygenOfficeLinux.conf |1 distro-configs/OxygenOfficeWin32.conf |1 download|2 ooo.lst.in |3 scp2/source/extensions/directory_extensions.scp | 14 scp2/source/extensions/file_extensions.scp | 15 scp2/source/extensions/makefile.mk |4 scp2/source/extensions/module_extensions.scp| 13 scp2/source/extensions/module_extensions.ulf|6 scp2/source/extensions/module_extensions_lightproof.scp | 52 scp2/source/extensions/module_extensions_lightproof.ulf | 695 -- scp2/source/templates/makefile.mk |2 scp2/source/templates/module_langpack_extensions_lightproof.sct | 49 scp2/util/makefile.mk |1 set_soenv.in|4 setup_native/source/packinfo/packinfo_extensions.txt| 16 setup_native/source/packinfo/packinfo_office_lang.txt | 16 18 files changed, 3 insertions(+), 941 deletions(-) New commits: commit c8cf245bac52aec55f9be9ad504dd82813728a6c Author: Andras Timar ati...@suse.com Date: Sun Dec 18 19:22:02 2011 +0100 remove obsolete (OxygenOffice-style) Lightproof integration Signed-off-by: Andras Timar ati...@suse.com diff --git a/configure.in b/configure.in index 39c533d..0a39ef4 100644 --- a/configure.in +++ b/configure.in @@ -321,14 +321,6 @@ AC_ARG_ENABLE(ext-languagetool, [Enable the LanguageTool extension.]) ) -AC_ARG_ENABLE(ext-lightproof, -AS_HELP_STRING([--enable-ext-lightproof], -[Enable the Lightproof extension. The enable switch can contain only - the desired languages: --enable-lightproof=en hu ru]), -[enable_ext_lightproof=$enableval], -[enable_ext_lightproof=no] -) - AC_ARG_ENABLE(ext-mysql-connector, AS_HELP_STRING([--enable-ext-mysql-connector], [Enable the build of the MySQL Connector extension.]) @@ -8038,48 +8030,6 @@ fi AC_SUBST(WITH_EXTENSION_INTEGRATION) dnl === -dnl Test whether to include Lightproof extensions -dnl === -AC_MSG_CHECKING([for Lightproof extensions integration (only supported languages displayed)]) -LIGHTPROOF_LANG= -LIGHTPROOF_HU_PACK= -LIGHTPROOF_RU_PACK= -LIGHTPROOF_EN_US_PACK= -if test x$enable_ext_lightproof = xno -o x$enable_extension_integration = xno; then -AC_MSG_RESULT([no integration]) -else -SCPDEFS=$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF -if test x$enable_ext_lightproof = xyes -o x$enable_ext_lightproof = x; then -wanted_lightproof=en-US hu ru -else -for lang in $enable_ext_lightproof ; do -case $lang in -en-US|hu|ru) -wanted_lightproof=$wanted_lightproof $lang -;; -*) -AC_MSG_ERROR([Unknown value for --enable-ext-lightproof: $lang]) -;; -esac -done -fi -for lang in $wanted_lightproof ; do -LIGHTPROOF_LANG=$LIGHTPROOF_LANG $lang -case $lang in -en-US) LIGHTPROOF_EN_US_PACK=0ab55ac8e88f04258f1d3e79e984382f-lightproof-en_US-0.1.oxt ;; -hu) LIGHTPROOF_HU_PACK=76345f925e34fef2d29bade4f29108e9-lightproof-hu_1.3.oxt ;; -ru) LIGHTPROOF_RU_PACK=673860e8649cff2ebdc68bd46f2f7f1a-lightproof-ru_0.1.oxt ;; -*) AC_MSG_ERROR([Unknown value for --enable-ext-lightproof: $lang]) ;; -esac -done -AC_MSG_RESULT([$LIGHTPROOF_LANG]) -fi -AC_SUBST(LIGHTPROOF_LANG) -AC_SUBST(LIGHTPROOF_HU_PACK) -AC_SUBST(LIGHTPROOF_RU_PACK) -AC_SUBST(LIGHTPROOF_EN_US_PACK) - -dnl === dnl Test whether to include Watch Window extension dnl === AC_MSG_CHECKING([for Watch Window extension integration]) diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index 16b065b..aacd3ba 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -36,7 +36,6 @@ --enable-ext-scripting-javascript --enable-ext-google-docs --enable-ext-hunart ---enable-ext-lightproof --enable-ext-nlpsolver --enable-ext-numbertext --enable-ext-typo diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf index c46bdde..04b92dd 100644 --- a/distro-configs/OxygenOfficeWin32.conf +++ b/distro-configs/OxygenOfficeWin32.conf @@ -23,7 +23,6 @@
[Libreoffice-commits] .: framework/source
framework/source/classes/fwlresid.cxx|2 +-
framework/source/fwe/classes/fwkresid.cxx|2 +-
framework/source/uielement/controlmenucontroller.cxx |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit de30370096b82e4ea24c13b7c7e8f525e074fe60
Author: Andras Timar ati...@suse.com
Date: Sun Dec 18 23:16:15 2011 +0100
Always load res of LibO UI locale, not system deflocale fdo#43475
diff --git a/framework/source/classes/fwlresid.cxx
b/framework/source/classes/fwlresid.cxx
index 768432e..b61bfd0 100644
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -44,7 +44,7 @@ ResMgr* FwlResId::GetResManager()
if ( !pResMgr )
{
SolarMutexGuard aSolarGuard;
-pResMgr = ResMgr::CreateResMgr(fwe);
+pResMgr = ResMgr::CreateResMgr(fwe,
Application::GetSettings().GetUILocale());
}
return pResMgr;
diff --git a/framework/source/fwe/classes/fwkresid.cxx
b/framework/source/fwe/classes/fwkresid.cxx
index cf1bcec..0c0a9d4 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -44,7 +44,7 @@ ResMgr* FwkResId::GetResManager()
if ( !pResMgr )
{
SolarMutexGuard aSolarGuard;
-pResMgr = ResMgr::CreateResMgr(fwe);
+pResMgr = ResMgr::CreateResMgr(fwe,
Application::GetSettings().GetUILocale());
}
return pResMgr;
diff --git a/framework/source/uielement/controlmenucontroller.cxx
b/framework/source/uielement/controlmenucontroller.cxx
index 7fd52d3..a946858 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -226,7 +226,7 @@ ControlMenuController::~ControlMenuController()
// private function
void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu )
{
-ResMgr* pResMgr = ResMgr::CreateResMgr(svx);
+ResMgr* pResMgr = ResMgr::CreateResMgr(svx,
Application::GetSettings().GetUILocale());
ResId aResId( RID_SVXIMGLIST_FMEXPL, *pResMgr );
aResId.SetRT( RSC_IMAGELIST );
@@ -375,7 +375,7 @@ void ControlMenuController::impl_setPopupMenu()
{
if ( m_pResPopupMenu == 0 )
{
-ResMgr* pResMgr = ResMgr::CreateResMgr(svx);
+ResMgr* pResMgr = ResMgr::CreateResMgr(svx,
Application::GetSettings().GetUILocale());
if ( pResMgr )
{
ResId aResId( RID_FMSHELL_CONVERSIONMENU, *pResMgr );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - l10ntools/prj l10ntools/scripts
l10ntools/prj/d.lst |1 + l10ntools/scripts/propex.bat |8 2 files changed, 9 insertions(+) New commits: commit d6fab97bfaecdaf121b4be0612df35d58b24c862 Author: Andras Timar ati...@suse.com Date: Mon Dec 19 00:16:20 2011 +0100 add propex.bat, so propex Perl script can run under Win32 diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst index ee088ff..95675a7 100644 --- a/l10ntools/prj/d.lst +++ b/l10ntools/prj/d.lst @@ -39,6 +39,7 @@ mkdir: %_DEST%\bin\help\com\sun\star\help ..\scripts\addkeyid2pot.pl %_DEST%\bin\addkeyid2pot.pl ..\scripts\po2lo %_DEST%\bin\po2lo ..\scripts\propex %_DEST%\bin\propex +..\scripts\propex.bat %_DEST%\bin\propex.bat ..\scripts\propmerge %_DEST%\bin\propmerge ..\inc\export.hxx %_DEST%\inc\l10ntools\export.hxx ..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx diff --git a/l10ntools/scripts/propex.bat b/l10ntools/scripts/propex.bat new file mode 100755 index 000..1174286 --- /dev/null +++ b/l10ntools/scripts/propex.bat @@ -0,0 +1,8 @@ +@echo off + +if x%PERL%x EQU xx ( +echo ERROR: Perl not found. Environment is not set. +exit /b 1 +) + +%PERL% %SOLARVER%\%INPATH%\bin\propex %* \ No newline at end of file ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/prj l10ntools/scripts
l10ntools/prj/d.lst |1 + l10ntools/scripts/propex.bat |8 2 files changed, 9 insertions(+) New commits: commit d4b573ec4ccedc6522fed32eb91aede9f5f37da5 Author: Andras Timar ati...@suse.com Date: Mon Dec 19 00:16:20 2011 +0100 add propex.bat, so propex Perl script can run under Win32 diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst index ee088ff..95675a7 100644 --- a/l10ntools/prj/d.lst +++ b/l10ntools/prj/d.lst @@ -39,6 +39,7 @@ mkdir: %_DEST%\bin\help\com\sun\star\help ..\scripts\addkeyid2pot.pl %_DEST%\bin\addkeyid2pot.pl ..\scripts\po2lo %_DEST%\bin\po2lo ..\scripts\propex %_DEST%\bin\propex +..\scripts\propex.bat %_DEST%\bin\propex.bat ..\scripts\propmerge %_DEST%\bin\propmerge ..\inc\export.hxx %_DEST%\inc\l10ntools\export.hxx ..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx diff --git a/l10ntools/scripts/propex.bat b/l10ntools/scripts/propex.bat new file mode 100755 index 000..1174286 --- /dev/null +++ b/l10ntools/scripts/propex.bat @@ -0,0 +1,8 @@ +@echo off + +if x%PERL%x EQU xx ( +echo ERROR: Perl not found. Environment is not set. +exit /b 1 +) + +%PERL% %SOLARVER%\%INPATH%\bin\propex %* \ No newline at end of file ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - android/qa unotest/source
android/qa/sc/AndroidManifest.xml |2 +-
android/qa/sc/Makefile | 12 ++--
unotest/source/cpp/bootstrapfixturebase.cxx |5 +
3 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 86cd55a24950263dce62a74a6829238bf035c42e
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Dec 19 01:25:41 2011 +0200
Use / as SRC_ROOT and OUTDIR_FOR_BUILD on Android
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx
b/unotest/source/cpp/bootstrapfixturebase.cxx
index 4ae52cd..ca04b30 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -46,6 +46,7 @@ using namespace ::com::sun::star;
test::BootstrapFixtureBase::BootstrapFixtureBase()
: m_aSrcRootURL(RTL_CONSTASCII_USTRINGPARAM(file://)), m_aSolverRootURL(
m_aSrcRootURL )
{
+#ifndef ANDROID
const char* pSrcRoot = getenv( SRC_ROOT );
CPPUNIT_ASSERT_MESSAGE(SRC_ROOT env variable not set, pSrcRoot != NULL
pSrcRoot[0] != 0);
const char* pSolverRoot = getenv( OUTDIR_FOR_BUILD );
@@ -56,6 +57,10 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
if (pSolverRoot[1] == ':')
m_aSolverRootURL += rtl::OUString::createFromAscii( / );
#endif
+#else
+const char* pSrcRoot = /;
+const char* pSolverRoot = /;
+#endif
m_aSrcRootPath = rtl::OUString::createFromAscii( pSrcRoot );
m_aSrcRootURL += m_aSrcRootPath;
commit 0f65dbcf9ac808a089793031b26893b74c138c0b
Author: Tor Lillqvist tlillqv...@suse.com
Date: Mon Dec 19 01:03:44 2011 +0200
More shlibs and .component files needed
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 1e316b0..582784d 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -60,6 +60,7 @@ copy-stuff:
bootstrap.uno \
canvastoolslo \
comphelpgcc3 \
+ configmgr.uno \
cppcanvaslo \
drawinglayerlo \
editenglo \
@@ -69,6 +70,7 @@ copy-stuff:
freetype \
fwelo \
fwilo \
+ fwklo \
gcc3_uno \
i18nisolang1gcc3 \
i18npaperlo \
@@ -97,13 +99,16 @@ copy-stuff:
test \
tklo \
tllo \
+ ucb1 \
ucbhelper4gcc3 \
+ ucpfile1 \
uno_cppu \
uno_cppuhelpergcc3 \
uno_sal \
uno_salhelpergcc3 \
unoexceptionprotector \
unotest \
+ unoxmllo \
utllo \
vbahelperlo \
vcllo \
@@ -125,10 +130,13 @@ copy-stuff:
cp $(OUTDIR)/bin/udkapi.rdb assets/bin
cp $(OUTDIR)/bin/types.rdb assets/bin
cp $(OUTDIR)/xml/ure/services.rdb assets/xml/ure
- for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx
unoxml/source/service/unoxml; do \
+ for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx
unoxml/source/service/unoxml configmgr/source/configmgr; do \
mkdir -p assets/ComponentTarget/`dirname $$F`; \
cp $(WORKDIR)/ComponentTarget/$$F.component
assets/ComponentTarget/`dirname $$F`; \
done
+ for F in ucb1 ucpfile1; do \
+ cp $(OUTDIR)/xml/$$F.component assets/xml; \
+ done
cp -R $(OUTDIR)/xml/registry assets/xml
for F in uno_services uno_types; do \
sed -e 's!uri=./!uri=$(APP_DATA_PATH)/lib/!g'
$(SRC_ROOT)/testtools/$(INPATH)/lib/$${F}.rdb assets/lib/$${F}.rdb; \
@@ -153,7 +161,7 @@ uninstall:
adb uninstall $(APP_PACKAGE)
run:
- adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library
libcppunittester -e lo-main-cmdline $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so
--headless --protector libunoexceptionprotector.so unoexceptionprotector
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry'
'-env:UNO_TYPES=file:///assets/bin/udkapi.rdb file:///assets/bin/types.rdb'
'-env:UNO_SERVICES=file:///assets/xml/ure/services.rdb
file:///assets/ComponentTarget/framework/util/fwk.component
file:///assets/ComponentTarget/i18npool/util/i18npool.component
file:///assets/ComponentTarget/sfx2/util/sfx.component
file:///assets/ComponentTarget/unoxml/source/service/unoxml.component
file:///assets/xml/configmgr.component file:///assets/xml/ucb1.component
file:///assets/xml/ucpfile1.component'
-env:URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib
-env:LO_LIB_DIR=file://$(APP_DATA_PATH)/lib
+ adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library
libcppunittester -e lo-main-cmdline $(APP_DATA_PATH)/lib/libtest_sc_ucalc.so
--headless --protector libunoexceptionprotector.so unoexceptionprotector
'-env:CONFIGURATION_LAYERS=xcsxcu:file:///assets/xml/registry'
[Libreoffice-commits] .: sw/source
sw/source/ui/dbui/mmmergepage.src | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 2ca2b35f728ac341748836839a4579a6ff668f54
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Dec 19 09:23:33 2011 +0400
mailmerge: move overlapped controls
diff --git a/sw/source/ui/dbui/mmmergepage.src
b/sw/source/ui/dbui/mmmergepage.src
index a66480a..93b9390 100644
--- a/sw/source/ui/dbui/mmmergepage.src
+++ b/sw/source/ui/dbui/mmmergepage.src
@@ -69,8 +69,8 @@ TabPage DLG_MM_MERGE_PAGE
Edit ED_FIND
{
HelpID = sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND;
-Pos = MAP_APPFONT ( 55 ,114 ) ;
-Size = MAP_APPFONT ( 140 , 12 ) ;
+Pos = MAP_APPFONT ( 65 ,114 ) ;
+Size = MAP_APPFONT ( 130 , 12 ) ;
Border = TRUE;
};
PushButton PB_FIND
@@ -83,21 +83,21 @@ TabPage DLG_MM_MERGE_PAGE
CheckBox CB_WHOLEWORDS
{
HelpID = sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS;
-Pos = MAP_APPFONT ( 55 , 131 ) ;
+Pos = MAP_APPFONT ( 65 , 131 ) ;
Size = MAP_APPFONT ( 180 , 10 ) ;
Text [ en-US ] = Whole wor~ds only;
};
CheckBox CB_BACKWARDS
{
HelpID = sw:CheckBox:DLG_MM_MERGE_PAGE:CB_BACKWARDS;
-Pos = MAP_APPFONT ( 55 , 144 ) ;
+Pos = MAP_APPFONT ( 65 , 144 ) ;
Size = MAP_APPFONT ( 180 , 10 ) ;
Text [ en-US ] = Back~wards;
};
CheckBox CB_MATCHCASE
{
HelpID = sw:CheckBox:DLG_MM_MERGE_PAGE:CB_MATCHCASE;
-Pos = MAP_APPFONT ( 55 , 157 ) ;
+Pos = MAP_APPFONT ( 65 , 157 ) ;
Size = MAP_APPFONT ( 180 , 10 ) ;
Text [ en-US ] = Ma~tch case;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/ui/dbui/mmmergepage.src | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 3c6197f501c1b6d59ebb4dabad5a129b62c6f051
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Dec 19 09:23:33 2011 +0400
mailmerge: move overlapped controls
diff --git a/sw/source/ui/dbui/mmmergepage.src
b/sw/source/ui/dbui/mmmergepage.src
index a66480a..93b9390 100644
--- a/sw/source/ui/dbui/mmmergepage.src
+++ b/sw/source/ui/dbui/mmmergepage.src
@@ -69,8 +69,8 @@ TabPage DLG_MM_MERGE_PAGE
Edit ED_FIND
{
HelpID = sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND;
-Pos = MAP_APPFONT ( 55 ,114 ) ;
-Size = MAP_APPFONT ( 140 , 12 ) ;
+Pos = MAP_APPFONT ( 65 ,114 ) ;
+Size = MAP_APPFONT ( 130 , 12 ) ;
Border = TRUE;
};
PushButton PB_FIND
@@ -83,21 +83,21 @@ TabPage DLG_MM_MERGE_PAGE
CheckBox CB_WHOLEWORDS
{
HelpID = sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS;
-Pos = MAP_APPFONT ( 55 , 131 ) ;
+Pos = MAP_APPFONT ( 65 , 131 ) ;
Size = MAP_APPFONT ( 180 , 10 ) ;
Text [ en-US ] = Whole wor~ds only;
};
CheckBox CB_BACKWARDS
{
HelpID = sw:CheckBox:DLG_MM_MERGE_PAGE:CB_BACKWARDS;
-Pos = MAP_APPFONT ( 55 , 144 ) ;
+Pos = MAP_APPFONT ( 65 , 144 ) ;
Size = MAP_APPFONT ( 180 , 10 ) ;
Text [ en-US ] = Back~wards;
};
CheckBox CB_MATCHCASE
{
HelpID = sw:CheckBox:DLG_MM_MERGE_PAGE:CB_MATCHCASE;
-Pos = MAP_APPFONT ( 55 , 157 ) ;
+Pos = MAP_APPFONT ( 65 , 157 ) ;
Size = MAP_APPFONT ( 180 , 10 ) ;
Text [ en-US ] = Ma~tch case;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/animations/SlideTransitionPane.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e81e5108b90340419264fa2562cc6b96837fee52 Author: Ivan Timofeev timofeev@gmail.com Date: Mon Dec 19 10:01:29 2011 +0400 impress: slide transition pane: use proper control width diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index bff23fe..6e7862d 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -714,7 +714,7 @@ void SlideTransitionPane::updateLayout() aCtrlSize = maFT_SOUND.GetSizePixel(); if( bStack ) aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); -aCtrlSize.setWidth( nFTSoundWidth ); +aCtrlSize.setWidth( nFTSoundWidth - 2 * nOffsetX ); maFT_SOUND.SetPosSizePixel( aUpperLeft, aCtrlSize ); aUpperLeft.setX( nIndent ); @@ -728,7 +728,7 @@ void SlideTransitionPane::updateLayout() aCtrlSize = maFT_SPEED.GetSizePixel(); if( bStack ) aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); -aCtrlSize.setWidth( nFTSpeedWidth ); +aCtrlSize.setWidth( nFTSpeedWidth - 2 * nOffsetX ); maFT_SPEED.SetPosSizePixel( aUpperLeft, aCtrlSize ); // fixed line Modify Transition ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source
sd/source/ui/animations/SlideTransitionPane.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 418dcec256481791721fb13fd4cdfe07074403fb Author: Ivan Timofeev timofeev@gmail.com Date: Mon Dec 19 10:01:29 2011 +0400 impress: slide transition pane: use proper control width diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index bff23fe..6e7862d 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -714,7 +714,7 @@ void SlideTransitionPane::updateLayout() aCtrlSize = maFT_SOUND.GetSizePixel(); if( bStack ) aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); -aCtrlSize.setWidth( nFTSoundWidth ); +aCtrlSize.setWidth( nFTSoundWidth - 2 * nOffsetX ); maFT_SOUND.SetPosSizePixel( aUpperLeft, aCtrlSize ); aUpperLeft.setX( nIndent ); @@ -728,7 +728,7 @@ void SlideTransitionPane::updateLayout() aCtrlSize = maFT_SPEED.GetSizePixel(); if( bStack ) aUpperLeft.setY( aUpperLeft.getY() - aCtrlSize.getHeight()); -aCtrlSize.setWidth( nFTSpeedWidth ); +aCtrlSize.setWidth( nFTSpeedWidth - 2 * nOffsetX ); maFT_SPEED.SetPosSizePixel( aUpperLeft, aCtrlSize ); // fixed line Modify Transition ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
