[Libreoffice-commits] .: dictionaries/ar dictionaries/bg_BG dictionaries/ca dictionaries/cs_CZ dictionaries/da_DK dictionaries/de dictionaries/en dictionaries/fr_FR dictionaries/hu_HU dictionaries/it_

[David Tardon]

 dictionaries/ar/makefile.mk |2 
 dictionaries/bg_BG/makefile.mk  |2 
 dictionaries/ca/makefile.mk |2 
 dictionaries/cs_CZ/makefile.mk  |2 
 dictionaries/da_DK/makefile.mk  |2 
 dictionaries/de/makefile.mk |4 -
 dictionaries/en/makefile.mk |2 
 dictionaries/fr_FR/makefile.mk  |2 
 dictionaries/hu_HU/makefile.mk  |2 
 dictionaries/it_IT/makefile.mk  |2 
 dictionaries/lv_LV/makefile.mk  |2 
 dictionaries/ne_NP/makefile.mk  |2 
 dictionaries/no/makefile.mk |4 -
 dictionaries/pl_PL/makefile.mk  |2 
 dictionaries/prj/build.lst  |   97 ++---
 dictionaries/pt_PT/makefile.mk  |2 
 dictionaries/ro/makefile.mk |2 
 dictionaries/ru_RU/makefile.mk  |2 
 dictionaries/sk_SK/makefile.mk  |2 
 dictionaries/sl_SI/makefile.mk  |2 
 dictionaries/source/idxdict.cpp |  104 
 dictionaries/source/makefile.mk |   16 --
 dictionaries/sv_SE/makefile.mk  |2 
 dictionaries/uk_UA/makefile.mk  |2 
 24 files changed, 71 insertions(+), 192 deletions(-)

New commits:
commit e05b210f5374949d0eeba4e87b62186ca61d3bcf
Author: David Tardon dtar...@redhat.com
Date:   Sun May 20 16:23:12 2012 +0200

move idxdict to l10ntools

Change-Id: I If670e3732177ef4f21c48b062c43d6a6c3867687

diff --git a/dictionaries/ar/makefile.mk b/dictionaries/ar/makefile.mk
index 2608e3f..f303cf0 100644
--- a/dictionaries/ar/makefile.mk
+++ b/dictionaries/ar/makefile.mk
@@ -91,4 +91,4 @@ $(DESCRIPTION_SRC) : description.xml
 .ENDIF
 
 $(EXTENSIONDIR)$/th_ar.idx : $(EXTENSIONDIR)$/th_ar.dat
- $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ar.idx 
$(EXTENSIONDIR)$/th_ar.dat
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ar.idx 
$(EXTENSIONDIR)$/th_ar.dat
diff --git a/dictionaries/bg_BG/makefile.mk b/dictionaries/bg_BG/makefile.mk
index 4730011..ebeaaf9 100644
--- a/dictionaries/bg_BG/makefile.mk
+++ b/dictionaries/bg_BG/makefile.mk
@@ -87,7 +87,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_bg_BG_v2.idx : $(EXTENSIONDIR)$/th_bg_BG_v2.dat
- $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_bg_BG_v2.idx 
$(EXTENSIONDIR)$/th_bg_BG_v2.dat
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_bg_BG_v2.idx 
$(EXTENSIONDIR)$/th_bg_BG_v2.dat
 
 .IF $(WITH_LANG) != 
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/ca/makefile.mk b/dictionaries/ca/makefile.mk
index eeac8a1..98ecc6a 100644
--- a/dictionaries/ca/makefile.mk
+++ b/dictionaries/ca/makefile.mk
@@ -97,7 +97,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_ca_ES_v3.idx : $(EXTENSIONDIR)$/th_ca_ES_v3.dat
- $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx 
$(EXTENSIONDIR)$/th_ca_ES_v3.dat
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx 
$(EXTENSIONDIR)$/th_ca_ES_v3.dat
 
 .IF $(WITH_LANG) != 
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/cs_CZ/makefile.mk b/dictionaries/cs_CZ/makefile.mk
index c2b1c60..3e807c0 100644
--- a/dictionaries/cs_CZ/makefile.mk
+++ b/dictionaries/cs_CZ/makefile.mk
@@ -87,7 +87,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_cs_CZ_v3.idx : $(EXTENSIONDIR)$/th_cs_CZ_v3.dat
- $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v3.idx 
$(EXTENSIONDIR)$/th_cs_CZ_v3.dat
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v3.idx 
$(EXTENSIONDIR)$/th_cs_CZ_v3.dat
 
 .IF $(WITH_LANG) != 
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/da_DK/makefile.mk b/dictionaries/da_DK/makefile.mk
index 8dc64c0..184f9c7 100644
--- a/dictionaries/da_DK/makefile.mk
+++ b/dictionaries/da_DK/makefile.mk
@@ -91,7 +91,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_da_DK.idx : $(EXTENSIONDIR)$/th_da_DK.dat
- $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx 
$(EXTENSIONDIR)$/th_da_DK.dat
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx 
$(EXTENSIONDIR)$/th_da_DK.dat
 
 .IF $(WITH_LANG) != 
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/de/makefile.mk b/dictionaries/de/makefile.mk
index ee8a954..d7eb6a6 100644
--- a/dictionaries/de

Re: [Libreoffice-commits] .: 2 commits - configure.in README.cross

[David Tardon]

On Thu, May 17, 2012 at 11:41:52PM -0700, Tor Lillqvist wrote:
 commit 6868d84b13a52efe91337f2dccb88e59b9f8d2b7
 Author: Tor Lillqvist t...@iki.fi
 Date:   Thu May 17 22:45:04 2012 +0300
 
 Add generic --with-build-platform-configure-options
 
 diff --git a/configure.in b/configure.in
 index 9c23d8a..510d82a 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -991,6 +991,9 @@ AC_ARG_WITH(gnu-patch,
  [Specify location of GNU patch on Solaris or FreeBSD.]),
  ,)
  
 +AC_ARG_WITH(build-platform-configure-options,
 +[Specify options for the configure script run for the *build* 
 platform in a cross-compilation])
 +
  AC_ARG_WITH(gnu-cp,
  AS_HELP_STRING([--with-gnu-cp],
  [Specify location of GNU cp on Solaris or FreeBSD.]),
 @@ -2021,6 +2024,7 @@ AC_ARG_WITH(macosx-version-max-allowed,
  
  dnl ===
  dnl options for stuff used during cross-compilation build
 +dnl These are superseded by --with-build-platform-configure-options
  dnl ===
  
  AC_ARG_WITH(system-boost-for-build,
 @@ -3472,6 +3476,7 @@ if test $cross_compiling = yes; then
  test -n $with_system_expat_for_build  sub_conf_opts=$sub_conf_opts 
 --with-system-expat
  test $with_system_icu_for_build = yes -o 
 $with_system_icu_for_build = force  sub_conf_opts=$sub_conf_opts 
 --with-system-icu
  test -n $with_system_libxml_for_build  sub_conf_opts=$sub_conf_opts 
 --with-system-libxml
 +sub_conf_opts=$sub_conf_opts $with_build_platform_configure_options
  ./configure \
  --disable-mozilla \
  --disable-build-mozilla \

This is a good idea, but I think it would be even better to have
autogen.lastrun.build (or whatever you want to call it). Then we would
not need to specify _any_ build-specific options for the host configure.
Opinions?

D.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - bridges/source testtools/source

[David Tardon]

 bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx   |   16 +---
 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |   16 
 testtools/source/bridgetest/makefile.mk |4 
 3 files changed, 21 insertions(+), 15 deletions(-)

New commits:
commit b8044cb828af149a4598b35a4d46d8fe4205ae74
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 23 13:51:51 2012 +0200

i hope this is fixed now

diff --git a/testtools/source/bridgetest/makefile.mk 
b/testtools/source/bridgetest/makefile.mk
index 3e31ba6..f87327e 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -146,15 +146,11 @@ ALLTAR: \
 runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
 $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
 .IF $(CROSS_COMPILING)!=YES
-.IF $(COM)$(OS)$(CPU) == GCCMACOSXP
-@echo Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me.
-.ELSE
 cd $(DLLDEST)  $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
 -ro uno_services.rdb -ro uno_types.rdb \
 -s com.sun.star.test.bridge.BridgeTest -- \
 com.sun.star.test.bridge.CppTestObject
 .ENDIF
-.ENDIF
 
 $(DLLDEST)/services.rdb :
 $(COPY) $(SOLARXMLDIR)/ure/services.rdb $@
commit 84dbc4fe2547f8fc341a46d7f000e721c81e63ee
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 23 13:19:39 2012 +0200

do not let gcc use registers we are setting ourselves

gcc uses a register for the function call--and it tried r9 here...

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index 34e8c63..f409bf7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -67,7 +67,6 @@ static void callVirtualMethod(
   // of floating point registers f1 to f8
 
  unsigned long * mfunc;// actual function to be invoked
- void (*ptr)();
  int gpr[8];   // storage for gpregisters, map to r3-r10
  int off;  // offset used to find function
 #ifndef __NO_FPRS__
@@ -243,7 +242,8 @@ static void callVirtualMethod(
  mfunc = *((unsigned long **)pAdjustedThisPtr);// get the address of 
the vtable
  mfunc = (unsigned long *)((char *)mfunc + off); // get the address from 
the vtable entry at offset
  mfunc = *((unsigned long **)mfunc); // the function is 
stored at the address
- ptr = (void (*)())mfunc;
+ typedef void (*FunctionCall)(sal_uInt32, sal_uInt32, sal_uInt32, 
sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32);
+ FunctionCall ptr = (FunctionCall)mfunc;
 
 /* Set up the machine registers and invoke the function */
 
@@ -272,7 +272,17 @@ static void callVirtualMethod(
 : 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
 );
 
-(*ptr)();
+// tell gcc that r3 to r10 are not available to it for doing the TOC and 
exception munge on the func call
+register sal_uInt32 r3 __asm__(r3);
+register sal_uInt32 r4 __asm__(r4);
+register sal_uInt32 r5 __asm__(r5);
+register sal_uInt32 r6 __asm__(r6);
+register sal_uInt32 r7 __asm__(r7);
+register sal_uInt32 r8 __asm__(r8);
+register sal_uInt32 r9 __asm__(r9);
+register sal_uInt32 r10 __asm__(r10);
+
+(*ptr)(r3, r4, r5, r6, r7, r8, r9, r10);
 
 __asm__ __volatile__ (
mr %0, 3\n\t
commit c4c9484a1f55266c92e83406ddee3715affed7f6
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 23 09:47:41 2012 +0200

save register arguments first

The mr stores r11 to indeterminate register (r9 in my case) before
storing it into the output variable, thus overwriting one of our input
arguments... This later leads to nice segfault in
testtools/source/bridgetest ...

I suppose there is a better way to get the variable, but I do not know
it .-)

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index 425c5b5..3cb94dd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -504,13 +504,6 @@ static typelib_TypeClass cpp_mediate(
 
 extern C void privateSnippetExecutor( ... )
 {
-volatile long nOffsetAndIndex;
-
-//mr %r3, %r11# move into arg1 the 64bit value passed from OOo
-__asm__ __volatile__ (
-mr %0,11\n\t
-: =r (nOffsetAndIndex) : );
-
 sal_uInt64 gpreg[ppc64::MAX_GPR_REGS];
 double fpreg[ppc64::MAX_SSE_REGS];
 
@@ -537,11 +530,18 @@ extern C void privateSnippetExecutor( ... )
 stfd 12, 88(%1)\t\n
 stfd 13, 96(%1)\t\n
 : : r (gpreg), r (fpreg)
-: r0, r3, r4, r5, r6, r7, r8, r9, r10,
+: r0, r3, r4, r5, r6, r7, r8, r9, r10, r11,
   fr1, fr2, fr3, fr4, fr5, fr6, fr7, fr8

[Libreoffice-commits] .: sdext/source

[David Tardon]

 sdext/source/presenter/PresenterComponent.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 1f1f8ac4db7aa40f299a104927499e72d39fd932
Author: David Tardon dtar...@redhat.com
Date:   Tue Apr 24 07:24:18 2012 +0200

remove leftover component_writeInfo

diff --git a/sdext/source/presenter/PresenterComponent.cxx 
b/sdext/source/presenter/PresenterComponent.cxx
index b73d617..581427c 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -106,12 +106,6 @@ extern C
 return g_moduleCount.canUnload( g_moduleCount , pTime );
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-void * pServiceManager, void * pRegistryKey )
-{
-return component_writeInfoHelper(pServiceManager, pRegistryKey, 
gServiceEntries);
-}
-
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 const sal_Char * pImplName, void * pServiceManager, void * 
pRegistryKey )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - 5 commits - sax/qa sax/source writerfilter/source xmloff/source

[David Tardon]

 sax/qa/cppunit/test_converter.cxx  |   72 +++
 sax/source/tools/converter.cxx |  155 +++--
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 
 xmloff/source/core/xmluconv.cxx|2 
 4 files changed, 218 insertions(+), 13 deletions(-)

New commits:
commit 70ba1b80ced76c40ad5d43101db9a1f60a00011c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Fri Apr 20 22:30:26 2012 +0200

Minor backporting fix

Signed-off-by: Michael Stahl mst...@redhat.com
Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index a8dad87..023177f 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -266,7 +266,7 @@ void doTestDouble(char const*const pis, double const rd,
 Converter::convertDouble(buf, od, true, nTargetUnit, nSourceUnit);
 OSL_TRACE(%s,
 ::rtl::OUStringToOString(buf.getStr(), 
RTL_TEXTENCODING_UTF8).getStr());
-CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
+CPPUNIT_ASSERT(buf.makeStringAndClear().equals(is));
 }
 
 void ConverterTest::testDouble()
commit 30878ae72d0881e9e3990bc6911a7e5ee4b64cd6
Author: Michael Stahl mst...@redhat.com
Date:   Fri Apr 20 18:39:36 2012 +0200

fdo#48969: add unit test for Converter::convertDouble

Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/sax/qa/cppunit/test_converter.cxx 
b/sax/qa/cppunit/test_converter.cxx
index 4a3d364..a8dad87 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -39,11 +39,13 @@
 #include com/sun/star/util/DateTime.hpp
 #include com/sun/star/util/Date.hpp
 #include com/sun/star/util/Duration.hpp
+#include com/sun/star/util/MeasureUnit.hpp
 
 #include sax/tools/converter.hxx
 
 
 using namespace ::com::sun::star;
+using namespace ::com::sun::star::util::MeasureUnit;
 using sax::Converter;
 
 
@@ -58,10 +60,12 @@ public:
 
 void testDuration();
 void testDateTime();
+void testDouble();
 
 CPPUNIT_TEST_SUITE(ConverterTest);
 CPPUNIT_TEST(testDuration);
 CPPUNIT_TEST(testDateTime);
+CPPUNIT_TEST(testDouble);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -249,6 +253,74 @@ void ConverterTest::testDateTime()
 OSL_TRACE(\nSAX CONVERTER TEST END);
 }
 
+void doTestDouble(char const*const pis, double const rd,
+sal_Int16 const nSourceUnit, sal_Int16 const nTargetUnit)
+{
+::rtl::OUString const is(::rtl::OUString::createFromAscii(pis));
+double od;
+bool bSuccess(Converter::convertDouble(od, is, nSourceUnit, nTargetUnit));
+OSL_TRACE(%f, od);
+CPPUNIT_ASSERT(bSuccess);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(rd, od, 0.0001);
+::rtl::OUStringBuffer buf;
+Converter::convertDouble(buf, od, true, nTargetUnit, nSourceUnit);
+OSL_TRACE(%s,
+::rtl::OUStringToOString(buf.getStr(), 
RTL_TEXTENCODING_UTF8).getStr());
+CPPUNIT_ASSERT_EQUAL(is, buf.makeStringAndClear());
+}
+
+void ConverterTest::testDouble()
+{
+doTestDouble(42, 42.0, TWIP, TWIP);
+doTestDouble(42, 42.0, POINT, POINT);
+doTestDouble(42, 42.0, MM_100TH, MM_100TH);
+doTestDouble(42, 42.0, MM_10TH, MM_10TH);
+doTestDouble(42, 42.0, MM, MM); // identity don't seem to add unit?
+doTestDouble(42, 42.0, CM, CM);
+doTestDouble(42, 42.0, INCH, INCH);
+doTestDouble(2pt, 40.0, POINT, TWIP);
+doTestDouble(20pc, 1, TWIP, POINT);
+doTestDouble(4, 2.26771653543307, MM_100TH, TWIP);
+doTestDouble(4, 22.6771653543307, MM_10TH, TWIP);
+doTestDouble(4mm, 226.771653543307, MM, TWIP);
+doTestDouble(4cm, 2267.71653543307, CM, TWIP);
+doTestDouble(4in, 5760.0, INCH, TWIP);
+doTestDouble(1440pc, 1.0, TWIP, INCH);
+doTestDouble(567pc, 1.000125, TWIP, CM);
+doTestDouble(56.7pc, 1.000125, TWIP, MM);
+doTestDouble(5.67pc, 1.000125, TWIP, MM_10TH);
+doTestDouble(0.567pc, 1.000125, TWIP, MM_100TH);
+doTestDouble(42pt, 1.48166, POINT, CM);
+doTestDouble(42pt, 14.8166, POINT, MM);
+doTestDouble(42pt, 148.166, POINT, MM_10TH);
+doTestDouble(42pt, 1481.66, POINT, MM_100TH);
+doTestDouble(72pt, 1.0, POINT, INCH);
+doTestDouble(3.5in, 8.89, INCH, CM);
+doTestDouble(3.5in, 88.9, INCH, MM);
+doTestDouble(3.5in, 889.0, INCH, MM_10TH);
+doTestDouble(3.5in, 8890.0, INCH, MM_100TH);
+doTestDouble(2in, 144, INCH, POINT);
+doTestDouble(5.08cm, 2.0, CM, INCH);
+doTestDouble(3.5cm, 3500.0, CM, MM_100TH);
+doTestDouble(3.5cm, 350.0, CM, MM_10TH);
+doTestDouble(3.5cm, 35.0, CM, MM);
+doTestDouble(10cm, 283.464566929134, CM, POINT);
+doTestDouble(0.5cm, 283.464566929134, CM, TWIP);
+doTestDouble(10mm, 28.3464566929134, MM, POINT);
+doTestDouble

[Libreoffice-commits] .: solenv/gbuild

[David Tardon]

 solenv/gbuild/platform/macosx.mk  |1 +
 solenv/gbuild/platform/solaris.mk |1 +
 solenv/gbuild/platform/unxgcc.mk  |1 +
 3 files changed, 3 insertions(+)

New commits:
commit b98c960e9707d8222dd7c8fad22e84bbfb725822
Author: David Tardon dtar...@redhat.com
Date:   Thu Apr 19 14:31:40 2012 +0200

add OXT to gb_LinkTarget__RPATHS too

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a55af3a..2ab1336 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -157,6 +157,7 @@ gb_LinkTarget__RPATHS := \
UREBIN: \
OOO:@__OOO/ \
SDKBIN: \
+   OXT: \
NONE:@__VIA_LIBRARY_PATH__@ \
 
 # $(call gb_LinkTarget__get_installname,libfilename,soversion,layerprefix)
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index cc8a2a8..28de7bd 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -196,6 +196,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
+   OXT:\dORIGIN/../lib:\dORIGIN \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 31859a2..37243ad 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -204,6 +204,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
+   OXT:\dORIGIN/../lib:\dORIGIN \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[David Tardon]

 solenv/gbuild/platform/solaris.mk |   11 +++
 solenv/gbuild/platform/unxgcc.mk  |9 ++---
 2 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit fba1422900c6d1763e2792b4a798d8c840d38fb1
Author: David Tardon dtar...@redhat.com
Date:   Thu Apr 19 15:10:47 2012 +0200

extension libs should have no RPATH

diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 28de7bd..1152c68 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -196,7 +196,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
-   OXT:\dORIGIN/../lib:\dORIGIN \
+   OXT: \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS) $(gb_CFLAGS_WERROR)
@@ -301,12 +301,15 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
-define gb_Library_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1)))' \
-'-L$(gb_Library_OUTDIRLOCATION)'
+define gb_Library__get_rpath
+$(if $(1),$(strip '-Wl,-rpath,$(1)' '-L$(gb_Library_OUTDIRLOCATION)'))
 #JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
 endef
 
+define gb_Library_get_rpath
+$(call gb_Library__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1
+endef
+
 define gb_Library_Library_platform
 $(call gb_LinkTarget_get_target,$(2)) : RPATH := $(call 
gb_Library_get_rpath,$(1))
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 37243ad..58bc7eb 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -204,7 +204,7 @@ gb_LinkTarget__RPATHS := \
UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
-   OXT:\dORIGIN/../lib:\dORIGIN \
+   OXT: \
NONE:\dORIGIN/../lib:\dORIGIN \
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
@@ -312,9 +312,12 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
 
+define gb_Library__get_rpath
+$(if $(1),$(strip '-Wl,-rpath,$(1)' 
'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'))
+endef
+
 define gb_Library_get_rpath
-'-Wl,-rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1)))' \
-'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
+$(call gb_Library__get_rpath,$(call gb_LinkTarget__get_rpath_for_layer,$(call 
gb_Library_get_layer,$(1
 endef
 
 define gb_Library_Library_platform
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - Module_tail_build.mk postprocess/prj solenv/gbuild tail_build/prj

[David Tardon]

 Module_tail_build.mk |1 +
 postprocess/prj/build.lst|2 +-
 solenv/gbuild/UnoApiTarget.mk|4 ++--
 solenv/gbuild/platform/macosx.mk |3 +--
 tail_build/prj/build.lst |2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9da0670b601c8c186b0bfbd28ea055016db376ad
Author: David Tardon dtar...@redhat.com
Date:   Thu Apr 19 19:27:19 2012 +0200

extension libs should have no RPATH

At least that is how it seems to work in the old build system:
LINFLAGSRUNPATH_OXT in solenv/inc/unxmacx.mk is empty, just like for
other platforms . On the other side, macosx-change-install-names.pl only
lists OXT in combination with URELIB... Now choose :-)

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 2ab1336..ab955cf 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -162,8 +162,7 @@ gb_LinkTarget__RPATHS := \
 
 # $(call gb_LinkTarget__get_installname,libfilename,soversion,layerprefix)
 define gb_LinkTarget__get_installname
-$(if $(3),-install_name '$(3)$(1)$(if $(2),.$(2))',
-   $(call gb_Output_error,cannot determine -install_name for $(3)))
+$(if $(3),-install_name '$(3)$(1)$(if $(2),.$(2))')
 endef
 
 gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
commit ab6e1860ba5d41b992b9695121b5a311f2cab3b3
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 16 06:22:48 2012 +0200

change announce

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 64ed831..8bc5b1f 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -109,7 +109,7 @@ $(call 
gb_UnoApiTarget__command_impl,$(gb_UnoApiTarget_RDBMAKERCOMMAND),-O$(1) -
 endef
 
 define gb_UnoApiTarget__command
-$(call gb_Output_announce,$*,$(true),RDB,3)
+$(call gb_Output_announce,$*,$(true),UNO,4)
 mkdir -p $(dir $(1))  \
 $(if $(UNOAPI_FILES),\
$(call 
gb_UnoApiTarget__regmerge_command_impl,$(1),$(UNOAPI_ROOT),$(UNOAPI_FILES)),\
@@ -139,7 +139,7 @@ $(call gb_UnoApiTarget_get_target,%):
 
 .PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
 $(call gb_UnoApiTarget_get_clean_target,%) :
-   $(call gb_Output_announce,$*,$(false),RDB,3)
+   $(call gb_Output_announce,$*,$(false),UNO,4)
-$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApiTarget_get_target,$*))
-rm -rf $(call gb_UnoApiTarget_get_dep_target,$*) \
commit dc4911f6cd08ee813c8172cfe3fa928dbf498755
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 16:07:25 2012 +0200

move unodevtools to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index a19f71c..cb000ca 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 toolkit \
 ucb \
 UnoControls \
+unodevtools \
 unoxml \
 uui \
 vbahelper \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 745c251..2521262 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk 
DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries 
PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport 
REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool MYSQLC:mysqlc 
NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL
+po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk 
DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries 
PYUNO:pyuno JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder 
LANGUAGETOOL:languagetool MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 
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
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 9d02e0c..a7c399a 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig 
FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis 
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 SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain 
VIGRA:vigra X11_EXTENSIONS:x11_extensions

[Libreoffice-commits] .: 3 commits - sc/source sdext/source

[David Tardon]

 sc/source/core/data/table6.cxx|4 ++--
 sdext/source/minimizer/pppoptimizeruno.cxx|2 +-
 sdext/source/presenter/PresenterAccessibility.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ea1cd1a10cc2d2bbf4f82aeca689fe81a3b79856
Author: David Tardon dtar...@redhat.com
Date:   Wed Apr 18 09:44:19 2012 +0200

fdo#44861 make Replace All work with REs

diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 45bf02e..f4dc35e 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -202,13 +202,13 @@ bool ScTable::SearchCell(const SvxSearchItem 
rSearchItem, SCCOL nCol, SCROW nRo
 else if (bDoBack)
 {
 xub_StrLen nTemp=nStart; nStart=nEnd; nEnd=nTemp;
-bRepeat = ((bool)(pSearchText-SearchBkwrd(aString, 
nStart, nEnd)));
+bRepeat = ((bool)(pSearchText-SearchBkwrd(aString, 
nStart, nEnd, aSearchResult)));
 // change results to definition before 614:
 --nEnd;
 }
 else
 {
-bRepeat = ((bool)(pSearchText-SearchFrwrd(aString, 
nStart, nEnd)));
+bRepeat = ((bool)(pSearchText-SearchFrwrd(aString, 
nStart, nEnd, aSearchResult)));
 // change results to definition before 614:
 --nEnd;
 }
commit 23d3532f9d7e60eca70930a7c2321192812c0c80
Author: David Tardon dtar...@redhat.com
Date:   Tue Apr 17 14:58:53 2012 +0200

fix presentation minimizer registration

diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx 
b/sdext/source/minimizer/pppoptimizeruno.cxx
index cc3fd35..c95e828 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::registry;
 
 extern C
 {
-sal_Bool SAL_CALL component_writeInfo(
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
 SAL_UNUSED_PARAMETER void* /*pServiceManager*/, void* pRegistryKey )
 {
 if (pRegistryKey)
commit 0ac093f3445dbf58907d8a9f9b7a2dfc07d306ef
Author: David Tardon dtar...@redhat.com
Date:   Tue Apr 17 10:43:26 2012 +0200

mpAccessibleConsole is not a child of itself .-)

diff --git a/sdext/source/presenter/PresenterAccessibility.cxx 
b/sdext/source/presenter/PresenterAccessibility.cxx
index ff90539..522e4b8 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -688,7 +688,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (
 {
 if (mpAccessibleNotes.is())
 {
-mpAccessibleConsole-RemoveChild(mpAccessibleConsole.get());
+mpAccessibleConsole-RemoveChild(mpAccessibleNotes);
 mpAccessibleNotes = NULL;
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - bean/native jvmfwk/plugins

[David Tardon]

 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c |2 -
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx   |   16 +-
 jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx  |8 ++---
 3 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit c6ade7266f5d1d16e4dc9a002ecde6bdf449dbfd
Author: David Tardon dtar...@redhat.com
Date:   Wed Apr 18 13:07:03 2012 +0200

WaE: cast from pointer to integer of different size

diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c 
b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index 7ad1126..bd8b37e 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -166,7 +166,7 @@ JNIEXPORT jlong JNICALL 
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
 SetProp( hWnd, OLD_PROC_KEY, (HANDLE)hFuncPtr );
 }
 
-return ((jlong)hWnd);
+return ((jlong)(LONG)hWnd);
 }
 
 
commit 2ff039195f817f3c372b4ba3bf59539948ce213d
Author: David Tardon dtar...@redhat.com
Date:   Tue Apr 17 07:17:45 2012 +0200

use SAL_N_ELEMENTS

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 1ba0279..1ffa982 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -59,7 +59,7 @@ char const* const* SunInfo::getJavaExePaths(int * size)
 jre/bin/java
 #endif
 };
-*size = sizeof (ar) / sizeof (char*);
+*size = SAL_N_ELEMENTS(ar);
 return ar;
 }
 
@@ -79,7 +79,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
 #endif
 
 };
-*size = sizeof(ar) / sizeof (char*);
+*size = SAL_N_ELEMENTS(ar);
 return ar;
 }
 
@@ -94,7 +94,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
 /lib/ JFW_PLUGIN_ARCH
 
 };
-*size = sizeof(ar) / sizeof (char*);
+*size = SAL_N_ELEMENTS(ar);
 return ar;
 #else
 *size = 0;
commit ea68b1a8977becd8f827d41b171e89d3b490216e
Author: David Tardon dtar...@redhat.com
Date:   Tue Apr 17 07:15:44 2012 +0200

WaE: parameter 'size' set but not used

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 52bd451..1ba0279 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -97,7 +97,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
 *size = sizeof(ar) / sizeof (char*);
 return ar;
 #else
-size = 0;
+*size = 0;
 return NULL;
 #endif
 }
commit ec4f5494dae3bd9819f07fe3ada6310a8bef468d
Author: David Tardon dtar...@redhat.com
Date:   Tue Apr 17 07:11:13 2012 +0200

WaE: declaration of 'errcode' shadows a global declaration

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index a4b9a1d..ffa6b55 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -347,7 +347,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
 sal_Int32  nLenList,
 JavaInfo ** ppInfo)
 {
-javaPluginError errcode = JFW_PLUGIN_E_NONE;
+javaPluginError errorcode = JFW_PLUGIN_E_NONE;
 
 OSL_ASSERT(path);
 OSL_ASSERT(sVendor);
@@ -444,7 +444,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
 }
 *ppInfo = createJavaInfo(aVendorInfo);
 
-return errcode;
+return errorcode;
 }
 
 #if defined(WNT)
@@ -571,9 +571,9 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
 // unless guard is volatile the following warning occurs on gcc:
 // warning: variable 't' might be clobbered by `longjmp' or `vfork'
 volatile osl::MutexGuard guard(PluginMutex::get());
