[Libreoffice-commits] .: sw/source
sw/source/ui/dialog/abstract.src |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1586279e78760507217f9a239a631ea74171a80d Author: Lior Kaplan kaplanl...@gmail.com Date: Sat Dec 24 13:15:31 2011 +0200 Keep abstract dialog terminology aligned diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src index 9d318cb..4480f0b 100644 --- a/sw/source/ui/dialog/abstract.src +++ b/sw/source/ui/dialog/abstract.src @@ -68,7 +68,7 @@ ModalDialog DLG_INSERT_ABSTRACT { Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 120 , 8 ) ; -Text [ en-US ] = Subpoints per level ; +Text [ en-US ] = Paragraphs per level ; }; NumericField NF_PARA { ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit a8feb5b1df99c12a5cb644097f935e9ccf512ed5 Author: Rene Engelhard r...@debian.org Date: Sat Dec 24 14:08:51 2011 +0100 support libebook-1.2.so.12 (evolution 3.2) diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index 12465f6..5cf5247 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.cxx @@ -33,6 +33,7 @@ #define DECLARE_FN_POINTERS 1 #include EApi.h static const char *eBookLibNames[] = { +libebook-1.2.so.12, // bumped again libebook-1.2.so.10, // bumped again libebook-1.2.so.9, // evolution-2.8 libebook-1.2.so.5, // evolution-2.4 and 2.6+ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source
connectivity/source/drivers/evoab2/EApi.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7dfc54c7337f77be8e258a218df741c330904f73 Author: Rene Engelhard r...@debian.org Date: Sat Dec 24 14:08:51 2011 +0100 support libebook-1.2.so.12 (evolution 3.2) diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index 12465f6..5cf5247 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.cxx @@ -33,6 +33,7 @@ #define DECLARE_FN_POINTERS 1 #include EApi.h static const char *eBookLibNames[] = { +libebook-1.2.so.12, // bumped again libebook-1.2.so.10, // bumped again libebook-1.2.so.9, // evolution-2.8 libebook-1.2.so.5, // evolution-2.4 and 2.6+ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: RepositoryExternal.mk RepositoryFixes.mk
RepositoryExternal.mk |4 ++-- RepositoryFixes.mk|2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 4258f0260d6e99edf5db44720b85db9f1d78ca91 Author: Matúš Kukan matus.ku...@gmail.com Date: Fri Dec 23 13:26:56 2011 +0100 Repository: fix Windows name for internal libexttextcat diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 11896cd..6b9ebc0 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -224,7 +224,7 @@ else # !SYSTEM_LIBEXTTEXTCAT ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - exttextcat \ + libexttextcat \ )) else $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ @@ -235,7 +235,7 @@ endif define gb_LinkTarget__use_libexttextcat ifeq ($(OS),WNT) $(call gb_LinkTarget_add_linked_libs,$(1),\ - exttextcat \ + libexttextcat \ ) else $(call gb_LinkTarget_add_linked_static_libs,$(1),\ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index ff1eb34..cb80f45 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -56,7 +56,6 @@ gb_Library_DLLFILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$ gb_Library_DLLFILENAMES := $(patsubst unsafe_uno:unsafe_uno%,unsafe_uno:unsafe_uno_uno%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) -gb_Library_FILENAMES := $(patsubst exttextcat:libexttextcat%,exttextcat:libilibexttextcat%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)) @@ -68,6 +67,7 @@ gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dl ifeq ($(COM),GCC) gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst libexttextcat:liblibext%,libexttextcat:libilibext%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:libxml2$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - chart2/source svtools/source
chart2/source/controller/dialogs/res_Trendline.hxx |1 - svtools/source/control/valueset.cxx| 10 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) New commits: commit 7a11e6106bf3080357ea486500d786010b0b5693 Author: Matteo Casalin matteo.casa...@poste.it Date: Sun Dec 18 21:48:03 2011 +0100 Remove unneeded tests before delete Pointers deleted in destructor are modified in remaining code, and already set to NULL when necessary. diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index abf575b..576a091 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -118,11 +118,8 @@ ValueSet::~ValueSet() if (xComponent.is()) xComponent-dispose (); -if ( mpScrBar ) -delete mpScrBar; - -if ( mpNoneItem ) -delete mpNoneItem; +delete mpScrBar; +delete mpNoneItem; ImplDeleteItems(); delete mpImpl; @@ -665,8 +662,7 @@ void ValueSet::Format() mbFormat = sal_False; // ScrollBar loeschen -if ( pDelScrBar ) -delete pDelScrBar; +delete pDelScrBar; } // --- commit 791b1e941ecdbf176831857e85fcd48720ae45b4 Author: Matteo Casalin matteo.casa...@poste.it Date: Sun Dec 18 15:37:09 2011 +0100 Remove unused header diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 6e290f8..6f9c395 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -31,7 +31,6 @@ #include vcl/window.hxx #include vcl/button.hxx #include vcl/fixed.hxx -#include svtools/valueset.hxx #include svl/itemset.hxx #include svx/chrtitem.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tail_build/prj
tail_build/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cdd98fc187aae086de5e4ca5fe4d693568963431 Author: Norbert Thiebaud nthieb...@gmail.com Date: Sat Dec 24 20:12:23 2011 -0600 psprint_config moved to tail_build, its dep must be added to tail_build's diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index 19d0cc5..6ae2a1c 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL tb tail_build\prj nmake - all tb_prj NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: config_host.mk.in set_soenv.in
config_host.mk.in | 60 ++ set_soenv.in | 60 -- 2 files changed, 60 insertions(+), 60 deletions(-) New commits: commit 28254c71081f3f96442d392cfd475d3c09b2ec3b Author: Norbert Thiebaud nthieb...@gmail.com Date: Sun Dec 25 00:10:31 2011 -0600 migrate most SYSTEM_* config from set_soenv.in to config_host.mk.in should be pretty safe. The main risk if is something rely on the 'undef if empty' behavior of the typical trap is the use of *= in dmake a git grep of \$(SYSTEM_ did not reveal any problematic case. diff --git a/config_host.mk.in b/config_host.mk.in index 35b9779..4a5b7ac 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -3,3 +3,63 @@ # or to be sourced in a shell session # export SRC_ROOT=@SRC_ROOT@ +export SYSTEM_APACHE_COMMONS=@SYSTEM_APACHE_COMMONS@ +export SYSTEM_BOOST=@SYSTEM_BOOST@ +export SYSTEM_BSH=@SYSTEM_BSH@ +export SYSTEM_CAIRO=@SYSTEM_CAIRO@ +export SYSTEM_CPPUNIT=@SYSTEM_CPPUNIT@ +export SYSTEM_CURL=@SYSTEM_CURL@ +export SYSTEM_DB=@SYSTEM_DB@ +export SYSTEM_DB_CFLAGS=@SYSTEM_DB_CFLAGS@ +export SYSTEM_DICTS=@SYSTEM_DICTS@ +export SYSTEM_EXPAT=@SYSTEM_EXPAT@ +export SYSTEM_GDKPIXBUF=@SYSTEM_GDKPIXBUF@ +export SYSTEM_GENBRK=@SYSTEM_GENBRK@ +export SYSTEM_GENCCODE=@SYSTEM_GENCCODE@ +export SYSTEM_GENCMN=@SYSTEM_GENCMN@ +export SYSTEM_GETTEXT=@SYSTEM_GETTEXT@ +export SYSTEM_GLIB=@SYSTEM_GLIB@ +export SYSTEM_GRAPHITE=@SYSTEM_GRAPHITE@ +export SYSTEM_HSQLDB=@SYSTEM_HSQLDB@ +export SYSTEM_HUNSPELL=@SYSTEM_HUNSPELL@ +export SYSTEM_HYPH=@SYSTEM_HYPH@ +export SYSTEM_ICU=@SYSTEM_ICU@ +export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@ +export SYSTEM_JPEG=@SYSTEM_JPEG@ +export SYSTEM_LIBC=@SYSTEM_LIBC@ +export SYSTEM_LIBCDR=@SYSTEM_LIBCDR@ +export SYSTEM_LIBCMIS=@SYSTEM_LIBCMIS@ +export SYSTEM_LIBCROCO=@SYSTEM_LIBCROCO@ +export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@ +export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@ +export SYSTEM_LIBGSF=@SYSTEM_LIBGSF@ +export SYSTEM_LIBJPEG=@SYSTEM_LIBJPEG@ +export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@ +export SYSTEM_LIBRSVG=@SYSTEM_LIBRSVG@ +export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@ +export SYSTEM_LIBWPD=@SYSTEM_LIBWPD@ +export SYSTEM_LIBWPG=@SYSTEM_LIBWPG@ +export SYSTEM_LIBWPS=@SYSTEM_LIBWPS@ +export SYSTEM_LIBXML=@SYSTEM_LIBXML@ +export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@ +export SYSTEM_LUCENE=@SYSTEM_LUCENE@ +export SYSTEM_MDDS=@SYSTEM_MDDS@ +export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@ +export SYSTEM_MYSQL=@SYSTEM_MYSQL@ +export SYSTEM_MYSQL_CPPCONN=@SYSTEM_MYSQL_CPPCONN@ +export SYSTEM_MYTHES=@SYSTEM_MYTHES@ +export SYSTEM_NEON=@SYSTEM_NEON@ +export SYSTEM_NSS=@SYSTEM_NSS@ +export SYSTEM_ODBC_HEADERS=@SYSTEM_ODBC_HEADERS@ +export SYSTEM_OPENSSL=@SYSTEM_OPENSSL@ +export SYSTEM_PANGO=@SYSTEM_PANGO@ +export SYSTEM_POPPLER=@SYSTEM_POPPLER@ +export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@ +export SYSTEM_REDLAND=@SYSTEM_REDLAND@ +export SYSTEM_SAMPLEICC=@SYSTEM_SAMPLEICC@ +export SYSTEM_SANE_HEADER=@SYSTEM_SANE_HEADER@ +export SYSTEM_SAXON=@SYSTEM_SAXON@ +export SYSTEM_SERVLETAPI=@SYSTEM_SERVLETAPI@ +export SYSTEM_STDLIBS=@SYSTEM_STDLIBS@ +export SYSTEM_VIGRA=@SYSTEM_VIGRA@ +export SYSTEM_ZLIB=@SYSTEM_ZLIB@ diff --git a/set_soenv.in b/set_soenv.in index 1a765cd..ab1cdae 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1396,7 +1396,6 @@ ToFile( BUILD_MOZAB, @BUILD_MOZAB@,e ); ToFile( PREBUILD_MOZAB,$PREBUILD_MOZAB,e ); ToFile( MOZILLA_VERSION, $MOZILLA_VERSION, e ); ToFile( DEFAULT_MOZILLA_TOOLKIT, $MOZILLA_TOOLKIT, e ); -ToFile( SYSTEM_NSS, @SYSTEM_NSS@, e ); ToFile( MOZILLA_HEADERS_CFLAGS, @MOZILLA_HEADERS_CFLAGS@, e ); ToFile( SYSTEM_MOZILLA_HEADERS, @SYSTEM_MOZILLA_HEADERS@, e ); ToFile( MOZILLABUILD, @MOZILLABUILD@, e ); @@ -1427,7 +1426,6 @@ ToFile( ENABLE_SCRIPTING_BEANSHELL,@ENABLE_SCRIPTING_BEANSHELL@,e ); ToFile( ENABLE_SCRIPTING_JAVASCRIPT,@ENABLE_SCRIPTING_JAVASCRIPT@,e ); ToFile( ENABLE_SCRIPTING_PYTHON,@ENABLE_SCRIPTING_PYTHON@,e ); ToFile( ENABLE_QUICKSTART_LIBPNG, @ENABLE_QUICKSTART_LIBPNG@, e ); -ToFile( SYSTEM_JFREEREPORT,@SYSTEM_JFREEREPORT@,e ); ToFile( WITH_THEMES, @WITH_THEMES@, e); ToFile( WITH_HELPPACK_INTEGRATION, @WITH_HELPPACK_INTEGRATION@, e); ToFile( WITH_EXTENSION_INTEGRATION, @WITH_EXTENSION_INTEGRATION@, e); @@ -1444,13 +1442,10 @@ ToFile( LIBBASE_JAR, @LIBBASE_JAR@, e ); ToFile( LIBFONTS_JAR, @LIBFONTS_JAR@, e ); ToFile( LIBSERIALIZER_JAR, @LIBSERIALIZER_JAR@,e ); ToFile( ENABLE_MEDIAWIKI, @ENABLE_MEDIAWIKI@, e ); -ToFile( SYSTEM_APACHE_COMMONS,@SYSTEM_APACHE_COMMONS@,e ); ToFile( COMMONS_CODEC_JAR, @COMMONS_CODEC_JAR@,e ); ToFile( COMMONS_LANG_JAR, @COMMONS_LANG_JAR@, e ); ToFile( COMMONS_HTTPCLIENT_JAR,@COMMONS_HTTPCLIENT_JAR@,e ); ToFile( COMMONS_LOGGING_JAR,@COMMONS_LOGGING_JAR@,e ); -ToFile( SYSTEM_SERVLETAPI, @SYSTEM_SERVLETAPI@, e ); -ToFile( SYSTEM_SAMPLEICC,
[Libreoffice-commits] .: postprocess/prj
postprocess/prj/build.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4a8626c6cc52125d15cfbc59de74cf937a24de0a Author: Norbert Thiebaud nthieb...@gmail.com Date: Sun Dec 25 01:56:16 2011 -0600 remove pre-req from postprocess that are already pulled by tail_build diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index a372450..435c1c3 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg remotebridges scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL +po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm DESKTOP:extensions extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk scp2 testtools UnoControls wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL po postprocess usr1- all po_mkout NULL po postprocess\checkxmlnmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits