[Libreoffice-commits] .: cppu/inc
cppu/inc/uno/lbnames.h |2 ++ 1 file changed, 2 insertions(+) New commits: commit 2b207686cdb6ed5bf398d2bfa2509a56374f7846 Author: Tor Lillqvist t...@iki.fi Date: Tue Aug 9 16:11:39 2011 +0300 Tell what LB means diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h index f9e32a9..bbf56d2 100644 --- a/cppu/inc/uno/lbnames.h +++ b/cppu/inc/uno/lbnames.h @@ -28,6 +28,8 @@ #ifndef _UNO_LBNAMES_H_ #define _UNO_LBNAMES_H_ +/* I assume LB means Language Binding */ + #ifdef __cplusplus #ifdef CPPU_ENV ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit c1e82b1c64ee863771bfc5958c2898ab1f650606 Author: Tor Lillqvist t...@iki.fi Date: Sun Sep 25 15:18:14 2011 +0300 Drop apparently unneeded inclusion of l10ntools/compilehelp.hxx Fixes compilation for non-desktop OSes (iOS and Android), for which we haven't built and delivered l10ntools. diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 542167b..c7a7ef4 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -64,7 +64,6 @@ #include com/sun/star/awt/XVclWindowPeer.hpp #include com/sun/star/awt/XTopWindow.hpp -#include l10ntools/compilehelp.hxx #include comphelper/storagehelper.hxx #include comphelper/string.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/CppunitTest_sw_test_filters.mk sw/Library_swui.mk
sw/CppunitTest_sw_test_filters.mk |6 ++ sw/Library_swui.mk|6 ++ 2 files changed, 12 insertions(+) New commits: commit e135afb73903ea16df49c0f68acb2f719534 Author: Tor Lillqvist t...@iki.fi Date: Sun Sep 25 15:49:42 2011 +0300 Fix compilation when SYSTEM_LIBXML headers are not in /usr/include Need to use LIBXML_CFLAGS, that's what it's for. diff --git a/sw/CppunitTest_sw_test_filters.mk b/sw/CppunitTest_sw_test_filters.mk index 1411e7c..ba5f1a4 100644 --- a/sw/CppunitTest_sw_test_filters.mk +++ b/sw/CppunitTest_sw_test_filters.mk @@ -30,6 +30,12 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_filters_test)) +ifeq ($(SYSTEM_LIBXML),YES) +$(eval $(call gb_CppunitTest_add_cxxflags,sw_filters_test,\ + $(LIBXML_CFLAGS) \ +)) +endif + $(eval $(call gb_CppunitTest_add_exception_objects,sw_filters_test, \ sw/qa/core/filters-test \ )) diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index cc12e44..cf3ab04 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -44,6 +44,12 @@ $(eval $(call gb_Library_add_api,swui,\ offapi \ )) +ifeq ($(SYSTEM_LIBXML),YES) +$(eval $(call gb_Library_add_cxxflags,swui,\ + $(LIBXML_CFLAGS) \ +)) +endif + $(eval $(call gb_Library_add_linked_libs,swui,\ comphelper \ cppu \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 24 +--- 1 file changed, 13 insertions(+), 11 deletions(-) New commits: commit 8148ad076ca750da8066051a105ab391b9ba8957 Author: Tomas Chvatal tchva...@suse.cz Date: Sun Sep 25 15:03:44 2011 +0200 Update some java checks to check all vars properly. diff --git a/configure.in b/configure.in index 11f4681..8f7ce2f 100755 --- a/configure.in +++ b/configure.in @@ -4410,13 +4410,15 @@ dnl === dnl Check for building stax dnl === AC_MSG_CHECKING([whether to build the stax]) -if test -f ./stax/download/jsr173_1.0_api.jar; then -BUILD_STAX=NO -AC_MSG_RESULT([no, will use the prebuilt stax/download/jsr173_1.0_api.jar]) -else -BUILD_STAX=YES -AC_MSG_RESULT([yes]) -fi +AS_IF([test $with_system_saxon = no -a $with_system_jars = no -a $SOLAR_JAVA != ], [ +if test -f ./stax/download/jsr173_1.0_api.jar; then +BUILD_STAX=NO +AC_MSG_RESULT([no, will use the prebuilt stax/download/jsr173_1.0_api.jar]) +else +BUILD_STAX=YES +AC_MSG_RESULT([yes]) +fi +]) AC_SUBST(BUILD_STAX) dnl === @@ -6374,16 +6376,16 @@ dnl === dnl Checking for libexttextcat dnl === AC_MSG_CHECKING([which libexttextcat to use]) -if test -n $with_system_libexttextcat test $with_system_libexttextcat != no; then +AS_IF([test $with_system_libexttextcat = yes], [ # -o -n $with_system_libs], [ AC_MSG_RESULT([external]) SYSTEM_LIBEXTTEXTCAT=YES PKG_CHECK_MODULES([LIBEXTTEXTCAT], [libexttextcat]) SYSTEM_LIBEXTTEXTCAT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir libexttextcat` -else +], [ AC_MSG_RESULT([internal]) SYSTEM_LIBEXTTEXTCAT=NO BUILD_TYPE=$BUILD_TYPE LIBEXTTEXTCAT -fi +]) AC_SUBST(SYSTEM_LIBEXTTEXTCAT) AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) AC_SUBST(LIBEXTTEXTCAT_CFLAGS) @@ -7086,7 +7088,7 @@ AS_IF([test $enable_ext_report_builder != no -a x$enable_extension_integrat ENABLE_REPORTBUILDER=YES AC_MSG_CHECKING([for reportbuilder module]) AC_MSG_CHECKING([which jfreereport libs to use]) -if test $with_system_jfreereport = yes; then +if test $with_system_jfreereport = yes -o x$with_system_jars = xyes; then SYSTEM_JFREEREPORT=YES AC_MSG_RESULT([external]) if test -z $SAC_JAR; then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: distro-configs/LibreOfficeiOS.conf
distro-configs/LibreOfficeiOS.conf |5 + 1 file changed, 5 insertions(+) New commits: commit 38ece856ae176ac14f68b4e9f36652c3eab8b84e Author: Tor Lillqvist t...@iki.fi Date: Sun Sep 25 17:14:12 2011 +0300 Disable some extensions that apparently are enabled otherwise diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf index 6b1b995..3149506 100644 --- a/distro-configs/LibreOfficeiOS.conf +++ b/distro-configs/LibreOfficeiOS.conf @@ -1,6 +1,11 @@ --build=i386-apple-darwin10.7.0 --host=arm-apple-darwin10 --disable-cairo +--disable-ext-pdfimport +--disable-ext-presenter-console +--disable-ext-presenter-minimizer +--disable-ext-report-builder +--disable-extension-integration --disable-fontconfig --disable-gconf --disable-gnome-vfs ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6104b24ff4f9d1921190bb10cd759df7be40597d Author: Tomas Chvatal tchva...@suse.cz Date: Sun Sep 25 17:34:27 2011 +0200 Remove the comment as it confuses the macro expansion. diff --git a/configure.in b/configure.in index 8f7ce2f..ad9c042 100755 --- a/configure.in +++ b/configure.in @@ -6376,7 +6376,7 @@ dnl === dnl Checking for libexttextcat dnl === AC_MSG_CHECKING([which libexttextcat to use]) -AS_IF([test $with_system_libexttextcat = yes], [ # -o -n $with_system_libs], [ +AS_IF([test x$with_system_libexttextcat = xyes], [ AC_MSG_RESULT([external]) SYSTEM_LIBEXTTEXTCAT=YES PKG_CHECK_MODULES([LIBEXTTEXTCAT], [libexttextcat]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/unx
desktop/unx/source/splashx.c | 602 ++-
desktop/unx/source/splashx.h | 25 -
desktop/unx/source/start.c | 152 --
3 files changed, 380 insertions(+), 399 deletions(-)
New commits:
commit c6811e675cbeaef31fd4d758f75939839b1aa10f
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Fri Sep 23 03:51:54 2011 -0500
refactor start.c and splash.c. de-couple the 2 sources and avoid globals
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index c1a1ba6..aa8109a 100755
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -46,9 +46,12 @@
#include string.h
#include unistd.h
-#ifdef USE_LIBPNG
-# include png.h
-#endif
+#include png.h
+
+#include osl/process.h
+#include osl/thread.h
+#include rtl/bootstrap.h
+#include rtl/ustrbuf.h
#include splashx.h
@@ -56,39 +59,45 @@ typedef struct {
unsigned char b, g, r;
} color_t;
-#define WINDOW_WIDTH 440
-#define WINDOW_HEIGHT 299
-
-#define PROGRESS_XOFFSET 12
-#define PROGRESS_YOFFSET 18
-#define PROGRESS_BARSPACE 2
-
-static Display *display = NULL;
-static int screen;
-static int depth;
-static Visual *visual = NULL;
+struct splash
+{
+Display* display;
+int screen;
+int depth;
+Visual* visual;
-static int width = WINDOW_WIDTH;
-static int height = WINDOW_HEIGHT;
+int width;
+int height;
-static Colormap color_map;
-static Window win;
-static GC gc;
+Colormap color_map;
+Window win;
+GC gc;
// Progress bar values
// taken from desktop/source/splash/splash.cxx
-static int tlx = 212;
-static int tly = 216;
-static int barwidth = 263;
-static int barheight = 8;
-static int barspace = PROGRESS_BARSPACE;
-static color_t barcol = { 18, 202, 157 };
-static color_t framecol = { 0xD3, 0xD3, 0xD3 };
+int tlx;
+int tly;
+int barwidth;
+int barheight;
+int barspace;
+color_t barcol;
+color_t framecol;
+
+XColor barcolor;
+XColor framecolor;
+
+unsigned char** bitmap_rows;
+png_structp png_ptr;
+png_infop info_ptr;
-static XColor barcolor;
-static XColor framecolor;
+};
+
+#define WINDOW_WIDTH 440
+#define WINDOW_HEIGHT 299
-static unsigned char **bitmap_rows = NULL;
+#define PROGRESS_XOFFSET 12
+#define PROGRESS_YOFFSET 18
+#define PROGRESS_BARSPACE 2
#define BMP_HEADER_LEN 14
#define WIN_INFO_LEN 40
@@ -112,100 +121,40 @@ static unsigned char **bitmap_rows = NULL;
return 0; \
}
-#ifdef USE_LIBPNG
-
/* libpng-1.2.41 */
#ifndef PNG_TRANSFORM_GRAY_TO_RGB
# define PNG_TRANSFORM_GRAY_TO_RGB 0x2000
#endif
-png_structp png_ptr = NULL;
-png_infop info_ptr = NULL;
-
-int splash_load_bmp( const char *filename )
+static int splash_load_bmp( struct splash* splash, const char *filename )
{
FILE *file;
if ( !(file = fopen( filename, r ) ) )
return 0;
-png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-info_ptr = png_create_info_struct(png_ptr);
-png_init_io( png_ptr, file );
+splash-png_ptr = png_create_read_struct( PNG_LIBPNG_VER_STRING, 0, 0, 0 );
+splash-info_ptr = png_create_info_struct(splash-png_ptr);
+png_init_io( splash-png_ptr, file );
-if( setjmp( png_jmpbuf( png_ptr ) ) )
+if( setjmp( png_jmpbuf( splash-png_ptr ) ) )
{
-png_destroy_read_struct( png_ptr, info_ptr, NULL );
+png_destroy_read_struct( (splash-png_ptr), (splash-info_ptr), NULL
);
fclose( file );
return 0;
}
-png_read_png( png_ptr, info_ptr,
+png_read_png( splash-png_ptr, splash-info_ptr,
PNG_TRANSFORM_EXPAND | PNG_TRANSFORM_STRIP_ALPHA |
PNG_TRANSFORM_GRAY_TO_RGB | PNG_TRANSFORM_BGR, NULL);
-bitmap_rows = png_get_rows( png_ptr, info_ptr );
-width = png_get_image_width( png_ptr, info_ptr );
-height = png_get_image_height( png_ptr, info_ptr );
+splash-bitmap_rows = png_get_rows( splash-png_ptr, splash-info_ptr );
+splash-width = png_get_image_width( splash-png_ptr, splash-info_ptr );
+splash-height = png_get_image_height( splash-png_ptr, splash-info_ptr );
fclose( file );
return 1;
}
-#else
-
-/* Load the specified Windows 24bit BMP to 'bitmap'
- * Return: 1 - success, 0 - failure */
-int splash_load_bmp( const char *filename )
-{
-int fd = open( filename, O_RDONLY );
-if ( fd 0 )
-return 0;
-
-char file_header[ BMP_HEADER_LEN ];
-
-if ( read( fd, file_header, BMP_HEADER_LEN ) != BMP_HEADER_LEN ||
file_header[0] != 'B' || file_header[1] != 'M' )
-LOAD_FAILURE( Not a bitmap.\n );
-
-char info_header[ WIN_INFO_LEN ];
-if ( read( fd, info_header, 4 ) != 4 )
-LOAD_FAILURE( Unable to read the header.\n );
-
-int header_size = UINT32( info_header );
-if ( header_size != WIN_INFO_LEN )
-LOAD_FAILURE( Not a Windows bitmap.\n );
-
-if ( read( fd, info_header + 4, WIN_INFO_LEN - 4 ) != WIN_INFO_LEN - 4 )
-
[Libreoffice-commits] .: chart2/source
chart2/source/controller/main/ShapeController.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0b24bd7a6ec714c74795cf417e35bd036303f3b9
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Sep 25 11:11:27 2011 -0500
hide a WaE... should be fixed properly when the issue is understood
diff --git a/chart2/source/controller/main/ShapeController.cxx
b/chart2/source/controller/main/ShapeController.cxx
index c4db4bb..138db4f 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -328,6 +328,7 @@ void ShapeController::executeDispatch_FormatArea()
SfxItemPool rItemPool =
pDrawViewWrapper-GetModel()-GetItemPool();
SfxItemSet aSet( rItemPool, rItemPool.GetFirstWhich(),
rItemPool.GetLastWhich() );
const SvxColorListItem* pColorItem = static_cast const
SvxColorListItem* ( aSet.GetItem( SID_COLOR_TABLE ) );
+(void)pColorItem; /* FIXME hide a WaE but the real cause
for it should be settled */
if ( pDlg-Execute() == RET_OK )
{
const SfxItemSet* pOutAttr = pDlg-GetOutputItemSet();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/unx
desktop/unx/source/splashx.c |6 ++
1 file changed, 6 insertions(+)
New commits:
commit cbeebc223b4e759dddb0c5ec03061b67ab88c859
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sun Sep 25 16:21:19 2011 -0500
make the case not ENABLE_QUICKSTART_LIBPNG work again
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index aa8109a..9f58f0c 100755
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -781,6 +781,12 @@ struct splash* splash_create(rtl_uString* pAppPath, int
argc, char** argv)
#else /* not ENABLE_QUICKSTART_LIBPNG */
+#include rtl/ustrbuf.h
+
+struct splash
+{
+};
+
/* Stubs that will never be called in this case */
void splash_draw_progress( struct splash* splash, int progress )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