-// unless errcode is volatile the following warning occurs on gcc:
-// warning: variable 'errcode' might be clobbered by `longjmp' or `vfork'
-volatile javaPluginError errcode = JFW_PLUGIN_E_NONE;
+// unless errorcode is volatile the following warning occurs on gcc:
+// warning: variable 'errorcode' might be clobbered by `longjmp' or `vfork'
+volatile javaPluginError errorcode = JFW_PLUGIN_E_NONE;
 if ( pInfo == NULL || ppVm == NULL || ppEnv == NULL)
 return JFW_PLUGIN_E_INVALID_ARG;
 //Check if the Vendor (pInfo-sVendor) is supported by this plugin
@@ -737,13 +737,13 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
 {
 fprintf(stderr,[Java framework] sunjavaplugin SAL_DLLEXTENSION
 Can not create Java Virtual Machine\n);
-errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
+errorcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
 }
 else if( err  0)
 {
 fprintf(stderr,[Java framework] sunjavaplugin SAL_DLLEXTENSION
 Can not create JavaVirtualMachine, abort handler was 
called.\n

[Libreoffice-commits] .: 26 commits - dbaccess/source desktop/win32 embeddedobj/source extensions/source forms/source fpicker/source hwpfilter/source sc/qa sd/source solenv/inc svtools/inc ucb/source

[David Tardon]

 dbaccess/source/ui/dlg/advancedsettings.cxx|5 
 desktop/win32/source/guistdio/guistdio.inc |  508 ++---
 desktop/win32/source/officeloader/officeloader.cxx |   20 
 embeddedobj/source/msole/olecomponent.cxx  |   16 
 embeddedobj/source/msole/oleembed.cxx  |3 
 embeddedobj/source/msole/olepersist.cxx|5 
 extensions/source/scanner/scanwin.cxx  |4 
 forms/source/component/ListBox.cxx |3 
 fpicker/source/odma/ODMAFilePicker.cxx |2 
 fpicker/source/win32/filepicker/FileOpenDlg.cxx|5 
 fpicker/source/win32/filepicker/dibpreview.cxx |7 
 fpicker/source/win32/filepicker/filepickerstate.cxx|7 
 fpicker/source/win32/filepicker/helppopupwindow.cxx|4 
 fpicker/source/win32/misc/AutoBuffer.cxx   |4 
 fpicker/source/win32/misc/AutoBuffer.hxx   |2 
 hwpfilter/source/hcode.cxx |2 
 sc/qa/unit/helper/debughelper.hxx  |2 
 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx |4 
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx   |6 
 sd/source/ui/accessibility/AccessibleTreeNode.cxx  |4 
 sd/source/ui/table/TableDesignPane.cxx |   13 
 solenv/inc/prewin.h|2 
 svtools/inc/svtools/syntaxhighlight.hxx|4 
 ucb/source/ucp/odma/odma_provider.cxx  |2 
 24 files changed, 330 insertions(+), 304 deletions(-)

New commits:
commit 4845405d405164a92792d7fc2ee98bb13394b9e9
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 16 19:15:28 2012 +0200

WaE: could not convert ... from 'const char*' to 'const rtl::OUString'

diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx 
b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 17e479e..abc0762 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -535,8 +535,8 @@ uno::Sequence ::rtl::OUString SAL_CALL
 ThrowIfDisposed ();
 
 static const OUString sServiceNames[2] = {
-com.sun.star.accessibility.Accessible,
-com.sun.star.accessibility.AccessibleContext
+OUString(com.sun.star.accessibility.Accessible),
+OUString(com.sun.star.accessibility.AccessibleContext)
 };
 return uno::SequenceOUString (sServiceNames, 2);
 }
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx 
b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 31cc1ce..c470c60 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -761,9 +761,9 @@ uno::Sequence ::rtl::OUString SAL_CALL
 ThrowIfDisposed ();
 
 static const OUString sServiceNames[3] = {
-com.sun.star.accessibility.Accessible,
-com.sun.star.accessibility.AccessibleContext,
-com.sun.star.drawing.AccessibleSlideSorterView
+OUString(com.sun.star.accessibility.Accessible),
+OUString(com.sun.star.accessibility.AccessibleContext),
+OUString(com.sun.star.drawing.AccessibleSlideSorterView)
 };
 return uno::SequenceOUString (sServiceNames, 3);
 }
diff --git a/sd/source/ui/accessibility/AccessibleTreeNode.cxx 
b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
index 871995e..5a0c014 100644
--- a/sd/source/ui/accessibility/AccessibleTreeNode.cxx
+++ b/sd/source/ui/accessibility/AccessibleTreeNode.cxx
@@ -602,8 +602,8 @@ uno::Sequence ::rtl::OUString SAL_CALL
 {
 ThrowIfDisposed ();
 static const OUString sServiceNames[2] = {
-com.sun.star.accessibility.Accessible,
-com.sun.star.accessibility.AccessibleContext,
+OUString(com.sun.star.accessibility.Accessible),
+OUString(com.sun.star.accessibility.AccessibleContext),
 };
 return uno::SequenceOUString (sServiceNames, 2);
 }
diff --git a/sd/source/ui/table/TableDesignPane.cxx 
b/sd/source/ui/table/TableDesignPane.cxx
index a48aaae..59a41bd 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -85,13 +85,12 @@ static const OUString* getPropertyNames()
 {
 static const OUString gPropNames[ CB_BANDED_COLUMNS-CB_HEADER_ROW+1 ] =
 {
-
-UseFirstRowStyle ,
-UseLastRowStyle ,
-UseBandingRowStyle ,
-UseFirstColumnStyle ,
-UseLastColumnStyle ,
-UseBandingColumnStyle
+OUString(UseFirstRowStyle) ,
+OUString(UseLastRowStyle) ,
+OUString(UseBandingRowStyle) ,
+OUString(UseFirstColumnStyle) ,
+OUString(UseLastColumnStyle) ,
+OUString(UseBandingColumnStyle)
 };
 return

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in solenv/bin solenv/inc

[David Tardon]

 config_host.mk.in |1 +
 configure.in  |   16 
 solenv/bin/modules/installer/windows/msiglobal.pm |2 +-
 solenv/inc/tg_ext.mk  |2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit a420516af36b3c7b6b657ffdef8cb0ef0a6ae1b4
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 16 14:50:19 2012 +0200

mingw: unbreak make check

Even if it does nothing because there is no installation available .-)

diff --git a/config_host.mk.in b/config_host.mk.in
index 8ad7f5c..fe5fc87 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -525,6 +525,7 @@ export UPD=@UPD@
 export USE_FT_EMBOLDEN=@USE_FT_EMBOLDEN@
 export use_shl_version=@use_shl_version@
 export USE_XINERAMA=@USE_XINERAMA@
+export UUIDGEN=@UUIDGEN@
 export VALGRIND_CFLAGS=@VALGRIND_CFLAGS@
 export VALIDATOR_EXTENSION_PACK=@VALIDATOR_EXTENSION_PACK@
 export VERBOSE=@VERBOSE@
diff --git a/configure.in b/configure.in
index 624464a..1792d2b 100644
--- a/configure.in
+++ b/configure.in
@@ -8160,6 +8160,22 @@ fi
 AC_SUBST(WINDOWS_SDK_HOME)
 
 dnl =
+dnl Check for uuidgen
+dnl =
+if test $_os = WINNT; then
+if test $WITH_MINGW = yes; then
+AC_PATH_PROG([UUIDGEN], [uuid])
+if test -z $UUIDGEN; then
+AC_MSG_ERROR([uuid is needed for dev-install])
+fi
+else
+# presence is already tested above in the WINDOWS_SDK_HOME check
+UUIDGEN=uuidgen.exe
+AC_SUBST(UUIDGEN)
+fi
+fi
+
+dnl =
 dnl Check for the Microsoft DirectX SDK.
 dnl =
 if test -n $ENABLE_DIRECTX -a $_os = WINNT; then
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 52711c6..c6a70ff 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1266,7 +1266,7 @@ sub get_guid_list
 
 if ( $log ) { installer::logger::include_header_into_logfile(Generating 
$number GUID); }
 
-my $uuidgen = uuidgen.exe;# Has to be in the path
+my $uuidgen = $ENV{'UUIDGEN'};# Has to be in the path
 
 # -c for uppercase output
 
commit afbc8993bdff272eb6712333c89715c9a1de0533
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 16 11:08:13 2012 +0200

this is only for _building_ on windows

diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 9588456..9a25d7a 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -189,7 +189,7 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : 
$(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
 @echo no patch needed...
 $(COMMAND_ECHO)$(TOUCH) $@
 .ELSE  # $(PATCH_FILES)==none ||   $(PATCH_FILES)==
-.IF $(GUI)==WNT
+.IF $(GUI_FOR_BUILD)==WNT
 $(COMMAND_ECHO)cd $(PACKAGE_DIR)  $(TYPE:s/+//) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d \015 | patch 
$(PATCHFLAGS) -p2  $(TOUCH) $(PATCH_FLAG_FILE)
 .ELSE   # $(GUI)==WNT
 $(COMMAND_ECHO)cd $(PACKAGE_DIR)  $(TYPE) 
$(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 
 $(TOUCH) $(PATCH_FLAG_FILE)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

[David Tardon]

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2c86edd6a15150d4b6ab8f5d22126f129db86fe
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 16 20:42:34 2012 +0200

make that warning, not error

diff --git a/configure.in b/configure.in
index 1792d2b..eb4e746 100644
--- a/configure.in
+++ b/configure.in
@@ -8166,7 +8166,7 @@ if test $_os = WINNT; then
 if test $WITH_MINGW = yes; then
 AC_PATH_PROG([UUIDGEN], [uuid])
 if test -z $UUIDGEN; then
-AC_MSG_ERROR([uuid is needed for dev-install])
+AC_MSG_WARN([uuid is needed for dev-install])
 fi
 else
 # presence is already tested above in the WINDOWS_SDK_HOME check
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 2 commits - connectivity/Library_ado.mk

[David Tardon]

 connectivity/Library_ado.mk |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c7d5e1656d52927839394509e8498ef5d8a408f5
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 15 08:44:49 2012 +0200

set include path properly

diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 63996f8..254ff65 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -29,6 +29,11 @@ $(eval $(call gb_Library_Library,ado))
 
 $(eval $(call 
gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado))
 
+$(eval $(call gb_Library_set_include,ado,\
+   -I$(SRCDIR)/connectivity/source/inc \
+   $$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_add_api,ado,\
offapi \
udkapi \
commit 59fbdb7da14cd0434b07a88bf2733c01313fb3e7
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 15 08:44:18 2012 +0200

have to use gb_Library_add_cxxflags for C++ lib

diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk
index 5cb183f..63996f8 100644
--- a/connectivity/Library_ado.mk
+++ b/connectivity/Library_ado.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_add_api,ado,\
 ))
 
 ifeq ($(COM),GCC)
-$(eval $(call gb_Library_add_cflags,ado,\
+$(eval $(call gb_Library_add_cxxflags,ado,\
-fpermissive \
 ))
 endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

[David Tardon]

 solenv/inc/settings.mk  |2 +-
 solenv/inc/unxaigppc.mk |2 +-
 solenv/inc/unxandr.mk   |2 +-
 solenv/inc/unxgcc.mk|2 +-
 solenv/inc/unxmacx.mk   |2 +-
 solenv/inc/unxnbsd.mk   |2 +-
 solenv/inc/unxsoli4.mk  |2 +-
 solenv/inc/unxsols4.mk  |2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bcc942451d7b5291d3f4c56ccd6868b23e2e923c
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 08:11:37 2012 +0200

really replace SDK with SDKBIN

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 9988f7c..575fdc9 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -1226,7 +1226,7 @@ RCLINKFLAGS+= $(ENVRCLINKFLAGS)
 LINKFLAGSRUNPATH_URELIB*=
 LINKFLAGSRUNPATH_UREBIN*=
 LINKFLAGSRUNPATH_OOO*=
-LINKFLAGSRUNPATH_SDK*=
+LINKFLAGSRUNPATH_SDKBIN*=
 LINKFLAGSRUNPATH_OXT*=
 LINKFLAGSRUNPATH_NONE*=
 
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
index 5e67079..983ae74 100644
--- a/solenv/inc/unxaigppc.mk
+++ b/solenv/inc/unxaigppc.mk
@@ -43,7 +43,7 @@ BRANDPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) 
$(foreach,i,{$(PRODUCTLIST)} /opt
 LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
 
LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
 
LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
-LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
+LINKFLAGSRUNPATH_SDKBIN:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
 LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
 
 LINKFLAGSAPPGUI:=
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index e8cbd9e..812c932 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -66,4 +66,4 @@ ENFORCEDSHLPREFIX=lib
 LINKFLAGSRUNPATH_URELIB=
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 151fc8b..2da3ef0 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -195,7 +195,7 @@ 
LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
 
LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
 #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 
LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
-LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_SDKBIN=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 # flag -Wl,-z,noexecstack sets the NX bit on the stack
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index c829a45..e402783 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -185,7 +185,7 @@ EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH)
 LINKFLAGSRUNPATH_URELIB=-install_name 
'@__URELIB/$(@:f)'
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=-install_name 
'@__OOO/$(@:f)'
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=-install_name 
'@__NONE/$(@:f)'
 LINKFLAGS=$(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxnbsd.mk b/solenv/inc/unxnbsd.mk
index 712ed6a..8dbe480 100644
--- a/solenv/inc/unxnbsd.mk
+++ b/solenv/inc/unxnbsd.mk
@@ -18,7 +18,7 @@ BUILD64=1
 # NetBSD has no support for using relative paths with $ORIGIN
 LINKFLAGSRUNPATH_UREBIN=
 LINKFLAGSRUNPATH_OOO=
-LINKFLAGSRUNPATH_SDK=
+LINKFLAGSRUNPATH_SDKBIN=
 
 LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
 LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index af85064..9120433 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -131,7 +131,7 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
 LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
 #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDKBIN=-R\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index e81ca0e..f1a1cd1 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -137,7 +137,7 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
 LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
 #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
 LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
-LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
+LINKFLAGSRUNPATH_SDKBIN=-R\''$$ORIGIN/../../ure-link/lib'\'
 LINKFLAGSRUNPATH_OXT=
 LINKFLAGSRUNPATH_NONE=
 LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp

[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 6 commits - connectivity/AllLangResTarget_cnr.mk connectivity/Configuration_evoab2.mk connectivity/Configuration_evoab.mk connectivity/Li

[David Tardon]

 Repository.mk|   12 ++--
 connectivity/AllLangResTarget_cnr.mk |   12 ++--
 connectivity/Configuration_evoab.mk  |   38 ++
 connectivity/Configuration_evoab2.mk |   38 --
 connectivity/Library_evoab.mk|   82 +++
 connectivity/Library_evoab2.mk   |   82 ---
 connectivity/Module_connectivity.mk  |4 -
 postprocess/packcomponents/makefile.mk   |   19 +--
 postprocess/packregistry/makefile.mk |   32 +---
 reportbuilder/Extension_reportbuilder.mk |   24 -
 10 files changed, 174 insertions(+), 169 deletions(-)

New commits:
commit fba02bc9fd7dc567c900508e8f354c031e45a527
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 10:10:43 2012 +0200

fix name of .res file

diff --git a/connectivity/AllLangResTarget_cnr.mk 
b/connectivity/AllLangResTarget_cnr.mk
index 2cf9bc5..3a6327a 100644
--- a/connectivity/AllLangResTarget_cnr.mk
+++ b/connectivity/AllLangResTarget_cnr.mk
@@ -25,20 +25,20 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,connectivity))
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,cnr))
 
-$(eval $(call gb_AllLangResTarget_add_srs,connectivity,\
-   connectivity/res \
+$(eval $(call gb_AllLangResTarget_add_srs,cnr,\
+   cnr/res \
 ))
 
-$(eval $(call gb_SrsTarget_SrsTarget,connectivity/res))
+$(eval $(call gb_SrsTarget_SrsTarget,cnr/res))
 
-$(eval $(call gb_SrsTarget_set_include,connectivity/res,\
+$(eval $(call gb_SrsTarget_set_include,cnr/res,\
$$(INCLUDE) \
-I$(SRCDIR)/connectivity/source/inc \
 ))
 
-$(eval $(call gb_SrsTarget_add_files,connectivity/res,\
+$(eval $(call gb_SrsTarget_add_files,cnr/res,\
connectivity/source/resource/conn_shared_res.src \
 ))
 
commit 4253e1d752c96af04e60548f70ad679dedced71b
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 09:53:48 2012 +0200

rename evoab2 back to evoab

diff --git a/Repository.mk b/Repository.mk
index 701cdd9..22e43ee 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -218,7 +218,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 ept \
 era \
 eti \
-evoab2 \
+evoab \
 exp \
 file \
 filterconfig \
diff --git a/connectivity/Configuration_evoab.mk 
b/connectivity/Configuration_evoab.mk
new file mode 100644
index 000..ad82268
--- /dev/null
+++ b/connectivity/Configuration_evoab.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Configuration_Configuration,driver_evoab))
+
+$(eval $(call 
gb_Configuration_add_spool_modules,driver_evoab,connectivity/registry/evoab2,\
+   org/openoffice/Office/DataAccess/Drivers-evoab2.xcu \
+))
+
+$(eval $(call 
gb_Configuration_add_localized_datas,driver_evoab,connectivity/registry/evoab2,\
+   org/openoffice/Office/DataAccess/Drivers.xcu \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Configuration_evoab2.mk 
b/connectivity/Configuration_evoab2.mk
deleted file mode 100644
index 9221efe..000
--- a/connectivity/Configuration_evoab2.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the License); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an AS IS basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License

Re: [Libreoffice-commits] .: extensions/Module_extensions.mk

[David Tardon]

On Wed, Apr 04, 2012 at 05:16:56AM -0700, Matus Kukan wrote:
  extensions/Module_extensions.mk |2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 New commits:
 commit 1e7fd91514940520c33f14898c2298d1251ac34d
 Author: Mat Kukan matus.ku...@gmail.com
 Date:   Wed Apr 4 14:14:33 2012 +0200
 
 fix so_activex_idl, part two
 
 The order seems to be important here.

Hi,

that sounds like incomplete dependencies. Not something that should be
relied upon too much :-)

D.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - postprocess/packregistry

[David Tardon]

 postprocess/packregistry/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d041f609f330ff30db2a54e38e91e3def1d7d053
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 18:26:59 2012 +0200

fix file name

diff --git a/postprocess/packregistry/makefile.mk 
b/postprocess/packregistry/makefile.mk
index 1a8e873..826aa8c 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -331,7 +331,7 @@ ERROR : unknown-GUIBASE
 .END
 .IF $(ENABLE_EVOAB2) == TRUE
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab.xcu
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
 MY_DRIVERS += evoab
 .END
 .IF $(SOLAR_JAVA) == TRUE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - postprocess/packregistry

[David Tardon]

 postprocess/packregistry/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96de6e6890ae7234a023c34674affaeb339681eb
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 18:37:25 2012 +0200

fix file name (part 2)

diff --git a/postprocess/packregistry/makefile.mk 
b/postprocess/packregistry/makefile.mk
index 826aa8c..8624146 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -330,7 +330,7 @@ MY_DRIVERS += ado
 ERROR : unknown-GUIBASE
 .END
 .IF $(ENABLE_EVOAB2) == TRUE
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess/Drivers-evoab2.xcu
 MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
 MY_DRIVERS += evoab
 .END
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: redland/prj redland/raptor redland/rasqal redland/redland scp2/source

[David Tardon]

 redland/prj/d.lst  |   24 ++---
 redland/raptor/makefile.mk |7 +++---
 redland/raptor/raptor-1.4.18.patch.bundled-soname  |   11 +
 redland/raptor/raptor-1.4.18.patch.mingw   |4 +--
 redland/rasqal/makefile.mk |7 +++---
 redland/rasqal/rasqal-0.9.16.patch.bundled-soname  |   11 +
 redland/rasqal/rasqal-0.9.16.patch.mingw   |4 +--
 redland/redland/makefile.mk|7 +++---
 redland/redland/redland-1.0.8.patch.bundled-soname |   11 +
 redland/redland/redland-1.0.8.patch.mingw  |4 +--
 scp2/source/ooo/file_library_ooo.scp   |   24 ++---
 11 files changed, 75 insertions(+), 39 deletions(-)

New commits:
commit 0a4ef4652564c5f2adf01c8d67c916a789f12dc8
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 13 07:03:15 2012 +0200

rhbz#809466 change soname of bundled redland libs

diff --git a/redland/prj/d.lst b/redland/prj/d.lst
index 5715417..39b7afa 100644
--- a/redland/prj/d.lst
+++ b/redland/prj/d.lst
@@ -1,20 +1,20 @@
 mkdir: %_DEST%\inc\external
 ..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h
-..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so.1
-symlink: %_DEST%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so
+..\%__SRC%\lib\libraptor-lo.so.1 %_DEST%\lib\libraptor-lo.so.1
+symlink: %_DEST%\lib\libraptor-lo.so.1 %_DEST%\lib\libraptor.so
 ..\%__SRC%\lib\libraptor.so %_DEST%\lib\libraptor.so
-..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.1.dylib
-symlink: %_DEST%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.dylib
-..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so.1
-symlink: %_DEST%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so
+..\%__SRC%\lib\libraptor-lo.1.dylib %_DEST%\lib\libraptor-lo.1.dylib
+symlink: %_DEST%\lib\libraptor-lo.1.dylib %_DEST%\lib\libraptor.dylib
+..\%__SRC%\lib\librasqal-lo.so.1 %_DEST%\lib\librasqal-lo.so.1
+symlink: %_DEST%\lib\librasqal-lo.so.1 %_DEST%\lib\librasqal.so
 ..\%__SRC%\lib\librasqal.so %_DEST%\lib\librasqal.so
-..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.1.dylib
-symlink: %_DEST%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.dylib
-..\%__SRC%\lib\librdf.so.0 %_DEST%\lib\librdf.so.0
-symlink: %_DEST%\lib\librdf.so.0 %_DEST%\lib\librdf.so
+..\%__SRC%\lib\librasqal-lo.1.dylib %_DEST%\lib\librasqal-lo.1.dylib
+symlink: %_DEST%\lib\librasqal-lo.1.dylib %_DEST%\lib\librasqal.dylib
+..\%__SRC%\lib\librdf-lo.so.0 %_DEST%\lib\librdf-lo.so.0
+symlink: %_DEST%\lib\librdf-lo.so.0 %_DEST%\lib\librdf.so
 ..\%__SRC%\lib\librdf.so %_DEST%\lib\librdf.so
-..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib\librdf.0.dylib
-symlink: %_DEST%\lib\librdf.0.dylib %_DEST%\lib\librdf.dylib
+..\%__SRC%\lib\librdf-lo.0.dylib %_DEST%\lib\librdf-lo.0.dylib
+symlink: %_DEST%\lib\librdf-lo.0.dylib %_DEST%\lib\librdf.dylib
 ..\%__SRC%\lib\*.lib %_DEST%\lib
 ..\%__SRC%\lib\*.a %_DEST%\lib
 ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\lib*.a
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 54a46ab..dacdfac 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -59,7 +59,8 @@ OOO_PATCH_FILES= \
 $(TARFILE_NAME).patch.win32 \
 $(TARFILE_NAME).patch.rindex \
 raptor-aix.patch \
-$(TARFILE_NAME).entities.patch
+$(TARFILE_NAME).entities.patch \
+$(TARFILE_NAME).patch.bundled-soname
 
 .IF $(CROSS_COMPILING)==YES
 OOO_PATCH_FILES += \
@@ -204,7 +205,7 @@ OUT2BIN+=src/raptor-config
 OUT2LIB+=src$/.libs$/libraptor.so
 OUT2BIN+=src/raptor-config
 .ELIF $(OS)==AIX
-OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
+OUT2LIB+=src$/.libs$/libraptor-lo.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
 OUT2BIN+=src/raptor-config
 .ELIF $(OS)==WNT
 .IF $(COM)==GCC
@@ -215,7 +216,7 @@ OUT2BIN+=src/raptor-config
 # if we use dmake, this is done automagically
 .ENDIF
 .ELSE
-OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
+OUT2LIB+=src$/.libs$/libraptor-lo.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so
 OUT2BIN+=src/raptor-config
 .ENDIF
 
diff --git a/redland/raptor/raptor-1.4.18.patch.bundled-soname 
b/redland/raptor/raptor-1.4.18.patch.bundled-soname
new file mode 100644
index 000..cd8e87e
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.bundled-soname
@@ -0,0 +1,11 @@
+--- misc/raptor-1.4.18/src/Makefile.in
 misc/build/raptor-1.4.18/src/Makefile.in
+@@ -404,7 +404,7 @@
+   $(am__append_20) $(am__append_21) $(am__append_22) \
+   $(am__append_23) $(am__append_24) $(am__append_25) \
+   $(am__append_26)
+-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
++libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo
+ libraptor_la_LIBADD = @LTLIBOBJS@
+ EXTRA_DIST = \
+ raptor-config.in \
diff --git a/redland/raptor/raptor-1.4.18.patch.mingw 
b/redland/raptor/raptor-1.4.18.patch.mingw
index bb9f6f4..b671e4d 100644
--- a/redland/raptor/raptor

[Libreoffice-commits] .: redland/raptor

[David Tardon]

 redland/raptor/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0086c3fe17a004807b5a394dd6bef9f5e6f1
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 13 10:55:31 2012 +0200

oops, missed one for macosx

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index dacdfac..3d25291 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -196,7 +196,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 OUT2INC+=src$/raptor.h
 
 .IF $(OS)==MACOSX
-OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib 
src$/.libs$/libraptor.dylib
+OUT2LIB+=src$/.libs$/libraptor-lo.$(RAPTOR_MAJOR).dylib 
src$/.libs$/libraptor.dylib
 OUT2BIN+=src/raptor-config
 .ELIF $(OS)==IOS
 OUT2LIB+=src$/.libs$/libraptor.a
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: redland/raptor redland/rasqal redland/redland

[David Tardon]

 redland/raptor/raptor-1.4.18.patch.dmake  |2 +-
 redland/rasqal/rasqal-0.9.16.patch.dmake  |2 +-
 redland/redland/redland-1.0.8.patch.dmake |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6bc4d28845db8d63faeaa9eac4ce7364f37e4d2e
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 13 15:49:11 2012 +0200

change redland dllnames on windows too

diff --git a/redland/raptor/raptor-1.4.18.patch.dmake 
b/redland/raptor/raptor-1.4.18.patch.dmake
index b017275..c81ed83 100644
--- a/redland/raptor/raptor-1.4.18.patch.dmake
+++ b/redland/raptor/raptor-1.4.18.patch.dmake
@@ -104,7 +104,7 @@
 +SHL1USE_EXPORTS=name
 +
 +#SHL1TARGET=  $(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET=   $(TARGET)
++SHL1TARGET=   $(TARGET)-lo
 +SHL1IMPLIB= lib$(TARGET)
 +
 +#SHL1VERSIONMAP=../service/exports.map
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake 
b/redland/rasqal/rasqal-0.9.16.patch.dmake
index 6795eb9..9d36867 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.dmake
+++ b/redland/rasqal/rasqal-0.9.16.patch.dmake
@@ -78,7 +78,7 @@
 +SHL1USE_EXPORTS=name
 +
 +#SHL1TARGET=  $(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET=   $(TARGET)
++SHL1TARGET=   $(TARGET)-lo
 +SHL1IMPLIB= lib$(TARGET)
 +
 +#SHL1VERSIONMAP=../service/exports.map
diff --git a/redland/redland/redland-1.0.8.patch.dmake 
b/redland/redland/redland-1.0.8.patch.dmake
index 34ba51d..2611fb1 100644
--- a/redland/redland/redland-1.0.8.patch.dmake
+++ b/redland/redland/redland-1.0.8.patch.dmake
@@ -92,7 +92,7 @@
 +SHL1OBJS=   $(SLOFILES)
 +
 +#SHL1TARGET=  $(TARGET)$(DLLPOSTFIX)
-+SHL1TARGET=   $(TARGET)
++SHL1TARGET=   $(TARGET)-lo
 +SHL1IMPLIB= $(TARGET)
 +SHL1USE_EXPORTS=name
 +
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - redland/raptor redland/rasqal redland/redland scp2/source

[David Tardon]

 redland/raptor/makefile.mk|6 +-
 redland/raptor/raptor-1.4.18.patch.dmake  |2 +-
 redland/raptor/raptor-1.4.18.patch.mingw  |4 ++--
 redland/rasqal/makefile.mk|6 +-
 redland/rasqal/rasqal-0.9.16.patch.dmake  |2 +-
 redland/rasqal/rasqal-0.9.16.patch.mingw  |4 ++--
 redland/redland/makefile.mk   |6 +-
 redland/redland/redland-1.0.8.patch.dmake |2 +-
 redland/redland/redland-1.0.8.patch.mingw |4 ++--
 scp2/source/ooo/file_library_ooo.scp  |   12 ++--
 10 files changed, 30 insertions(+), 18 deletions(-)

New commits:
commit 4d6a36dd0c3c0f61ee8e80f748dd6d8ec2cebbd5
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 13 16:24:16 2012 +0200

renaming dlls makes little sense on windows

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 3d25291..0229bf8 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -59,8 +59,12 @@ OOO_PATCH_FILES= \
 $(TARFILE_NAME).patch.win32 \
 $(TARFILE_NAME).patch.rindex \
 raptor-aix.patch \
-$(TARFILE_NAME).entities.patch \
+$(TARFILE_NAME).entities.patch
+
+.IF $(GUI) == UNX
+OOO_PATCH_FILES+= \
 $(TARFILE_NAME).patch.bundled-soname
+.ENDIF
 
 .IF $(CROSS_COMPILING)==YES
 OOO_PATCH_FILES += \
diff --git a/redland/raptor/raptor-1.4.18.patch.mingw 
b/redland/raptor/raptor-1.4.18.patch.mingw
index b671e4d..bb9f6f4 100644
--- a/redland/raptor/raptor-1.4.18.patch.mingw
+++ b/redland/raptor/raptor-1.4.18.patch.mingw
@@ -34,8 +34,8 @@
$(am__append_20) $(am__append_21) $(am__append_22) \
$(am__append_23) $(am__append_24) $(am__append_25) \
$(am__append_26)
--libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo
-+libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo 
-no-undefined
+-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@
++libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined
  libraptor_la_LIBADD = @LTLIBOBJS@
  EXTRA_DIST = \
  raptor-config.in \
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 764993c..fb0dce7 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -57,8 +57,12 @@ OOO_PATCH_FILES= \
 $(TARFILE_NAME).patch.ooo_build \
 $(TARFILE_NAME).patch.dmake \
 $(TARFILE_NAME).patch.win32 \
-rasqal-aix.patch \
+rasqal-aix.patch
+
+.IF $(GUI) == UNX
+OOO_PATCH_FILES+= \
 $(TARFILE_NAME).patch.bundled-soname
+.ENDIF
 
 PATCH_FILES=$(OOO_PATCH_FILES)
 
diff --git a/redland/rasqal/rasqal-0.9.16.patch.mingw 
b/redland/rasqal/rasqal-0.9.16.patch.mingw
index 459ed46..9c42a98 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.mingw
+++ b/redland/rasqal/rasqal-0.9.16.patch.mingw
@@ -4,8 +4,8 @@
rasqal_xsd_datatypes.c rasqal_decimal.c rasqal_datetime.c \
rasqal_rowsource.c rasqal_sparql_xml.c $(am__append_3) \
$(am__append_4) $(am__append_5)
--librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo
-+librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo 
-no-undefined
+-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@
++librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -no-undefined
  librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ 
@RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS)
  librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@
  EXTRA_DIST = \
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index cf7639f..5bec90f 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -57,8 +57,12 @@ OOO_PATCH_FILES= \
 $(TARFILE_NAME).patch.dmake \
 $(TARFILE_NAME).patch.ooo_build \
 $(TARFILE_NAME).patch.win32 \
-redland-aix.patch \
+redland-aix.patch
+
+.IF $(GUI) == UNX
+OOO_PATCH_FILES+= \
 $(TARFILE_NAME).patch.bundled-soname
+.ENDIF
 
 PATCH_FILES=$(OOO_PATCH_FILES) \
 
diff --git a/redland/redland/redland-1.0.8.patch.mingw 
b/redland/redland/redland-1.0.8.patch.mingw
index aeddac8..a32621b 100644
--- a/redland/redland/redland-1.0.8.patch.mingw
+++ b/redland/redland/redland-1.0.8.patch.mingw
@@ -4,8 +4,8 @@
  rdf_parser_raptor.c
  
  EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl
--librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo \
-+librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo 
-no-undefined \
+-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \
++librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -no-undefined \
  @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS)
  
  pkgdata_DATA = $(am__append_11)
diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index 6673568..1f3b605 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1573,9 +1573,9 @@ File gid_File_Lib_Raptor
 #endif
   #else
#ifdef _gcc3

[Libreoffice-commits] .: Makefile

[David Tardon]

 Makefile |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1f84379c5b99b8c67f9296a1bbd0a08f0fa31278
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 13 17:19:40 2012 +0200

Revert re-run bootstrap after make clean

This reverts commit 7c489dc2ec5543c3481d0d5385f3a7a328276cff.

diff --git a/Makefile b/Makefile
index 338e620..4b5d025 100644
--- a/Makefile
+++ b/Makefile
@@ -304,7 +304,6 @@ clean: clean-host clean-build
 clean-host:
rm -fr $(SRCDIR)/*/$(INPATH)
rm -fr install
-   rm -f $(WORKDIR_BOOTSTRAP)
 
 clean-build:
 ifeq ($(CROSS_COMPILING),YES)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: autodoc/source codemaker/source registry/tools solenv/bin unodevtools/source

[David Tardon]

 autodoc/source/exes/adc_uni/makefile.mk  |2 +-
 codemaker/source/cppumaker/makefile.mk   |2 +-
 codemaker/source/javamaker/makefile.mk   |2 +-
 registry/tools/makefile.mk   |2 +-
 solenv/bin/macosx-change-install-names.pl|2 +-
 unodevtools/source/skeletonmaker/makefile.mk |2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 55823d331e5adc2d97cf3c8670bdb6f54f772ded
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 14 07:11:04 2012 +0200

replace APP?RPATH SDK by SDKBIN in old build system

Commit 0c80ad06fd96a4fec062a7edfff12bb65ef204b4 broke MacOS X builds
because of this discrepancy. It would be easy to accept both, but I
think it is better to be consistent with gbuild.

diff --git a/autodoc/source/exes/adc_uni/makefile.mk 
b/autodoc/source/exes/adc_uni/makefile.mk
index 0a97354..859bace 100644
--- a/autodoc/source/exes/adc_uni/makefile.mk
+++ b/autodoc/source/exes/adc_uni/makefile.mk
@@ -72,7 +72,7 @@ APP1TARGET=   $(TARGET)
 APP1STACK= 100
 APP1OBJS=   $(OBJ)$/main.obj
 
-APP1RPATH=SDK
+APP1RPATH=SDKBIN
 
 .IF $(GUI)==WNT
 APP1STDLIBS= $(COSVLIB) $(UDMLIB)
diff --git a/codemaker/source/cppumaker/makefile.mk 
b/codemaker/source/cppumaker/makefile.mk
index 25e881a..6904c52 100644
--- a/codemaker/source/cppumaker/makefile.mk
+++ b/codemaker/source/cppumaker/makefile.mk
@@ -64,7 +64,7 @@ NOOPTFILES= \
 $(OBJ)$/cpputype.obj
 
 APP1TARGET= $(TARGET)
-APP1RPATH=SDK
+APP1RPATH=SDKBIN
 APP1OBJS=   $(OBJFILES)
 
 APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONCPPLIBDEPN)
diff --git a/codemaker/source/javamaker/makefile.mk 
b/codemaker/source/javamaker/makefile.mk
index 314dd0f..ac248e7 100644
--- a/codemaker/source/javamaker/makefile.mk
+++ b/codemaker/source/javamaker/makefile.mk
@@ -56,7 +56,7 @@ OBJFILES = \
 $(OBJ)$/javatype.obj
 
 APP1TARGET= $(TARGET)
-APP1RPATH=SDK
+APP1RPATH=SDKBIN
 APP1OBJS = $(OBJFILES)
 
 APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONJAVALIBDEPN)
diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk
index 6a759b1..4304371 100644
--- a/registry/tools/makefile.mk
+++ b/registry/tools/makefile.mk
@@ -62,7 +62,7 @@ APP2STDLIBS=\
 
 APP3TARGET= regcompare
 APP3OBJS=   $(OBJ)$/regcompare.obj $(OBJ)/fileurl.obj $(OBJ)/options.obj
-APP3RPATH=  SDK
+APP3RPATH=  SDKBIN
 
 APP3STDLIBS=\
 $(SALLIB) \
diff --git a/solenv/bin/macosx-change-install-names.pl 
b/solenv/bin/macosx-change-install-names.pl
index ad0318a..82380e1 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -71,7 +71,7 @@ sub action($$$)
 return $act;
 }
 
-@ARGV = 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDK|OXT|NONE filepath*';
+@ARGV = 2 or die 'Usage: app|shl UREBIN|URELIB|OOO|SDKBIN|OXT|NONE 
filepath*';
 $type = shift @ARGV;
 $loc = shift @ARGV;
 if ($type eq Executable)
diff --git a/unodevtools/source/skeletonmaker/makefile.mk 
b/unodevtools/source/skeletonmaker/makefile.mk
index ec0a382..0a6bfde 100644
--- a/unodevtools/source/skeletonmaker/makefile.mk
+++ b/unodevtools/source/skeletonmaker/makefile.mk
@@ -44,7 +44,7 @@ all:
 .INCLUDE : $(PRJ)$/unodevtools.pmk
 
 APP1TARGET = $(TARGET)
-APP1RPATH=SDK
+APP1RPATH=SDKBIN
 
 APP1OBJS = $(OBJ)$/skeletonmaker.obj \
 $(OBJ)$/skeletoncommon.obj \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cpputools/Module_cpputools.mk cpputools/Package_bin.mk solenv/gbuild

[David Tardon]

 cpputools/Module_cpputools.mk|6 ++
 cpputools/Package_bin.mk |   34 ++
 solenv/gbuild/TargetLocations.mk |1 +
 3 files changed, 41 insertions(+)

New commits:
commit dd9bbad2b19d7c8bbe68dd2cdcf3d90d763d747d
Author: David Tardon dtar...@redhat.com
Date:   Wed Apr 11 10:01:25 2012 +0200

also deliver .bin variants of the tools

diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
index 17b41b3..3e5a063 100644
--- a/cpputools/Module_cpputools.mk
+++ b/cpputools/Module_cpputools.mk
@@ -40,6 +40,12 @@ $(eval $(call gb_Module_add_targets,cpputools,\
 Executable_regsingleton \
 Executable_uno \
 ))
+
+ifneq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,cpputools,\
+Package_bin \
+))
+endif
 endif
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cpputools/Package_bin.mk b/cpputools/Package_bin.mk
new file mode 100644
index 000..9a0b8d4
--- /dev/null
+++ b/cpputools/Package_bin.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# because the installation system is so incredibly inflexible...
+$(eval $(call gb_Package_Package,cpputools_bin,$(gb_Executable_BINDIR)))
+
+$(eval $(call gb_Package_add_file,cpputools_bin,bin/regcomp.bin,regcomp))
+$(eval $(call gb_Package_add_file,cpputools_bin,bin/uno.bin,uno))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 2fbd434..df694b7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -253,6 +253,7 @@ gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call 
gb_StaticLibrary_get_
 
 # static members declared here because they are used globally
 
+gb_Executable_BINDIR = $(WORKDIR)/LinkTarget/Executable
 gb_Library_OUTDIRLOCATION = $(OUTDIR)/lib
 gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
 gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: smoketest/CppunitTest_smoketest.mk

[David Tardon]

 smoketest/CppunitTest_smoketest.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9bbc7cf94a05ce71c34421816005fae1692fb5bd
Author: David Tardon dtar...@redhat.com
Date:   Tue Apr 10 11:52:36 2012 +0200

get subsequentcheck unstuck

diff --git a/smoketest/CppunitTest_smoketest.mk 
b/smoketest/CppunitTest_smoketest.mk
index 16a6ea3..0fc2ab5 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -48,6 +48,8 @@ else
 my_soffice:=path:$(OUTDIR)/installation/opt/program/soffice
 endif
 
+$(eval $(call gb_CppunitTest_use_ure,smoketest))
+
 $(eval $(call gb_CppunitTest_add_arguments,smoketest,\
-env:arg-soffice=$(my_soffice) \
-env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - basctl/AllLangResTarget_basctl.mk basic/AllLangResTarget_sb.mk chart2/AllLangResTarget_chartcontroller.mk cui/AllLangResTarget_cui.mk dbaccess/AllLangResTarget_dba

[David Tardon]

 basctl/AllLangResTarget_basctl.mk  |   13 +
 basic/AllLangResTarget_sb.mk   |7 +++
 chart2/AllLangResTarget_chartcontroller.mk |   10 +-
 cui/AllLangResTarget_cui.mk|8 
 dbaccess/AllLangResTarget_dba.mk   |4 
 dbaccess/AllLangResTarget_dbmm.mk  |4 ++--
 dbaccess/AllLangResTarget_dbu.mk   |   12 +---
 dbaccess/AllLangResTarget_dbui.mk  |   12 +---
 dbaccess/AllLangResTarget_sdbt.mk  |6 --
 dbaccess/Library_dbu.mk|   12 ++--
 desktop/AllLangResTarget_dkt.mk|4 ++--
 editeng/AllLangResTarget_editeng.mk|4 
 extensions/AllLangResTarget_abp.mk |4 
 extensions/AllLangResTarget_bib.mk |7 +++
 extensions/AllLangResTarget_dbp.mk |4 
 filter/AllLangResTarget_pdffilter.mk   |4 
 filter/AllLangResTarget_xsltdlg.mk |4 
 forms/AllLangResTarget_frm.mk  |4 
 formula/AllLangResTarget_for.mk|6 +-
 formula/AllLangResTarget_forui.mk  |4 
 fpicker/AllLangResTarget_fps_office.mk |5 +++--
 framework/AllLangResTarget_fwe.mk  |4 
 padmin/AllLangResTarget_spa.mk |4 
 reportdesign/AllLangResTarget_rpt.mk   |7 +--
 reportdesign/AllLangResTarget_rptui.mk |   10 --
 sc/AllLangResTarget_sc.mk  |   12 ++--
 sd/AllLangResTarget_sd.mk  |   14 +++---
 sfx2/AllLangResTarget_sfx2.mk  |8 +++-
 solenv/gbuild/AllLangResTarget.mk  |   15 +++
 solenv/gbuild/TargetLocations.mk   |4 +++-
 starmath/AllLangResTarget_sm.mk|9 +++--
 svl/AllLangResTarget_svl.mk|5 ++---
 svtools/AllLangResTarget_svt.mk|7 +++
 svx/AllLangResTarget_gal.mk|7 +++
 svx/AllLangResTarget_ofa.mk|   10 +++---
 svx/AllLangResTarget_svx.mk|   12 +++-
 svx/AllLangResTarget_textconversiondlgs.mk |5 ++---
 svx/Package_globlmn_hrc.mk |2 +-
 sw/AllLangResTarget_sw.mk  |   12 ++--
 uui/AllLangResTarget_uui.mk|6 ++
 vcl/AllLangResTarget_vcl.mk|4 
 wizards/AllLangResTarget_cal.mk|4 
 wizards/AllLangResTarget_dbw.mk|4 
 wizards/AllLangResTarget_eur.mk|4 
 wizards/AllLangResTarget_imp.mk|4 
 wizards/AllLangResTarget_tpl.mk|4 
 wizards/AllLangResTarget_wwz.mk|4 
 wizards/AllLangResTarget_wzi.mk|4 
 xmlsecurity/AllLangResTarget_xsec.mk   |5 +
 49 files changed, 240 insertions(+), 88 deletions(-)

New commits:
commit 2753a9904ce4caeeacca5eb2987319dc179c428b
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 9 10:08:01 2012 +0200

do not put things directly into $(WORKDIR)

diff --git a/chart2/AllLangResTarget_chartcontroller.mk 
b/chart2/AllLangResTarget_chartcontroller.mk
index b72a07a..ec8dd82 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\
 -I$(SRCDIR)/chart2/source/controller/inc \
 -I$(SRCDIR)/chart2/source/controller/main \
 -I$(SRCDIR)/chart2/source/inc \
--I$(WORKDIR)/inc/chart2 \
+-I$(call gb_SrsTemplateTarget_get_include_dir,chart2) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,chart2/res,\
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index a8e17f8..1e353af 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_SrsTarget_use_packages,dbaccess/dbu,\
 
 $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\
 $$(INCLUDE) \
--I$(WORKDIR)/inc/dbaccess \
+   -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \
 -I$(SRCDIR)/dbaccess/inc \
 -I$(SRCDIR)/dbaccess/source/ui/inc \
 ))
diff --git a/dbaccess/AllLangResTarget_dbui.mk 
b/dbaccess/AllLangResTarget_dbui.mk
index c22b4d1..fe37557 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_SrsTarget_use_package,dbaccess/dbui,\
 
 $(eval $(call gb_SrsTarget_set_include,dbaccess/dbui,\
$$(INCLUDE) \
-   -I$(WORKDIR)/inc/dbaccess \
+   -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \
-I$(SRCDIR)/dbaccess/source/ui/inc \
-I$(SRCDIR)/dbaccess/source/ui/dlg \
-I$(SRCDIR)/dbaccess/inc \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 727568e..44d75b5 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_include

[Libreoffice-commits] .: Makefile rdbmaker/Executable_rdbmaker.mk rdbmaker/Makefile rdbmaker/Module_rdbmaker.mk rdbmaker/prj rdbmaker/source Repository.mk RepositoryModule_ooo.mk

[David Tardon]

 Makefile  |2 -
 Repository.mk |1 
 RepositoryModule_ooo.mk   |1 
 rdbmaker/Executable_rdbmaker.mk   |   58 +++
 rdbmaker/Makefile |7 +++
 rdbmaker/Module_rdbmaker.mk   |   33 +
 rdbmaker/prj/build.lst|6 ---
 rdbmaker/prj/d.lst|3 -
 rdbmaker/prj/makefile.mk  |1 
 rdbmaker/source/codemaker/makefile.mk |   55 -
 rdbmaker/source/rdbmaker/makefile.mk  |   63 --
 11 files changed, 103 insertions(+), 127 deletions(-)

New commits:
commit f55eed29c68205f69dd263f8a9657ac407a73ee3
Author: David Ostrovsky david.ostrov...@gmx.de
Date:   Thu Apr 5 20:24:34 2012 +0200

gbuild conversion: rdbmaker module

dmake stuff removed

diff --git a/Makefile b/Makefile
index 1bfb75b..adeb637 100644
--- a/Makefile
+++ b/Makefile
@@ -87,6 +87,7 @@ psprint_config\
 qadevOOo\
 regexp\
 reportdesign\
+rdbmaker\
 ridljar\
 rsc\
 sal\
@@ -214,7 +215,6 @@ postgresql\
 postprocess\
 python\
 pyuno\
-rdbmaker\
 readlicense_oo\
 redland\
 registry\
diff --git a/Repository.mk b/Repository.mk
index 7775190..1fe0aa3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
 osl_process_child \
 pdf2xml \
 pdfunzip \
+rdbmaker \
 rsc \
 rscdep \
 saxparser \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 2ad7f41..a79028c 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 package \
 padmin \
 psprint_config \
+rdbmaker \
 regexp \
 reportdesign \
 ridljar \
diff --git a/rdbmaker/Executable_rdbmaker.mk b/rdbmaker/Executable_rdbmaker.mk
new file mode 100644
index 000..6e46d38
--- /dev/null
+++ b/rdbmaker/Executable_rdbmaker.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky d.ostrov...@gmx.de (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,rdbmaker))
+
+$(eval $(call gb_Executable_use_api,rdbmaker,\
+udkapi \
+))
+
+$(eval $(call gb_Executable_set_include,rdbmaker,\
+-I$(SRCDIR)/rdbmaker/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,rdbmaker,\
+sal \
+salhelper \
+reg \
+cppu \
+cppuhelper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,rdbmaker,\
+rdbmaker/source/rdbmaker/rdbmaker \
+rdbmaker/source/rdbmaker/rdbtype \
+rdbmaker/source/rdbmaker/rdboptions \
+rdbmaker/source/rdbmaker/typeblop \
+rdbmaker/source/rdbmaker/specialtypemanager \
+rdbmaker/source/codemaker/global \
+rdbmaker/source/codemaker/options \
+rdbmaker/source/codemaker/typemanager \
+rdbmaker/source/codemaker/dependency \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/rdbmaker/Makefile b/rdbmaker/Makefile
new file mode 100644
index 000..ccb1c85
--- /dev/null
+++ b/rdbmaker/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/rdbmaker/Module_rdbmaker.mk b/rdbmaker/Module_rdbmaker.mk
new file mode 100644
index 000..0145b23
--- /dev/null
+++ b/rdbmaker/Module_rdbmaker.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# 

[Libreoffice-commits] .: 3 commits - dbaccess/CppunitTest_dbaccess_macros_test.mk extensions/CppunitTest_extensions_test_update.mk filter/CppunitTest_filter_tga_test.mk filter/CppunitTest_filter_tiff_

[David Tardon]

 dbaccess/CppunitTest_dbaccess_macros_test.mk   |2 
 extensions/CppunitTest_extensions_test_update.mk   |2 
 filter/CppunitTest_filter_tga_test.mk  |2 
 filter/CppunitTest_filter_tiff_test.mk |2 
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk  |2 
 i18npool/CppunitTest_i18npool_test_breakiterator.mk|2 
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk |2 
 sc/CppunitTest_sc_cellrangeobj.mk  |2 
 sc/CppunitTest_sc_chart_regression_test.mk |2 
 sc/CppunitTest_sc_databaserangeobj.mk  |2 
 sc/CppunitTest_sc_datapilotfieldobj.mk |2 
 sc/CppunitTest_sc_datapilottableobj.mk |2 
 sc/CppunitTest_sc_filters_test.mk  |2 
 sc/CppunitTest_sc_macros_test.mk   |2 
 sc/CppunitTest_sc_namedrangeobj.mk |2 
 sc/CppunitTest_sc_namedrangesobj.mk|2 
 sc/CppunitTest_sc_subsequent_filters_test.mk   |2 
 sc/CppunitTest_sc_tableautoformatfield.mk  |2 
 sc/CppunitTest_sc_tablesheetobj.mk |2 
 sc/CppunitTest_sc_tablesheetsobj.mk|2 
 sc/CppunitTest_sc_ucalc.mk |2 
 sd/CppunitTest_sd_filters_test.mk  |2 
 sd/CppunitTest_sd_regression_test.mk   |2 
 sd/CppunitTest_sd_uimpress.mk  |2 
 sdext/CppunitTest_pdfimport.mk |2 
 solenv/gbuild/CppunitTest.mk   |   28 +++--
 sot/CppunitTest_sot_test_sot.mk|2 
 starmath/CppunitTest_starmath_qa_cppunit.mk|2 
 svl/CppunitTest_svl_urihelper.mk   |2 
 svtools/CppunitTest_svtools_filters_test.mk|2 
 sw/CppunitTest_sw_filters_test.mk  |2 
 sw/CppunitTest_sw_layout_test.mk   |2 
 sw/CppunitTest_sw_macros_test.mk   |2 
 sw/CppunitTest_sw_regression_test.mk   |2 
 sw/CppunitTest_sw_subsequent_ooxmltok.mk   |2 
 sw/CppunitTest_sw_subsequent_rtftok.mk |2 
 sw/CppunitTest_sw_swdoc_test.mk|2 
 writerfilter/CppunitTest_writerfilter_rtftok.mk|2 
 38 files changed, 90 insertions(+), 12 deletions(-)

New commits:
commit e27674781a99faff65db42bc20eeffb8ef5596ae
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 8 15:19:08 2012 +0200

only add -env: args for tests that use URE

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 862e3b8..2fb3411 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -59,16 +59,16 @@ gb_CppunitTest__get_linktargetname = CppunitTest/$(call 
gb_CppunitTest_get_filen
 
 define gb_CppunitTest__make_args
 --headless \
-$(if $(strip $(CONFIGURATION_LAYERS)),\
-   -env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))) \
-$(if $(strip $(UNO_TYPES)),\
-   -env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call 
gb_Helper_make_url,$(item \
-$(if $(strip $(UNO_SERVICES)),\
-   -env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call 
gb_Helper_make_url,$(item \
 $(if $(URE),\
-   $(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
-   -env:$(dir)=$(call 
gb_Helper_make_url,$(gb_CppunitTest_LIBDIR))) \
-   --protector unoexceptionprotector$(gb_Library_DLLEXT) 
unoexceptionprotector) \
+$(if $(strip $(CONFIGURATION_LAYERS)),\
+   -env:CONFIGURATION_LAYERS=$(strip $(CONFIGURATION_LAYERS))) \
+$(if $(strip $(UNO_TYPES)),\
+   -env:UNO_TYPES=$(foreach item,$(UNO_TYPES),$(call 
gb_Helper_make_url,$(item \
+$(if $(strip $(UNO_SERVICES)),\
+   -env:UNO_SERVICES=$(foreach item,$(UNO_SERVICES),$(call 
gb_Helper_make_url,$(item \
+$(foreach dir,URE_INTERNAL_LIB_DIR LO_LIB_DIR,\
+   -env:$(dir)=$(call gb_Helper_make_url,$(gb_CppunitTest_LIBDIR))) \
+--protector unoexceptionprotector$(gb_Library_DLLEXT) 
unoexceptionprotector) \
 $(ARGS)
 endef
 
commit 5fcacd84082b039c4c2d6f3470d51b3c49b3110c
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 8 15:17:45 2012 +0200

rename gb_CppunitTest_uses_ure

diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk 
b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 4d37ab7..2d48691 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -83,7 +83,7 @@ $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\
 udkapi \
 ))
 
-$(eval $(call gb_CppunitTest_uses_ure,dbaccess_macros_test))
+$(eval $(call gb_CppunitTest_use_ure

[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - svl/Library_svl.mk

[David Tardon]

 svl/Library_svl.mk |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c831076abe1a5d40b515ec64c29c86e6204bfbfd
Author: David Tardon dtar...@redhat.com
Date:   Sat Apr 7 14:27:37 2012 +0200

make sure that rsc headers are available

diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 5addf89..01d0c1d 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -28,7 +28,10 @@
 
 $(eval $(call gb_Library_Library,svl))
 
-$(eval $(call gb_Library_add_package_headers,svl,svl_inc))
+$(eval $(call gb_Library_add_package_headers,svl,\
+   rsc_inc \
+   svl_inc \
+))
 
 $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/gbuild_shell'

[David Tardon]

New branch 'feature/gbuild_shell' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/gbuild_scp2'

[David Tardon]

New branch 'feature/gbuild_scp2' available with the following commits:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - io/Makefile solenv/gbuild stoc/Makefile

[David Tardon]

 io/Makefile   |   37 ++---
 solenv/gbuild/UnoApiTarget.mk |2 +-
 stoc/Makefile |   37 ++---
 3 files changed, 5 insertions(+), 71 deletions(-)

New commits:
commit 2c1d6b2fdee1e3572769146d77addbccea7bc513
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 6 16:48:42 2012 +0200

fix makefiles

diff --git a/io/Makefile b/io/Makefile
index 7bbbe6c..ccb1c85 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# http://www.openoffice.org/license.html
-# for a copy of the LGPLv3 License.
-#
-#*
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath 
$(firstword $(MAKEFILE_LIST/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
diff --git a/stoc/Makefile b/stoc/Makefile
index 7bbbe6c..ccb1c85 100644
--- a/stoc/Makefile
+++ b/stoc/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# http://www.openoffice.org/license.html
-# for a copy of the LGPLv3 License.
-#
-#*
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_build.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath 
$(firstword $(MAKEFILE_LIST/Module*.mk)))
-
-endif
 # vim: set noet sw=4 ts=4:
commit 565707cda484b10c1809525df1670b378f9a61f8
Author: David Tardon dtar...@redhat.com
Date:   Fri Apr 6 16:48:31 2012 +0200

fix build on windows (i hope)

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index d2adfe9..8192d26 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -91,7 +91,7 @@ gb_UnoApiTarget_XML2CMPCOMMAND := $(gb_Helper_set_ld_path) 
$(gb_UnoApiTarget_XML
 gb_UnoApiTarget_XMLRDB := $(call gb_UnoApiTarget_get_target,types)
 
 define gb_UnoApiTarget__get_types
-$(if $(1),$(foreach type,$(shell $(gb_UnoApiTarget_XML2CMPCOMMAND) -types 
stdout $(1)),$(addprefix -T,$(type
+$(if $(1),$(foreach type,$(shell $(gb_UnoApiTarget_XML2CMPCOMMAND) -types 
stdout $(call gb_Helper_native_path,$(1))),$(addprefix -T,$(type
 endef
 
 define gb_UnoApiTarget__command_impl

[Libreoffice-commits] .: desktop/source

[David Tardon]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit c4c6b52a214b474353013f9b1b03d56a5d9a0380
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 2 12:46:43 2012 +0200

fdo#47963 do not increase height of checkboxes

Especially as it is obvious the grow is unbounded .-)

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 5e94e31..0450159 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1247,19 +1247,16 @@ void ExtMgrDialog::Resize()
 long nWidth = m_aBundledCbx.GetCtrlTextWidth( m_aBundledCbx.GetText() );
 Size aBCBSize(m_aBundledCbx.GetSizePixel());
 aBCBSize.Width() = nWidth + 30;
-aBCBSize.Height() += 3;
 m_aBundledCbx.SetSizePixel( aBCBSize );
 
 nWidth = m_aSharedCbx.GetCtrlTextWidth( m_aSharedCbx.GetText() );
 Size aSCBSize(m_aSharedCbx.GetSizePixel());
 aSCBSize.Width() = nWidth + 30;
-aSCBSize.Height() += 3;
 m_aSharedCbx.SetSizePixel( aSCBSize );
 
 nWidth = m_aUserCbx.GetCtrlTextWidth( m_aUserCbx.GetText() );
 Size aUCBSize(m_aUserCbx.GetSizePixel());
 aUCBSize.Width() = nWidth + 30;
-aUCBSize.Height() += 3;
 m_aUserCbx.SetSizePixel( aUCBSize );
 
 offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - 
RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_SP_CTRL_GROUP_X - aBCBSize.Width() - 
aSCBSize.Width() - aUCBSize.Width() );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gdb

[David Tardon]

 solenv/gdb/boost/__init__.py |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9bbb398ef9722e7e1862f6379470ccdd9fc59743
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 2 18:32:19 2012 +0200

call the right function :blush:

diff --git a/solenv/gdb/boost/__init__.py b/solenv/gdb/boost/__init__.py
index 734ba01..353ee3b 100644
--- a/solenv/gdb/boost/__init__.py
+++ b/solenv/gdb/boost/__init__.py
@@ -24,9 +24,9 @@ import boost.smart_ptr
 import boost.unordered
 
 def register_pretty_printers(obj):
-boost.optional.register_pretty_printer(obj)
-boost.ptr_container.register_pretty_printer(obj)
-boost.smart_ptr.register_pretty_printer(obj)
-boost.unordered.register_pretty_printer(obj)
+boost.optional.register_pretty_printers(obj)
+boost.ptr_container.register_pretty_printers(obj)
+boost.smart_ptr.register_pretty_printers(obj)
+boost.unordered.register_pretty_printers(obj)
 
 # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gdb

[David Tardon]

 solenv/gdb/boost/__init__.py |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b4f5ef6304c0caf162a044a4022b4371535ec29a
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 2 18:32:19 2012 +0200

call the right function :blush:

diff --git a/solenv/gdb/boost/__init__.py b/solenv/gdb/boost/__init__.py
index 734ba01..353ee3b 100644
--- a/solenv/gdb/boost/__init__.py
+++ b/solenv/gdb/boost/__init__.py
@@ -24,9 +24,9 @@ import boost.smart_ptr
 import boost.unordered
 
 def register_pretty_printers(obj):
-boost.optional.register_pretty_printer(obj)
-boost.ptr_container.register_pretty_printer(obj)
-boost.smart_ptr.register_pretty_printer(obj)
-boost.unordered.register_pretty_printer(obj)
+boost.optional.register_pretty_printers(obj)
+boost.ptr_container.register_pretty_printers(obj)
+boost.smart_ptr.register_pretty_printers(obj)
+boost.unordered.register_pretty_printers(obj)
 
 # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gdb

[David Tardon]

 solenv/gdb/autoload.template   |6 
 solenv/gdb/boost/__init__.py   |   32 
 solenv/gdb/boost/lib/unordered.py  |  128 +
 solenv/gdb/boost/optional.py   |   56 +++
 solenv/gdb/boost/ptr_container.py  |  247 +
 solenv/gdb/boost/smart_ptr.py  |   61 
 solenv/gdb/boost/unordered.py  |  111 ++
 solenv/gdb/boost/util/__init__.py  |3 
 solenv/gdb/boost/util/compatibility.py |   32 
 solenv/gdb/boost/util/printing.py  |  133 +
 10 files changed, 809 insertions(+)

New commits:
commit 101e449427f4dc2ef70105cdb63f989e2442e915
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 1 16:00:58 2012 +0200

add pretty printers for boost

diff --git a/solenv/gdb/autoload.template b/solenv/gdb/autoload.template
index 4105c8c..2dbfa0a 100644
--- a/solenv/gdb/autoload.template
+++ b/solenv/gdb/autoload.template
@@ -39,4 +39,10 @@ if gdb.current_objfile():
 from %MODULE% import register_pretty_printers
 register_pretty_printers(gdb.current_objfile())
 
+try:
+import boost
+boost.register_pretty_printers(gdb)
+except:
+pass
+
 # vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/gdb/boost/__init__.py b/solenv/gdb/boost/__init__.py
new file mode 100644
index 000..734ba01
--- /dev/null
+++ b/solenv/gdb/boost/__init__.py
@@ -0,0 +1,32 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+# GDB pretty printers for Boost.
+#
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#
+# This file is part of boost-gdb-printers.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+import boost.optional
+import boost.ptr_container
+import boost.smart_ptr
+import boost.unordered
+
+def register_pretty_printers(obj):
+boost.optional.register_pretty_printer(obj)
+boost.ptr_container.register_pretty_printer(obj)
+boost.smart_ptr.register_pretty_printer(obj)
+boost.unordered.register_pretty_printer(obj)
+
+# vim:set filetype=python shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/gdb/boost/lib/__init__.py b/solenv/gdb/boost/lib/__init__.py
new file mode 100644
index 000..e69de29
diff --git a/solenv/gdb/boost/lib/unordered.py 
b/solenv/gdb/boost/lib/unordered.py
new file mode 100644
index 000..eecfa79
--- /dev/null
+++ b/solenv/gdb/boost/lib/unordered.py
@@ -0,0 +1,128 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+# Helper classes for working with Boost.Unordered.
+#
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#
+# This file is part of boost-gdb-printers.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+import gdb
+
+class Unordered(object):
+'''Common representation of Boost.Unordered types'''
+
+def __init__(self, value, extractor):
+self.value = value
+self.extractor = extractor
+self.node_type = self._node_type()
+
+def __len__(self):
+table = self.value['table_']
+if table['buckets_']:
+return int(table['size_'])
+else:
+return 0
+
+def __iter__(self):
+table = self.value['table_']
+buckets = table['buckets_']
+if buckets:
+first = table['cached_begin_bucket_']
+last = buckets + table['bucket_count_']
+else:
+first = last = None
+return self._iterator(first, last, self.node_type, self.extractor)
+
+def empty(self):
+return not self.value['table_']['buckets_']
+
+def _node_type(self):
+hash_table = self.value['table_'].type.fields()[0]
+assert hash_table.is_base_class
+hash_buckets = hash_table.type.fields()[0]
+assert

[Libreoffice-commits] .: Branch 'feature/gbuild_components' - 2 commits - Makefile solenv/gbuild

[David Tardon]

 Makefile|4 ++--
 solenv/gbuild/Executable.mk |3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7e94a37403aa4470bd7dad7c549ba8bc7485620a
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 1 17:11:57 2012 +0200

add_internal_*_api for Executable too

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 8a7fc26..174ddb6 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -105,6 +105,9 @@ $(eval $(foreach method,\
add_libs \
set_library_path_flags \
add_api \
+   add_internal_api \
+   add_internal_bootstrap_api \
+   add_internal_comprehensive_api \
add_linked_libs \
add_linked_static_libs \
use_external \
commit 18c661f715a0b6850d30b374e5556dc14a377d2b
Author: David Tardon dtar...@redhat.com
Date:   Sun Apr 1 16:43:34 2012 +0200

move from dmake to gbuild list

diff --git a/Makefile b/Makefile
index d29f244..d412f16 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,7 @@ hwpfilter\
 i18npool\
 i18nutil\
 idl\
+io\
 javaunohelper\
 jurt\
 jvmaccess\
@@ -103,6 +104,7 @@ slideshow\
 smoketest\
 sot\
 starmath\
+stoc\
 svl\
 svtools\
 svx\
@@ -174,7 +176,6 @@ icc\
 icu\
 idlc\
 instsetoo_native\
-io\
 jfreereport\
 jpeg\
 l10ntools\
@@ -227,7 +228,6 @@ solenv\
 soltools\
 stax\
 stlport\
-stoc\
 store\
 sysui\
 testtools\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - editeng/source vcl/source vcl/unx

[David Tardon]

 editeng/source/editeng/impedit5.cxx |2 +-
 vcl/source/gdi/print3.cxx   |   21 +
 vcl/unx/gtk/gdi/salprn-gtk.cxx  |2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit 39fb17daf029ac51480a7f49b764b238eb3c7e19
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 29 08:05:28 2012 +0200

ParaPortionList no longer a child class of DummyParaPortionList

diff --git a/editeng/source/editeng/impedit5.cxx 
b/editeng/source/editeng/impedit5.cxx
index 1310064..bdaefbc 100644
--- a/editeng/source/editeng/impedit5.cxx
+++ b/editeng/source/editeng/impedit5.cxx
@@ -536,7 +536,7 @@ void ImpEditEngine::SetAttribs( EditSelection aSel, const 
SfxItemSet rSet, sal_
 ParaPortion* pPortion = GetParaPortions()[nNode];
 
 DBG_ASSERT( aEditDoc.SaveGetObject( nNode ), Node not founden: 
SetAttribs );
-DBG_ASSERT( GetParaPortions().GetObject( nNode ), Portion not found: 
SetAttribs );
+DBG_ASSERT( GetParaPortions()[ nNode ], Portion not found: 
SetAttribs );
 
 xub_StrLen nStartPos = 0;
 xub_StrLen nEndPos = pNode-Len();
commit fa87093686614d75d63664722de103e47f91c7db
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 28 13:25:25 2012 +0200

bypass GtkSalPrinter when it is not enabled

diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index ffa584c..4ea5f7b 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -239,7 +239,7 @@ GtkSalPrinter::StartJob(
 vcl::PrinterController io_rController)
 {
 if (!lcl_useSystemPrintDialog())
-return impl_doJob(i_pFileName, i_rJobName, i_rAppName, io_pSetupData, 
1, false, io_rController);
+return PspSalPrinter::StartJob(i_pFileName, i_rJobName, i_rAppName, 
io_pSetupData, io_rController);
 
 assert(!m_pImpl);
 
commit 38f8241859cdef4dd7c3098e365947dd5b64f78c
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 28 14:03:46 2012 +0200

set correct paper tray in UI

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 4824203..260fdc0 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -172,9 +172,25 @@ public:
 // set by user through printer config dialog
 // if set, pages are centered and trimmed onto the fixed page
 Size
maFixedPageSize;
+// set by user through printer config dialog
 sal_Int32   
mnDefaultPaperBin;
+// Set by user through printer preferences in print dialog.
+// Overrides application-set tray for a page.
 sal_Int32   
mnFixedPaperBin;
 
+// N.B. Apparently we have three levels of paper tray settings
+// (latter overrides former):
+// 1. default tray
+// 2. tray set for a concrete page by an application, e.g., writer
+//allows setting a printer tray (for the default printer) for a
+//page style. This setting can be overriden by user by selecting
+//Use only paper tray from printer preferences on the Options
+//page in the print dialog, in which case the default tray is
+//used for all pages.
+// 3. tray set in printer properties the printer dialog
+// I'm not quite sure why 1. and 3. are distinct, but the commit
+// history suggests this is intentional...
+
 ImplPrinterControllerData() :
 mbFirstPage( sal_True ),
 mbLastPage( sal_False ),
@@ -818,6 +834,11 @@ PrinterController::PageSize 
vcl::ImplPrinterControllerData::modifyJobSetup( cons
 mpPrinter-SetPaperSizeUser( aRealPaperSize, ! isFixedPageSize() );
 }
 
+// paper bin set from properties in print dialog overrides
+// application default for a page
+if ( mnFixedPaperBin != -1 )
+nPaperBin = mnFixedPaperBin;
+
 if( nPaperBin != -1  nPaperBin != mpPrinter-GetPaperBin() )
 mpPrinter-SetPaperBin( nPaperBin );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_conversions' - 8 commits - connectivity/AllLangResTarget_hsqldb.mk connectivity/Library_dbase.mk connectivity/Library_dbtools.mk connectivity/Library_ev

[David Tardon]

 Repository.mk  |1 
 RepositoryExternal.mk  |   28 -
 connectivity/AllLangResTarget_hsqldb.mk|   47 +
 connectivity/Library_dbase.mk  |1 
 connectivity/Library_dbtools.mk|8 +
 connectivity/Library_evoab2.mk |9 +
 connectivity/Library_file.mk   |1 
 connectivity/Library_flat.mk   |1 
 connectivity/Library_hsqldb.mk |   80 +++
 connectivity/Library_jdbc.mk   |1 
 connectivity/Makefile  |2 
 connectivity/Module_connectivity.mk|2 
 connectivity/source/drivers/hsqldb/makefile.mk |  126 -
 13 files changed, 175 insertions(+), 132 deletions(-)

New commits:
commit 67b4a880e85476a5420e4278918c23da96375970
Author: David Tardon dtar...@redhat.com
Date:   Tue Mar 27 16:36:31 2012 +0200

connectivity: convert hsqldb

diff --git a/Repository.mk b/Repository.mk
index 49e04dc..4017476 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -163,6 +163,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 fwm \
guesslang \
 helplinker \
+hsqldb \
 hwp \
hyphen \
 i18npaper \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 324d206..42c7ba7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -922,6 +922,26 @@ $(call gb_LinkTarget_set_include,$(1),\
 )
 endef
 
+
+ifdef ($(SYSTEM_HSQLDB),YES)
+
+define gb_LinkTarget__use_hsqldb
+
+$(call gb_LinkTarget_add_defs,$(1),\
+   -DSYSTEM_HSQLDB \
+   -DHSQLDB_JAR=\file://$(HSQLDB_JAR)\ \
+)
+
+endef
+
+else # !SYSTEM_HSQLDB
+
+define gb_LinkTarget__use_hsqldb
+
+endef
+
+endif # SYSTEM_HSQLDB
+
 # MacOSX-only frameworks 
 # (in alphabetical order)
 
diff --git a/connectivity/AllLangResTarget_hsqldb.mk 
b/connectivity/AllLangResTarget_hsqldb.mk
new file mode 100644
index 000..923833d
--- /dev/null
+++ b/connectivity/AllLangResTarget_hsqldb.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,hsqldb))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,hsqldb,database))
+
+$(eval $(call gb_AllLangResTarget_add_srs,hsqldb,\
+   database \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,hsqldb/res))
+
+$(eval $(call gb_SrsTarget_set_include,hsqldb/res,\
+   -I$(SRCDIR)/connectivity/source/drivers/hsqldb \
+   $$(INCLUDE) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,hsqldb/res,\
+   connectivity/source/drivers/hsqldb/hsqlui.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk
new file mode 100644
index 000..fda6612
--- /dev/null
+++ b/connectivity/Library_hsqldb.mk
@@ -0,0 +1,80 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later

[Libreoffice-commits] .: bootstrap

[David Tardon]

 bootstrap |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 547249832d5cde98c2973fd5eb31bd30cddb63b9
Author: David Tardon dtar...@redhat.com
Date:   Fri Mar 23 08:45:49 2012 +0100

allow leading space

diff --git a/bootstrap b/bootstrap
index 3d1bc88..073f69a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,12 +2,12 @@
 
 if test -z ${SRC_ROOT}; then
 if test -f ./config_build.mk ; then
-sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_build.mk 
config_build.mk.sh
+sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_build.mk 
config_build.mk.sh
 . ./config_build.mk.sh
 rm config_build.mk.sh
 else
 if test -f ./config_host.mk ; then
-sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_host.mk 
config_host.mk.sh
+sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' 
config_host.mk config_host.mk.sh
 . ./config_host.mk.sh
 rm config_host.mk.sh
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

[David Tardon]

 ucb/source/ucp/gio/gio_provider.cxx   |6 ++
 ucb/source/ucp/odma/odma_provider.cxx |5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit f7d571d2eefea079be3d89f3253ed90cbd9fa07f
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 21 07:37:51 2012 +0100

this requires string literals now

diff --git a/ucb/source/ucp/gio/gio_provider.cxx 
b/ucb/source/ucp/gio/gio_provider.cxx
index 62e8d98..14bdbd0 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -94,10 +94,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
   com::sun::star::ucb::XContentProvider );
 
 XSERVICEINFO_IMPL_1( ContentProvider,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-   com.sun.star.comp.GIOContentProvider )),
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-   com.sun.star.ucb.GIOContentProvider )) );
+   com.sun.star.comp.GIOContentProvider,
+   com.sun.star.ucb.GIOContentProvider );
 
 ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
 
diff --git a/ucb/source/ucp/odma/odma_provider.cxx 
b/ucb/source/ucp/odma/odma_provider.cxx
index da09d11..702851f 100644
--- a/ucb/source/ucp/odma/odma_provider.cxx
+++ b/ucb/source/ucp/odma/odma_provider.cxx
@@ -149,9 +149,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
 // @@@ Adjust implementation name. Keep the prefix com.sun.star.comp.!
 // @@@ Adjust service name.
 XSERVICEINFO_IMPL_1( ContentProvider,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-com.sun.star.comp.odma.ContentProvider )),
- 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODMA_CONTENT_PROVIDER_SERVICE_NAME) ) 
);
+com.sun.star.comp.odma.ContentProvider,
+ ODMA_CONTENT_PROVIDER_SERVICE_NAME );
 
 //=
 //
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in external/mingw-dlls scp2/source

[David Tardon]

 config_host.mk.in   |2 ++
 configure.in|4 
 external/mingw-dlls/makefile.mk |2 ++
 scp2/source/ooo/makefile.mk |   12 
 scp2/source/ooo/mingw_dlls.scp  |9 +
 5 files changed, 29 insertions(+)

New commits:
commit 28eaee81ac06866435351d87846868732d5afeb6
Author: David Tardon dtar...@redhat.com
Date:   Mon Mar 19 09:19:26 2012 +0100

mingw: check for jpeg dll

diff --git a/config_host.mk.in b/config_host.mk.in
index 002ff8e..828fd82 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -298,6 +298,7 @@ export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@
 export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@
 export MINGW_IDN_DLL=@MINGW_IDN_DLL@
 export MINGW_INTL_DLL=@MINGW_INTL_DLL@
+export MINGW_JPEG_DLL=@MINGW_JPEG_DLL@
 export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@
 export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@
 export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@
diff --git a/configure.in b/configure.in
index 68a0e3b..055e061 100644
--- a/configure.in
+++ b/configure.in
@@ -5765,12 +5765,14 @@ if test $with_system_jpeg = yes; then
 [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
 AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
 [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
+libo_MINGW_CHECK_DLL([JPEG], [libjpeg])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_JPEG=NO
 BUILD_TYPE=$BUILD_TYPE JPEG
 fi
 AC_SUBST(SYSTEM_JPEG)
+AC_SUBST([MINGW_JPEG_DLL])
 
 dnl ===
 dnl Check for system clucene
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index bc64b27..50aa73b 100644
--- a/external/mingw-dlls/makefile.mk
+++ b/external/mingw-dlls/makefile.mk
@@ -61,6 +61,7 @@ MINGW_DLLS:= \
 $(MINGW_ICUUC_DLL) \
 $(MINGW_IDN_DLL) \
 $(MINGW_INTL_DLL) \
+$(MINGW_JPEG_DLL) \
 $(MINGW_LCMS2_DLL) \
 $(MINGW_LIBXML_DLL) \
 $(MINGW_LIBXSLT_DLL) \
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 3d8c068..501ee3e 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -172,6 +172,10 @@ SCPDEFS+=-DSYSTEM_HUNSPELL
 SCPDEFS+=-DSYSTEM_HYPH
 .ENDIF
 
+.IF $(SYSTEM_JPEG) == YES
+SCPDEFS+=-DSYSTEM_JPEG
+.ENDIF
+
 .IF $(SYSTEM_MYTHES) == YES
 SCPDEFS+=-DSYSTEM_MYTHES
 .ENDIF
@@ -333,6 +337,10 @@ SCPDEFS += -DNEEDS_MINGW_IDN_DLL 
-DMINGW_IDN_DLL=\$(MINGW_IDN_DLL)\
 SCPDEFS += -DNEEDS_MINGW_INTL_DLL -DMINGW_INTL_DLL=\$(MINGW_INTL_DLL)\
 .ENDIF
 
+.IF $(MINGW_JPEG_DLL) != 
+SCPDEFS += -DNEEDS_MINGW_JPEG_DLL -DMINGW_JPEG_DLL=\$(MINGW_JPEG_DLL)\
+.ENDIF
+
 .IF $(MINGW_LCMS2_DLL) != 
 SCPDEFS += -DNEEDS_MINGW_LCMS2_DLL -DMINGW_LCMS2_DLL=\$(MINGW_LCMS2_DLL)\
 .ENDIF
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 4dff90c..8a3098f 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -121,6 +121,12 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Icudata, 
MINGW_ICUDATA_DLL )
 #endif
 #endif
 
+#ifdef SYSTEM_JPEG
+#ifdef NEEDS_MINGW_JPEG_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Jpeg, MINGW_JPEG_DLL )
+#endif
+#endif
+
 #ifdef SYSTEM_GRAPHITE
 #ifdef NEEDS_MINGW_GRAPHITE2_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, MINGW_GRAPHITE2_DLL )
commit 9339da8659d0807bb8306a670facacc55821aca0
Author: David Tardon dtar...@redhat.com
Date:   Mon Mar 19 09:10:06 2012 +0100

mingw: check for system iconv dll

libxslt in Fedora mingw packages depends on it.

diff --git a/config_host.mk.in b/config_host.mk.in
index 050417e..002ff8e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -292,6 +292,7 @@ export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@
 export MINGW_GXXDLL=@MINGW_GXXDLL@
 export MINGW_HUNSPELL_DLL=@MINGW_HUNSPELL_DLL@
 export MINGW_HYPHEN_DLL=@MINGW_HYPHEN_DLL@
+export MINGW_ICONV_DLL=@MINGW_ICONV_DLL@
 export MINGW_ICUDATA_DLL=@MINGW_ICUDATA_DLL@
 export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@
 export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@
diff --git a/configure.in b/configure.in
index 65200c8..68a0e3b 100644
--- a/configure.in
+++ b/configure.in
@@ -6034,6 +6034,7 @@ if test $with_system_libxml = yes; then
 fi
 
 libo_MINGW_CHECK_DLL([LIBXSLT], [libxslt])
+libo_MINGW_TRY_DLL([ICONV], [iconv])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBXSLT=NO
@@ -6056,6 +6057,7 @@ AC_SUBST(LIBXSLT_CFLAGS)
 AC_SUBST(LIBXSLT_LIBS)
 AC_SUBST(XSLTPROC)
 AC_SUBST([MINGW_LIBXSLT_DLL])
+AC_SUBST([MINGW_ICONV_DLL])
 
 # ===
 # Check for system libxml
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index d312c34..bc64b27 100644
--- a/external/mingw-dlls/makefile.mk
+++ b/external/mingw-dlls/makefile.mk
@@ -55,6 +55,7 @@ MINGW_DLLS:= \
 $(MINGW_GRAPHITE2_DLL) \
 $(MINGW_HUNSPELL_DLL) \
 $(MINGW_HYPHEN_DLL) \
+$(MINGW_ICONV_DLL) \
 $(MINGW_ICUDATA_DLL) \
 $(MINGW_ICUI18N_DLL

[Libreoffice-commits] .: sc/source

[David Tardon]

 sc/source/core/data/document.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32dc82b9d456ed92ba946611239349ab0e424e2a
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 15 09:43:26 2012 +0100

fdo#47311 don't crash when pasting into more than 1 sheet

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 2a5c751..60ba818 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2277,7 +2277,7 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW 
nRow1,
 while ( i + nFollow  nTabEnd
  rMark.GetTableSelect( i + nFollow + 1 )
  nClipTab + nFollow  MAXTAB
- rClipTabs[nClipTab + nFollow + 1] )
+ rClipTabs[(nClipTab + nFollow + 1) % 
static_castSCTAB(rClipTabs.size())] )
 ++nFollow;
 
 if ( pCBFCP-pClipDoc-GetClipParam().mbCutMode )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: fpicker/source

[David Tardon]

 fpicker/source/win32/filepicker/FPentry.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d5e83535a5ab32dc0730e6edab116855875bfa74
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 15 10:28:07 2012 +0100

error: 'XFolderPicker' was not declared in this scope

diff --git a/fpicker/source/win32/filepicker/FPentry.cxx 
b/fpicker/source/win32/filepicker/FPentry.cxx
index 0242171..3c1e0c0 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -59,6 +59,7 @@ using namespace ::com::sun::star::registry  ;
 using namespace ::cppu  ;
 using ::com::sun::star::ui::dialogs::XFilePicker;
 using ::com::sun::star::ui::dialogs::XFilePicker2;
+using ::com::sun::star::ui::dialogs::XFolderPicker;
 
 //
 //
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

[David Tardon]

 vcl/source/gdi/print3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 504aead0573befc744a00b8b1d68e3ebbaca8c47
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 15 14:15:09 2012 +0100

Revert fix setting of paper tray from print dialog (fdo#43932)

This reverts commit 6d4cca9c22c52b5a7742adc47ebf1a2930e29764.

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 817e6d5..4824203 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -773,7 +773,7 @@ PrinterController::PageSize 
vcl::ImplPrinterControllerData::modifyJobSetup( cons
 PrinterController::PageSize aPageSize;
 aPageSize.aSize = mpPrinter-GetPaperSize();
 awt::Size aSetSize, aIsSize;
-sal_Int32 nPaperBin = (mnFixedPaperBin != -1) ? mnFixedPaperBin : 
mnDefaultPaperBin;
+sal_Int32 nPaperBin = mnDefaultPaperBin;
 for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); 
nProperty  nPropertyCount; ++nProperty )
 {
 if( i_rProps[ nProperty ].Name.equalsAsciiL( 
RTL_CONSTASCII_STRINGPARAM( PreferredPageSize ) ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

[David Tardon]

 vcl/source/gdi/print3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6d4cca9c22c52b5a7742adc47ebf1a2930e29764
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 14 13:58:37 2012 +0100

fix setting of paper tray from print dialog (fdo#43932)

This fixes the simple case when all pages are to be printed from the
same paper tray. The use of this setting is still confusing when there
is application-set tray for a page (e.g., for a page style in Writer,
through Format-Page), because the change in Preferences is applied (and
will be used for pages without application-set tray), but Preferences
shows the application-set value on second try again...

IOW, it still s---s, but it s---s a bit less .-)

diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 4824203..817e6d5 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -773,7 +773,7 @@ PrinterController::PageSize 
vcl::ImplPrinterControllerData::modifyJobSetup( cons
 PrinterController::PageSize aPageSize;
 aPageSize.aSize = mpPrinter-GetPaperSize();
 awt::Size aSetSize, aIsSize;
-sal_Int32 nPaperBin = mnDefaultPaperBin;
+sal_Int32 nPaperBin = (mnFixedPaperBin != -1) ? mnFixedPaperBin : 
mnDefaultPaperBin;
 for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); 
nProperty  nPropertyCount; ++nProperty )
 {
 if( i_rProps[ nProperty ].Name.equalsAsciiL( 
RTL_CONSTASCII_STRINGPARAM( PreferredPageSize ) ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile

[David Tardon]

 Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c9408fde23f5091795a645b621dbdcaf6d71c72
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 14 05:58:16 2012 +0100

fix typo

diff --git a/Makefile b/Makefile
index 3b55e87..79ccd2e 100644
--- a/Makefile
+++ b/Makefile
@@ -322,7 +322,7 @@ endif
 bin/repo-list config.log config.status configure \
ooo.lst post_download post_download.log \
config_host.mk.last set_soenv.stamp src.downloaded warn
-   find $(SOLARENV)/gdb -name *.pyc -exec rm [} \;
+   find $(SOLARENV)/gdb -name *.pyc -exec rm {} \;
 
 #
 # custom command
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_components' - io/inc io/InternalUnoApi_acceptor.mk io/InternalUnoApi_connectr.mk io/InternalUnoApi_stm.mk io/Library_acceptor.mk io/Library_connector.mk

[David Tardon]

 Repository.mk  |5 +
 io/InternalUnoApi_acceptor.mk  |   32 
 io/InternalUnoApi_connectr.mk  |   32 
 io/InternalUnoApi_stm.mk   |   32 
 io/Library_acceptor.mk |   48 +++
 io/Library_connector.mk|   48 +++
 io/Library_streams.mk  |   51 
 io/Library_textinstream.mk |   46 ++
 io/Library_textoutstream.mk|   46 ++
 io/Makefile|   40 +++
 io/Module_io.mk|   42 
 io/Package_xml.mk  |   34 +
 io/inc/makefile.mk |   40 ---
 io/prj/build.lst   |7 --
 io/prj/d.lst   |   12 
 io/prj/makefile.mk |1 
 io/source/TextInputStream/makefile.mk  |   69 ---
 io/source/TextOutputStream/makefile.mk |   70 ---
 io/source/acceptor/makefile.mk |   80 ---
 io/source/connector/makefile.mk|   80 ---
 io/source/stm/makefile.mk  |   83 -
 ure/Rdb_ure.mk |   10 +--
 22 files changed, 463 insertions(+), 445 deletions(-)

New commits:
commit 59162c85c269e247dc0c07fabb8b67d361d6392c
Author: David Tardon dtar...@redhat.com
Date:   Mon Mar 12 19:51:20 2012 +0100

gbuildize io

diff --git a/Repository.mk b/Repository.mk
index 3167d77..4aa91bb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -475,7 +475,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
 endif
 
 $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
+acceptor \
 binaryurp \
+connector \
 introspection \
 invocadapt \
 invocation \
@@ -483,6 +485,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
 javavm \
 namingservice \
 proxyfac \
+streams \
+textinstream \
+textoutstream \
 ))
 
 $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
diff --git a/io/InternalUnoApi_acceptor.mk b/io/InternalUnoApi_acceptor.mk
new file mode 100644
index 000..ddd31d2
--- /dev/null
+++ b/io/InternalUnoApi_acceptor.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,acceptor))
+
+$(eval $(call 
gb_InternalUnoApi_set_xmlfile,acceptor,io/source/acceptor/acceptor.xml))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/io/InternalUnoApi_connectr.mk b/io/InternalUnoApi_connectr.mk
new file mode 100644
index 000..4896069
--- /dev/null
+++ b/io/InternalUnoApi_connectr.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version

[Libreoffice-commits] .: fpicker/source

[David Tardon]

 fpicker/source/unx/kde4/KDE4FilePicker.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit ee67c55260ec7723c39606955ccdbd3e2934935a
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 8 14:15:09 2012 +0100

yet another clash with macro name

diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx 
b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 269deee..8e8b3e8 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -60,6 +60,8 @@
 #undef SETTINGS_MOUSE
 #define LO_SETTINGS_LOCALE SETTINGS_LOCALE
 #undef SETTINGS_LOCALE
+#define LO_SETTINGS_STYLE SETTINGS_STYLE
+#undef SETTINGS_STYLE
 
 #include kfiledialog.h
 #include kwindowsystem.h
@@ -77,6 +79,8 @@
 #undef LO_SETTINGS_MOUSE
 #define SETTINGS_LOCALE LO_SETTINGS_LOCALE
 #undef LO_SETTINGS_LOCALE
+#define SETTINGS_STYLE LO_SETTINGS_STYLE
+#undef LO_SETTINGS_STYLE
 
 using namespace ::com::sun::star;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[David Tardon]

 solenv/gbuild/Extension.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 74a6d7a135ca03c23eff8b360a748a8f964c92a3
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 8 15:39:26 2012 +0100

fix mis-merge

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 49186c1..9fcaa33 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -183,7 +183,7 @@ endef
 
 define gb_Extension_localize_help_onelang
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_rootdir,$(1))/$(2)
-$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst 
$(SRCDIR),,$(dir $(3)))localize.sdf
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sdext/Extension_presenter.mk solenv/gbuild

[David Tardon]

 sdext/Extension_presenter.mk |4 +---
 solenv/gbuild/Extension.mk   |2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit ac488d581a06fadb8866f6612595fe93b120c8fb
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 8 19:01:24 2012 +0100

quick hack to fix building sdext with l10n

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 9fcaa33..3bfc6b5 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -183,7 +183,7 @@ endef
 
 define gb_Extension_localize_help_onelang
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_rootdir,$(1))/$(2)
-$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst 
$(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := $(gb_SDFLOCATION)$(subst 
$(SRCDIR),,$(subst $(WORKDIR)/CustomTarget,,$(dir $(3localize.sdf
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(gb_Extension_HELPEXTARGET)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
commit de9f94dc8f3be28f11881e036ce0680988fb1666
Author: David Tardon dtar...@redhat.com
Date:   Thu Mar 8 19:00:43 2012 +0100

beware of excessive white spaces

diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index 0b228a2..3fa9806 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -147,9 +147,7 @@ $(eval $(call 
gb_Extension_add_files,presenter-screen,help/en-US/com.sun.Present
 
$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
 \
 ))
 
-$(eval $(call gb_Extension_localize_help,presenter-screen,\
-help/lang/com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,\
-
$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp))
+$(eval $(call 
gb_Extension_localize_help,presenter-screen,help/lang/com.sun.PresenterScreen-$(sdext_PLATFORM)/presenter.xhp,$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp))
 
 # this file is created by a custom target, but we depend on it: ensure
 # make knows about it
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 26 commits - sal/osl sal/qa

[David Tardon]

 sal/osl/w32/dllentry.c|2 +-
 sal/osl/w32/file.cxx  |2 +-
 sal/osl/w32/file_dirvol.cxx   |2 +-
 sal/osl/w32/file_url.cxx  |4 ++--
 sal/osl/w32/interlck.c|4 
 sal/osl/w32/process.cxx   |2 +-
 sal/osl/w32/procimpl.cxx  |6 +++---
 sal/osl/w32/profile.cxx   |   24 
 sal/osl/w32/salinit.cxx   |4 ++--
 sal/osl/w32/security.c|4 ++--
 sal/osl/w32/signal.cxx|5 +
 sal/osl/w32/socket.cxx|   15 ---
 sal/osl/w32/sockimpl.h|7 ---
 sal/qa/OStringBuffer/rtl_String_Utils.cxx |   20 +---
 sal/qa/osl/process/osl_Thread.cxx |2 ++
 sal/qa/osl/security/osl_Security.cxx  |4 ++--
 16 files changed, 43 insertions(+), 64 deletions(-)

New commits:
commit e319053190ccf9ceb5ce49659a88c7ea56079997
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 7 13:53:55 2012 +0100

probable intent

diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index 9da4a97..d2e0ef7 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -679,7 +679,7 @@ void SAL_CALL osl_unloadUserProfile(oslSecurity Security)
 }
 }
 
-((oslSecurityImpl*)Security)-m_hProfile;
+((oslSecurityImpl*)Security)-m_hProfile = NULL;
 
 if (hAccessToken  (hAccessToken != 
((oslSecurityImpl*)Security)-m_hToken))
 {
commit bed1173cfe0de2ca13bacbcbca610cecca8f3829
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 7 13:51:46 2012 +0100

WaE: missing braces around initializer

diff --git a/sal/osl/w32/security.c b/sal/osl/w32/security.c
index 29f35a1..9da4a97 100644
--- a/sal/osl/w32/security.c
+++ b/sal/osl/w32/security.c
@@ -245,7 +245,7 @@ sal_Bool SAL_CALL osl_isAdministrator(oslSecurity Security)
 {
 HANDLE  hImpersonationToken = NULL;
 PSIDpsidAdministrators;
-SID_IDENTIFIER_AUTHORITYsiaNtAuthority = SECURITY_NT_AUTHORITY;
+SID_IDENTIFIER_AUTHORITYsiaNtAuthority = { SECURITY_NT_AUTHORITY };
 sal_BoolbSuccess = sal_False;
 
 
commit 7daafe70db4188b2eb83e05792ff934fa574a927
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 7 13:47:16 2012 +0100

suppress compiler error when building with -Werror

Return value of the function is set by the inline assembler code.

diff --git a/sal/osl/w32/interlck.c b/sal/osl/w32/interlck.c
index 5c9e566..4737edc 100644
--- a/sal/osl/w32/interlck.c
+++ b/sal/osl/w32/interlck.c
@@ -42,6 +42,10 @@ extern int osl_isSingleCPU;
on every x86-Windows-Platform the inline assembler implementation.
 */
 
+#if defined __MINGW32__
+#pragma GCC diagnostic warning -Wreturn-type
+#endif
+
 /*/
 /* osl_incrementInterlockedCount */
 /*/
commit 48b419ceb68c9bcf821e906a601f9b0c5e943200
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 7 13:34:05 2012 +0100

WaE: comparison between signed and unsigned integer expressions

diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index 0267216..cc39c99 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -120,7 +120,7 @@ __do_global_ctors (void)
* is terminated with a null entry. Otherwise the first entry was
* the number of pointers in the list.
*/
-  if (nptrs == -1)
+  if (nptrs == (unsigned long)-1)
 {
   for (nptrs = 0; __CTOR_LIST__[nptrs + 1] != 0; nptrs++)
 ;
commit c06ec2fdc21d4794535fb4d2358f65575ee9f2b7
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 7 13:32:46 2012 +0100

WaE: comparison between signed and unsigned integer expressions

diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx
index fa6c34f..4f150d0 100644
--- a/sal/osl/w32/socket.cxx
+++ b/sal/osl/w32/socket.cxx
@@ -649,7 +649,7 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr (
 rtl_uString *strDottedAddr,
 sal_Int32Port)
 {
-DWORD Addr;
+sal_uInt32 Addr;
 rtl_String  *pDottedAddr=NULL;
 
 rtl_uString2String(
@@ -660,7 +660,7 @@ oslSocketAddr SAL_CALL osl_createInetSocketAddr (
 rtl_string_release (pDottedAddr);
 
 oslSocketAddr pAddr = 0;
-if(Addr != -1)
+if(Addr != OSL_INADDR_NONE)
 {
 pAddr = __osl_createSocketAddrWithFamily( osl_Socket_FamilyInet, 
htons( (sal_uInt16)Port), Addr );
 }
@@ -1412,7 +1412,7 @@ oslSocket SAL_CALL osl_acceptConnectionOnSocket (
 Connection= accept(pSocket-m_Socket, Addr, AddrLen);
 OSL_ASSERT(AddrLen == sizeof(struct sockaddr));
 
-if(Connection != OSL_SOCKET_ERROR)
+if(Connection != static_castSOCKET(OSL_SOCKET_ERROR

[Libreoffice-commits] .: 2 commits - configure.in openssl/makefile.mk

[David Tardon]

 configure.in|1 +
 openssl/makefile.mk |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5eb87c7b6a3e8c6e1057c71cd623b005b6745467
Author: David Tardon dtar...@redhat.com
Date:   Tue Mar 6 09:16:03 2012 +0100

fix case

diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 666a202..68fb409 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -138,7 +138,7 @@ UNAME=$(shell uname)
 
 .IF $(COM)==GCC
 PATCH_FILES=opensslmingw.patch
-CONFIGURE_ACTION=$(PERL) configure
+CONFIGURE_ACTION=$(PERL) Configure
 CONFIGURE_FLAGS=mingw shared 
 INSTALL_ACTION=mv libcrypto.a libcrypto_static.a  mv libcrypto.dll.a 
libcrypto.a  mv libssl.a libssl_static.a  mv libssl.dll.a libssl.a
 OUT2LIB = libcrypto_static.*
commit 27eb7b93dc0f3db356d1836e66e03ee9fac716bf
Author: David Tardon dtar...@redhat.com
Date:   Tue Mar 6 09:01:49 2012 +0100

mingw: pass --disable-ccache to build's configure

diff --git a/configure.in b/configure.in
index 49ce97f..f6a2367 100644
--- a/configure.in
+++ b/configure.in
@@ -3249,6 +3249,7 @@ if test $cross_compiling = yes; then
 test -n $PKG_CONFIG_FOR_BUILD  export 
PKG_CONFIG=$PKG_CONFIG_FOR_BUILD
 cd CONF-FOR-BUILD
 sub_conf_opts=
+test -n $enable_ccache  sub_conf_opts=$sub_conf_opts 
--enable-ccache=$enable_ccache
 test -n $with_ant_home  sub_conf_opts=$sub_conf_opts 
--with-ant-home=$with_ant_home
 test $with_java = no  sub_conf_opts=$sub_conf_opts --without-java
 test $with_junit = no  sub_conf_opts=$sub_conf_opts --without-junit
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sdext/Extension_presenter.mk

[David Tardon]

 sdext/Extension_presenter.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b061efc4b3f3b3204adddf54f48bb1bcf6b66a31
Author: David Tardon dtar...@redhat.com
Date:   Tue Mar 6 11:34:53 2012 +0100

ensure proper ordering, too

diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
index c9e725b..0b228a2 100644
--- a/sdext/Extension_presenter.mk
+++ b/sdext/Extension_presenter.mk
@@ -153,6 +153,6 @@ $(eval $(call gb_Extension_localize_help,presenter-screen,\
 
 # this file is created by a custom target, but we depend on it: ensure
 # make knows about it
-$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
 :| $(gb_Helper_DUMMY)
+$(WORKDIR)/CustomTarget/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
 :| $(call gb_Package_get_target,sdext_presenter_help)
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

[David Tardon]

 solenv/inc/libs.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 021f685f1683ebab157a899def6316be206632eb
Author: David Tardon dtar...@redhat.com
Date:   Tue Mar 6 13:12:25 2012 +0100

mingw: synchronize berkeleydb lib name with gbuild

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 6f0e4fd..0e164f4 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -215,6 +215,8 @@ NEON3RDLIB=-lneon
 .ENDIF
 .IF $(SYSTEM_DB) == YES
 BERKELEYLIB=-l$(DB_LIB)
+.ELIF $(GUI)$(COM)==WNTGCC
+BERKELEYLIB=-ldb47
 .ELSE
 BERKELEYLIB=-ldb-4.7
 .ENDIF
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - framework/inc framework/source

[David Tardon]

 framework/inc/services/desktop.hxx|4 +++
 framework/source/services/desktop.cxx |   30 ++
 framework/source/services/sessionlistener.cxx |   15 -
 3 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit 1baa3d0720b2ef9d12104a22ce03ed32b1e4b921
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Feb 28 14:29:06 2012 +0100

lp#562027: fix logout with quickstarter

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/framework/inc/services/desktop.hxx 
b/framework/inc/services/desktop.hxx
index 8dcc872..324a056 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -339,6 +339,10 @@ class Desktop   :   // interfaces
 virtual ::rtl::OUString SAL_CALL getUntitledPrefix()
 throw (css::uno::RuntimeException);
 
+// we need this wrapped terminate()-call to terminate even the 
QuickStarter
+// non-virtual and non-UNO for now
+bool SAL_CALL terminateQuickstarterToo()
+throw( css::uno::RuntimeException );
 
//-
 //  protected methods
 
//-
diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 5cdf44d..e3569ee 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -427,6 +427,36 @@ sal_Bool SAL_CALL Desktop::terminate()
 return bTerminate;
 }
 
+namespace
+{
+class QuickstartSuppressor
+{
+Desktop* const m_pDesktop;
+css::uno::Reference css::frame::XTerminateListener  m_xQuickLauncher;
+public:
+QuickstartSuppressor(Desktop* const pDesktop, css::uno::Reference 
css::frame::XTerminateListener  xQuickLauncher)
+: m_pDesktop(pDesktop)
+, m_xQuickLauncher(xQuickLauncher)
+{
+SAL_INFO(fwk.desktop, temporary removing Quickstarter);
+if(m_xQuickLauncher.is())
+m_pDesktop-removeTerminateListener(m_xQuickLauncher);
+}
+~QuickstartSuppressor()
+{
+SAL_INFO(fwk.desktop, readding Quickstarter);
+if(m_xQuickLauncher.is())
+m_pDesktop-addTerminateListener(m_xQuickLauncher);
+}
+};
+}
+
+bool SAL_CALL Desktop::terminateQuickstarterToo()
+throw( css::uno::RuntimeException )
+{
+QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
+return terminate();
+}
 
 //=
 void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference 
css::frame::XTerminateListener  xListener )
diff --git a/framework/source/services/sessionlistener.cxx 
b/framework/source/services/sessionlistener.cxx
index 6dc4877..c150aa5 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -30,6 +30,7 @@
 // my own includes
 
 #include services/sessionlistener.hxx
+#include services/desktop.hxx
 #include threadhelp/readguard.hxx
 #include threadhelp/resetableguard.hxx
 #include protocols.h
@@ -318,7 +319,19 @@ void SAL_CALL SessionListener::approveInteraction( 
sal_Bool bInteractionGranted
 StoreSession( sal_False );
 
 css::uno::Reference css::frame::XDesktop  xDesktop( 
m_xSMGR-createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW);
-m_bTerminated = xDesktop-terminate();
+// honestly: how many implementations of XDesktop will we ever 
have?
+// so casting this directly to the implementation
+Desktop* pDesktop(dynamic_castDesktop*(xDesktop.get()));
+if(pDesktop)
+{
+SAL_INFO(fwk.session, XDesktop is a framework::Desktop -- 
good.);
+m_bTerminated = pDesktop-terminateQuickstarterToo();
+}
+else
+{
+SAL_WARN(fwk.session, XDesktop is not a framework::Desktop 
-- this should never happen.);
+m_bTerminated = xDesktop-terminate();
+}
 
 if ( m_rSessionManager.is() )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: lpsolve/lp_solve_5.5.patch

[David Tardon]

 lpsolve/lp_solve_5.5.patch |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit d0b7ad3a446a17671b4cb7d3dd6a0106b0c46a91
Author: David Tardon dtar...@redhat.com
Date:   Mon Mar 5 08:38:51 2012 +0100

mingw: override gcc's definition of INLINE

gcc defines INLINE to __inline, which leads to 'multiple definition of ...'
error on use of liblpsolve.dll.a (e.g., in sccomp).

Also use host ar and ranlib.

diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index 590da2e..43c9e07 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -1,9 +1,11 @@
 --- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005
 +++ misc/build/lp_solve_5.5/lpsolve55/ccc  Sun May 22 11:20:19 2011
-@@ -1,25 +1,40 @@
+@@ -1,25 +1,42 @@
  src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c 
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c 
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c 
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c 
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c 
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
 -c=cc
++ar=$AR
 +c=$CC
++ranlib=$RANLIB
  
  def=
  so=
@@ -36,11 +38,12 @@
 +
  opts='-O3'
  
- $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
++$c -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
 -ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
 -ranlib liblpsolve55.a
-+ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
-+ranlib liblpsolve55.$a
++$ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++$ranlib liblpsolve55.$a
  
  if [ $so !=  ]
  then
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk extensions/Module_extensions.mk extensions/Package_so_activex_idl.mk extensions/Package_so_ac

[David Tardon]

 extensions/Library_so_activex.mk|   17 ++-
 extensions/Library_so_activex_x64.mk|   12 +++-
 extensions/Module_extensions.mk |2 +
 extensions/Package_so_activex_idl.mk|   36 
 extensions/Package_so_activex_x64.mk|   41 +++
 extensions/WinResTarget_activex.mk  |8 +++--
 extensions/source/activex/Makefile  |   41 +++
 extensions/source/activex/idl/Makefile  |   48 
 extensions/source/activex/so_activex.rc |2 -
 9 files changed, 183 insertions(+), 24 deletions(-)

New commits:
commit 09888c688ebfdd43a5cb1e44b6c9776eedcf5c3c
Author: David Tardon dtar...@redhat.com
Date:   Sun Mar 4 09:57:54 2012 +0100

fix building of so_activex (fdo#46847)

diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index 292b7e1..235bcbe 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -30,22 +30,13 @@
 
 $(eval $(call gb_Library_Library,so_activex))
 
-$(SRCDIR)/extensions/source/activex/so_activex.cxx: 
$(WORKDIR)/CustomTarget/so_activex/so_activex.tlb
-
-$(WORKDIR)/CustomTarget/so_activex/so_activex.tlb: 
$(SRCDIR)/extensions/source/activex/so_activex.idl
-   mkdir -p $(WORKDIR)/CustomTarget/so_activex
-   midl.exe -out $(call 
gb_Helper_convert_native,$(WORKDIR)/CustomTarget/so_activex) -Oicf $(call 
gb_Helper_convert_native,$) \
-   $(foreach i,$(SOLARINC_FOR_BUILD), $(patsubst -I,/I,$(i)))
-
-$(call gb_Library_get_clean_target,so_activex) : extensions_activex_idlclean
-
-.PHONY: extensions_activex_idlclean
-extensions_activex_idlclean:
-   rm -rf $(WORKDIR)/CustomTarget/so_activex
+$(eval $(call gb_Library_add_package_headers,so_activex,\
+extensions_so_activex_idl \
+))
 
 $(eval $(call gb_Library_set_include,so_activex,\
$$(INCLUDE) \
-   -I$(WORKDIR)/CustomTarget/so_activex \
+   -I$(WORKDIR)/CustomTarget/extensions/source/activex/idl \
$(foreach i,$(ATL_INCLUDE), -I$(i)) \
 ))
 
diff --git a/extensions/Library_so_activex_x64.mk 
b/extensions/Library_so_activex_x64.mk
index 6283900..af70b66 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -32,16 +32,15 @@ $(eval $(call gb_Library_Library,so_activex_x64))
 
 $(eval $(call gb_Library_set_x64,so_activex_x64,YES))
 
-$(SRCDIR)/extensions/source/activex/so_activex.cxx: 
$(WORKDIR)/CustomTarget/so_activex/so_activex.tlb
-
 $(eval $(call gb_Library_add_package_headers,so_activex_x64,\
+extensions_so_activex_idl \
 extensions_so_activex_x64_sources \
 ))
 
 $(eval $(call gb_Library_set_include,so_activex_x64,\
$$(INCLUDE) \
-I$(SRCDIR)/extensions/source/activex \
-   -I$(WORKDIR)/CustomTarget/so_activex \
+   -I$(WORKDIR)/CustomTarget/extensions/source/activex/idl \
$(foreach i,$(ATL_INCLUDE), -I$(i)) \
 ))
 
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 1be04f9..4e1b027 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -71,6 +71,7 @@ ifneq ($(DISABLE_ACTIVEX),TRUE)
 $(eval $(call gb_Module_add_targets,extensions,\
WinResTarget_activex \
Library_so_activex \
+   Package_so_activex_idl \
 ))
 
 ifeq ($(BUILD_X64),TRUE)
diff --git a/extensions/Package_so_activex_idl.mk 
b/extensions/Package_so_activex_idl.mk
new file mode 100644
index 000..b49c482
--- /dev/null
+++ b/extensions/Package_so_activex_idl.mk
@@ -0,0 +1,36 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call 
gb_Package_Package,extensions_so_activex_idl,$(WORKDIR)/extensions/source/activex/idl))
+
+$(eval $(call 
gb_Package_add_customtarget,extensions_so_activex_idl,extensions/source/activex/idl))
+
+$(eval $(call gb_CustomTarget_add_dependencies,extensions

[Libreoffice-commits] .: 3 commits - berkeleydb/prj lpsolve/lp_solve_5.5.patch lpsolve/makefile.mk lpsolve/prj redland/raptor

[David Tardon]

 berkeleydb/prj/d.lst   |2 +-
 lpsolve/lp_solve_5.5.patch |9 +++--
 lpsolve/makefile.mk|2 +-
 lpsolve/prj/d.lst  |1 +
 redland/raptor/makefile.mk |8 
 5 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit f65ed052f124f51bd5aaf538752bfd121c6c483c
Author: David Tardon dtar...@redhat.com
Date:   Sun Mar 4 11:49:35 2012 +0100

mingw: change liblpsolve.a - .dll.a

diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch
index 88e8828..590da2e 100644
--- a/lpsolve/lp_solve_5.5.patch
+++ b/lpsolve/lp_solve_5.5.patch
@@ -1,6 +1,6 @@
 --- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005
 +++ misc/build/lp_solve_5.5/lpsolve55/ccc  Sun May 22 11:20:19 2011
-@@ -1,15 +1,28 @@
+@@ -1,25 +1,40 @@
  src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c 
../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c 
../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c 
../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c 
../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c 
../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c'
 -c=cc
 +c=$CC
@@ -19,9 +19,11 @@
 +inline=
 +if [ $GUI = WNT -a $COM = GCC ]; then
 + so=dll
++ a=dll.a
 + inline=-DINLINE=static
 +else
 + so=so
++ a=a
 + soprefix=lib
 + libs=-lm
 + pic=-fpic
@@ -35,7 +37,10 @@
  opts='-O3'
  
  $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL 
-I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE 
-DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
-@@ -18,8 +31,8 @@
+-ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+-ranlib liblpsolve55.a
++ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
++ranlib liblpsolve55.$a
  
  if [ $so !=  ]
  then
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index 7e47591..232faad 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -65,7 +65,7 @@ lpsolve_LIBS=$(MINGW_SHARED_LIBSTDCPP)
 BUILD_ACTION=lpsolve_LDFLAGS=$(lpsolve_LDFLAGS) lpsolve_LIBS=$(lpsolve_LIBS) 
cmd /c cgcc.bat
 .ELSE
 BUILD_ACTION=sh ccc
-OUT2LIB=$(BUILD_DIR)$/liblpsolve55.a
+OUT2LIB=$(BUILD_DIR)$/liblpsolve55.dll.a
 .ENDIF
 .ELSE
 BUILD_ACTION=cmd /c cvc6.bat
diff --git a/lpsolve/prj/d.lst b/lpsolve/prj/d.lst
index 68001dc..bf8d87c 100644
--- a/lpsolve/prj/d.lst
+++ b/lpsolve/prj/d.lst
@@ -5,6 +5,7 @@ mkdir: %_DEST%\inc\lpsolve
 ..\%__SRC%\lib\liblpsolve55.dylib %_DEST%\lib\liblpsolve55.dylib
 ..\%__SRC%\lib\liblpsolve55.lib %_DEST%\lib\liblpsolve55.lib
 ..\%__SRC%\lib\liblpsolve55.a %_DEST%\lib\liblpsolve55.a
+..\%__SRC%\lib\liblpsolve55.dll.a %_DEST%\lib\liblpsolve55.dll.a
 ..\%__SRC%\lib\lpsolve55.lib %_DEST%\lib\lpsolve55.lib
 ..\%__SRC%\bin\lpsolve55.dll %_DEST%\bin\lpsolve55.dll
 
commit cd5bcd60266f0b99ad015c193d567c992f7e65bd
Author: David Tardon dtar...@redhat.com
Date:   Fri Mar 2 10:51:48 2012 +0100

do not change the lib name

diff --git a/berkeleydb/prj/d.lst b/berkeleydb/prj/d.lst
index 1d50f61..1de53d4 100644
--- a/berkeleydb/prj/d.lst
+++ b/berkeleydb/prj/d.lst
@@ -6,7 +6,7 @@ mkdir: %_DEST%\inc\berkeleydb
 ..\%__SRC%\lib\libdb-4.7.a %_DEST%\lib\libdb-4.7.a
 ..\%__SRC%\lib\libdb-4.7.so %_DEST%\lib\libdb-4.7.so
 ..\%__SRC%\lib\libdb-4.7.dylib %_DEST%\lib\libdb-4.7.dylib
-..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb-4.7.a
+..\%__SRC%\lib\libdb47.dll.a %_DEST%\lib\libdb47.dll.a
 ..\%__SRC%\bin\libdb47.dll %_DEST%\bin\libdb47.dll
 
 
commit 5efc793653950ea8efcd9638a0669a62a9e662c8
Author: David Tardon dtar...@redhat.com
Date:   Fri Mar 2 10:47:46 2012 +0100

it seems this is not necessary after all

Maybe it depends on the day of the week or something like that...

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 9143f99..a2a3bd3 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -97,14 +97,6 @@ BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 
-# Hack to get librdf.dll linked on mingw. I am already wearied of
-# fighting libtool's pseudo-intelligence, so I am just going to go with
-# the flow here.
-ALL : $(OUT)/lib/libraptor.la
-
-$(OUT)/lib/libraptor.la : $(MISC)/build/so_built_so_raptor
-   $(SED) /^dlname/s@='@='../bin/@ 
$(MISC)/build/$(TARFILE_NAME)/src/libraptor.la  $@
-
 .ELSE
 
 # there is no wntmsci build environment in the tarball; we use custom dmakefile
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/source

[David Tardon]

 extensions/source/activex/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 08d65d27827d462fcf7f9768a22352f405a13955
Author: David Tardon dtar...@redhat.com
Date:   Mon Mar 5 07:36:45 2012 +0100

fix path

diff --git a/extensions/source/activex/Makefile 
b/extensions/source/activex/Makefile
index bf79e4c..65f82ea 100644
--- a/extensions/source/activex/Makefile
+++ b/extensions/source/activex/Makefile
@@ -25,7 +25,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-% : $(SRCDIR)/source/activex/%
+% : $(SRCDIR)/extensions/source/activex/%
cp $ $@
 
 .DEFAULT_GOAL := all
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Module_tail_build.mk postprocess/prj

[David Tardon]

 Module_tail_build.mk  |1 +
 postprocess/prj/build.lst |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 75a6e52bc8d3062859f626f7466f5af55841a7b7
Author: David Tardon dtar...@redhat.com
Date:   Fri Mar 2 08:15:50 2012 +0100

move embeddedobj to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index c761620..f03ef43 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 dtrans \
 drawinglayer \
 editeng \
+embeddedobj \
 eventattacher \
 extensions \
 fileaccess \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index deb1fb8..88f604b 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 
LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools 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 tail_build NULL
+po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk 
DESKTOP:scp2 testtools 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 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

[Libreoffice-commits] .: 3 commits - Module_tail_build.mk tail_build/prj

[David Tardon]

 Module_tail_build.mk |3 +++
 tail_build/prj/build.lst |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit f7cad8a44be4056d60cd7bd4ed33748592954e8e
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 29 10:37:31 2012 +0100

move oovbaapi to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index d8faedd..c761620 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 MathMLDTD \
 Mesa \
 np_sdk \
+oovbaapi \
 oox \
 package \
 padmin \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index d827820..4fb2472 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig 
FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis 
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 SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain 
VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges 
comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool 
i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi 
QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal 
salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi 
unoil unotest unotool
 s ure DESKTOP:xmlhelp xmlreader xsltml NULL
+tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig 
FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis 
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 SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain 
VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib basegfx bridges 
comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool 
i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg 
QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal 
salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi 
unoil unotest unotools ure DES
 KTOP:xmlhelp xmlreader xsltml NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 7454de8576883c42c053be5cb967f62a4c9c1b75
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 29 10:23:17 2012 +0100

move apple_remote to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 50df9e1..d8faedd 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Module_Module,tail_end))
 $(eval $(call gb_Module_add_moduledirs,tail_end,\
 accessibility \
 animations \
+apple_remote \
 avmedia \
 basctl \
 basebmp \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 1c59a80..d827820 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig 
FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis 
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 SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain 
VIGRA:vigra X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib apple_remote 
basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper 
cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi 
officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino 
ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools 
ucbhelper udkapi unoil un
 otest unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
+tb  tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig 
FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu 
DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis 
LIBEXTTEXTCAT:libexttextcat LIBXML2

[Libreoffice-commits] .: apple_remote/Library_AppleRemote.mk

[David Tardon]

 apple_remote/Library_AppleRemote.mk |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 1744010821be1ebcbfdf0f67ef3eda98d9f3e7b0
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 29 12:26:35 2012 +0100

add missing dep on headers' package

diff --git a/apple_remote/Library_AppleRemote.mk 
b/apple_remote/Library_AppleRemote.mk
index 308725c..b5acc01 100644
--- a/apple_remote/Library_AppleRemote.mk
+++ b/apple_remote/Library_AppleRemote.mk
@@ -29,9 +29,8 @@
 
 $(eval $(call gb_Library_Library,AppleRemote))
 
-$(eval $(call gb_Library_set_include,AppleRemote,\
--I$(SRCDIR)/apple_remote/inc \
-$$(INCLUDE) \
+$(eval $(call gb_Library_add_package_headers,AppleRemote,\
+apple_remote_inc \
 ))
 
 $(eval $(call gb_Library_use_externals,AppleRemote,\
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/aqua vcl/Module_vcl.mk vcl/Package_osx.mk vcl/Zip_osxres.mk

[David Tardon]

 vcl/Module_vcl.mk  |2 -
 vcl/Package_osx.mk |   38 ---
 vcl/Zip_osxres.mk  |  106 +
 3 files changed, 107 insertions(+), 39 deletions(-)

New commits:
commit b5af1c35284560deaa862c2d87847b2088afcae0
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 29 12:34:33 2012 +0100

can use Zip for this

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index f9b86ed..7ec9395 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -75,7 +75,7 @@ endif
 
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Module_add_targets,vcl,\
-Package_osx \
+Zip_osxres \
 ))
 endif
 
diff --git a/vcl/Package_osx.mk b/vcl/Package_osx.mk
deleted file mode 100644
index 17df37a..000
--- a/vcl/Package_osx.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# http://www.openoffice.org/license.html
-# for a copy of the LGPLv3 License.
-#
-#*
-
-### FIXME: when we have a real ZipTarget mechanism in gbuild replace this mess
-$(eval $(call gb_Package_Package,vcl_zip,))
-$(eval $(call 
gb_Package_add_file,vcl_zip,bin/osxres.zip,$(WORKDIR)/Misc/osxres.zip))
-
-/$(WORKDIR)/Misc/osxres.zip: $(SRCDIR)/vcl/aqua/source/res/MainMenu.nib/*.nib 
$(SRCDIR)/vcl/aqua/source/res/cursors/*.png
-   cd $(SRCDIR)/vcl/aqua/source/res ; \
-   mkdir -p $(dir $@) ; \
-   zip $@ MainMenu.nib/*.nib cursors/*.png
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/Zip_osxres.mk b/vcl/Zip_osxres.mk
new file mode 100644
index 000..212b802
--- /dev/null
+++ b/vcl/Zip_osxres.mk
@@ -0,0 +1,106 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the GPLv3+), or
+# the GNU Lesser General Public License Version 3 or later (the LGPLv3+),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Zip_Zip,osxres,$(SRCDIR)/vcl/aqua/source/res))
+
+$(eval $(call gb_Zip_add_files,osxres,\
+MainMenu.nib/classes.nib \
+MainMenu.nib/info.nib \
+MainMenu.nib/keyedobjects.nib \
+cursors/airbrush.png \
+cursors/ase.png \
+cursors/asn.png \
+cursors/asne.png \
+cursors/asns.png \
+cursors/asnswe.png \
+cursors/asnw.png \
+cursors/ass.png \
+cursors/asse.png \
+cursors/assw.png \
+cursors/asw.png \
+cursors/aswe.png \
+cursors/chain.png \
+cursors/chainnot.png \
+cursors/chart.png \
+cursors/copydata.png \
+cursors/copydlnk.png \
+cursors/copyf.png \
+cursors/copyf2.png \
+cursors/copyflnk.png \
+cursors/crook.png \
+cursors/crop.png \
+cursors/darc.png \
+cursors/dbezier.png \
+cursors/dcapt.png \
+cursors/dcirccut.png \
+cursors/dconnect.png \
+cursors/dellipse.png \
+cursors/detectiv.png \
+cursors/dfree.png \
+cursors/dline.png \
+cursors/dpie.png \
+cursors/dpolygon.png \
+cursors/drect.png \
+cursors/dtext.png \
+cursors/fill.png \
+cursors/help.png \
+cursors/hourglass.png

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 6 commits - sdext/Extension_minimizer.mk sdext/Extension_pdfimport.mk sdext/Extension_presenter.mk sdext/Library_pdfimport.mk sdext/source sole

[David Tardon]

 dev/null  |binary
 sdext/Extension_minimizer.mk  |4 
 sdext/Extension_pdfimport.mk  |2 
 sdext/Extension_presenter.mk  |   10 
 sdext/Library_pdfimport.mk|4 
 sdext/source/presenter/PresenterClock.cxx | 1287 --
 sdext/source/presenter/PresenterClock.hxx |  196 
 solenv/gbuild/Extension.mk|5 
 8 files changed, 16 insertions(+), 1492 deletions(-)

New commits:
commit e36d981aa7b88d841f6d1325797083d4df026987
Author: David Tardon dtar...@redhat.com
Date:   Sat Feb 25 11:44:22 2012 +0100

fix platform ID

diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index f59d988..e04c2eb 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -32,11 +32,11 @@ $(eval $(call gb_Library_add_api,pdfimport,\
 udkapi \
 ))
 
-include $(OUTDIR)/inc/rtlbootstrap.mk
+include $(dir $(realpath $(lastword $(MAKEFILE_LISTplatform.mk
 
 $(eval $(call gb_Library_add_defs,pdfimport,\
 -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
--DPDFI_IMPL_IDENTIFIER=\com.sun.star.PDFImport-$(RTL_OS)-$(RTL_ARCH)\ \
+-DPDFI_IMPL_IDENTIFIER=\com.sun.star.PDFImport-$(sdext_PLATFORM)\ \
 ))
 
 $(eval $(call gb_Library_add_package_headers,pdfimport,\
commit 8e5cb35f9b6e0934ee388bfa049a55bea1658515
Author: David Tardon dtar...@redhat.com
Date:   Sat Feb 25 09:45:51 2012 +0100

remove unused bitmap

diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png 
b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png
deleted file mode 100644
index 65073e4..000
Binary files a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorDisabled.png 
and /dev/null differ
commit 0d585549d91b7c48f4e846006680289c52102bf3
Author: David Tardon dtar...@redhat.com
Date:   Sat Feb 25 09:45:14 2012 +0100

remove unused sources

diff --git a/sdext/source/presenter/PresenterClock.cxx 
b/sdext/source/presenter/PresenterClock.cxx
deleted file mode 100644
index f176b8b..000
--- a/sdext/source/presenter/PresenterClock.cxx
+++ /dev/null
@@ -1,1287 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include PresenterClock.hxx
-#include PresenterComponent.hxx
-#include PresenterConfigurationAccess.hxx
-#include PresenterGeometryHelper.hxx
-#include com/sun/star/awt/InvalidateStyle.hpp
-#include com/sun/star/awt/MouseButton.hpp
-#include com/sun/star/awt/Point.hpp
-#include com/sun/star/awt/XWindowPeer.hpp
-#include com/sun/star/container/XNameAccess.hpp
-#include com/sun/star/deployment/XPackageInformationProvider.hpp
-#include com/sun/star/drawing/framework/XControllerManager.hpp
-#include com/sun/star/drawing/framework/XConfigurationController.hpp
-#include com/sun/star/rendering/CompositeOperation.hpp
-#include com/sun/star/rendering/PathCapType.hpp
-#include com/sun/star/rendering/TextDirection.hpp
-#include com/sun/star/rendering/XCanvasFont.hpp
-#include com/sun/star/rendering/XSpriteCanvas.hpp
-#include com/sun/star/util/Color.hpp
-#include osl/mutex.hxx
-#include osl/time.h
-#include rtl/ref.hxx
-#include salhelper/timer.hxx
-#include boost/bind.hpp
-#include cmath
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing::framework;
-using ::rtl::OUString;
-
-namespace sdext { namespace presenter {
-
-/** Wrapper around a library timer.
-*/
-class PresenterClock::Timer : public salhelper::Timer
-{
-public:
-explicit Timer (const ::rtl::ReferencePresenterClock rpClock);
-virtual ~Timer (void);
-
-void Stop (void);
-
-protected:
-virtual void SAL_CALL onShot (void);
-
-private:
-::rtl::ReferencePresenterClock mpClock;
-};
-
-namespace {
-bool GetDateTime (oslDateTime rDateTime

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - sdext/Library_pdfimport.mk

[David Tardon]

 sdext/Library_pdfimport.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bc2cbaf95386a44b225d0ee25ce4ddf4a9e239c5
Author: David Tardon dtar...@redhat.com
Date:   Sat Feb 25 11:50:22 2012 +0100

the include must be at the beginning

diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index e04c2eb..485a14a 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -25,6 +25,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+include $(dir $(realpath $(lastword $(MAKEFILE_LISTplatform.mk
+
 $(eval $(call gb_Library_Library,pdfimport))
 
 $(eval $(call gb_Library_add_api,pdfimport,\
@@ -32,8 +34,6 @@ $(eval $(call gb_Library_add_api,pdfimport,\
 udkapi \
 ))
 
-include $(dir $(realpath $(lastword $(MAKEFILE_LISTplatform.mk
-
 $(eval $(call gb_Library_add_defs,pdfimport,\
 -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
 -DPDFI_IMPL_IDENTIFIER=\com.sun.star.PDFImport-$(sdext_PLATFORM)\ \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 3 commits - sdext/CppunitTest_pdfimport.mk sdext/Module_sdext.mk sdext/source

[David Tardon]

 sdext/CppunitTest_pdfimport.mk |   90 ++
 sdext/Module_sdext.mk  |4 
 sdext/source/minimizer/delzip  |1 
 sdext/source/minimizer/minimizer.pmk   |   28 -
 sdext/source/pdfimport/delzip  |1 
 sdext/source/pdfimport/pdfisettings.pmk|   28 -
 sdext/source/pdfimport/test/makefile.mk|  141 -
 sdext/source/pdfimport/test/tests.cxx  |  101 
 sdext/source/pdfimport/wrapper/wrapper.cxx |4 
 sdext/source/presenter/delzip  |1 
 10 files changed, 193 insertions(+), 206 deletions(-)

New commits:
commit 5d44d9fec3aa594e1990e3000fd7c1e2e365a469
Author: David Tardon dtar...@redhat.com
Date:   Sat Feb 25 19:15:09 2012 +0100

the passed string is already quoted

diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx 
b/sdext/source/pdfimport/wrapper/wrapper.cxx
index 807bcdd..27d8567 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -63,7 +63,6 @@
 #include basegfx/tools/unopolypolygon.hxx
 
 #include boost/bind.hpp
-#include boost/preprocessor/stringize.hpp
 #include boost/scoped_ptr.hpp
 #include boost/scoped_array.hpp
 
@@ -1017,8 +1016,7 @@ bool xpdf_ImportFromFile( const ::rtl::OUString  
   rUR
 converterURL.insert(
 0,
 xProvider-getPackageLocation(
-rtl::OUString::createFromAscii(
-BOOST_PP_STRINGIZE(PDFI_IMPL_IDENTIFIER;
+rtl::OUString::createFromAscii(PDFI_IMPL_IDENTIFIER)));
 }
 
 // spawn separate process to keep LGPL/GPL code apart.
commit 3acc9127ffa86c90f8916f1d80e5f4b924719692
Author: David Tardon dtar...@redhat.com
Date:   Sat Feb 25 17:18:50 2012 +0100

remove leftover makefiles

diff --git a/sdext/source/minimizer/delzip b/sdext/source/minimizer/delzip
deleted file mode 100644
index 8b13789..000
--- a/sdext/source/minimizer/delzip
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/sdext/source/minimizer/minimizer.pmk 
b/sdext/source/minimizer/minimizer.pmk
deleted file mode 100644
index f832f2d..000
--- a/sdext/source/minimizer/minimizer.pmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# http://www.openoffice.org/license.html
-# for a copy of the LGPLv3 License.
-#
-#*
-
-EXTENSIONNAME:=PresentationMinimizer
diff --git a/sdext/source/pdfimport/delzip b/sdext/source/pdfimport/delzip
deleted file mode 100644
index e16c76d..000
--- a/sdext/source/pdfimport/delzip
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/sdext/source/pdfimport/pdfisettings.pmk 
b/sdext/source/pdfimport/pdfisettings.pmk
deleted file mode 100644
index b0f6ae4..000
--- a/sdext/source/pdfimport/pdfisettings.pmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# http://www.openoffice.org/license.html
-# for a copy of the LGPLv3 License

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 2 commits - RepositoryExternal.mk sdext/Library_pdfimport.mk

[David Tardon]

 RepositoryExternal.mk  |   27 +++
 sdext/Library_pdfimport.mk |5 +++--
 2 files changed, 26 insertions(+), 6 deletions(-)

New commits:
commit 09fae00a9b7dc8408ec0eba2a2c09ff66b860eeb
Author: David Tardon dtar...@redhat.com
Date:   Tue Feb 21 08:57:47 2012 +0100

fix platform ID

diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index 9f4528a..f59d988 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -32,10 +32,11 @@ $(eval $(call gb_Library_add_api,pdfimport,\
 udkapi \
 ))
 
-# FIXME: set PLATFORMID correctly
+include $(OUTDIR)/inc/rtlbootstrap.mk
+
 $(eval $(call gb_Library_add_defs,pdfimport,\
 -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
--DPDFI_IMPL_IDENTIFIER=\com.sun.star.PDFImport-$(PLATFORMID)\ \
+-DPDFI_IMPL_IDENTIFIER=\com.sun.star.PDFImport-$(RTL_OS)-$(RTL_ARCH)\ \
 ))
 
 $(eval $(call gb_Library_add_package_headers,pdfimport,\
commit b2f603970a9916c232d6df640b75235fa4401ba1
Author: David Tardon dtar...@redhat.com
Date:   Tue Feb 21 06:58:02 2012 +0100

fix build with internal xpdf

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f39768e..577c570 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1026,15 +1026,34 @@ endef
 
 else # !SYSTEM_POPPLER
 
-# FIXME: what are the libs created by xpdf?
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-   poppler \
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
+   fofi \
+   Goo \
+   xpdf \
 ))
 
 define gb_LinkTarget__use_poppler
+$(call gb_LinkTarget_set_include,$(1),\
+   -I$(OUTDIR)/inc/xpdf \
+   $$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+   fofi \
+   Goo \
+   xpdf \
+)
+
+ifeq ($(OS),MACOSX)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
-   poppler \
+   objc \
 )
+else ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+   advapi32 \
+   gdi32 \
+)
+endif
 
 endef
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 9 commits - sdext/Extension_minimizer.mk sdext/Extension_pdfimport.mk sdext/Extension_presenter.mk sdext/Module_sdext.mk sdext/Package_minimize

[David Tardon]

 sdext/Extension_minimizer.mk   |6 
 sdext/Extension_pdfimport.mk   |5 
 sdext/Extension_presenter.mk   |5 
 sdext/Module_sdext.mk  |3 
 sdext/Package_minimizer_manifest.mk|   36 
 sdext/Package_pdfimport_manifest.mk|   36 
 sdext/Package_presenter_manifest.mk|   36 
 sdext/platform.mk  |   49 +
 sdext/source/minimizer/Makefile|   40 
 sdext/source/minimizer/description.xml |4 
 sdext/source/minimizer/manifest.xml|2 
 sdext/source/pdfimport/config/Makefile |   43 -
 sdext/source/pdfimport/config/manifest.xml |   14 -
 sdext/source/pdfimport/description.xml |4 
 sdext/source/pdfimport/manifest.xml|   14 +
 sdext/source/presenter/Makefile|   40 
 sdext/source/presenter/description.xml |4 
 sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile |4 
 sdext/source/presenter/manifest.xml|2 
 solenv/gbuild/Extension.mk |   86 
--
 solenv/gbuild/TargetLocations.mk   |1 
 solenv/gbuild/platform/WNT_INTEL_GCC.mk|5 
 solenv/gbuild/platform/WNT_INTEL_MSC.mk|5 
 solenv/gbuild/platform/com_GCC_defs.mk |5 
 solenv/gbuild/platform/solaris.mk  |5 
 25 files changed, 144 insertions(+), 310 deletions(-)

New commits:
commit 6def461beb77a30f00e0f4cd88f791b8c434c38d
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 24 18:29:22 2012 +0100

set localize.sdf path separately for each file

It cannot be done at the main target, because there is no guarantee that
all help (or properties) files are in one directory.

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 449c74f..da06010 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -161,15 +161,15 @@ define gb_Extension_localize_properties
 $(call gb_Extension_get_target,$(1)) : FILES += $(2)
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : FILES += $(foreach lang,$(subst 
-,_,$(gb_Extension_LANGS)),$(subst en_US,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF2 := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
-$(call gb_Extension_get_target,$(1)) : $$(SDF2)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
 endif
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_rootdir,$(1))/$(2)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$$(call gb_Output_announce,$(2),$(true),PRP,3)
mkdir -p $$(dir $$@)  \
cp -f $$ $$@ \
-   $(if $(strip $(gb_WITH_LANG)), $(gb_Extension_PROPMERGECOMMAND) -i 
$$@ -m $$(SDF2))
+   $(if $(strip $(gb_WITH_LANG)), $(gb_Extension_PROPMERGECOMMAND) -i 
$$@ -m $$(SDF))
 
 endef
 
@@ -177,8 +177,6 @@ endef
 define gb_Extension_localize_help
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : FILES += $(foreach 
lang,$(gb_Extension_LANGS),$(subst lang,$(lang),$(2)))
-$(call gb_Extension_get_target,$(1)) : SDF3 := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
-$(call gb_Extension_get_target,$(1)) : $$(SDF3)
 $(foreach lang,$(gb_Extension_LANGS),$(call 
gb_Extension_localize_help_onelang,$(1),$(subst 
lang,$(lang),$(2)),$(3),$(lang)))
 endif
 
@@ -186,10 +184,12 @@ endef
 
 define gb_Extension_localize_help_onelang
 $(call gb_Extension_get_target,$(1)) : $(call 
gb_Extension_get_rootdir,$(1))/$(2)
+$(call gb_Extension_get_rootdir,$(1))/$(2) : SDF := 
$(gb_Extension_SDFLOCATION)$(subst $(SRCDIR),,$(dir $(3)))localize.sdf
+$(call gb_Extension_get_rootdir,$(1))/$(2) : $$(SDF)
 $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3)
$(call gb_Output_announce,$(2),$(true),XHP,3)
mkdir -p $$(dir $$@)  \
-   $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$) -o 
$$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF3)
+   $(gb_Extension_HELPEXCOMMAND) -i $$(call gb_Helper_native_path,$$) -o 
$$(call gb_Helper_native_path,$$@) -l $(4) -m $$(SDF)
 
 endef
 
commit 7e107b68f8e7a2a92090291f7bb0b63596349afb
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 24 18:05:12 2012 +0100

fail if any previous

[Libreoffice-commits] .: 2 commits - configure.in m4/mingw.m4

[David Tardon]

 configure.in |   12 +++
 m4/mingw.m4  |   90 ---
 2 files changed, 62 insertions(+), 40 deletions(-)

New commits:
commit 0c128345eaa94686b67039346b7ce20ef43ab024
Author: David Tardon dtar...@redhat.com
Date:   Tue Feb 21 13:41:37 2012 +0100

reintroduce hardcoded dll names as defaults

diff --git a/configure.in b/configure.in
index 12ce546..c099579 100644
--- a/configure.in
+++ b/configure.in
@@ -5651,7 +5651,7 @@ if test $with_system_expat = yes; then
 [AC_MSG_ERROR(expat.h not found. install expat)], [])
 AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
 [AC_MSG_RESULT(expat library not found or functional.)], [])
-libo_ADD_MINGW_EXTERNAL_DLLS([libexpat],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libexpat],[MINGW_EXTERNAL_DLLS],[libexpat-1.dll])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_EXPAT=NO
@@ -5843,7 +5843,7 @@ if test $with_system_libxml = yes; then
 AC_MSG_ERROR([xsltproc is required])
 fi
 
-libo_ADD_MINGW_EXTERNAL_DLLS([libxslt],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libxslt],[MINGW_EXTERNAL_DLLS],[libxslt-1.dll])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBXSLT=NO
@@ -5893,7 +5893,7 @@ if test $with_system_libxml = yes; then
 AC_MSG_ERROR([xmllint is required])
 fi
 
-libo_ADD_MINGW_EXTERNAL_DLLS([libxml2],[MINGW_EXTERNAL_DLLS])
+libo_ADD_MINGW_EXTERNAL_DLLS([libxml2],[MINGW_EXTERNAL_DLLS],[zlib1.dll 
libxml2-2.dll])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBXML=NO
@@ -6694,7 +6694,7 @@ if test $with_system_curl = yes; then
 ;;
 esac
 
-libo_ADD_MINGW_EXTERNAL_DLLS([libcurl],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libcurl],[MINGW_EXTERNAL_DLLS],[libintl-8.dll 
libidn-11.dll libnspr4.dll nssutil3.dll libplc4.dll libplds4.dll nss3.dll 
ssl3.dll libgpg-error-0.dll libgcrypt-11.dll libssh2-1.dll libcurl-4.dll])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_CURL=NO
@@ -7599,7 +7599,7 @@ if test $with_system_hunspell = yes; then
 HUNSPELL_LIBS=-lhunspell
 fi
 AC_LANG_POP([C++])
-libo_ADD_MINGW_EXTERNAL_DLLS([libhunspell],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libhunspell],[MINGW_EXTERNAL_DLLS],[libhunspell-1.3-0.dll])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_HUNSPELL=NO
@@ -9794,7 +9794,7 @@ if test $enable_cairo_canvas = yes -a 
$with_system_cairo = yes; then
 AC_LANG_POP([C])
 fi
 fi
-libo_ADD_MINGW_EXTERNAL_DLLS([libcairo],[MINGW_EXTERNAL_DLLS])
+
libo_ADD_MINGW_EXTERNAL_DLLS([libcairo],[MINGW_EXTERNAL_DLLS],[libfontconfig-1.dll
 libfreetype-6.dll libpixman-1-0.dll libpng15-15.dll libcairo-2.dll])
 else
 AC_MSG_RESULT([no])
 
commit 743a56fcce564c461c4ad86ad55edb069cc764bc
Author: David Tardon dtar...@redhat.com
Date:   Tue Feb 21 13:37:53 2012 +0100

allow to pass default dll list

diff --git a/m4/mingw.m4 b/m4/mingw.m4
index 952b2ed..35d638c 100644
--- a/m4/mingw.m4
+++ b/m4/mingw.m4
@@ -1,36 +1,25 @@
-# libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude])
+# 
libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude],[?default-value])
 # uses: CC, SED, WITH_MINGW
 # 
 AC_DEFUN([libo_FIND_MINGW_EXTERNAL_DLLS],
 [if test $WITH_MINGW = yes -a -n $CC; then
 _libo_mingw_libdir=`$CC -print-sysroot`/mingw/lib
-for _libo_mingw_lib in $1; do
-_libo_mingw_lib=$_libo_mingw_libdir/$_libo_mingw_lib.la
-_libo_mingw_find_dll([$_libo_mingw_lib],[$3],[_libo_mingw_new_dll])
-if test -n $_libo_mingw_new_dll; then
-_libo_mingw_new_dlls=$_libo_mingw_new_dll
-fi
-
-
_libo_mingw_get_libtool_var([dependency_libs],[$_libo_mingw_lib],[_libo_mingw_dep_libs])
-for _libo_mingw_dep_lib in $_libo_mingw_dep_libs; do
-if test ${_libo_mingw_dep_lib%.la} != $_libo_mingw_dep_lib; 
then
-_libo_mingw_new_dll=''
-
_libo_mingw_find_dll([$_libo_mingw_dep_lib],[$3],[_libo_mingw_new_dll])
-if test -n $_libo_mingw_new_dll; then
-_libo_mingw_new_dlls=$_libo_mingw_new_dlls 
$_libo_mingw_new_dll
-fi
-fi
-done
-$2=$_libo_mingw_new_dlls
-done
+_libo_mingw_found_la=
+_libo_mingw_test_la([$1],[_libo_mingw_found_la],[$_libo_mingw_libdir])
+if test $_libo_mingw_found_la = yes; then
+_libo_mingw_find_dlls([$1],[$2],[$3],[$_libo_mingw_libdir])
+else
+# no .la files found, use defaults
+$2=$4
+fi
 fi[]dnl
 ]) # libo_FIND_MINGW_EXTERNAL_DLLS
 
-# libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable])
+# libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable],[?default-value])
 # uses: CC, SED, WITH_MINGW
 # 
 AC_DEFUN([libo_ADD_MINGW_EXTERNAL_DLLS

[Libreoffice-commits] .: 2 commits - m4/mingw.m4 mythes/makefile.mk

[David Tardon]

 m4/mingw.m4|7 +++
 mythes/makefile.mk |   17 +++--
 2 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit bcf1edba4eeecba9b47d3ef983e0973b4c737871
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 20 14:25:34 2012 +0100

expect sed has already been detected

Reportedly AC_PROG_SED does not exist on XCode 2.5 .

diff --git a/m4/mingw.m4 b/m4/mingw.m4
index cd0f38f..952b2ed 100644
--- a/m4/mingw.m4
+++ b/m4/mingw.m4
@@ -1,9 +1,8 @@
 # libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude])
-# uses: CC, WITH_MINGW
+# uses: CC, SED, WITH_MINGW
 # 
 AC_DEFUN([libo_FIND_MINGW_EXTERNAL_DLLS],
-[AC_REQUIRE([AC_PROG_SED])dnl
-if test $WITH_MINGW = yes -a -n $CC; then
+[if test $WITH_MINGW = yes -a -n $CC; then
 _libo_mingw_libdir=`$CC -print-sysroot`/mingw/lib
 for _libo_mingw_lib in $1; do
 _libo_mingw_lib=$_libo_mingw_libdir/$_libo_mingw_lib.la
@@ -28,7 +27,7 @@ fi[]dnl
 ]) # libo_FIND_MINGW_EXTERNAL_DLLS
 
 # libo_ADD_MINGW_EXTERNAL_DLLS([library-names],[variable])
-# uses: CC, WITH_MINGW
+# uses: CC, SED, WITH_MINGW
 # 
 AC_DEFUN([libo_ADD_MINGW_EXTERNAL_DLLS],
 [libo_FIND_MINGW_EXTERNAL_DLLS([$1],[_libo_mingw_found_dlls],[$$2])
commit ad3b8a779db8f5ba908c59155328a4912ee0941d
Author: David Tardon dtar...@redhat.com
Date:   Sat Feb 18 14:07:27 2012 +0100

fix mingw build of mythes with system hunspell

diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 46520fc..44f8ba9 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -46,15 +46,15 @@ PATCH_FILES=\
 mythes-1.2.0-makefile-mk.diff \
 mythes-1.2.0-android.patch
 
-.IF $(GUI)==UNX
-CONFIGURE_DIR=$(BUILD_DIR)
-
-.IF $(SYSTEM_MYTHES) != YES
-
+.IF $(COM)==GCC
 .IF $(SYSTEM_HUNSPELL) != YES
 HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
 HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.3
 .ENDIF
+.ENDIF
+
+.IF $(GUI)==UNX
+CONFIGURE_DIR=$(BUILD_DIR)
 
 #relative to CONFIGURE_DIR
 # still needed also in system-mythes case as it creates the makefile
@@ -86,17 +86,15 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM) gio_can_sniff
 
 BUILD_ACTION=make
 OUT2INC += mythes.hxx
-.ENDIF
 .ENDIF # $(GUI)==UNX
 
 
 .IF $(GUI)==WNT
 .IF $(COM)==GCC
-.IF $(SYSTEM_MYTHES) != YES
 CONFIGURE_ACTION=configure
 CONFIGURE_FLAGS= --disable-shared --with-pic \
-HUNSPELL_CFLAGS=-I$(SOLARINCDIR)$/hunspell \
-HUNSPELL_LIBS=-L$(SOLARLIBDIR) -lhunspell-1.3
+HUNSPELL_CFLAGS=$(HUNSPELL_CFLAGS) \
+HUNSPELL_LIBS=$(HUNSPELL_LIBS)
 
 .IF $(CROSS_COMPILING)==YES
 CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) 
gio_can_sniff=no
@@ -104,7 +102,6 @@ CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM) gio_can_sniff
 
 BUILD_ACTION=make
 
-.ENDIF
 .ELSE
 BUILD_ACTION=dmake
 .ENDIF # $(COM)==GCC
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: svx/source

[David Tardon]

 svx/source/engine3d/scene3d.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 967c82e9ce359ecb96982ece6d9e83f0771d8011
Author: David Tardon dtar...@redhat.com
Date:   Tue Feb 21 06:21:15 2012 +0100

add missing semicolon

diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 5081b50..805829f 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -224,7 +224,7 @@ void E3dScene::SetDefaultAttributes(E3dDefaultAttributes 
/*rDefault*/)
 {
 // For WIN95/NT turn off the FP-Exceptions
 #if defined(WNT)
-_control87( _MCW_EM, _MCW_EM )
+_control87( _MCW_EM, _MCW_EM );
 #endif
 
 // Set defaults
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 2 commits - Module_tail_build.mk postprocess/prj RepositoryModule_ooo.mk

[David Tardon]

 Module_tail_build.mk  |1 +
 RepositoryModule_ooo.mk   |1 +
 postprocess/prj/build.lst |2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 674af1a496d136da41b188f5920063adda120126
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 20 07:08:43 2012 +0100

add sdext to tail_build

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 362434d..ae0bd01 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 sccomp \
 scripting \
 sd \
+sdext \
 sfx2 \
 slideshow \
 starmath \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index aa756e5..7e590ec 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po  postprocess ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 
LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools 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 ::  BINFILTER:binfilter CRASHREP:crashrep 
CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 
LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts 
DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools 
JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool 
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
commit 3543f791ecf7a989ea3415f920d9b64ec2fdb674
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 20 07:05:21 2012 +0100

add sdext to gbuildified modules list

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 3f0f023..e15c537 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
 sccomp \
 scripting \
 sd \
+sdext \
 sfx2 \
 slideshow \
 sot \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: qadevOOo/Jar_OOoRunner.mk

[David Tardon]

 qadevOOo/Jar_OOoRunner.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit e0bea132d86b417975a7b73464fb527a6c3c1cbe
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 20 07:11:47 2012 +0100

_XInplaceLayout.java is gone

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 43a4740..116622c 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -571,7 +571,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/frame/_XFrameActionListener \
 qadevOOo/tests/java/ifc/frame/_XFrameLoader \
 qadevOOo/tests/java/ifc/frame/_XFramesSupplier \
-qadevOOo/tests/java/ifc/frame/_XInplaceLayout \
 qadevOOo/tests/java/ifc/frame/_XLayoutManager \
 qadevOOo/tests/java/ifc/frame/_XModel \
 qadevOOo/tests/java/ifc/frame/_XModuleManager \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: qadevOOo/Jar_OOoRunner.mk

[David Tardon]

 qadevOOo/Jar_OOoRunner.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d95be4823e25a24a2d1fae92d2f6c355ef4fa96b
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 20 07:29:43 2012 +0100

removal of XInplaceLayout.java was reverted later...

This reverts commit e0bea132d86b417975a7b73464fb527a6c3c1cbe.

diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk
index 116622c..43a4740 100644
--- a/qadevOOo/Jar_OOoRunner.mk
+++ b/qadevOOo/Jar_OOoRunner.mk
@@ -571,6 +571,7 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\
 qadevOOo/tests/java/ifc/frame/_XFrameActionListener \
 qadevOOo/tests/java/ifc/frame/_XFrameLoader \
 qadevOOo/tests/java/ifc/frame/_XFramesSupplier \
+qadevOOo/tests/java/ifc/frame/_XInplaceLayout \
 qadevOOo/tests/java/ifc/frame/_XLayoutManager \
 qadevOOo/tests/java/ifc/frame/_XModel \
 qadevOOo/tests/java/ifc/frame/_XModuleManager \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/unx

[David Tardon]

 desktop/unx/source/start.c |4 
 1 file changed, 4 insertions(+)

New commits:
commit ce4c9fa90af70832744e4a9f344b05eb42577f2e
Author: David Tardon dtar...@redhat.com
Date:   Sat Feb 18 14:47:17 2012 +0100

WaE: exec_javaldx defined but not used (javaless build)

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index d043b88..4033c37 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -666,6 +666,8 @@ exec_pagein (Args *args)
 free (argv[1]);
 }
 
+#if defined SOLAR_JAVA
+
 static void extend_library_path (const char *new_element)
 {
 rtl_uString *pEnvName=NULL, *pOrigEnvVar=NULL, *pNewEnvVar=NULL;
@@ -789,6 +791,8 @@ exec_javaldx (Args *args)
 osl_closeFile(fileOut);
 }
 
+#endif
+
 SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
 {
 int fd = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - clucene/Library_clucene.mk clucene/Module_clucene.mk clucene/Package_inc.mk clucene/Package_source.mk clucene/source slideshow/source

[David Tardon]

 clucene/Library_clucene.mk |  397 
--
 clucene/Module_clucene.mk  |2 
 clucene/Package_inc.mk |   97 --
 clucene/Package_source.mk  |  110 ++
 clucene/source/Makefile|   49 +
 slideshow/source/engine/transitions/shapetransitionfactory.cxx |4 
 6 files changed, 352 insertions(+), 307 deletions(-)

New commits:
commit 314c2d3e0cab5f5e72fbd09585f344368125e1d1
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 14:34:34 2012 +0100

use custom target for preparing sources

diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 7c8f0d5..53da705 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -31,14 +31,14 @@ $(eval $(call gb_Library_Library,clucene))
 
 $(eval $(call gb_Library_use_external,clucene,zlib))
 
-$(eval $(call gb_Library_add_package_headers,clucene,clucene_inc))
+$(eval $(call gb_Library_add_package_headers,clucene,clucene_source))
 
 $(eval $(call gb_Library_set_include,clucene,\
--I$(WORKDIR)/clucene/src/core \
--I$(WORKDIR)/clucene/src/shared \
--I$(WORKDIR)/clucene/src/contribs-lib \
--I$(WORKDIR)/clucene/inc/internal \
-$$(INCLUDE) \
+   -I$(WORKDIR)/CustomTarget/clucene/source/inc/internal \
+   -I$(WORKDIR)/CustomTarget/clucene/source/src/core \
+   -I$(WORKDIR)/CustomTarget/clucene/source/src/contribs-lib \
+   -I$(WORKDIR)/CustomTarget/clucene/source/src/shared \
+   $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_add_defs,clucene,\
@@ -60,208 +60,195 @@ $(eval $(call gb_Library_add_linked_libs,clucene,\
 endif
 
 $(eval $(call gb_Library_add_generated_exception_objects,clucene,\
-clucene/src/shared/CLucene/SharedHeader \
-clucene/src/shared/CLucene/config/gunichartables \
-clucene/src/shared/CLucene/config/repl_tcslwr \
-clucene/src/shared/CLucene/config/repl_tcstoll \
-clucene/src/shared/CLucene/config/repl_tcscasecmp \
-clucene/src/shared/CLucene/config/repl_tprintf \
-clucene/src/shared/CLucene/config/repl_lltot \
-clucene/src/shared/CLucene/config/repl_tcstod \
-clucene/src/shared/CLucene/config/utf8 \
-clucene/src/shared/CLucene/config/threads \
-clucene/src/shared/CLucene/debug/condition \
-clucene/src/shared/CLucene/util/StringBuffer \
-clucene/src/shared/CLucene/util/Misc \
-clucene/src/shared/CLucene/util/dirent \
-   clucene/src/core/CLucene/StdHeader \
-   clucene/src/core/CLucene/debug/error \
-   clucene/src/core/CLucene/util/ThreadLocal \
-   clucene/src/core/CLucene/util/Reader \
-   clucene/src/core/CLucene/util/Equators \
-   clucene/src/core/CLucene/util/FastCharStream \
-   clucene/src/core/CLucene/util/MD5Digester \
-   clucene/src/core/CLucene/util/StringIntern \
-   clucene/src/core/CLucene/util/BitSet \
-   clucene/src/core/CLucene/queryParser/FastCharStream \
-   clucene/src/core/CLucene/queryParser/MultiFieldQueryParser \
-   clucene/src/core/CLucene/queryParser/QueryParser \
-   clucene/src/core/CLucene/queryParser/QueryParserTokenManager \
-   clucene/src/core/CLucene/queryParser/QueryToken \
-   clucene/src/core/CLucene/queryParser/legacy/Lexer \
-   clucene/src/core/CLucene/queryParser/legacy/MultiFieldQueryParser \
-   clucene/src/core/CLucene/queryParser/legacy/QueryParser \
-   clucene/src/core/CLucene/queryParser/legacy/QueryParserBase \
-   clucene/src/core/CLucene/queryParser/legacy/QueryToken \
-   clucene/src/core/CLucene/queryParser/legacy/TokenList \
-   clucene/src/core/CLucene/analysis/standard/StandardAnalyzer \
-   clucene/src/core/CLucene/analysis/standard/StandardFilter \
-   clucene/src/core/CLucene/analysis/standard/StandardTokenizer \
-   clucene/src/core/CLucene/analysis/Analyzers \
-   clucene/src/core/CLucene/analysis/AnalysisHeader \
-   clucene/src/core/CLucene/store/MMapInput \
-   clucene/src/core/CLucene/store/IndexInput \
-   clucene/src/core/CLucene/store/Lock \
-   clucene/src/core/CLucene/store/LockFactory \
-   clucene/src/core/CLucene/store/IndexOutput \
-   clucene/src/core/CLucene/store/Directory \
-clucene/src/core/CLucene/store/FSDirectory \
-clucene/src/core/CLucene/store/RAMDirectory \
-clucene/src/core/CLucene/document/Document \
-clucene/src/core/CLucene/document/DateField \
-clucene/src/core/CLucene/document/DateTools \
-clucene/src/core/CLucene/document/Field \
-clucene/src/core/CLucene/document/FieldSelector \
-clucene/src/core/CLucene/document/NumberTools \
-clucene/src/core/CLucene/index/IndexFileNames \
-clucene/src/core/CLucene/index/IndexFileNameFilter \
-clucene/src/core/CLucene/index/IndexDeletionPolicy \
-clucene/src/core/CLucene/index/SegmentMergeInfo \
-clucene/src/core/CLucene/index

[Libreoffice-commits] .: 3 commits - clucene/Library_clucene.mk solenv/gbuild vcl/Library_vclplug_gtk3.mk

[David Tardon]

 clucene/Library_clucene.mk  |4 ++--
 solenv/gbuild/Executable.mk |1 +
 solenv/gbuild/Library.mk|1 +
 solenv/gbuild/LinkTarget.mk |9 +
 solenv/gbuild/StaticLibrary.mk  |1 +
 solenv/gbuild/platform/IOS_ARM_GCC.mk   |8 +---
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |5 +++--
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |6 --
 solenv/gbuild/platform/com_GCC_class.mk |2 ++
 solenv/gbuild/platform/macosx.mk|   10 ++
 solenv/gbuild/platform/solaris.mk   |6 --
 solenv/gbuild/platform/unxgcc.mk|4 ++--
 vcl/Library_vclplug_gtk3.mk |2 ++
 13 files changed, 42 insertions(+), 17 deletions(-)

New commits:
commit a3aa7ada194c33a9bedd2b5ce0506b1c5f3604a6
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 15:46:07 2012 +0100

suppress -Werror for vclplug_gtk3

diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 0be8ef9..0b85964 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -28,6 +28,8 @@
 
 $(eval $(call gb_Library_Library,vclplug_gtk3))
 
+$(eval $(call gb_Library_set_warnings_not_errors,vclplug_gtk3))
+
 $(eval $(call gb_Library_set_include,vclplug_gtk3,\
 $$(INCLUDE) \
 -I$(SRCDIR)/vcl/inc \
commit 512fcc354d02715e4e11df5c37f11d130365a139
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 15:43:10 2012 +0100

suppress -Werror for clucene

diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 53da705..74e7dbc 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -25,14 +25,14 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-# FIXME, need a way to suppress -Werror
-
 $(eval $(call gb_Library_Library,clucene))
 
 $(eval $(call gb_Library_use_external,clucene,zlib))
 
 $(eval $(call gb_Library_add_package_headers,clucene,clucene_source))
 
+$(eval $(call gb_Library_set_warnings_not_errors,clucene))
+
 $(eval $(call gb_Library_set_include,clucene,\
-I$(WORKDIR)/CustomTarget/clucene/source/inc/internal \
-I$(WORKDIR)/CustomTarget/clucene/source/src/core \
commit a6e47f72dc08669c1600f10e624bb19421cee04b
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 15:40:20 2012 +0100

allow to suppress -Werror per link target

It is implemented for Executable, Library and StaticLibrary and works
for C, C++, Objective C and Objective C++ sources.

Please, do not misuse! Better fix your code!

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 2c5d9ea..2d148a6 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -111,6 +111,7 @@ $(eval $(foreach method,\
add_package_headers \
add_sdi_headers \
add_nativeres \
+   set_warnings_not_errors \
 ,\
$(call gb_Executable_forward_to_Linktarget,$(method))\
 ))
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 72599c6..1b7a2aa 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -181,6 +181,7 @@ $(eval $(foreach method,\
add_sdi_headers \
export_objects_list \
add_nativeres \
+   set_warnings_not_errors \
 ,\
$(call gb_Library__forward_to_Linktarget,$(method))\
 ))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 227fe96..3edc66f 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -472,6 +472,7 @@ $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : PDBFILE :=
 $(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS :=
 $(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
+$(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS :=
 
 ifeq ($(gb_FULLDEPS),$(true))
 -include $(call gb_LinkTarget_get_dep_target,$(1))
@@ -494,6 +495,7 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := 
$$(gb_LinkTarget_INCL
 $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : LIBRARY_X64 :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : WARNINGS_NOT_ERRORS :=
 endif
 
 endef
@@ -949,5 +951,12 @@ endef
 gb_LinkTarget_use_externals = \
  $(foreach external,$(2),$(call gb_LinkTarget_use_external,$(1),$(external)))
 
+define gb_LinkTarget_set_warnings_not_errors
+$(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS := $(true)
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : WARNINGS_NOT_ERRORS := $(true)
+endif
+
+endef
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 23ceef4..888918c 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -113,6 +113,7 @@ $(eval $(foreach method,\
use_externals \
add_package_headers

[Libreoffice-commits] .: 12 commits - autogen.sh configure.in external/mingw-dlls m4/mingw.m4 redland/raptor

[David Tardon]

 autogen.sh  |6 +++
 configure.in|   52 +-
 external/mingw-dlls/makefile.mk |4 +-
 m4/mingw.m4 |   61 
 redland/raptor/makefile.mk  |2 -
 5 files changed, 114 insertions(+), 11 deletions(-)

New commits:
commit 80b94e54d8861d32c608d8831037b48d6418f57b
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 13:55:56 2012 +0100

do not hardcode mingw path

diff --git a/configure.in b/configure.in
index afce205..2459b76 100644
--- a/configure.in
+++ b/configure.in
@@ -7231,7 +7231,7 @@ if test $with_system_icu = yes; then
 
 ICUPATH=$PATH
 if test $WITH_MINGW = yes ; then
-ICUPATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$ICUPATH
+ICUPATH=`$CC -print-sysroot`/mingw/bin:$ICUPATH
 fi
 AC_PATH_PROG(ICUCONFIG,icu-config,,[$ICUPATH])
 
commit 41522fc7752acd25829a9d3b5ec9e89898777106
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 13:54:10 2012 +0100

avoid hardcoded dll names

diff --git a/configure.in b/configure.in
index 1b7bce3..afce205 100644
--- a/configure.in
+++ b/configure.in
@@ -5631,7 +5631,7 @@ if test $with_system_expat = yes; then
 [AC_MSG_ERROR(expat.h not found. install expat)], [])
 AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
 [AC_MSG_RESULT(expat library not found or functional.)], [])
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libexpat-1.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libexpat],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_EXPAT=NO
@@ -5823,7 +5823,7 @@ if test $with_system_libxml = yes; then
 AC_MSG_ERROR([xsltproc is required])
 fi
 
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libxslt-1.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libxslt],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBXSLT=NO
@@ -5873,7 +5873,7 @@ if test $with_system_libxml = yes; then
 AC_MSG_ERROR([xmllint is required])
 fi
 
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS zlib1.dll libxml2-2.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libxml2],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_LIBXML=NO
@@ -6674,7 +6674,7 @@ if test $with_system_curl = yes; then
 ;;
 esac
 
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libintl-8.dll libidn-11.dll 
libnspr4.dll nssutil3.dll libplc4.dll libplds4.dll nss3.dll ssl3.dll 
libgpg-error-0.dll libgcrypt-11.dll libssh2-1.dll libcurl-4.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libcurl],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_CURL=NO
@@ -7572,7 +7572,7 @@ if test $with_system_hunspell = yes; then
 HUNSPELL_LIBS=-lhunspell
 fi
 AC_LANG_POP([C++])
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libhunspell-1.3-0.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libhunspell],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([internal])
 SYSTEM_HUNSPELL=NO
@@ -9759,7 +9759,7 @@ if test $with_system_cairo = yes; then
 AC_LANG_POP([C])
 fi
 fi
-MINGW_EXTERNAL_DLLS=$MINGW_EXTERNAL_DLLS libfontconfig-1.dll 
libfreetype-6.dll libpixman-1-0.dll libpng15-15.dll libcairo-2.dll
+libo_ADD_MINGW_EXTERNAL_DLLS([libcairo],[MINGW_EXTERNAL_DLLS])
 else
 AC_MSG_RESULT([no])
 
commit 12c35f511e7d2ff74113f307212b6b422898b0f2
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 13:10:14 2012 +0100

add macro for extracting mingw dll names from libtool files

Hardcoding dll names from SuSE Linux in configure.in is not good,
because they might be slightly different on other systems (notably
Fedora :-), or the libraries might be compiled with different
dependencies.

diff --git a/autogen.sh b/autogen.sh
index f423fe1..d41ccdd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -125,7 +125,11 @@ sanity_checks ($system) unless($system eq 'Darwin');
 
 my $aclocal_flags = $ENV{ACLOCAL_FLAGS};
 
-$aclocal_flags = -I ./m4/mac if (($aclocal_flags eq )  ($system eq 
'Darwin'));
+if ($aclocal_flags eq )
+{
+$aclocal_flags = -I ./m4;
+$aclocal_flags .=  -I ./m4/mac if ($system eq 'Darwin');
+}
 
 $ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 
'Darwin'));
 
diff --git a/m4/mingw.m4 b/m4/mingw.m4
new file mode 100644
index 000..cd0f38f
--- /dev/null
+++ b/m4/mingw.m4
@@ -0,0 +1,61 @@
+# libo_FIND_MINGW_EXTERNAL_DLLS([library-names],[variable],[?exclude])
+# uses: CC, WITH_MINGW
+# 
+AC_DEFUN([libo_FIND_MINGW_EXTERNAL_DLLS],
+[AC_REQUIRE([AC_PROG_SED])dnl
+if test $WITH_MINGW = yes -a -n $CC; then
+_libo_mingw_libdir=`$CC -print-sysroot`/mingw/lib
+for _libo_mingw_lib in $1; do
+_libo_mingw_lib=$_libo_mingw_libdir/$_libo_mingw_lib.la
+_libo_mingw_find_dll([$_libo_mingw_lib],[$3],[_libo_mingw_new_dll])
+if test -n $_libo_mingw_new_dll

[Libreoffice-commits] .: 2 commits - canvas/source

[David Tardon]

 canvas/source/vcl/spritecanvashelper.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 48453f3d5d8ba0429d814552c7d9c48a595d539e
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 8 15:46:17 2012 +0100

mark parameter as unused

diff --git a/canvas/source/vcl/spritecanvashelper.cxx 
b/canvas/source/vcl/spritecanvashelper.cxx
index ba4248e..1e3d2dd 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -486,11 +486,9 @@ namespace vclcanvas
 _1 ) );
 }
 
-void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange  
rTotalArea,
+void SpriteCanvasHelper::opaqueUpdate( SAL_UNUSED_PARAMETER const 
::basegfx::B2DRange rTotalArea ,
const ::std::vector 
::canvas::Sprite::Reference  rSortedUpdateSprites )
 {
-(void)rTotalArea;
-
 ENSURE_OR_THROW( mpOwningSpriteCanvas 
  mpOwningSpriteCanvas-getBackBuffer() 
  mpOwningSpriteCanvas-getFrontBuffer(),
commit b24c4e7461fbd3452bc98ce1e945d15b33795c73
Author: David Tardon dtar...@redhat.com
Date:   Wed Feb 8 15:42:15 2012 +0100

remove unused variable

diff --git a/canvas/source/vcl/spritecanvashelper.cxx 
b/canvas/source/vcl/spritecanvashelper.cxx
index 5f0b75f..ba4248e 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -454,8 +454,6 @@ namespace vclcanvas
 
 const 
::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
 aFirst( rUpdateArea.maComponentList.begin() );
-
::canvas::SpriteRedrawManager::SpriteConnectedRanges::ComponentListType::const_iterator
-  aSecond( aFirst ); ++aSecond;
 
 ENSURE_OR_THROW( aFirst-second.getSprite().is(),
   VCLCanvas::scrollUpdate(): no sprite );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: jvmfwk/Module_jvmfwk.mk

[David Tardon]

 jvmfwk/Module_jvmfwk.mk |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit b73e3c50757665653c28c6938746eb0257f40ed4
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 19:32:48 2012 +0100

libjvmfwk is needed even when building without java

diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index a6131da..84399db 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -27,15 +27,18 @@
 
 $(eval $(call gb_Module_Module,jvmfwk))
 
+$(eval $(call gb_Module_add_targets,jvmfwk,\
+Library_jvmfwk \
+Package_inc \
+Package_rcfiles \
+))
+
 ifneq ($(SOLAR_JAVA),)
 
 $(eval $(call gb_Module_add_targets,jvmfwk,\
-Library_jvmfwk \
 Library_sunjavaplugin \
-Package_inc \
 Package_javavendors \
 Package_jreproperties \
-Package_rcfiles \
 ))
 
 ifneq ($(OS),MACOSX)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild_java' - 2 commits - javaunohelper/cppumaker jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjavaplugin.mk jvmfwk/plugins ridljar/javamaker unoil/javamaker

[David Tardon]

 javaunohelper/cppumaker/Makefile   |3 ++-
 jvmfwk/Library_jvmfwk.mk   |2 +-
 jvmfwk/Library_sunjavaplugin.mk|2 +-
 jvmfwk/plugins/sunmajor/pluginlib/Makefile |3 ++-
 ridljar/javamaker/Makefile |3 ++-
 unoil/javamaker/Makefile   |3 ++-
 6 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 980e69cd61b41a644de0736ee7b70c84f5b9e013
Author: Matus Kukan matus.ku...@gmail.com
Date:   Wed Feb 15 23:26:40 2012 +0100

add gb_Helper_abbreviate_dirs_native

diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile
index 230daa0..017acf1 100644
--- a/javaunohelper/cppumaker/Makefile
+++ b/javaunohelper/cppumaker/Makefile
@@ -29,6 +29,7 @@ gb_PARTIALBUILD := T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 done :
+   $(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,cppumaker -C -BUCR -O. \
-Tcom.sun.star.beans.NamedValue \
-Tcom.sun.star.beans.XPropertySet \
@@ -51,7 +52,7 @@ done :
-Tcom.sun.star.uno.XComponentContext \
-Tcom.sun.star.uno.XWeak \
$(OUTDIR)/bin/udkapi.rdb)  \
-   touch $@
+   touch $@)
 
 .DEFAULT_GOAL := all
 .PHONY : all
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/Makefile 
b/jvmfwk/plugins/sunmajor/pluginlib/Makefile
index 2e91b1d..b190038 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/Makefile
+++ b/jvmfwk/plugins/sunmajor/pluginlib/Makefile
@@ -28,7 +28,8 @@
 include $(GBUILDDIR)/gbuild.mk
 
 JREProperties.class : 
$(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
-   $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir 
$@) $^
+   $(call gb_Helper_abbreviate_dirs_native, \
+   $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir 
$@) $^)
 
 .DEFAULT_GOAL := all
 .PHONY : all
diff --git a/ridljar/javamaker/Makefile b/ridljar/javamaker/Makefile
index 65c106b..d2fe741 100644
--- a/ridljar/javamaker/Makefile
+++ b/ridljar/javamaker/Makefile
@@ -29,7 +29,8 @@ gb_PARTIALBUILD := T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 done : $(OUTDIR)/bin/udkapi.rdb
-   $(call gb_Helper_execute,javamaker -BUCR -O./class $)  touch $@
+   $(call gb_Helper_abbreviate_dirs_native, \
+   $(call gb_Helper_execute,javamaker -BUCR -O./class $)  touch $@)
 
 .DEFAULT_GOAL := all
 .PHONY : all
diff --git a/unoil/javamaker/Makefile b/unoil/javamaker/Makefile
index 7c21708..d39e96b 100644
--- a/unoil/javamaker/Makefile
+++ b/unoil/javamaker/Makefile
@@ -29,8 +29,9 @@ gb_PARTIALBUILD := T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 done :
+   $(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,javamaker -BUCR -O$(realpath .) 
$(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb)  \
-   touch $@
+   touch $@)
 
 .DEFAULT_GOAL := all
 .PHONY : all
commit 2faa029ade2b1bec92016e78b744502fbf680e38
Author: Matus Kukan matus.ku...@gmail.com
Date:   Wed Feb 15 23:25:11 2012 +0100

jvmfwk: these are also linked_libs

diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index 5638164..e58dade 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,jvmfwk,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_libs,jvmfwk,\
+$(eval $(call gb_Library_add_linked_libs,jvmfwk,\
 advapi32 \
 ))
 endif
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 9ce5461..734e564 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
 endif
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_libs,sunjavaplugin,\
+$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
 advapi32 \
 uwinapi \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ure/Rdb_ure.mk

[David Tardon]

 ure/Rdb_ure.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 42e8410538995a28274a4d4a8936e75ad4dedcd8
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 17 08:57:54 2012 +0100

component file moved

diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index b3b6531..a0639c1 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -49,7 +49,7 @@ ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Rdb_add_components,ure/services,\
 javaloader \
 javavm \
-juh \
+javaunohelper/util/juh \
 ))
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: avmedia/README basic/README configmgr/README connectivity/README desktop/README editeng/README eventattacher/README fileaccess/README formula/README fpicker/README framework/R

[David Tardon]

 avmedia/README|4 
 basic/README  |4 
 configmgr/README  |1 +
 connectivity/README   |1 +
 desktop/README|1 +
 editeng/README|6 ++
 eventattacher/README  |1 +
 fileaccess/README |1 +
 formula/README|3 +++
 fpicker/README|1 +
 framework/README  |7 +++
 idl/README|3 +++
 linguistic/README |1 +
 officecfg/README  |4 
 oovbaapi/README   |5 +
 readlicense_oo/README |1 +
 scripting/README  |   15 ---
 sfx2/README   |6 --
 shell/README  |1 +
 svx/README|9 +
 sysui/README  |1 +
 ucb/README|1 +
 uui/README|1 +
 xmlhelp/README|1 +
 xmloff/README |1 +
 xmlscript/README  |1 +
 26 files changed, 72 insertions(+), 9 deletions(-)

New commits:
commit 64e1ae0f5581bcf8eafecc6c22bcdcb76ac7ba5d
Author: Josh Heidenreich josh.sickm...@gmail.com
Date:   Tue Feb 7 14:17:29 2012 +1030

Added READMEs for modules which used to be in libs-core

diff --git a/avmedia/README b/avmedia/README
new file mode 100644
index 000..b33f70c
--- /dev/null
+++ b/avmedia/README
@@ -0,0 +1,4 @@
+Audio/Video media implementation.
+
+Needs a Java Media Framework (JMF).
+Not currently usable for streams but only for URIs in the file system.
diff --git a/basic/README b/basic/README
new file mode 100644
index 000..bed2870
--- /dev/null
+++ b/basic/README
@@ -0,0 +1,4 @@
+Contains the StarBASIC Interpreter and in addition the GUI of VCLTestTool.
+
+See also:
+[http://wiki.services.openoffice.org/wiki/Basic]
diff --git a/configmgr/README b/configmgr/README
new file mode 100644
index 000..e63f37c
--- /dev/null
+++ b/configmgr/README
@@ -0,0 +1 @@
+The configuration database - UNO services and some tools.
diff --git a/connectivity/README b/connectivity/README
new file mode 100644
index 000..852d4f8
--- /dev/null
+++ b/connectivity/README
@@ -0,0 +1 @@
+Contains database pieces, drivers, etc.
diff --git a/desktop/README b/desktop/README
new file mode 100644
index 000..75a189a
--- /dev/null
+++ b/desktop/README
@@ -0,0 +1 @@
+What used to be the desktop in StarOffice 5 - now the binary.
diff --git a/editeng/README b/editeng/README
new file mode 100644
index 000..d2a1a13
--- /dev/null
+++ b/editeng/README
@@ -0,0 +1,6 @@
+Edit engine.
+
+In OO.o build DEV300m72 this module was split off from svx but it
+has no dependencies on [[svx]] (nor on [[sfx2]]) while in turn svx depends on 
editeng
+Read more in the mailing list post:
+[http://www.mail-archive.com/dev@openoffice.org/msg13237.html]
diff --git a/eventattacher/README b/eventattacher/README
new file mode 100644
index 000..ecfdcf7
--- /dev/null
+++ b/eventattacher/README
@@ -0,0 +1 @@
+How [[basic]] handles events
diff --git a/fileaccess/README b/fileaccess/README
new file mode 100644
index 000..113465a
--- /dev/null
+++ b/fileaccess/README
@@ -0,0 +1 @@
+Implements XSimpleFileAccess interface that makes the UCB interfaces actually 
usable (via UNO) and more intuitive.
diff --git a/formula/README b/formula/README
new file mode 100644
index 000..da0d528
--- /dev/null
+++ b/formula/README
@@ -0,0 +1,3 @@
+Contains parts of the formula parser used outside Calc code.
+
+Has been pulled out from Calc's formula parser code.
diff --git a/fpicker/README b/fpicker/README
new file mode 100644
index 000..8c09487
--- /dev/null
+++ b/fpicker/README
@@ -0,0 +1 @@
+Native file pickers for Unix and Windows (file open dialog) GTK+, KDE, Windows.
diff --git a/framework/README b/framework/README
new file mode 100644
index 000..200c2af
--- /dev/null
+++ b/framework/README
@@ -0,0 +1,7 @@
+UI rewrite, toolbars, menus, UNO stuff, including accelerators and 
interaction, etc.
+
+See also:
+[http://wiki.services.openoffice.org/wiki/Framework]
+
+Notable files:
+[git:framework/source/services/backingwindow.hxx] Layout of the Startcenter 
buttons and the corresponding event handler.
diff --git a/idl/README b/idl/README
new file mode 100644
index 000..38d46bd
--- /dev/null
+++ b/idl/README
@@ -0,0 +1,3 @@
+SvIDL Compiler.
+
+(CH: Where is the difference to [[idlc]]???)
diff --git a/linguistic/README b/linguistic/README
new file mode 100644
index 000..39f447c
--- /dev/null
+++ b/linguistic/README
@@ -0,0 +1 @@
+Handles registered modules for spellchecker, hyphenator and thesaurus.
diff --git a/officecfg/README b/officecfg/README
new file mode 100644
index 000..3a39d28
--- /dev/null
+++ b/officecfg/README
@@ -0,0 +1,4 @@
+The schema and default settings for the OpenOffice.org configuration database.
+
+See also:
+[[configmgr]]
diff --git a/oovbaapi/README b/oovbaapi/README
new file mode 100644
index 000..c9d37ea
--- /dev/null
+++ b/oovbaapi/README
@@ -0,0 +1,5 @@
+Module for OpenOffice - VisualBasic interoperability.
+
+See also:

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sd/source

[David Tardon]

 sd/source/ui/unoidl/unopage.cxx |   15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

New commits:
commit 6d49075a032191b4f7034b1b8c799d163d35a58c
Author: Muthu Subramanian sumu...@suse.com
Date:   Wed Feb 1 18:01:17 2012 +0530

n#735533: Donot set duplicate master slide names.

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 84a76d3..2f441e9 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -3015,7 +3015,7 @@ void SdMasterPage::getBackground( Any rValue ) throw()
 }
 
 // XNamed
-void SAL_CALL SdMasterPage::setName( const OUString aName )
+void SAL_CALL SdMasterPage::setName( const OUString rName )
 throw(uno::RuntimeException)
 {
 ::SolarMutexGuard aGuard;
@@ -3024,11 +3024,18 @@ void SAL_CALL SdMasterPage::setName( const OUString 
aName )
 
 if(SvxFmDrawPage::mpPage  GetPage()-GetPageKind() != PK_NOTES)
 {
-String aNewName( aName );
+SdDrawDocument* pDoc = GetModel()-GetDoc();
+sal_Bool bOutDummy;
+String aNewName( rName );
+
+// Slide Name has to be unique
+if( pDoc  pDoc-GetPageByName( aNewName, bOutDummy ) != 
SDRPAGE_NOTFOUND )
+return; // throw Exception ?
+
 GetPage()-SetName( aNewName );
 
-if(GetModel()-GetDoc())
-
GetModel()-GetDoc()-RenameLayoutTemplate(GetPage()-GetLayoutName(), 
aNewName);
+if( pDoc )
+pDoc-RenameLayoutTemplate( GetPage()-GetLayoutName(), aNewName );
 
 // fake a mode change to repaint the page tab bar
 ::sd::DrawDocShell* pDocSh = GetModel()-GetDocShell();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

[David Tardon]

 configure.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7bca5b92d45288b380c4f1ebc11a7e5de923fd9a
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 6 19:01:45 2012 +0100

fix typo

diff --git a/configure.in b/configure.in
index f14d675..7102f10 100644
--- a/configure.in
+++ b/configure.in
@@ -3088,7 +3088,7 @@ WORKDIR=$SRC_ROOT/workdir/$INPATH
 AC_SUBST(COM)
 AC_SUBST(CPU)
 AC_SUBST(CPUNAME)
-AC_SUBST(EMP_FLAGS)
+AC_SUBST(EPM_FLAGS)
 AC_SUBST(GUI)
 AC_SUBST(GUIBASE)
 AC_SUBST(INPATH)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sal/inc sc/source

[David Tardon]

 sal/inc/sal/log-areas.dox|4 
 sc/source/ui/view/output.cxx |2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 064990eb8849a8c1eda8960fafb31f28ac114a5e
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 3 10:01:35 2012 +0100

add sc.ui log area

diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 074f1b2..1af17a3 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -13,6 +13,10 @@ a new area, use it and add it to the list in the proper 
section with an explanat
 This list should give you an overview of which areas to enable when debugging
 certain functionality.
 
+@section Calc
+
+@li sc.ui - Calc's UI
+
 @section oox
 
 @li oox.xmlstream - XmlStream class
commit 96ea52dbd1ca409625cd0378a18f6bf13a7da86b
Author: David Tardon dtar...@redhat.com
Date:   Fri Feb 3 09:59:18 2012 +0100

fix build breaker with --enable-debug

diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index cfa44de..b80bfdc 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -149,7 +149,7 @@ void ScActionColorChanger::Update( const ScChangeAction 
rAction )
 if (it == rUsers.end())
 {
 // empty string is possible if a name wasn't found while 
saving a 5.0 file
-OSL_ENSURE( aLastUserName.Len() == 0, Author not found );
+SAL_INFO_IF( aLastUserName.isEmpty(), sc.ui, Author not 
found );
 nLastUserIndex = 0;
 }
 else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 6 commits - canvas/inc canvas/source sal/inc vcl/source

[David Tardon]

 canvas/inc/canvas/vclwrapper.hxx |2 --
 canvas/source/cairo/cairo_xlib_cairo.cxx |3 ++-
 sal/inc/sal/log-areas.dox|1 +
 vcl/source/gdi/virdev.cxx|   26 --
 4 files changed, 19 insertions(+), 13 deletions(-)

New commits:
commit 4ecc4a91e1199e061a4561f2eaf577085064658f
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 13:37:24 2012 +0100

remove duplicate include

diff --git a/canvas/inc/canvas/vclwrapper.hxx b/canvas/inc/canvas/vclwrapper.hxx
index cf42e15..f6d5b3a 100644
--- a/canvas/inc/canvas/vclwrapper.hxx
+++ b/canvas/inc/canvas/vclwrapper.hxx
@@ -30,10 +30,8 @@
 #define INCLUDED_CANVAS_VCLWRAPPER_HXX
 
 #include osl/mutex.hxx
-#include osl/mutex.hxx
 #include vcl/svapp.hxx
 
-
 namespace canvas
 {
 namespace vcltools
commit b9accbafa13b0ffb8855d3ae732b397f6120a3cb
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 11:51:18 2012 +0100

the bug number is not from public bugzilla

diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 6cde626..3165d35 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -168,7 +168,7 @@ VirtualDevice::VirtualDevice( const OutputDevice rCompDev, 
sal_uInt16 nBitCount
 
 ImplInitVirDev( rCompDev, 1, 1, nBitCount );
 
-// #110958# Enable alpha channel
+// Enable alpha channel
 mnAlphaDepth = sal::static_int_castsal_Int8(nAlphaBitCount);
 }
 
commit 4f6a5040db04a59498d2ef2b729659a94140c23b
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 10:52:10 2012 +0100

the depth argument must be = 0

diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx 
b/canvas/source/cairo/cairo_xlib_cairo.cxx
index e084eda..df14fce 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -26,6 +26,7 @@
  *
  /
 
+#include utility
 
 #include tools/prex.h
 #include X11/extensions/Xrender.h
@@ -267,7 +268,7 @@ namespace cairo
 aSystemGraphicsData.pXRenderFormat = getRenderFormat();
 
 return boost::shared_ptrVirtualDevice(
-new VirtualDevice( aSystemGraphicsData, getDepth() ));
+new VirtualDevice( aSystemGraphicsData, std::max( getDepth(), 0 ) 
));
 }
 
 /**
commit 767098b0ca717b6649223940af907593723bc927
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 10:52:38 2012 +0100

add vcl.gdi log area

diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index d0cbaee..074f1b2 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -19,6 +19,7 @@ certain functionality.
 
 @section VCL
 
+@li vcl.gdi - the GDI part of VCL: devices, bitmaps, etc.
 @li vcl.gtk - Gtk+ 2/3 plugin
 
 @section Writer
commit ec505d879eaf59815dfc912c2dda525fbf5f2340
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 11:42:23 2012 +0100

OSL_TRACE - SAL_INFO

diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 3f6acf3..6cde626 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -137,7 +137,7 @@ VirtualDevice::VirtualDevice( sal_uInt16 nBitCount )
 {
 SAL_WARN_IF( nBitCount  1, vcl.gdi,
 VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount 
allowed );
-OSL_TRACE( VirtualDevice::VirtualDevice( %hu ), nBitCount );
+SAL_INFO( vcl.gdi, VirtualDevice::VirtualDevice(   nBitCount   ) 
);
 
 ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount );
 }
@@ -150,7 +150,7 @@ VirtualDevice::VirtualDevice( const OutputDevice rCompDev, 
sal_uInt16 nBitCount
 {
 SAL_WARN_IF( nBitCount  1, vcl.gdi,
 VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount 
allowed );
-OSL_TRACE( VirtualDevice::VirtualDevice( %hu ), nBitCount );
+SAL_INFO( vcl.gdi, VirtualDevice::VirtualDevice(   nBitCount   ) 
);
 
 ImplInitVirDev( rCompDev, 1, 1, nBitCount );
 }
@@ -163,7 +163,8 @@ VirtualDevice::VirtualDevice( const OutputDevice rCompDev, 
sal_uInt16 nBitCount
 {
 SAL_WARN_IF( nBitCount  1, vcl.gdi,
 VirtualDevice::VirtualDevice(): Only 0 or 1 is for BitCount 
allowed );
-OSL_TRACE( VirtualDevice::VirtualDevice( %hu ), nBitCount );
+SAL_INFO( vcl.gdi,
+VirtualDevice::VirtualDevice(   nBitCount  ,   
nAlphaBitCount   ) );
 
 ImplInitVirDev( rCompDev, 1, 1, nBitCount );
 
@@ -177,7 +178,7 @@ VirtualDevice::VirtualDevice( const SystemGraphicsData 
*pData, sal_uInt16 nBitCo
 :   mpVirDev( NULL ),
 meRefDevMode( REFDEV_NONE )
 {
-OSL_TRACE( VirtualDevice::VirtualDevice( %hu ), nBitCount );
+SAL_INFO( vcl.gdi, VirtualDevice::VirtualDevice(   nBitCount   ) 
);
 
 ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount, pData );
 }
@@ -186,7 +187,7 @@ VirtualDevice::VirtualDevice( const SystemGraphicsData 
*pData, sal_uInt16 nBitCo
 
 VirtualDevice::~VirtualDevice()
 {
-OSL_TRACE

[Libreoffice-commits] .: sal/inc

[David Tardon]

 sal/inc/sal/log-areas.dox |4 
 1 file changed, 4 insertions(+)

New commits:
commit bfd9753b92c225d7cc2b2d3172b26eb53a8e9228
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 31 07:18:49 2012 +0100

add vcl log area

diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 42a96ae..d0cbaee 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -17,6 +17,10 @@ certain functionality.
 
 @li oox.xmlstream - XmlStream class
 
+@section VCL
+
+@li vcl.gtk - Gtk+ 2/3 plugin
+
 @section Writer
 
 @li sw.uno - Writer's UNO interfaces
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: canvas/source

[David Tardon]

 canvas/source/tools/spriteredrawmanager.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 259e0dfc293d455f1ea777de132730f7e5fde22d
Author: David Tardon dtar...@redhat.com
Date:   Wed Jan 25 12:34:23 2012 +0100

transparency gradient effect fade in is wrong (fdo#45219)

diff --git a/canvas/source/tools/spriteredrawmanager.cxx 
b/canvas/source/tools/spriteredrawmanager.cxx
index 91b81c5..72976c1 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -301,7 +301,8 @@ namespace canvas
aSortedSpriteVector.end(),
aUpdatableSprites.begin(),
aEnd,
-   ::std::back_insert_iterator VectorOfSprites 
(aUnchangedSprites) );
+   ::std::back_insert_iterator VectorOfSprites 
(aUnchangedSprites),
+   aSpriteComparator );
 
 // add each remaining unchanged sprite to connected ranges,
 // marked as don't need update
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - canvas/source solenv/gdb

[David Tardon]

 canvas/source/tools/spriteredrawmanager.cxx |3 ++-
 solenv/gdb/libreoffice/sal.py   |1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f933735c1cd7f1fad71c300fdb14baebdc62e1bd
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 24 12:03:11 2012 +0100

make slide transitions work

diff --git a/canvas/source/tools/spriteredrawmanager.cxx 
b/canvas/source/tools/spriteredrawmanager.cxx
index 2af5b34..91b81c5 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -277,7 +277,8 @@ namespace canvas
 
 VectorOfSprites::iterator aEnd=
 ::std::unique( aUpdatableSprites.begin(),
-   aUpdatableSprites.end() );
+   aUpdatableSprites.end(),
+   aSpriteComparator );
 
 // for each unique sprite, check the change event vector,
 // calculate the update operation from that, and add the
commit efe48e57e986d03c388668e5955ded4f563d3a61
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 24 11:51:18 2012 +0100

remove debugging print

diff --git a/solenv/gdb/libreoffice/sal.py b/solenv/gdb/libreoffice/sal.py
index 15cebe8..df87ed5 100644
--- a/solenv/gdb/libreoffice/sal.py
+++ b/solenv/gdb/libreoffice/sal.py
@@ -83,7 +83,6 @@ class RtlReferencePrinter(object):
 self.val = val
 
 def to_string(self):
-print(RtlReferencePrinter:to_string)
 pointee = self.val['m_pBody']
 if pointee:
 val = pointee.dereference()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[David Tardon]

 cui/source/tabpages/tabarea.src |  205 
 1 file changed, 148 insertions(+), 57 deletions(-)

New commits:
commit a13d3436852a28c50a36c4ebd26c0e0c4fd9718c
Author: David Tardon dtar...@redhat.com
Date:   Fri Jan 20 09:41:59 2012 +0100

make these strings localizable again (fdo#44947)

Our translation tools read the src files literally, line by line, only
reacting on specific patterns (e.g., 'Text [en-US] = ...;'). Therefore
use of macros like this cannot work.

diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index b1117b1..6c830d0 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -682,51 +682,6 @@ TabPage RID_SVXPAGE_SHADOW
 };
 };
 
-// Helper for creating the load / save / embed buttons in std. positions
-
-#define LOAD_BUTTON(hid,qhtxt) \
-ImageButton BTN_LOAD \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 197 , 104  ) ; \
-Size = MAP_APPFONT ( 16 , 16 ) ; \
-TabStop = TRUE ; \
-QuickHelpText [ en-US ] = qhtxt ; \
-ButtonImage = Image \
-{ \
-ImageBitmap = Bitmap \
-{ \
-File = sc05501.bmp ; \
-}; \
-}; \
-} \
-
-#define SAVE_BUTTON(hid,qhtxt) \
-ImageButton BTN_SAVE \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 217 , 104  ) ; \
-Size = MAP_APPFONT ( 16 , 16 ) ; \
-TabStop = TRUE ; \
-QuickHelpText [ en-US ] = qhtxt ; \
-ButtonImage = Image \
-{ \
-ImageBitmap = Bitmap \
-{ \
-File = sc05502.bmp ; \
-}; \
-}; \
-}
-
-#define EMBED_BUTTON(hid,txt) \
-CheckBox BTN_EMBED \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 197 , 124 ) ; \
-Size = MAP_APPFONT ( 122 , 10 ) ; \
-Text [ en-US ] = txt ; \
-}
-
 // --
 TabPage RID_SVXPAGE_HATCH
 {
@@ -868,9 +823,43 @@ TabPage RID_SVXPAGE_HATCH
 TabStop = TRUE ;
 };
 
-LOAD_BUTTON( cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD, Load Hatches 
List );
-SAVE_BUTTON( cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE, Save Hatches 
List );
-EMBED_BUTTON( cui:ImageButton:RID_SVXPAGE_HATCH:BTN_EMBED, Embed );
+ImageButton BTN_LOAD
+{
+   HelpID = cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD;
+Pos = MAP_APPFONT ( 197 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = Load Hatches List;
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = sc05501.bmp ;
+};
+};
+};
+ImageButton BTN_SAVE
+{
+   HelpID = cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE;
+Pos = MAP_APPFONT ( 217 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = Save Hatches List;
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = sc05502.bmp ;
+};
+};
+};
+CheckBox BTN_EMBED
+{
+   HelpID = cui:ImageButton:RID_SVXPAGE_HATCH:BTN_EMBED;
+Pos = MAP_APPFONT ( 197 , 124 ) ;
+Size = MAP_APPFONT ( 122 , 10 ) ;
+Text [ en-US ] = Embed;
+};
 };
 
 // --
@@ -983,9 +972,43 @@ TabPage RID_SVXPAGE_BITMAP
 TabStop = TRUE ;
 };
 
-LOAD_BUTTON( cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD, Load Bitmap 
List );
-SAVE_BUTTON( cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE, Save Bitmap 
List );
-EMBED_BUTTON( cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED, Embed );
+ImageButton BTN_LOAD
+{
+   HelpID = cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD;
+Pos = MAP_APPFONT ( 197 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = Load Bitmap List;
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = sc05501.bmp ;
+};
+};
+};
+ImageButton BTN_SAVE
+{
+   HelpID = cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE;
+Pos = MAP_APPFONT ( 217 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = Save Bitmap List;
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = sc05502.bmp ;
+};
+};
+}
+CheckBox BTN_EMBED
+{
+   HelpID = cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED;
+Pos = MAP_APPFONT ( 197 , 124 ) ;
+Size = MAP_APPFONT ( 122 , 10 ) ;
+Text [ en-US ] =  Embed;
+}
 };
 
 // --
@@ -1214,9 +1237,43

[Libreoffice-commits] .: cui/source

[David Tardon]

 cui/source/tabpages/tabarea.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 614feec5481ee618bea98dabab2df0281995385e
Author: David Tardon dtar...@redhat.com
Date:   Fri Jan 20 10:32:42 2012 +0100

add missing semicolons. *blush*

diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index 6c830d0..fe22673 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1001,14 +1001,14 @@ TabPage RID_SVXPAGE_BITMAP
 File = sc05502.bmp ;
 };
 };
-}
+};
 CheckBox BTN_EMBED
 {
HelpID = cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED;
 Pos = MAP_APPFONT ( 197 , 124 ) ;
 Size = MAP_APPFONT ( 122 , 10 ) ;
 Text [ en-US ] =  Embed;
-}
+};
 };
 
 // --
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[David Tardon]

 solenv/gbuild/LinkTarget.mk |   19 ++-
 solenv/gbuild/TargetLocations.mk|3 ++-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 solenv/gbuild/platform/com_GCC_defs.mk  |4 ++--
 4 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
Author: David Tardon dtar...@redhat.com
Date:   Mon Jan 16 14:55:57 2012 +0100

sort out dep problem with yacc-generated header (fdo#44707)

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e8f9bab..227fe96 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -185,18 +185,28 @@ endif
 gb_GenCxxObject_GenCxxObject =
 
 # YaccTarget class
+
+# XXX: This is more complicated than necessary, but we cannot just use
+# the generated C++ file as the main target, because we need to let the
+# header depend on that to ensure the header is present before anything
+# tries to use it.
+
 gb_YaccTarget_get_source = $(1)/$(2).y
 
 .PHONY : $(call gb_YaccTarget_get_clean_target,%)
 $(call gb_YaccTarget_get_clean_target,%) :
$(call gb_Output_announce,$(2),$(false),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
-   rm -f $(call gb_YaccTarget_get_header_target,$*) $(call 
gb_YaccTarget_get_target,$*))
+   rm -f $(call gb_YaccTarget_get_grammar_target,$*) $(call 
gb_YaccTarget_get_header_target,$*) $(call gb_YaccTarget_get_target,$*))
 
 $(call gb_YaccTarget_get_target,%) : $(call 
gb_YaccTarget_get_source,$(SRCDIR),%)
-   $(call gb_YaccTarget__command,$,$*,$@,$(call 
gb_YaccTarget_get_header_target,$*))
+   $(call gb_YaccTarget__command,$,$*,$@,$(call 
gb_YaccTarget_get_header_target,$*),$(call gb_YaccTarget_get_grammar_target,$*))
 
-gb_YaccTarget_YaccTarget =
+define gb_YaccTarget_YaccTarget
+$(call gb_YaccTarget_get_grammar_target,$(1)) :| $(call 
gb_YaccTarget_get_target,$(1))
+$(call gb_YaccTarget_get_header_target,$(1)) :| $(call 
gb_YaccTarget_get_target,$(1))
+
+endef
 
 gb_YACC := bison
 
@@ -791,13 +801,12 @@ endef
 # Add a bison grammar to the build.
 # gb_LinkTarget_add_grammar(component,grammar file)
 define gb_LinkTarget_add_grammar
+$(call gb_YaccTarget_YaccTarget,$(2))
 $(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccTarget/$(2))
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_YaccTarget_get_clean_target,$(2))
 $(call gb_LinkTarget__add_internal_headers,$(1),$(call 
gb_YaccTarget_get_header_target,$(2)))
 
-
 endef
-#$(call gb_YaccTarget_YaccTarget,$(2))
 
 # Add bison grammars to the build.
 # gb_LinkTarget_add_grammars(component,grammar file [grammar file*])
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 58b581a..59ad239 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -122,8 +122,9 @@ gb_UnoApiTarget_get_header_target = 
$(WORKDIR)/UnoApiHeaders/$(1)
 gb_WinResTarget_get_target = 
$(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
 # workdir targets: $(1) is prefix/path
 gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done
+gb_YaccTarget_get_grammar_target = $(WORKDIR)/YaccTarget/$(1).cxx
 gb_YaccTarget_get_header_target = $(WORKDIR)/YaccTarget/$(1).hxx
-gb_YaccTarget_get_target = $(WORKDIR)/YaccTarget/$(1).cxx
+gb_YaccTarget_get_target = $(WORKDIR)/YaccTarget/$(1).done
 gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1)
 gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
 gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index af59807..b7b4e94 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -261,7 +261,7 @@ define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3))  \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1)  touch $(3) )
 
 endef
 
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index 9e055ed..f2bf866 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -40,7 +40,7 @@ define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3))  \
-   $(gb_YACC) $(T_YACCFLAGS) -d -o $(3) $(1)  mv $(3).h $(4) )
+   $(gb_YACC) $(T_YACCFLAGS) -d -o $(5) $(1)  mv $(5).h $(4)  touch 
$(3) )
 
 endef
 
@@ -49,7 +49,7 @@ define gb_YaccTarget__command
 $(call gb_Output_announce,$(2),$(true),YAC,3)
 $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3))  \
-   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(3) $(1) )
+   $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1)  touch $(3) )
 
 endef
 endif
___
Libreoffice

[Libreoffice-commits] .: sal/StaticLibrary_salcpprt.mk

[David Tardon]

 sal/StaticLibrary_salcpprt.mk |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 750f32c6ccd4c5dcf0036b0aa421bedea4e686f5
Author: David Tardon dtar...@redhat.com
Date:   Tue Jan 17 07:23:40 2012 +0100

Revert try to solve tml_'s detected dependencies issue with salcpprt

Bjoern fixed it by adding proper package deps

This reverts commit a56cf2216105065b7576ff695cf376bc58b12346.

diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index 2286e6c..b56d4a8 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -36,12 +36,6 @@ $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
$(LFS_CFLAGS) \
 ))
 
-$(eval $(call gb_StaticLibrary_set_include,salcpprt,\
-$$(INCLUDE) \
--I$(realpath $(SRCDIR)/sal/inc) \
-))
-
-
 $(eval $(call gb_StaticLibrary_add_exception_objects,salcpprt, \
sal/cpprt/operators_new_delete \
 ))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in desktop/Module_desktop.mk desktop/Package_scripts.mk desktop/scripts set_soenv.in

[David Tardon]

 config_host.mk.in  |2 +-
 configure.in   |4 ++--
 desktop/Module_desktop.mk  |5 -
 desktop/Package_scripts.mk |8 
 desktop/scripts/Makefile   |6 +-
 set_soenv.in   |3 ---
 6 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit c475316c00056ab2c59438fb78705c2a851f292b
Author: David Tardon dtar...@redhat.com
Date:   Sat Jan 14 10:23:57 2012 +0100

simplify handling of JITC_PROCESSOR_TYPE

diff --git a/config_host.mk.in b/config_host.mk.in
index 280c844..f8b0d81 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -173,7 +173,7 @@ export INSTALLDIR=@INSTALLDIR@
 export INSTALLDIRNAME=@INSTALLDIRNAME@
 export INTRO_BIPMAP=@INTRO_BITMAP@
 @x_JAVALIB@ export JAVALIB=@JAVALIB@
-export JITC_PROCESSOR_TYPE_EXPORT=@JITC_PROCESSOR_TYPE_EXPORT@
+export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
 export JFREEREPORT_JAR=@JFREEREPORT_JAR@
 export KDE4_CFLAGS=@KDE4_CFLAGS@
 export KDE4_LIBS=@KDE4_LIBS@
diff --git a/configure.in b/configure.in
index cef039e..84c1dcc 100644
--- a/configure.in
+++ b/configure.in
@@ -4309,13 +4309,13 @@ dnl empty or non-empty.
 
 dnl SOLAR_JAVA= indicate no java support at all
 
+JITC_PROCESSOR_TYPE=
 if test $_os = Linux  test $host_cpu = powerpc; then
 # IBMs JDK needs this...
 JITC_PROCESSOR_TYPE=6
 export JITC_PROCESSOR_TYPE
-JITC_PROCESSOR_TYPE_EXPORT=export 
JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE
 fi
-AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
+AC_SUBST([JITC_PROCESSOR_TYPE])
 
 if test $_os = WINNT; then
 WITH_VC_REDIST=TRUE
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index ed2c1fe..17fe079 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -71,14 +71,12 @@ $(eval $(call gb_Module_add_targets,desktop,\
 
 ifneq ($(OS),MACOSX)
 ifneq ($(OS),WNT)
-ifneq ($(JITC_PROCESSOR_TYPE_EXPORT),)
 $(eval $(call gb_Module_add_targets,desktop,\
 Package_soffice_sh \
 ))
 endif
 endif
 endif
-endif
 
 ifeq ($(OS),WNT)
 
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index 7611765..9492306 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -46,14 +46,6 @@ $(eval $(call 
gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh))
 $(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh))
 
-ifneq ($(OS),MACOSX)
-ifeq ($(JITC_PROCESSOR_TYPE_EXPORT),)
-
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh))
-
-endif
-endif
-
 endif
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/scripts/Makefile b/desktop/scripts/Makefile
index 349c5dd..a654b6b 100644
--- a/desktop/scripts/Makefile
+++ b/desktop/scripts/Makefile
@@ -26,7 +26,11 @@
 # instead of those above.
 
 soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh
-   sed -e 
s/^#@JITC_PROCESSOR_TYPE_EXPORT@/$(JITC_PROCESSOR_TYPE_EXPORT)/ $  $@
+ifneq ($(JITC_PROCESSOR_TYPE),)
+   sed -e s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export 
JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/ $  $@
+else
+   cp $ $@
+endif
 
 .DEFAULT_GOAL := all
 .PHONY : all
diff --git a/set_soenv.in b/set_soenv.in
index e558deb..53b388f 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -888,9 +888,6 @@ if (@ENABLE_WERROR@ eq FALSE) {
 ToFile( EXTERNAL_WARNINGS_NOT_ERRORS, TRUE,  e );
 }
 ToFile( PROEXT,$PROEXT,e );
-if ($platform =~ m/linux/  $platform =~ m/powerpc/) {
-ToFile( JITC_PROCESSOR_TYPE,6, e );
-}
 ToFile( nodep, @nodep@,  e );
 ToFile( TARFILE_LOCATION,  $TARFILE_LOCATION,  e );
 
commit f4092cb7657b0a403078d593cb612431858150ca
Author: David Tardon dtar...@redhat.com
Date:   Sat Jan 14 15:28:10 2012 +0100

do not build on macosx and win

diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 267cc2c..ed2c1fe 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -68,12 +68,17 @@ $(eval $(call gb_Module_add_targets,desktop,\
 Pagein_impress \
 Pagein_writer \
 ))
+
+ifneq ($(OS),MACOSX)
+ifneq ($(OS),WNT)
 ifneq ($(JITC_PROCESSOR_TYPE_EXPORT),)
 $(eval $(call gb_Module_add_targets,desktop,\
 Package_soffice_sh \
 ))
 endif
 endif
+endif
+endif
 
 ifeq ($(OS),WNT)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[David Tardon]

 sc/source/ui/inc/anyrefdg.hxx  |   23 +++---
 sc/source/ui/miscdlgs/anyrefdg.cxx |   80 ++---
 2 files changed, 49 insertions(+), 54 deletions(-)

New commits:
commit 4163074e53603f5a068b9b066cfcf840b593b236
Author: David Tardon dtar...@redhat.com
Date:   Fri Jan 13 07:53:08 2012 +0100

refactor slightly to avoid link problems with gcc 4.7

Signed-off-by: David Tardon dtar...@redhat.com

diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 8bca700..afd98e4 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -121,7 +121,6 @@ class SC_DLLPUBLIC ScRefHandler : //public 
SfxModelessDialog,
 public:
 operator Window *(){ return m_rWindow; }
 Window  * operator -() { return static_castWindow *(*this); }
-templateclass,bool friend class ScRefHdlrImplBase;
 friend classformula::RefButton;
 friend classformula::RefEdit;
 
@@ -152,6 +151,9 @@ protected:
 
 boolParseWithNames( ScRangeList rRanges, const String 
rStr, ScDocument* pDoc );
 
+void preNotify(const NotifyEvent rEvent, const bool bBindRef);
+void stateChanged(const StateChangedType nStateChange, const bool 
bBindRef);
+
 public:
 ScRefHandler( Window rWindow, SfxBindings* pB/*, 
SfxChildWindow* pCW,
  Window* pParent, sal_uInt16 nResId*/, 
bool bBindRef );
@@ -222,6 +224,20 @@ ScRefHdlrImplBaseTWindow,bBindRef::ScRefHdlrImplBase( 
TParentWindow* pParent,
 templateclass TWindow, bool bBindRef 
 ScRefHdlrImplBaseTWindow,bBindRef::~ScRefHdlrImplBase(){}
 
+templateclass TWindow, bool bBindRef
+long ScRefHdlrImplBaseTWindow, bBindRef::PreNotify( NotifyEvent rNEvt )
+{
+ScRefHandler::preNotify( rNEvt, bBindRef );
+return TWindow::PreNotify( rNEvt );
+}
+
+templateclass TWindow, bool bBindRef
+void ScRefHdlrImplBaseTWindow, bBindRef::StateChanged( StateChangedType 
nStateChange )
+{
+TWindow::StateChanged( nStateChange );
+ScRefHandler::stateChanged( nStateChange, bBindRef );
+}
+
 //
 templateclass TDerived, class TBase, bool bBindRef = true
 struct ScRefHdlrImpl: ScRefHdlrImplBaseTBase, bBindRef 
@@ -257,11 +273,6 @@ inline  bool ScRefHandler::CanInputDone( sal_Bool bForced )
 return m_aHelper.CanInputDone( bForced );
 }
 
-template  SC_DLLPUBLIC void 
ScRefHdlrImplBaseSfxModelessDialog,true::StateChanged( StateChangedType 
nStateChange );
-template  SC_DLLPUBLIC long 
ScRefHdlrImplBaseSfxModelessDialog,true::PreNotify( NotifyEvent rNEvt );
-template  SC_DLLPUBLIC void 
ScRefHdlrImplBaseSfxTabDialog,false::StateChanged( StateChangedType 
nStateChange );
-template  SC_DLLPUBLIC long 
ScRefHdlrImplBaseSfxTabDialog,false::PreNotify( NotifyEvent rNEvt );
-
 #endif // SC_ANYREFDG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx 
b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 25e2f12..42942f2 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -868,54 +868,38 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* 
pEdit, formula::RefButton*
 m_aHelper.ToggleCollapsed( pEdit, pButton );
 }
 
-#if defined( _MSC_VER )
-#define INTRODUCE_TEMPLATE
-#else
-#define INTRODUCE_TEMPLATE  template 
-#endif
-
-#define IMPL_TWINDOW_PRENOTIFY( TWindow,bBindRef )  \
-INTRODUCE_TEMPLATE long ScRefHdlrImplBaseTWindow,bBindRef::PreNotify( 
NotifyEvent rNEvt )\
-{\
-if( bBindRef || m_bInRefMode )\
-{\
-sal_uInt16 nSwitch=rNEvt.GetType();\
-if(nSwitch==EVENT_GETFOCUS)\
-{\
-pActiveWin=rNEvt.GetWindow();\
-}\
-}\
-return TWindow::PreNotify(rNEvt);\
-}
-
-#define IMPL_TWINDOW_STATECHANGED( TWindow,bBindRef )   \
-INTRODUCE_TEMPLATE void ScRefHdlrImplBaseTWindow,bBindRef::StateChanged( 
StateChangedType nStateChange )\
-{\
-TWindow::StateChanged( nStateChange );\
-\
-if( !bBindRef  !m_bInRefMode ) return;\
-\
-if(nStateChange == STATE_CHANGE_VISIBLE)\
-{\
-if(m_rWindow.IsVisible())\
-{\
-m_aHelper.enableInput( false );\
-m_aHelper.EnableSpreadsheets();\
-m_aHelper.SetDispatcherLock( sal_True );\
-aTimer.Start();\
-}\
-else\
-{\
-m_aHelper.enableInput( sal_True );\
-m_aHelper.SetDispatcherLock( false );   /*//! here and in 
DoClose ?*/\
-}\
-}\
-}
-
-IMPL_TWINDOW_PRENOTIFY( SfxModelessDialog, true )
-IMPL_TWINDOW_PRENOTIFY( SfxTabDialog, false )
-IMPL_TWINDOW_STATECHANGED( SfxModelessDialog, true )
-IMPL_TWINDOW_STATECHANGED( SfxTabDialog, false )
+void ScRefHandler::preNotify(const NotifyEvent rNEvt, const bool bBindRef)
+{
+if( bBindRef || m_bInRefMode )
+{
+sal_uInt16 nSwitch=rNEvt.GetType();
+if(nSwitch==EVENT_GETFOCUS

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - l10ntools/scripts

[David Tardon]

 l10ntools/scripts/fast_merge.pl |   21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

New commits:
commit d3dca82e81c32433756ab7d92b1b8f901b9b23b5
Author: David Tardon dtar...@redhat.com
Date:   Wed Jan 11 14:04:54 2012 +0100

fix writing of strings from the first module

Signed-off-by: Andras Timar tima...@gmail.com

diff --git a/l10ntools/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index e9c36d0..c84f00b 100644
--- a/l10ntools/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
@@ -89,11 +89,10 @@ while( hasLines() )
 }
 write_lines();
 }
-if( $#current+1 ne 0 )
+# write content of the last localize.sdf file
+if( $#buffer ge 0 )
 {
-( $path , $localize_file ) = make_paths();
-add_to_buffer();
-write_buffer( $path , $localize_file );
+write_buffer( $last_path , $last_localize_file );
 }
 release_lock();
 exit( 0 );
@@ -248,15 +247,14 @@ sub make_paths
 
 return ( $path , $localizeFile );
 }
+
 sub write_lines
 {
 if( $first_run ){
-add_to_buffer();
 my( $path , $localize_file ) = make_paths();
 $last_path = $path;
 $last_localize_file = $localize_file;
-mkpath $path;
-write_buffer( $path , $localize_file );
+add_to_buffer();
 $first_run = '';
 }
 else
@@ -269,7 +267,6 @@ sub write_lines
 }
 else
 {
-mkpath $path;
 write_buffer( $last_path , $last_localize_file );
 add_to_buffer();
 $last_path = $path;
@@ -277,6 +274,11 @@ sub write_lines
 }
 }
 }
+
+# Adds all lines that contain strings from one source file from every input 
file.
+# TODO: Would it not be better to add lines for all files from a directory 
(i.e., replace
+# $afile eq $elem-file by $adir eq $elem-dir)? We could get rid of the 
delayed
+# writing then. But maybe there is a reason for doing it this way...
 sub add_to_buffer
 {
 my $plainline;
@@ -293,12 +295,15 @@ sub add_to_buffer
 } while ( !$elem-endoffile  $amodule eq $elem-module  $afile eq 
$elem-file );
 }
 }
+
+# Writes the buffer to currently selected localize.sdf file.
 sub write_buffer
 {
 my $path= shift;
 my $localize_file   = shift;
 my $cnt = $#buffer+1;
 print Write to $path $cnt lines\n;
+mkpath $path;
 open FILE , $localize_file or die Can't open file '$localize_file'\n;
 foreach ( @buffer )
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits