from:"Bjoern Michaelsen"

[Libreoffice-commits] .: binfilter/prj

2012-04-29 Thread Bjoern Michaelsen

 0 files changed

New commits:
commit ea53b6fe73dbdce48c0b16309b78f7a1b78e06d8
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sun Apr 29 13:08:57 2012 +0200

add dmake flagfile for build.pl

diff --git a/binfilter/prj/dmake b/binfilter/prj/dmake
new file mode 100644
index 000..e69de29
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10n/prj

2012-04-29 Thread Bjoern Michaelsen

 0 files changed

New commits:
commit 15dcf02f0e2633830c48fede5e54766a7fd3ba7d
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sun Apr 29 13:18:06 2012 +0200

add dmake flagfile for build.pl

diff --git a/l10n/prj/dmake b/l10n/prj/dmake
new file mode 100644
index 000..e69de29
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sysui/desktop

2012-04-18 Thread Bjoern Michaelsen

 sysui/desktop/menus/base.desktop|5 +
 sysui/desktop/menus/calc.desktop|5 +
 sysui/desktop/menus/draw.desktop|7 ++-
 sysui/desktop/menus/impress.desktop |5 +
 sysui/desktop/menus/math.desktop|5 +
 sysui/desktop/menus/writer.desktop  |5 +
 sysui/desktop/share/makefile.mk |4 +++-
 sysui/desktop/share/translate.pl|   18 +++---
 8 files changed, 49 insertions(+), 5 deletions(-)

New commits:
commit b7423ceee1a6b1c5595fbbef6f0ca4417feeddf6
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Apr 18 12:00:30 2012 +0200

lp#720716: add unity quicklist support

diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 56a25a2..8cc8e7c 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Base
 GenericName=Database Development
 Comment=Manage databases, create queries and reports to track and manage your 
information by using Base.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Database
+Exec=libreoffice --base %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index f58a164..d1a4147 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Calc
 GenericName=Spreadsheet
 Comment=Perform calculations, analyze information and manage lists in 
spreadsheets by using Calc.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Spreadsheet
+Exec=libreoffice --calc %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 7819d81..e558330 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Draw
 GenericName=Drawing Program
 Comment=Create and edit drawings, flow charts, and logos by using Draw.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Drawing
+Exec=libreoffice --draw %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/impress.desktop 
b/sysui/desktop/menus/impress.desktop
index 84f16a9..1ea00aa 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Impress
 GenericName=Presentation
 Comment=Create and edit presentations for slideshows, meeting and Web pages by 
using Impress.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Presentation
+Exec=libreoffice --impress %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 9b87ef0..70b5695 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -11,3 +11,8 @@ Name=%PRODUCTNAME Math
 GenericName=Formula Editor
 Comment=Create and edit scientific formulas and equations by using Math.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Formula
+Exec=libreoffice --math %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/writer.desktop 
b/sysui/desktop/menus/writer.desktop
index 0b6f116..8698e97 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Writer
 GenericName=Word Processor
 Comment=Create and edit text and graphics in letters, reports, documents and 
Web pages by using Writer.
 InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Document
+Exec=libreoffice --writer %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 1d99c84..0a7c549 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -50,6 +50,7 @@ ULFFILES= \
 documents.ulf \
 launcher_comment.ulf \
 launcher_genericname.ulf \
+launcher_unityquicklist.ulf \
 launcher_name.ulf
 
 LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter
@@ -146,7 +147,7 @@ ALLTAR : $(LAUNCHERFLAGFILE) $(SPECFILES) 
$(COMMONMISC)$/{$(PRODUCTLIST)}$/build
 # merge-in the translations. 
 #
 
-$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl 
$(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf 
$(ULFDIR)/launcher_genericname.ulf
+$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl 
$(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf 
$(ULFDIR)/launcher_genericname.ulf $(ULFDIR)/launcher_unityquicklist.ulf
 $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN) 
 @@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
 @echo Creating desktop entries for $(@:f) ..
@@ -155,6 +156,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
 @$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d 
$(@:db).$(INPATH).$(@:f

[Libreoffice-commits] .: 2 commits - configure.in sysui/desktop

2012-04-18 Thread Bjoern Michaelsen

 configure.in|4 +++-
 sysui/desktop/share/launcher_unityquicklist.ulf |   23 +++
 2 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit 04ce0e891ecb9c4bb51fd19e9588ecb8613ac788
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Apr 18 13:14:07 2012 +0200

lp#720716: add unity quicklist support (add missed file)

diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf 
b/sysui/desktop/share/launcher_unityquicklist.ulf
new file mode 100644
index 000..d1b0c86
--- /dev/null
+++ b/sysui/desktop/share/launcher_unityquicklist.ulf
@@ -0,0 +1,23 @@
+[writer]
+en-US = New Document
+
+[impress]
+en-US = New Presentation
+
+[calc]
+en-US = New Spreadsheet
+
+[base]
+en-US = New Database
+
+[math]
+en-US = New Formula
+
+[draw]
+en-US = New Drawing
+
+[startcenter]
+en-US = 
+
+[javafilter]
+en-US = 
commit 79e185898a577a2f90493f128628e559a481a374
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Apr 18 13:07:51 2012 +0200

update configure help for --enable-debug

diff --git a/configure.in b/configure.in
index 499cbf0..4f981fc 100644
--- a/configure.in
+++ b/configure.in
@@ -637,7 +637,9 @@ AC_ARG_ENABLE(debug,
 [Include debugging symbols from --enable-symbols plus extra debugging
  code. Extra large build! (enables -g compiler flag and dmake 
debug=true)
  If you need even more verbose output, build a module with
- build -- debug=true dbglevel=2.]))
+ build -- debug=true dbglevel=2. You can also use this switch as 
follows:
+ --enable-debug=tl svx to enable debug only for the specified
+ gbuild-build libraries.]))
 
 AC_ARG_ENABLE(dbgutil,
 AS_HELP_STRING([--enable-dbgutil],
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: config_host.mk.in configure.in solenv/gbuild

2012-04-16 Thread Bjoern Michaelsen

 config_host.mk.in   |1 
 configure.in|   15 +++---
 solenv/gbuild/LinkTarget.mk |   64 ++--
 3 files changed, 33 insertions(+), 47 deletions(-)

New commits:
commit ebed42c38ae91147633c47873307e07984bc62c1
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Apr 16 00:42:28 2012 +0200

introduce ENABLE_DEBUG_ONLY

with this you can now do:

 ./autogen.sh --enable-debug=sw sc

and your build will have debug version of the libraries sw and sc, but a
non-debug build elsewhere. This currently only works for libraries. It 
would be
also possible to extend that to excutables, but that would need explicit in 
the
enable-debug switch then:

 ./autogen.sh --enable-debug=Library/sw Library/sc Executable/mkunroll

so I dont know if it is worth it.

diff --git a/config_host.mk.in b/config_host.mk.in
index 378dc07..8ad7f5c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -74,6 +74,7 @@ export DBUS_LIBS=@DBUS_LIBS@
 export DB_CPPLIB=@DB_CPPLIB@
 export DB_LIB=@DB_LIB@
 export debug=@ENABLE_DEBUG@
+export ENABLE_DEBUG_ONLY=@ENABLE_DEBUG_ONLY@
 export DEFAULT_MOZILLA_TOOLKIT=@MOZILLA_TOOLKIT@
 export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
diff --git a/configure.in b/configure.in
index 01b86c2..e75f81c 100644
--- a/configure.in
+++ b/configure.in
@@ -3426,15 +3426,22 @@ AC_SUBST(EXTERNAL_WARNINGS_NOT_ERRORS)
 dnl Set the ENABLE_DEBUG variable. (Activate --enable-symbols)
 dnl ===
 AC_MSG_CHECKING([whether to do a debug build])
-if test -n $enable_debug -a $enable_debug != no; then
-ENABLE_DEBUG=TRUE
-enable_symbols=yes
-AC_MSG_RESULT([yes])
+if test -n $enable_debug  test $enable_debug != no; then
+if test $enable_debug = y || test $enable_debug = yes; then
+ENABLE_DEBUG=TRUE
+ENABLE_DEBUG_ONLY=
+else
+ENABLE_DEBUG=
+ENABLE_DEBUG_ONLY=$enable_debug
+AC_MSG_RESULT([for $enable_debug])
+fi
 else
 ENABLE_DEBUG=
+ENABLE_DEBUG_ONLY=
 AC_MSG_RESULT([no])
 fi
 AC_SUBST(ENABLE_DEBUG)
+AC_SUBST(ENABLE_DEBUG_ONLY)
 
 
 dnl Determine whether to use linkoo for the smoketest installation
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 8d886c6..dc75200 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -35,15 +35,22 @@
 # OBJCXXFLAGS
 # LDFLAGS
 
-# CFLAGS from environment override debug/optimization flags
+# this returns the cflags/cxxflags to use from either the environment or
+# otherwise debug flags, if ENABLE_DEBUG is set or the LinkTarget is named
+# in the list of libraries of ENABLE_DEBUG_ONLY
+
 ifeq ($(gb_DEBUGLEVEL),2)
-CFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS)
-CXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS)
-OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS) $(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS)
+define gb_LinkTarget__get_debugcflags
+$(if $(CFLAGS),$(CFLAGS),$(gb_DEBUG_CFLAGS))
+endef
+
+define gb_LinkTarget__get_debugcxxflags
+$(if $(CXXFLAGS),$(CXXFLAGS),$(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS))
+endef
+
 else
-CFLAGS ?= $(gb_COMPILEROPTFLAGS)
-CXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
-OBJCXXFLAGS ?= $(gb_COMPILEROPTFLAGS)
+gb_LinkTarget__get_debugcflags=$(if $(filter $(1),$(foreach 
lib,$(ENABLE_DEBUG_ONLY),$(call 
gb_Library_get_linktargetname,$(lib,$(gb_DEBUG_CFLAGS))
+gb_LinkTarget__get_debugcxxflags=$(if $(filter $(1),$(foreach 
lib,$(ENABLE_DEBUG_ONLY),$(call 
gb_Library_get_linktargetname,$(lib,$(gb_DEBUG_CFLAGS) $(gb_DEBUG_CXXFLAGS))
 endif
 
 # Overview of dependencies and tasks of LinkTarget
@@ -426,10 +433,10 @@ $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS :=
 $(call gb_LinkTarget_get_clean_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
 $(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS) 
$(CFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := 
$$(gb_LinkTarget_CXXFLAGS)
-$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := 
$$(gb_LinkTarget_OBJCXXFLAGS) $(OBJCXXFLAGS)
+$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := 
$$(gb_LinkTarget_OBJCXXFLAGS)
 $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := 
$$(gb_LinkTarget_OBJCFLAGS) $(OBJCFLAGS)
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) 
$(CPPFLAGS)
@@ -459,7 +466,7 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : ASMOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS :=
 $(call gb_LinkTarget_get_dep_target,$(1)) : YACCOBJECTS

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

2012-04-06 Thread Bjoern Michaelsen

 sfx2/source/dialog/filedlghelper.cxx |   11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit cac9cf690bf337a97ede781c38c5e7ddb3f37ca5
Author: Michael Stahl mst...@redhat.com
Date:   Thu Apr 5 18:09:41 2012 +0200

fdo#43895 lp#905355: fix the fix so it doesn't crash

rtl::OUString rtl::OUString::copy(sal_Int32) const: Assertion
`beginIndex = 0  beginIndex = getLength()' failed.
(regression from dd2fe95cce75f1157bd1c75d286a0047b2e4175e)

Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 79c1e4e..6acb006 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1654,8 +1654,17 @@ void FileDialogHelper_Impl::getRealFilter( String 
_rFilter ) const
 void FileDialogHelper_Impl::verifyPath()
 {
 #ifdef UNX
+static char const s_FileScheme[] = file://;
+if (0 != rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
+maPath.getStr(), maPath.getLength(),
+s_FileScheme, RTL_CONSTASCII_LENGTH(s_FileScheme)))
+{
+return;
+}
+const OString sFullPath = OUStringToOString(
+maPath.copy(RTL_CONSTASCII_LENGTH(s_FileScheme)) + maFileName,
+osl_getThreadTextEncoding() );
 struct stat aFileStat;
-const OString sFullPath = OUStringToOString( 
maPath.copy(RTL_CONSTASCII_LENGTH(file://)) + maFileName, 
osl_getThreadTextEncoding() );
 stat( sFullPath.getStr(), aFileStat );
 // lp#905355, fdo#43895
 // Check that the file has read only permission and is in /tmp -- this is
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sfx2/source vcl/unx

2012-04-04 Thread Bjoern Michaelsen

 sfx2/source/dialog/filedlghelper.cxx |   23 +++
 sfx2/source/dialog/filedlgimpl.hxx   |2 ++
 vcl/unx/gtk/gdi/salprn-gtk.cxx   |2 +-
 3 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit d347e443e2c847d50f45ac810c5f78de3b892e3a
Author: David Tardon dtar...@redhat.com
Date:   Wed Mar 28 13:25:25 2012 +0200

bypass GtkSalPrinter when it is not enabled

Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com

diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index fb25aec..b8c182f 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -236,7 +236,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 2890ca399dd23abd9b8b507d80f7242fce735278
Author: Andrzej J. R. Hunt andr...@hunt.org
Date:   Tue Mar 27 10:32:52 2012 +0200

fdo#43895 lp#905355: Never let users save in /tmp by default
(cherry picked from commit dd2fe95cce75f1157bd1c75d286a0047b2e4175e)

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 141b389..79c1e4e 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -100,6 +100,9 @@
 #include helpid.hrc
 #include sfxlocal.hrc
 #include rtl/strbuf.hxx
+#ifdef UNX
+#include sys/stat.h
+#endif
 
 //-
 
@@ -1648,6 +1651,24 @@ void FileDialogHelper_Impl::getRealFilter( String 
_rFilter ) const
 }
 }
 
+void FileDialogHelper_Impl::verifyPath()
+{
+#ifdef UNX
+struct stat aFileStat;
+const OString sFullPath = OUStringToOString( 
maPath.copy(RTL_CONSTASCII_LENGTH(file://)) + maFileName, 
osl_getThreadTextEncoding() );
+stat( sFullPath.getStr(), aFileStat );
+// lp#905355, fdo#43895
+// Check that the file has read only permission and is in /tmp -- this is
+//  the case if we have opened the file from the web with firefox only.
+if ( maPath.reverseCompareToAsciiL(file:///tmp,11) == 0 
+( aFileStat.st_mode  (S_IRWXO + S_IRWXG + S_IRWXU) ) == S_IRUSR )
+{
+maPath = SvtPathOptions().GetWorkPath();
+mxFileDlg-setDisplayDirectory( maPath );
+}
+#endif
+}
+
 // 
 void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString _rPath )
 {
@@ -1661,6 +1682,7 @@ void FileDialogHelper_Impl::displayFolder( const 
::rtl::OUString _rPath )
 try
 {
 mxFileDlg-setDisplayDirectory( maPath );
+verifyPath();
 }
 catch( const IllegalArgumentException )
 {
@@ -1678,6 +1700,7 @@ void FileDialogHelper_Impl::setFileName( const 
::rtl::OUString _rFile )
 try
 {
 mxFileDlg-setDefaultName( maFileName );
+verifyPath();
 }
 catch( const IllegalArgumentException )
 {
diff --git a/sfx2/source/dialog/filedlgimpl.hxx 
b/sfx2/source/dialog/filedlgimpl.hxx
index 6770bb7..3433883 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -155,6 +155,8 @@ namespace sfx2
 
 voidimplInitializeFileName( );
 
+voidverifyPath( );
+
 voidimplGetAndCacheFiles( const 
::com::sun::star::uno::Reference XInterface  xPicker  ,
 SvStringsDtor*
   rpURLList,
   const SfxFilter* 
   pFilter  );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

2012-03-27 Thread Bjoern Michaelsen

 sfx2/source/dialog/filedlghelper.cxx |   23 +++
 sfx2/source/dialog/filedlgimpl.hxx   |2 ++
 2 files changed, 25 insertions(+)

New commits:
commit dd2fe95cce75f1157bd1c75d286a0047b2e4175e
Author: Andrzej J. R. Hunt andr...@hunt.org
Date:   Tue Mar 27 10:32:52 2012 +0200

fdo#43895 lp#905355: Never let users save in /tmp by default

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index 3bf4fb5..0018912 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -101,6 +101,9 @@
 #include sfxlocal.hrc
 #include rtl/oustringostreaminserter.hxx
 #include rtl/strbuf.hxx
+#ifdef UNX
+#include sys/stat.h
+#endif
 
 //-
 
@@ -1635,6 +1638,24 @@ void FileDialogHelper_Impl::getRealFilter( String 
_rFilter ) const
 }
 }
 
+void FileDialogHelper_Impl::verifyPath()
+{
+#ifdef UNX
+struct stat aFileStat;
+const OString sFullPath = OUStringToOString( 
maPath.copy(RTL_CONSTASCII_LENGTH(file://)) + maFileName, 
osl_getThreadTextEncoding() );
+stat( sFullPath.getStr(), aFileStat );
+// lp#905355, fdo#43895
+// Check that the file has read only permission and is in /tmp -- this is
+//  the case if we have opened the file from the web with firefox only.
+if ( maPath.reverseCompareToAsciiL(file:///tmp,11) == 0 
+( aFileStat.st_mode  (S_IRWXO + S_IRWXG + S_IRWXU) ) == S_IRUSR )
+{
+maPath = SvtPathOptions().GetWorkPath();
+mxFileDlg-setDisplayDirectory( maPath );
+}
+#endif
+}
+
 // 
 void FileDialogHelper_Impl::displayFolder( const ::rtl::OUString _rPath )
 {
@@ -1648,6 +1669,7 @@ void FileDialogHelper_Impl::displayFolder( const 
::rtl::OUString _rPath )
 try
 {
 mxFileDlg-setDisplayDirectory( maPath );
+verifyPath();
 }
 catch( const IllegalArgumentException )
 {
@@ -1665,6 +1687,7 @@ void FileDialogHelper_Impl::setFileName( const 
::rtl::OUString _rFile )
 try
 {
 mxFileDlg-setDefaultName( maFileName );
+verifyPath();
 }
 catch( const IllegalArgumentException )
 {
diff --git a/sfx2/source/dialog/filedlgimpl.hxx 
b/sfx2/source/dialog/filedlgimpl.hxx
index 4f4e86d..4c3c68b 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -152,6 +152,8 @@ namespace sfx2
 
 voidimplInitializeFileName( );
 
+voidverifyPath( );
+
 voidimplGetAndCacheFiles( const 
::com::sun::star::uno::Reference XInterface  xPicker  ,
   
std::vectorrtl::OUString   rpURLList,
   const SfxFilter* 
   pFilter  );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in

2012-03-18 Thread Bjoern Michaelsen

 configure.in |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit eb1400e33049b447869234134da59afe6553ad72
Author: Tomas Chvatal tchva...@suse.cz
Date:   Sun Mar 18 12:28:44 2012 +0100

Add check for hamcrest even if it is not first in classpath.

Conflicts:

configure.in

Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com

diff --git a/configure.in b/configure.in
index f7ee08f..ea959e6 100644
--- a/configure.in
+++ b/configure.in
@@ -9154,8 +9154,8 @@ if test $SOLAR_JAVA !=   test $with_junit != 
no; then
 if test $? -eq 0; then
 # check if either class-path entry is available for hamcrest or
 # it's bundled
-if $JAVA_HOME/bin/jar tf $OOO_JUNIT_JAR |grep -q hamcrest || \
-$UNZIP -c $OOO_JUNIT_JAR META-INF/MANIFEST.MF |grep -q 
'Class-Path: hamcrest'; then
+if $JAVA_HOME/bin/jar tf $OOO_JUNIT_JAR |$GREP -q hamcrest || \
+$UNZIP -c $OOO_JUNIT_JAR META-INF/MANIFEST.MF |$GREP 
'Class-Path:' | $GREP -q 'hamcrest'; then
 AC_MSG_RESULT([$OOO_JUNIT_JAR])
 else
 AC_MSG_ERROR([your junit jar neither sets a classpath nor includes 
hamcrest; please
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - binaryurp/prj configure.in solenv/gbuild

2012-03-13 Thread Bjoern Michaelsen

 binaryurp/prj/build.lst |2 +-
 configure.in|3 +++
 solenv/gbuild/LinkTarget.mk |2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3b6773c9d4550ad322248db8b16caa0206fbb3cb
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Mar 13 13:45:15 2012 +0100

add bug-id directly to the error message

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index c547891..3d691cc 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -85,7 +85,7 @@ endif
 # require different compiler flags
 define gb_Object__owner
 $$(if $$(OBJECTOWNER),\
-  $$(call gb_Output_error,$(1) is linked in by $$(OBJECTOWNER) $(2)))$(2)
+  $$(call gb_Output_error,fdo#47246: $(1) is linked in by $$(OBJECTOWNER) 
$(2)))$(2)
 endef
 
 # For every object there is a dep file (if gb_FULLDEPS is active).
commit d54e03caf915d5d89d35f73ea5fdd0b8d2fdb9db
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Mar 13 13:40:30 2012 +0100

binaryurp has cppunit tests

diff --git a/binaryurp/prj/build.lst b/binaryurp/prj/build.lst
index eba5c27..7a32eda 100644
--- a/binaryurp/prj/build.lst
+++ b/binaryurp/prj/build.lst
@@ -1,2 +1,2 @@
-bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal 
salhelper NULL
+bu binaryurp : BOOST:boost LIBXSLT:libxslt cppu cppuhelper offapi sal 
salhelper CPPUNIT:cppunit NULL
 bu binaryurp\prj nmake - all bu_prj NULL
commit 567a22f15ab35638ba04d51fdb1e8c91471bf8d1
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Mar 13 12:56:56 2012 +0100

upstream pkgconfig-mozilla-plugin.diff from Ubuntu/Debian packaging

diff --git a/configure.in b/configure.in
index 8ccb1e7..764b9c0 100644
--- a/configure.in
+++ b/configure.in
@@ -7274,6 +7274,9 @@ if test $with_system_mozilla_headers = yes; then
 if test x$LOCATED != xyes; then
 PKG_CHECK_MODULES(MOZILLA_HEADERS, libxul, [LOCATED=yes], [LOCATED=no])
 fi
+if test x$LOCATED != xyes; then
+PKG_CHECK_MODULES(MOZILLA_HEADERS, mozilla-plugin, [LOCATED=yes], 
[LOCATED=no])
+fi
 # if still not found bail out
 if test x$LOCATED != xyes; then
 AC_MSG_ERROR([npapi.h header file not found])
commit 58f5a26e2d4d6998a30e423ac67335cf62e97226
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Mar 13 11:16:32 2012 +0100

fdo#47246: abort on duplicate linked objects

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 555a805..c547891 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -85,7 +85,7 @@ endif
 # require different compiler flags
 define gb_Object__owner
 $$(if $$(OBJECTOWNER),\
-  $$(call gb_Output_warn,$(1) is linked in by $$(OBJECTOWNER) $(2)))$(2)
+  $$(call gb_Output_error,$(1) is linked in by $$(OBJECTOWNER) $(2)))$(2)
 endef
 
 # For every object there is a dep file (if gb_FULLDEPS is active).
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/source

2012-03-06 Thread Bjoern Michaelsen

 extensions/source/bibliography/bibload.cxx |   17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 1889c1af41650576a29c587a0b2cdeaf0d297587
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Mar 6 18:16:35 2012 +0100

lp#527938, debian#602953, fdo#33266, i#105408: do not crash on clicking 
bibliography when base isnt installed

diff --git a/extensions/source/bibliography/bibload.cxx 
b/extensions/source/bibliography/bibload.cxx
index 882b9a2..d20d34c 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -53,6 +53,7 @@
 #include com/sun/star/text/BibliographyDataField.hpp
 #include com/sun/star/form/XLoadListener.hpp
 #include com/sun/star/frame/XLayoutManager.hpp
+#include com/sun/star/uno/XAggregation.hpp
 #include toolkit/awt/vclxwindow.hxx
 #include vcl/window.hxx
 #include vcl/edit.hxx
@@ -242,13 +243,27 @@ void BibliographyLoader::cancel(void) throw 
(::com::sun::star::uno::RuntimeExcep
 }
 
 // ---
+namespace
+{
+// lp#527938, debian#602953, fdo#33266, i#105408
+static bool lcl_isBaseAvailable()
+{
+Reference XMultiServiceFactory   xMgr = 
comphelper::getProcessServiceFactory();
+Reference XAggregation  xAggregate = Reference XAggregation ( 
xMgr-createInstance(C2U(com.sun.star.sbd.RowSet)), UNO_QUERY);
+return xAggregate.is();
+}
+}
 void BibliographyLoader::load(const Reference XFrame   rFrame, const 
rtl::OUString rURL,
 const Sequence PropertyValue  rArgs,
 const Reference XLoadEventListener   rListener) throw 
(::com::sun::star::uno::RuntimeException)
 {
-//!
+// lp#527938, debian#602953, fdo#33266, i#105408
+// make sure we actually can instanciate services from base first
+if(!lcl_isBaseAvailable())
+return;
 
 SolarMutexGuard aGuard;
+
 m_pBibMod = OpenBibModul();
 
 String aURLStr( rURL );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/source

2012-03-05 Thread Bjoern Michaelsen

 framework/source/services/desktop.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8550f6a66af279a34731a2d7921fb63550e463b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Mar 5 09:21:38 2012 +0100

add a space

diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 3d164f0..8a03aa3 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -428,7 +428,7 @@ namespace
 bool SAL_CALL Desktop::terminateQuickstarterToo()
 throw( css::uno::RuntimeException )
 {
-QuickstartSuppressoraQuickstartSuppressor(this, m_xQuickLauncher);
+QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
 return terminate();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: framework/source

2012-03-04 Thread Bjoern Michaelsen

 framework/source/services/desktop.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f3d78616dfc0805ff31038e00148e115d409ef9a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Mar 5 08:50:10 2012 +0100

lp#562027: actually give the quickstart suppressor a scope

diff --git a/framework/source/services/desktop.cxx 
b/framework/source/services/desktop.cxx
index 6c63aea..3d164f0 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -428,7 +428,7 @@ namespace
 bool SAL_CALL Desktop::terminateQuickstarterToo()
 throw( css::uno::RuntimeException )
 {
-QuickstartSuppressor(this, m_xQuickLauncher);
+QuickstartSuppressoraQuickstartSuppressor(this, m_xQuickLauncher);
 return terminate();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-02-29 Thread Bjoern Michaelsen

 svl/source/inc/poolio.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33e530692e5527f3286547647604cbcd2e410b82
Author: Michael Stahl mst...@redhat.com
Date:   Mon Feb 27 20:43:28 2012 +0100

SfxItemPool: replace deque with vector for SfxPoolItem array

Yields measurable speedup on load/store of large documents, wonder where
the equivalent patch i committed long time ago to OOo went...

Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com

diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 15f55ee..7c2cfc6 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -56,7 +56,7 @@ struct SfxPoolVersion_Impl
 {}
 };
 
-typedef std::dequeSfxPoolItem* SfxPoolItemArrayBase_Impl;
+typedef std::vectorSfxPoolItem* SfxPoolItemArrayBase_Impl;
 
 typedef boost::shared_ptr SfxPoolVersion_Impl  SfxPoolVersion_ImplPtr;
 typedef std::deque SfxPoolVersion_ImplPtr  SfxPoolVersionArr_Impl;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 4 commits - framework/inc framework/source sfx2/source vcl/inc vcl/unx

2012-02-28 Thread Bjoern Michaelsen

 framework/inc/services/desktop.hxx|4 +
 framework/source/services/desktop.cxx |   30 
 framework/source/services/sessionlistener.cxx |   27 +++
 sfx2/source/appl/shutdownicon.cxx |1 
 vcl/inc/unx/sm.hxx|1 
 vcl/unx/generic/app/sm.cxx|   96 ++
 6 files changed, 100 insertions(+), 59 deletions(-)

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

lp#562027: fix logout with quickstarter

diff --git a/framework/inc/services/desktop.hxx 
b/framework/inc/services/desktop.hxx
index ac51f25..530d615 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 eccd010..6c63aea 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -401,6 +401,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(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 b6c94b2..92b479d 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
@@ -326,7 +327,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() )
 {
commit 478485d19f290f417f824dbecad3e3588bf553f5
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Feb 28 14:27:41 2012 +0100

some fancy new SAL_LOG tracing for sfx2

diff --git a/sfx2/source/appl/shutdownicon.cxx 
b/sfx2/source/appl/shutdownicon.cxx
index ffaa63d..2f56e0b 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -686,6 +686,7 @@ void SAL_CALL ShutdownIcon::disposing( const 
::com::sun::star

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx

2012-02-28 Thread Bjoern Michaelsen

 vcl/unx/generic/plugadapt/salplug.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e532d4932b8a265cc82bf06ef54db58c9b532e38
Author: Tomas Chvatal tchva...@suse.cz
Date:   Tue Feb 28 21:09:08 2012 +0100

Fix crash on exit using KDE interface
This is slightly modified version of patch from Lubos Lunak
llu...@suse.cz.

This fixes downstream bugs:
https://bugs.gentoo.org/show_bug.cgi?id=394533
https://bugs.launchpad.net/bugs/925049

Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx 
b/vcl/unx/generic/plugadapt/salplug.cxx
index 72d236f..f94d6e5 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -96,8 +96,10 @@ static SalInstance* tryInstance( const OUString rModuleBase 
)
 /*
  * #i109007# KDE3 seems to have the same problem; an atexit 
cleanup
  * handler, which cannot be resolved anymore if the plugin is 
already unloaded.
+* Same applies for kde4.
  */
-else if( 
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde)) )
+else if( 
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde)) ||
+
rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(kde4)) )
 {
 pCloseModule = NULL;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

2012-02-21 Thread Bjoern Michaelsen

 solenv/bin/linkoo |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 43eefa11eb1d025b7967e75574f07603f6ac8a96
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Feb 21 13:43:04 2012 +0100

pythonloader.uno.so, libpyuno and pyuno are duplicates for linkoo too

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 5c15611..97ae2e3 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -136,7 +136,7 @@ my %replaceable = (
 
 my @search_dirs = ( 'lib', 'bin', 'class' );
 
-my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 
'libsqlite3', 'libnssutil3' );
+my @known_duplicates = ( 'db.jar', 'libi18n', 'libnssckbi', 'libnssdbm', 
'libsqlite3', 'libnssutil3', 'pythonloader.uno', 'pyuno', 'libpyuno' );
 
 sub sniff_target($)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile

2012-02-20 Thread Bjoern Michaelsen

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

New commits:
commit 41ad8739cba290a309bffe85aaf2088289054933
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Feb 21 00:59:19 2012 +0100

make debugrun run debugrun and not subsequentcheck

diff --git a/Makefile b/Makefile
index 346e91c..4899664 100644
--- a/Makefile
+++ b/Makefile
@@ -448,10 +448,10 @@ findunusedcode:
 check: subsequentcheck
 
 subsequentcheck: dev-install
-   $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile 
subsequentcheck
+   $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile $@
 
 debugrun:
-   $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile 
debugrun
+   $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile $@
 
 endif # not clean or distclean
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - sc/Module_sc.mk solenv/gbuild

2012-02-08 Thread Bjoern Michaelsen

 sc/Module_sc.mk   |5 +-
 solenv/gbuild/Module.mk   |   43 +++---
 solenv/gbuild/TargetLocations.mk  |1 
 solenv/gbuild/extensions/post_DisableIosUnitchecks.mk |1 
 solenv/gbuild/extensions/post_SpeedUpTargets.mk   |1 
 solenv/gbuild/gbuild.help.txt |1 
 6 files changed, 46 insertions(+), 6 deletions(-)

New commits:
commit 17f59f3aa995dd324ec88974b6196402f8fd89f0
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Feb 8 15:28:09 2012 +0100

stick to three-letter length

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index f99c4cb..c46a2e8 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -69,7 +69,7 @@ $(call gb_Module_get_check_target,%) :
touch $@)
 
 $(call gb_Module_get_slowcheck_target,%) :
-   $(call gb_Output_announce,$*,$(true),SCHK,5)
+   $(call gb_Output_announce,$*,$(true),SLC,5)
$(call gb_Output_announce_title,module $* slowchecks done.)
-$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@)  \
commit 7472fe259e2cc94ddf66de29ab1d287d0775ceb3
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Feb 8 15:07:40 2012 +0100

remove superflous whitespace

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 2825cce..ef47326 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
 CppunitTest_sc_filters_test \
 ))
 
-$(eval $(call gb_Module_add_slowcheck_targets, sc,\
+$(eval $(call gb_Module_add_slowcheck_targets,sc,\
 CppunitTest_sc_ucalc \
 ))
 
commit 590c2400f168faa6eccf793b478d681dcdb73ca7
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Fri Jan 13 20:51:34 2012 +0100

first try to add slowcheck build target

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 112fa40..2825cce 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -42,10 +42,13 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
-CppunitTest_sc_ucalc \
 CppunitTest_sc_filters_test \
 ))
 
+$(eval $(call gb_Module_add_slowcheck_targets, sc,\
+CppunitTest_sc_ucalc \
+))
+
 $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 JunitTest_sc_complex \
 JunitTest_sc_unoapi \
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 24cc1e5..f99c4cb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -34,10 +34,12 @@
 #  excluding tests recursive Modules
 # Module/unitcheckrun unit tests   all unit tests
 #  recursive 
Module/checks
+# Module/slowcheckrun all slow unit tests
 # Module/subsequentcheck  run system tests all system tests
 #  recursive 
Module/subsequentchecks
 # build (global)  build the producttop-level Module
 # unitcheck (global)  run unit tests   top-level 
Module/unitcheck
+# slowcheck (global)  run slow unit tests  top-level 
Module/slowcheck
 # subsequentcheck (global)run system tests top-level 
Module/subsequentcheck
 # all (global)default goal build unitcheck
 
@@ -48,6 +50,7 @@ gb_Module_ALLMODULES :=
 gb_Module_MODULELOCATIONS :=
 gb_Module_TARGETSTACK :=
 gb_Module_CHECKTARGETSTACK :=
+gb_Module_SLOWCHECKTARGETSTACK :=
 gb_Module_SUBSEQUENTCHECKTARGETSTACK :=
 gb_Module_CLEANTARGETSTACK :=
 
@@ -56,7 +59,7 @@ $(call gb_Module_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),MOD,5)
$(call gb_Output_announce_title,module $* cleared.)
-$(call gb_Helper_abbreviate_dirs,\
-   rm -f $(call gb_Module_get_target,$*) $(call 
gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*))
+   rm -f $(call gb_Module_get_target,$*) $(call 
gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call 
gb_Module_get_subsequentcheck_target,$*))
 
 $(call gb_Module_get_check_target,%) :
$(call gb_Output_announce,$*,$(true),CHK,5)
@@ -65,6 +68,13 @@ $(call gb_Module_get_check_target,%) :
mkdir -p $(dir $@)  \
touch $@)
 
+$(call gb_Module_get_slowcheck_target,%) :
+   $(call gb_Output_announce,$*,$(true),SCHK,5)
+   $(call gb_Output_announce_title,module $* slowchecks done.)
+   -$(call gb_Helper_abbreviate_dirs,\
+   mkdir -p $(dir $@)  \
+   touch $@)
+
 $(call gb_Module_get_subsequentcheck_target,%) :
$(call gb_Output_announce,$*,$(true),SCK,5)
$(call gb_Output_announce_title,module $* subsequentchecks done.)
@@ -79,7 +89,7 @@ $(call gb_Module_get_target

[Libreoffice-commits] .: Branch 'distro/ubuntu/oneiric-3.4' - 0 commits -

2012-01-19 Thread Bjoern Michaelsen

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'distro/ubuntu/oneiric-3.4'

2012-01-19 Thread Bjoern Michaelsen

New branch 'distro/ubuntu/oneiric-3.4' available with the following commits:
commit 3129d7d23d06ac9609957d141cedbc04ac42c48a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue Dec 13 21:01:28 2011 +

Resolves: rhbz#761009 IFSD_Equal is asymmetrical

commit 6a98980289ecc5b21a9c1044ca22e8de4f8f9c93
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Aug 25 00:23:31 2011 +0200

lp#832121: libgcc_s magic breaks horribly on armel and powerpc

commit 1518416ac6a692c2234dfa3cb4b98a382ebe65cc
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Jun 29 19:20:43 2011 +0200

lp#746375: soffice.bin crashed with SIGSEGV in uno_type_sequence_construct()

commit 9d3fb278999edb233eb1c2612412a06cd150e396
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Jun 29 19:15:31 2011 +0200

lp#720716: more translations in desktop files

commit 2c1ac0ff6558bd2b3dafe79a76a5fbaaa6507ba3
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Jun 29 19:49:36 2011 +0200

apply ubuntu-palette.diff

commit 4441ba7add7cd954b7f9077585d10033cc4ded2b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jul 19 13:16:14 2011 +0200

disable default as-needed on linking for gbuild too

 * for not breaking pkg-config provided link switches (because of order)

commit 903c82fa3bfeafe33965ca5d38c4ff144dbad572
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sun Jul 3 11:37:02 2011 +0200

adding human theme to scp2

commit 83eed6f49ede0f7b60d3b19e9cc558a90c762ecc
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Jul 1 10:45:59 2011 +0200

disable default as-needed on linking

 * for not breaking pkg-config provided link switches (because of order)

commit 1821350817000893ed9643f3081fca225ca151c2
Author: Rene Engelhard r...@debian.org
Date:   Thu Jun 30 10:18:47 2011 +0200

apply system-lpsolve-rpath.diff from libreoffice-build

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

[Libreoffice-commits] .: extensions/source

2012-01-17 Thread Bjoern Michaelsen

 extensions/source/nsplugin/source/so_env.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03f4f6e17a0a159eb48282bde0a5392c104a0b19
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Jan 18 00:49:51 2012 +0100

lp#711673: mozilla-libreoffice mislabeled as OpenOffice.org Plug-in

diff --git a/extensions/source/nsplugin/source/so_env.cxx 
b/extensions/source/nsplugin/source/so_env.cxx
index 322a2ff..92faaa2 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -63,7 +63,7 @@
 #include ns_debug.hxx
 #include sal/config.h
 
-#define PLUGIN_NAME OpenOffice.org
+#define PLUGIN_NAME LibreOffice
 
 // Tranform all strings like %20 in pPath to one char like space
 /*int retoreUTF8(char* pPath)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - configure.in scp2/source

2012-01-16 Thread Bjoern Michaelsen

 configure.in  |6 +++---
 scp2/source/ooo/file_ooo.scp  |9 +
 scp2/source/ooo/module_hidden_ooo.scp |3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit db741827e630518e40006cbf7486bead92820300
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jan 17 01:16:32 2012 +0100

add human theme to packaging

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a3dd222..8e18e8e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1294,6 +1294,15 @@ File gid_File_ImagesTango_Zip
 End
 #endif
 
+#ifdef THEME_HUMAN
+File gid_File_ImagesHuman_Zip
+TXT_FILE_BODY;
+Dir = gid_Brand_Dir_Share_Config;
+Name = images_human.zip;
+Styles = (PACKED);
+End
+#endif
+
 File gid_File_Share_Registry_Lingucomponent_Xcd
 TXT_FILE_BODY;
 Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 024ec68..2588b5b 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -713,6 +713,9 @@ Module gid_Module_Root_Files_Images
 #ifdef THEME_HICONTRAST
  gid_File_ImagesHicontrast_Zip,
 #endif
+#ifdef THEME_HUMAN
+ gid_File_ImagesHuman_Zip,
+#endif
 #ifdef THEME_TANGO
  gid_File_ImagesTango_Zip
 #endif
commit 03351d7d10f06dbf9fb52343c9f1a360c17ef702
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jan 17 01:13:09 2012 +0100

add human theme to configure

Conflicts:

configure.in

diff --git a/configure.in b/configure.in
index 824de63..c66a6c5 100644
--- a/configure.in
+++ b/configure.in
@@ -855,7 +855,7 @@ AC_ARG_WITH(vba-package-format,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme=theme1 theme2...],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial.]),
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial, human.]),
 ,)
 
 AC_ARG_WITH(helppack-integration,
@@ -7992,8 +7992,8 @@ fi
 WITH_THEMES=
 for theme in $with_theme; do
 case $theme in
-default|crystal|hicontrast|oxygen|tango) : ;;
-*) AC_MSG_ERROR([Unknown value for --with-themes: $theme]) ;;
+default|crystal|hicontrast|oxygen|tango|human) : ;;
+*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
 WITH_THEMES=$WITH_THEMES $theme
 SCPDEFS=$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'`
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - configure.in sal/StaticLibrary_salcpprt.mk scp2/source

2012-01-16 Thread Bjoern Michaelsen

 configure.in  |4 ++--
 sal/StaticLibrary_salcpprt.mk |5 -
 scp2/source/ooo/file_ooo.scp  |9 +
 scp2/source/ooo/module_hidden_ooo.scp |3 +++
 4 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 3c1ddd4de187363cf1c3f14c43b4a2c66b1de6d6
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jan 17 01:16:32 2012 +0100

add human theme to packaging

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 5263c11..cae313a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1295,6 +1295,15 @@ File gid_File_ImagesTango_Zip
 End
 #endif
 
+#ifdef THEME_HUMAN
+File gid_File_ImagesHuman_Zip
+TXT_FILE_BODY;
+Dir = gid_Brand_Dir_Share_Config;
+Name = images_human.zip;
+Styles = (PACKED);
+End
+#endif
+
 File gid_File_Share_Registry_Lingucomponent_Xcd
 TXT_FILE_BODY;
 Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp 
b/scp2/source/ooo/module_hidden_ooo.scp
index 867677d..67499de 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -711,6 +711,9 @@ Module gid_Module_Root_Files_Images
 #ifdef THEME_HICONTRAST
  gid_File_ImagesHicontrast_Zip,
 #endif
+#ifdef THEME_HUMAN
+ gid_File_ImagesHuman_Zip,
+#endif
 #ifdef THEME_TANGO
  gid_File_ImagesTango_Zip
 #endif
commit f8766b4c489e5fb7101ae71fbe41fceaff88f941
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jan 17 01:13:09 2012 +0100

add human theme to configure

diff --git a/configure.in b/configure.in
index 20411f3..251cfa8 100644
--- a/configure.in
+++ b/configure.in
@@ -882,7 +882,7 @@ AC_ARG_WITH(vba-package-format,
 AC_ARG_WITH(theme,
 AS_HELP_STRING([--with-theme=theme1 theme2...],
 [Choose which themes to include. By default those themes with an '*' 
are included.
- Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial.]),
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, 
classic, industrial, human.]),
 ,)
 
 AC_ARG_WITH(helppack-integration,
@@ -8753,7 +8753,7 @@ fi
 WITH_THEMES=
 for theme in $with_theme; do
 case $theme in
-default|crystal|hicontrast|oxygen|tango) : ;;
+default|crystal|hicontrast|oxygen|tango|human) : ;;
 *) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;;
 esac
 WITH_THEMES=$WITH_THEMES $theme
commit 605b8a0bc0201ea0bb07190a57213236dd009216
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Jan 17 01:09:48 2012 +0100

salcpprt also uses headers from sal_inc

diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index 65bd100..2286e6c 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -27,7 +27,10 @@
 
 $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
 
-$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,sal_generated))
+$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,\
+sal_generated \
+sal_inc \
+))
 
 $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \
$(LFS_CFLAGS) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - bridges/source sdext/source

2011-12-19 Thread Bjoern Michaelsen

 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |4 ++--
 sdext/source/pdfimport/makefile.mk|5 -
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit f233f3973631c664e0953f04f88a58234390c088
Author: Matthias Klose matthias.kl...@canonical.com
Date:   Mon Dec 19 10:51:43 2011 +0100

fix armhf build in bridges

Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com
Signed-off-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 5b02678..9502b87 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -173,14 +173,14 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, 
typelib_TypeDescriptionReference *
 pRegisterReturn[0] = r0;
 break;
 case typelib_TypeClass_FLOAT:
-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+#if !defined(__ARM_PCS_VFP)  (defined(__ARM_EABI__) || defined(__SOFTFP__))
 pRegisterReturn[0] = r0;
 #else
 *(float*)pRegisterReturn = fret;
 #endif
 break;
 case typelib_TypeClass_DOUBLE:
-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+#if !defined(__ARM_PCS_VFP)  (defined(__ARM_EABI__) || defined(__SOFTFP__))
 pRegisterReturn[1] = r1;
 pRegisterReturn[0] = r0;
 #else
commit f2a1882be486986a76682ed51f481595e1cf0d5c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Dec 16 19:55:37 2011 +0100

fix racecondition in sdext/source/pdfimport/makefile.mk

diff --git a/sdext/source/pdfimport/makefile.mk 
b/sdext/source/pdfimport/makefile.mk
index 641e90f..d33680f 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -156,11 +156,14 @@ $(COMPONENT_DIALOGS) : dialogs$/$$(@:f)
 @@-$(MKDIRHIER) $(@:d)
 $(COPY) $ $@
 
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
+$(COMPONENT_DESCRIPTION) : $(MISC)/descriptions
+
+$(MISC)/descriptions : $(DESCRIPTION)
 $(COPY) description-en-US.txt $(EXTENSIONDIR)
 .IF $(WITH_LANG) != 
 $(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
 .ENDIF
+$(TOUCH) $@
 
 $(COMPONENT_IMAGES) :  $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
 @@-$(MKDIRHIER) $(@:d)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-12-19 Thread Bjoern Michaelsen

 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 468fe685e3c58c84bce6d9a48b931dcc21682679
Author: Matthias Klose matthias.kl...@canonical.com
Date:   Mon Dec 19 10:51:43 2011 +0100

fix armhf build in bridges

Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com
Signed-off-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 5b02678..9502b87 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -173,14 +173,14 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, 
typelib_TypeDescriptionReference *
 pRegisterReturn[0] = r0;
 break;
 case typelib_TypeClass_FLOAT:
-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+#if !defined(__ARM_PCS_VFP)  (defined(__ARM_EABI__) || defined(__SOFTFP__))
 pRegisterReturn[0] = r0;
 #else
 *(float*)pRegisterReturn = fret;
 #endif
 break;
 case typelib_TypeClass_DOUBLE:
-#if defined(__ARM_EABI__) || defined(__SOFTFP__)
+#if !defined(__ARM_PCS_VFP)  (defined(__ARM_EABI__) || defined(__SOFTFP__))
 pRegisterReturn[1] = r1;
 pRegisterReturn[0] = r0;
 #else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-14 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_AuxTargets.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9c197011a564c185db425d38425f3a89c1700c9d
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 14 12:02:25 2011 +0100

skip AuxTargets in buildpl phase

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index da31aa6..13dd2e0 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -27,6 +27,8 @@
 
 .PHONY: id tags docs distro-pack-install install fetch clean-host clean-build 
bootstrap
 
+ifneq ($(gb_SourceEnvAndRecurse_STAGE),buildpl)
+
 id:
@create-ids
 
@@ -86,5 +88,6 @@ install: build
 
 endif
 
+endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - solenv/gbuild sw/source

2011-12-09 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_BuildplTargets.mk |3 +++
 sw/source/ui/app/applab.cxx |   10 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 18069824a67602719007673c393ae511c476747e
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Dec 9 20:46:02 2011 +0100

do nothing in buildpl stage for debugrun

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 66bb98a..cd98688 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -146,6 +146,9 @@ check: subsequentcheck
 unitcheck: build
@true
 
+debugrun:
+   @true
+
 endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
commit a34ccd2ec9ffaf09162427b198fdc08cc324a3f3
Author: Winfried Donkers w.donk...@dci-electronics.nl
Date:   Fri Dec 9 17:44:20 2011 +0100

fdo#36874: Label PRINTING misplaced on paper sheet

diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index f6784f5..e913db7 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -264,10 +264,14 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool 
bLabel)
 
 aDesc.SetUseOn(nsUseOnPage::PD_ALL);// Site 
numbering
 
+// fix (fdo36874) revised page size calculation
 // Set page size
-rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
-rItem.lLeft  + rItem.nCols * 
rItem.lHDist + MINLAY,
-rItem.lUpper + rItem.nRows * 
rItem.lVDist + MINLAY));
+   long lPgWidth, lPgHeight;
+   lPgWidth = (((rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft)  MINLAY) ?
+   (rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft) : MINLAY);
+   lPgHeight = (((rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper)  MINLAY) ?
+   (rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper) : MINLAY);
+rFmt.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, lPgWidth, lPgHeight 
));
 
 // Numbering type
 SvxNumberType aType;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - solenv/gbuild sw/source

2011-12-09 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_BuildplTargets.mk |3 +++
 sw/source/ui/app/applab.cxx |   10 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 044d1d6a9586f02c1137ee8f654f89008bd12e39
Author: Winfried Donkers w.donk...@dci-electronics.nl
Date:   Fri Dec 9 17:44:20 2011 +0100

fdo#36874: Label PRINTING misplaced on paper sheet

diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index f6784f5..e913db7 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -264,10 +264,14 @@ void SwModule::InsertLab(SfxRequest rReq, sal_Bool 
bLabel)
 
 aDesc.SetUseOn(nsUseOnPage::PD_ALL);// Site 
numbering
 
+// fix (fdo36874) revised page size calculation
 // Set page size
-rFmt.SetFmtAttr(SwFmtFrmSize(ATT_FIX_SIZE,
-rItem.lLeft  + rItem.nCols * 
rItem.lHDist + MINLAY,
-rItem.lUpper + rItem.nRows * 
rItem.lVDist + MINLAY));
+   long lPgWidth, lPgHeight;
+   lPgWidth = (((rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft)  MINLAY) ?
+   (rItem.lLeft  + (rItem.nCols - 1) * rItem.lHDist + 
rItem.lWidth + rItem.lLeft) : MINLAY);
+   lPgHeight = (((rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper)  MINLAY) ?
+   (rItem.lUpper + (rItem.nRows - 1) * rItem.lVDist + 
rItem.lHeight + rItem.lUpper) : MINLAY);
+rFmt.SetFmtAttr( SwFmtFrmSize( ATT_FIX_SIZE, lPgWidth, lPgHeight 
));
 
 // Numbering type
 SvxNumberType aType;
commit f5ac85575ad7066c9490c423cdfeba72df3d78fc
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Dec 9 20:46:02 2011 +0100

do nothing in buildpl stage for debugrun

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 66bb98a..cd98688 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -146,6 +146,9 @@ check: subsequentcheck
 unitcheck: build
@true
 
+debugrun:
+   @true
+
 endif # gb_SourceEnvAndRecurse_STAGE=buildpl
 
 ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-07 Thread Bjoern Michaelsen

 solenv/gbuild/Pyuno.mk   |   26 ++
 solenv/gbuild/TargetLocations.mk |5 +++--
 2 files changed, 9 insertions(+), 22 deletions(-)

New commits:
commit ca23cdbf90b97f141fdcf4fbc237e8f945cdd1e6
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 7 14:48:48 2011 +0100

reuse Zip Target for PyUno

diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 37512fb..9ad8b36 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -25,40 +25,26 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-gb_Pyuno_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
-gb_Pyuno__get_outdir_path = $(patsubst 
$(OUTDIR)/%,%,$(gb_Helper_OUTDIRLIBDIR))/pyuno/$(1)
-
 $(call gb_Pyuno_get_target,%) :
$(call gb_Output_announce,$*,$(true),PYU,3)
mkdir -p $(dir $@)  touch $@
 
-$(call gb_Pyuno_get_target_zip,%) : $(call gb_Package_get_target,%_pyuno)
-   $(call gb_Output_announce,$*,$(true),PZP,3)
-   cd $(gb_Helper_OUTDIRLIBDIR)/pyuno  \
-   $(gb_Pyuno_ZIPCOMMAND) -rX --filesync \
-   $(call gb_Pyuno_get_target_zip,$*) \
-   $(PYZFILES)
-
 .PHONY : $(call gb_Pyuno_get_clean_target,%)
 $(call gb_Pyuno_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PYU,3)
-   rm -f $@ $(gb_Pyuno_get_target_zip,$*)
+   rm -f $(call gb_Pyuno_get_target,$*) $(call 
gb_Pyuno_get_outdir_target,$*)
 
 define gb_Pyuno_Pyuno
-$(call gb_Pyuno_get_target_zip,$(1)) : PYZFILES :=
-$(call gb_Package_Package,$(1)_pyuno,$(2))
+$(call gb_Zip_Zip,Pyuno/$(1),$(2))
 $$(eval $$(call gb_Module_register_target,$(call 
gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1
-$(call gb_Pyuno_get_target,$(1)) : \
-   $(call gb_Package_get_target,$(1)_pyuno) \
-   $(call gb_Pyuno_get_target_zip,$(1))
-$(call gb_Pyuno_get_clean_target,$(1)) : \
-   $(call gb_Package_get_clean_target,$(1)_pyuno)
+$(call gb_Pyuno_get_target,$(1)) : $(call gb_Pyuno_get_outdir_target,$(1))
+$(call gb_Pyuno_get_outdir_target,$(1)) : $(call gb_Zip_get_target,Pyuno/$(1))
+$(call gb_Pyuno_get_clean_target,$(1)) : $(call 
gb_Zip_get_clean_target,Pyuno/$(1))
 
 endef
 
 define gb_Pyuno_add_file
-$(call gb_Pyuno_get_target_zip,$(1)) : PYZFILES += $(2)
-$(call gb_Package_add_file,$(1)_pyuno,$(call 
gb_Pyuno__get_outdir_path,$(2)),$(2))
+$(call gb_Zip_add_file,Pyuno/$(1),$(2))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index d51b8ed..b7a4fde 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -103,8 +103,9 @@ gb_ObjCxxObject_get_target = $(WORKDIR)/ObjCxxObject/$(1).o
 gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
 gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
 gb_Package_get_target = $(WORKDIR)/Package/$(1)
-gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1)
-gb_Pyuno_get_target_zip = $(OUTDIR)/bin/$(1).zip
+gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
+gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
+gb_PyunoFile_get_target = $(WORKDIR)/Pyuno/$(1)/contents/$(2)
 gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
 gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: RepositoryModule_ooo.mk

2011-12-07 Thread Bjoern Michaelsen

 RepositoryModule_ooo.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit d432b00bfa05b1bd1413fb0b9afac19de5c1f60b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 7 17:07:18 2011 +0100

fix rebase mismatch: automation is gone

diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 3297d95..f59b2e0 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_Module_Module,ooo))
 
 $(eval $(call gb_Module_add_moduledirs,ooo,\
 animations \
-automation \
 basctl \
 basebmp \
 basegfx \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-07 Thread Bjoern Michaelsen

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

New commits:
commit 4d247bd3c0b3a2d7460dedfb7050260eff2c0999
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Dec 7 23:50:07 2011 +0100

do not clean INPATH_FOR_BUILD on noncrosscompiles

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index ce4a5cb..f4c653f 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -67,7 +67,7 @@ clean-host:
 clean-build:
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
rm -f solenv/*/bin/dmake*
-   rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD)
+   $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD),)rm -rf 
$(SRCDIR)/*/$(INPATH_FOR_BUILD))
 
 distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-12-07 Thread Bjoern Michaelsen

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

New commits:
commit 855115d2f5845502e8619b35666512023584e012
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Dec 8 00:18:46 2011 +0100

fix typo

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
index f4c653f..5e11850 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -67,7 +67,7 @@ clean-host:
 clean-build:
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
rm -f solenv/*/bin/dmake*
-   $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD),)rm -rf 
$(SRCDIR)/*/$(INPATH_FOR_BUILD))
+   $(if $(filter-out $(INPATH),$(INPATH_FOR_BUILD)),rm -rf 
$(SRCDIR)/*/$(INPATH_FOR_BUILD))
 
 distclean: clean
if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuildfixes' - solenv/gbuild

2011-12-06 Thread Bjoern Michaelsen

 solenv/gbuild/JunitTest.mk  |2 +-
 solenv/gbuild/extensions/post_BuildplTargets.mk |8 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 700b3bc934538ca26e6d215ff78efb8b75bef6ed
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Dec 6 17:15:44 2011 +0100

only depend from dev-install on build if it is an explicit goal

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 5ce0b3f..5afe595 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -58,7 +58,7 @@ $(call gb_JunitTest_get_target,%) :
 echo see full error log at $@.log \
 echo to rerun just this failed test without all others, 
run: \
 echo  echo make $@  echo \
-echo cd into the module dir if you do not want a full 
dev-install run \
+echo cd into the module dir to run the tests faster \
 echo Or to do interactive debugging, run two shells with 
(Linux only): \
 echo \
 echo make debugrun \
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 01dc08a..66bb98a 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -100,14 +100,12 @@ gb_MAKETARGET=build
 endif
 endif
 
-gb_BuildplTarget_COMPLETEDTARGETS=
 define gb_BuildplTarget_command
 cd $(SRCDIR)/$(1)  unset MAKEFLAGS  export 
gb_SourceEnvAndRecurse_STAGE=gbuild  $(SOLARENV)/bin/build.pl $(if 
$(findstring s,$(MAKEFLAGS)),,VERBOSE=T) -P$(BUILD_NCPUS) $(2) -- 
-P$(GMAKE_PARALLELISM) gb_MAKETARGET=$(gb_MAKETARGET)
-$(eval gb_BuildplTarget_COMPLETEDTARGETS+=$(1))
 endef
 
-dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | build
-   $(call gb_BuildplTarget_command,smoketestoo_native,$(if $(filter 
instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from 
instsetoo_native,--all))
+dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
+   $(call gb_BuildplTarget_command,smoketestoo_native,--from 
instsetoo_native)
 
 build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
$(call gb_BuildplTarget_command,instsetoo_native,--all)
@@ -154,7 +152,7 @@ ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
 
 clean: clean-host clean-build
 
-dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | build
+dev-install: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
 
 build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sal/osl

2011-12-05 Thread Bjoern Michaelsen

 sal/osl/unx/interlck.c |   45 -
 1 file changed, 45 deletions(-)

New commits:
commit efd750d8433aade624d09f7c9d37516c9e073cda
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Dec 5 21:56:12 2011 +0100

lp#726529: inline arm assembler is obsolete by now

diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c
index a32f67c..bf9ff62 100644
--- a/sal/osl/unx/interlck.c
+++ b/sal/osl/unx/interlck.c
@@ -37,51 +37,6 @@
 #error please use asm/interlck_sparc.s
 #elif defined ( SOLARIS)  defined ( X86 )
 #error please use asm/interlck_x86.s
-#elif defined ( ARM )  (( __GNUC__  4 ) || (( __GNUC__ == 4)  ( 
__GNUC_MINOR__  6 )))  ( __ARM_ARCH__ = 6)
-// assembler implementation for gcc 4.6 on arm
-// originally contributed by Eric Bachard / OOo4Kids
-// replaced with the asm code generated by Linaro gcc 4.5
-// which includes memory barriers to make it SMP-safe
-// #i117017# and lp#726529
-oslInterlockedCount SAL_CALL 
osl_incrementInterlockedCount(oslInterlockedCount* pCount)
-{
-register oslInterlockedCount nCount __asm__ (r1);
-int nResult;
-
-__asm__ __volatile__ (
- dmb\n
-1:   ldrex %0, [%3]\n
- add %0, %0, #1\n
- strex %1, %0, [%3]\n
- teq %1, #0\n
- bne 1b\n
- dmb\n
-: =r (nCount), =r (nResult), =m (*pCount)
-: r (pCount)
-: memory);
-
-return nCount;
-}
-
-oslInterlockedCount SAL_CALL 
osl_decrementInterlockedCount(oslInterlockedCount* pCount)
-{
-register oslInterlockedCount nCount __asm__ (r1);
-int nResult;
-
-__asm__ __volatile__ (
- dmb\n
-0:   ldrex %0, [%3]\n
- sub %0, %0, #1\n
- strex %1, %0, [%3]\n
- teq %1, #0\n
- bne 0b\n
- dmb\n
-: =r (nCount), =r (nResult), =m (*pCount)
-: r (pCount)
-: memory);
-
-return nCount;
-}
 #elif defined ( GCC )  ( defined ( X86 ) || defined ( X86_64 ) )
 /* That's possible on x86-64 too since oslInterlockedCount is a sal_Int32 */
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2011-12-01 Thread Bjoern Michaelsen

New branch 'feature/gbuildfixes' available with the following commits:
commit ba894147056bdfe8766432bd60c45efec3702d54
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Dec 1 17:43:25 2011 +0100

use some macro magic here

commit 9eabbd8f03353fb750194761bffa26204cde5133
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Dec 1 17:37:36 2011 +0100

some more work on staging buildpl in front of gbuild

commit dca8b6c3d8a2e4ab2d823f3026dfe34de21376a9
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Dec 1 14:32:47 2011 +0100

introduce staged build

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

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

 solenv/gbuild/Module.mk |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ec894c5fb90bdee1c56d113d14b0bf524df9f5a9
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 15:21:28 2011 +0100

lets only depend build-order only on build from debugrun for now

- as long as we still have the slow build.pl run for top-level build

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 02e76ea..2efef85 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -84,6 +84,7 @@ $(call gb_Module_get_target,%) :
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 check : subsequentcheck
+debugrun :| build
 
 define gb_Module_BUILDHINT
 
@@ -108,6 +109,7 @@ else
 gb_Module_BUILDHINT=
 gb_Module_DEVINSTALLHINT=
 
+debugrun : build
 endif
 
 all : build unitcheck
@@ -142,7 +144,7 @@ check : unitcheck
$(call gb_Output_announce_title,all tests checked.)
$(call gb_Output_announce_bell)

-debugrun : build
+debugrun :
$(call gb_Module_DEBUGRUNCOMMAND)
 
 dev-install :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_BuildplTargets.mk |6 --
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |   16 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit ab988b37908a0b8ee62869bd637bf176b03ac3ac
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 16:45:31 2011 +0100

fix conditions on when to read gbuild definitions

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index cd3101d..702d84f 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -27,12 +27,6 @@
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 
-gb_Module_add_target=
-gb_Module_add_moduledir=
-gb_Module_add_check_target=
-gb_Module_add_subsequentcheck_target=
-gb_FULLDEPS=
-
 clean: clean-host clean-build
 
 subsequentcheck: smoketestoo_native
diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 842f05e..f5e17b8 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -27,14 +27,26 @@
 
 
 # speed up if no target need to parse all modules
+gb_SpeedUpTargets_WRAPPEDBUILD:=
 ifneq ($(strip $(MAKECMDGOALS)),)
-ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun 
Env.Host.sh,$(MAKECMDGOALS)),)
+ifeq ($(filter-out id tags docs distro-pack-install fetch help debugrun 
$(SRCDIR)/Env.Host.sh,$(MAKECMDGOALS)),)
+gb_SpeedUpTargets_WRAPPEDBUILD:=T
+endif
+endif
+
+ifeq ($(strip $(gb_PARTIALBUILD)),)
+ifeq ($(filter-out clean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
+gb_SpeedUpTargets_WRAPPEDBUILD:=T
+endif
+endif
+
+ifneq ($(strip $(gb_SpeedUpTargets_WRAPPEDBUILD)),)
+$(info wrapped build - skip reading gbuild definitions)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
 gb_FULLDEPS=
 endif
-endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

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

New commits:
commit 7d3f21b27469d04b57dbd9f7befb3109001422ed
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 19:06:46 2011 +0100

dont read gbuild definitions on distclean

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index f5e17b8..e3b65b3 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -35,7 +35,7 @@ endif
 endif
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
-ifeq ($(filter-out clean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
+ifeq ($(filter-out clean distclean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
 gb_SpeedUpTargets_WRAPPEDBUILD:=T
 endif
 endif
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - solenv/gbuild

2011-11-30 Thread Bjoern Michaelsen

 solenv/gbuild/Module.mk |6 +-
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 1f6be70688a74b9f2ff1f641ef45c6fc5d20cc38
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 22:20:17 2011 +0100

do not even read module dirs when shortcuting

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 2b86a7d..87209c2 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -45,6 +45,7 @@ $(info wrapped build - skip reading gbuild definitions)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
+gb_Module_add_moduledir=
 gb_FULLDEPS=
 endif
 
commit f95bf9c68dde00624a9b4134993f9ddf14123d1a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 22:16:11 2011 +0100

debugrun does not need to read gbuild definitions

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index e3b65b3..2b86a7d 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -35,7 +35,7 @@ endif
 endif
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
-ifeq ($(filter-out clean distclean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset 
findunusedcode,$(MAKECMDGOALS)),)
+ifeq ($(filter-out clean distclean subsequentcheck unitcheck build dev-install 
smoketestoo_native instsetoo_native cross_toolset findunusedcode 
debugrun,$(MAKECMDGOALS)),)
 gb_SpeedUpTargets_WRAPPEDBUILD:=T
 endif
 endif
commit 359dc427b4633b271078fbb80fdf674f54c89c0d
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 30 22:15:29 2011 +0100

execute debugrun after building

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 2efef85..c0f8ffd 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -84,7 +84,11 @@ $(call gb_Module_get_target,%) :
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 check : subsequentcheck
-debugrun :| build
+
+# execute debugrun at the end
+ifneq ($(filter dev-install build all,$(MAKECMDGOALS)),)
+debugrun :| $(filter dev-install build all,$(MAKECMDGOALS))
+endif
 
 define gb_Module_BUILDHINT
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Makefile.in

2011-11-29 Thread Bjoern Michaelsen

 Makefile.in |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 55da6a0907fe3679dd09de4c9f29ad32cb2a5ab5
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Nov 29 13:18:15 2011 +0100

these deps are already handled in gbuild

diff --git a/Makefile.in b/Makefile.in
index 1375db4..2df1863 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -102,6 +102,4 @@ findunusedcode:
@grep ::.*\( unusedcode.all | grep -v ^cppu::  unusedcode.easy
 
 #as long as we are not completely gbuildified we need to explicitly depend on 
the build/install
-unitcheck: build
-subsequentcheck: dev-install
 #debugrun : dev-install # disabled for now, this dep seems to poison the 
debugrun !?
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - automation/packimages automation/source desktop/win32 filter/source i18npool/source solenv/gbuild writerfilter/source

2011-11-29 Thread Bjoern Michaelsen

 automation/packimages/Makefile  |1 +
 automation/source/testtool/Makefile |2 ++
 desktop/win32/source/setup/Makefile |1 +
 filter/source/svg/Makefile  |1 +
 i18npool/source/breakiterator/Makefile  |1 +
 i18npool/source/indexentry/Makefile |1 +
 i18npool/source/localedata/Makefile |1 +
 i18npool/source/textconversion/Makefile |1 +
 solenv/gbuild/UnoApiTarget.mk   |6 +++---
 writerfilter/source/Makefile|2 ++
 10 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit dd750cf42b308cdbf48ebd54fdd6f4fa0865b91a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Nov 29 18:10:55 2011 +0100

with announce letters shalt thou count to three, no more, no less

diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 5511ec5..e5415df 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -158,13 +158,13 @@ endef
 
 .PHONY : $(call gb_UnoApiOutTarget_get_clean_target,%)
 $(call gb_UnoApiOutTarget_get_clean_target,%) :
-   $(call gb_Output_announce,$*,$(false),UNOAPI,1)
+   $(call gb_Output_announce,$*,$(false),UNO,1)
-$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApiOutTarget_get_target,$*)) 
 
 .PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
 $(call gb_UnoApiTarget_get_clean_target,%) :
-   $(call gb_Output_announce,$*,$(false),UNOAPI,1)
+   $(call gb_Output_announce,$*,$(false),UNO,1)
-$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_UnoApiTarget_get_target,$*)) 
-rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\
@@ -213,7 +213,7 @@ $(call gb_UnoApiTarget_get_target,%):
$(if $(gb_UnoApiTarget_IDLFILES_$*),$(call 
gb_UnoApiTarget__command,$@,$*,$,UCR,$(addprefix $(call 
gb_UnoApiPartTarget_get_target,),$(patsubst 
%.idl,%.urd,$(gb_UnoApiTarget_IDLFILES_$*)
$(if $(UNOAPI_MERGE),$(call 
gb_UnoApiTarget__command,$@,$*,$,/,$(UNOAPI_MERGE)))
$(if $(UNOAPI_REFERENCE), \
-   $(call gb_Output_announce,$*,$(true),RDBCHEK,4) \
+   $(call gb_Output_announce,$*,$(true),DBc,4) \
$(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call 
gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call 
gb_Helper_convert_native,$@))
$(if $(gb_UnoApiTarget_IDLFILES_$*), \
$(call gb_Output_announce,$*,$(true),HPP,4) \
commit b1d20f68474d91d8accafdeb403526b16a636220
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Nov 29 18:04:42 2011 +0100

set gb_PARTIALBUILD in CustomTargets

diff --git a/automation/packimages/Makefile b/automation/packimages/Makefile
index 69631bb..a26f117 100644
--- a/automation/packimages/Makefile
+++ b/automation/packimages/Makefile
@@ -23,6 +23,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+gb_PARTIALBUILD:=T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 BINDIR := $(dir $(GBUILDDIR))bin
diff --git a/automation/source/testtool/Makefile 
b/automation/source/testtool/Makefile
index f0d1d13..9b1e007 100644
--- a/automation/source/testtool/Makefile
+++ b/automation/source/testtool/Makefile
@@ -23,6 +23,8 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+
+gb_PARTIALBUILD:=T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 BASEDIR := $(dir $(firstword $(MAKEFILE_LIST)))
diff --git a/desktop/win32/source/setup/Makefile 
b/desktop/win32/source/setup/Makefile
index c5337ee..004f490 100644
--- a/desktop/win32/source/setup/Makefile
+++ b/desktop/win32/source/setup/Makefile
@@ -23,6 +23,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+gb_PARTIALBUILD:=T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 DESTDIR := $(WORKDIR)/CustomTarget/desktop/win32/source/setup
diff --git a/filter/source/svg/Makefile b/filter/source/svg/Makefile
index 20ed8f8..31a4244 100644
--- a/filter/source/svg/Makefile
+++ b/filter/source/svg/Makefile
@@ -28,6 +28,7 @@
 SRCDIR_FILTER := $(dir $(realpath $(firstword $(MAKEFILE_LIST
 WORKDIR_FILTER := .
 
+gb_PARTIALBUILD:=T
 include $(GBUILDDIR)/gbuild.mk
 
 filter_SRC_svg_Tokens := $(SRCDIR_FILTER)/tokens.txt
diff --git a/i18npool/source/breakiterator/Makefile 
b/i18npool/source/breakiterator/Makefile
index 011dd6f..9f1a6ce 100644
--- a/i18npool/source/breakiterator/Makefile
+++ b/i18npool/source/breakiterator/Makefile
@@ -28,6 +28,7 @@
 
 all : OpenOffice_dat.c data/dict_ja.cxx data/dict_zh.cxx
 
+gb_PARTIALBUILD:=T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 data:
diff --git a/i18npool/source/indexentry/Makefile 
b/i18npool/source/indexentry/Makefile
index c5335dc..cb0212c 100644
--- a/i18npool/source/indexentry/Makefile
+++ b/i18npool/source/indexentry/Makefile
@@ -28,6 +28,7 @@
 
 all : $(subst .txt,.cxx,$(notdir $(wildcard 
$(SRC_ROOT)/i18npool/source/indexentry

[Libreoffice-commits] .: icc/source

2011-11-29 Thread Bjoern Michaelsen

 icc/source/create_sRGB_profile/create_sRGB_profile.cpp |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 2c4537471c932b65e6f72e41881b505c4bbad12c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Nov 29 20:00:55 2011 +0100

dont mindlessly touch the icc-header file on every build

- this little gremlin touches the header file everytime it is run
- as icc is very low level, this causes a lot of pointless rebuild
- everything from vcl up gets relinked
- this slows every empty 'make build' down by more than 40 percent
- would really need to check if the file changed before writing, but as we
  rarely change icc itself, I didnt bother with that

diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp 
b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
index cceb0c5..2d6b52f 100644
--- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
+++ b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
@@ -474,6 +474,11 @@ int main(int argc, char* argv[])
 profile.Write(out);
 out.Close();
 
+if(FILE *headerfile_exists = fopen(hxx_file_name,r))
+{
+fclose(headerfile_exists);
+exit(0);
+}
 FILE *headerfile = fopen(hxx_file_name,w);
 
 //print OpenOffice standard file header
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-29 Thread Bjoern Michaelsen

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

New commits:
commit eef80c23ffc790ae30feb5048e978c48e7b76e73
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Nov 29 20:15:24 2011 +0100

use gb_MINISOLARENV for platform check

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 57387f1..f6a38af 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -151,7 +151,7 @@ $(eval $(call gb_Helper_collect_libtargets))
 gb_Library_DLLPOSTFIX := lo
 
 # Include platform/cpu/compiler specific config/definitions
-ifneq ($(strip $(OS)),)
+ifeq ($(strip $(gb_MINISOLARENV)),)
 include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - Makefile.in solenv/gbuild tail_build/Makefile

2011-11-28 Thread Bjoern Michaelsen

 Makefile.in |  165 +++-
 solenv/gbuild/Module.mk |   48 +-
 solenv/gbuild/extensions/post_AuxTargets.mk |   77 +++
 solenv/gbuild/extensions/post_BuildplTargets.mk |   76 +++
 solenv/gbuild/extensions/post_SpeedUpTargets.mk |   38 +
 solenv/gbuild/gbuild.mk |2 
 tail_build/Makefile |2 
 7 files changed, 281 insertions(+), 127 deletions(-)

New commits:
commit ce33bdce9d3499b7419b9210a2b5117ccda7ea32
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Nov 28 17:56:11 2011 +0100

targets must be postextension SRCDIR is empty otherwise

diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk 
b/solenv/gbuild/extensions/post_AuxTargets.mk
new file mode 100644
index 000..fff1c10
--- /dev/null
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -0,0 +1,77 @@
+#   -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
*/
+#  
+#   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) 2011 Bjoern Michaelsen bjoern.michael...@canonical.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.
+
+.PHONY: id tags docs distro-pack-install fetch clean-host clean-build bootstrap
+
+id:
+   @create-ids
+
+tags:
+   @create-tags
+
+docs:
+   @mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
+
+distro-pack-install: install
+   $(SRCDIR)/bin/distro-install-clean-up
+   $(SRCDIR)/bin/distro-install-desktop-integration
+   $(SRCDIR)/bin/distro-install-sdk
+   $(SRCDIR)/bin/distro-install-file-lists
+
+$(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download
+   @$(SRCDIR)/download $(SRCDIR)/ooo.lst  touch $@
+
+fetch: $(SRCDIR)/src.downloaded
+
+$(WORKDIR)/bootstrap:
+   @cd $(SRCDIR)  ./bootstrap
+   @mkdir -p $(dir $@)  touch $@
+
+bootstrap: $(WORKDIR)/bootstrap
+
+ifeq ($(strip $(gb_PARTIALBUILD)),)
+
+clean-host:
+   rm -rf $(SRCDIR)/*/$(INPATH)
+   rm -rf install
+
+clean-build:
+   if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
+   rm -f solenv/*/bin/dmake*
+   rm -rf $(SRCDIR)*/$(INPATH_FOR_BUILD)
+
+distclean: clean
+   if [ -f $(SRCDIR)/dmake/Makefile ] ; then $(GNUMAKE) -C $(SRCDIR)/dmake 
clean; fi
+   cd $(SRCDIR)  rm -rf Env.Host.sh Makefile aclocal.m4 autogen.lastrun 
autom4te.cache \
+   bin/repo-list build_env config.log config.status configure \
+   desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
+   set_soenv set_soenv.last set_soenv.stamp src.downloaded warn
+
+endif
+
+
+# vim:set shiftwidth=4 softtabstop=4 noexpandtab:
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 6c62649..1fa6a2b 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -42,7 +42,34 @@ unitcheck: dev-install
@$(MAKE) -f $(realpath $(firstword $(MAKEFILE_LIST))) $@ 
gb_PARTIALBUILD=
 
 all:
-   
+
+ifeq ($(filter-out build,$(MAKECMDGOALS)),)
+gb_MAKETARGET=build
+else
+gb_MAKETARGET=all
+endif
+
+define gb_BuildplTarget_command
+cd $(SRCDIR)/$(1)  unset MAKEFLAGS  $(SOLARENV)/bin/build.pl --all 
gb_MAKETARGET=$(gb_MAKETARGET)
+endef
+
+.PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install 
all build
+
+smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if 
$(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+   $(call gb_BuildplTarget_command,$@)
+
+instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-build-toolset)
+   $(call gb_BuildplTarget_command,$@)
+
+cross-build-toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
+   $(call gb_BuildplTarget_command,$@)
+
+dev-install: smoketestoo_native
+
+all: instsetoo_native
+
+build: instsetoo_native
+
 endif

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

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

New commits:
commit 92d68ce31ab351905e5411a523a557ea658b9802
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Nov 28 19:42:21 2011 +0100

source build env for crosscompiles

diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk 
b/solenv/gbuild/extensions/post_BuildplTargets.mk
index cba5b33..0dcc15a 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -62,7 +62,7 @@ instsetoo_native: $(WORKDIR)/bootstrap 
$(SRCDIR)/src.downloaded $(if $(filter $(
$(call gb_BuildplTarget_command,$@)
 
 cross_toolset: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded
-   $(call gb_BuildplTarget_command,$@)
+   source $(SRCDIR)/Env.Build.sh  $(call gb_BuildplTarget_command,$@)
 
 dev-install: smoketestoo_native
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-28 Thread Bjoern Michaelsen

 solenv/gbuild/extensions/post_SpeedUpTargets.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 70324f1e66bf64882d5ffc0b9215aa5524dc2e23
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Nov 28 21:09:51 2011 +0100

dont overoptimize a plain make without an explicit target

diff --git a/solenv/gbuild/extensions/post_SpeedUpTargets.mk 
b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
index 1ac06ee..7e1a640 100644
--- a/solenv/gbuild/extensions/post_SpeedUpTargets.mk
+++ b/solenv/gbuild/extensions/post_SpeedUpTargets.mk
@@ -27,12 +27,14 @@
 
 
 # speed up if no target need to parse all modules
+ifneq ($(strip $(MAKECMDGOALS)),)
 ifeq ($(filter-out id tags docs distro-pack-install fetch help 
debugrun,$(MAKECMDGOALS)),)
 gb_Module_add_target=
 gb_Module_add_check_target=
 gb_Module_add_subsequentcheck_target=
 gb_FULLDEPS=
 endif
+endif
 
 # vim:set shiftwidth=4 softtabstop=4 noexpandtab:
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: tail_build/Makefile

2011-11-25 Thread Bjoern Michaelsen

 tail_build/Makefile |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 538b1071531e895a55e2d6799806c3036f9ada49
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Nov 25 13:02:36 2011 +0100

copy Makefile to everywhere was a bit too much of a shotgun approach

diff --git a/tail_build/Makefile b/tail_build/Makefile
index f9ac01e..625b0cb 100644
--- a/tail_build/Makefile
+++ b/tail_build/Makefile
@@ -30,10 +30,9 @@ ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk
 else
 
-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath 
$(firstword $(MAKEFILE_LIST/Module*.mk)))
+$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk))
 
 endif
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - Makefile.in solenv/gbuild unotest/source

2011-11-25 Thread Bjoern Michaelsen

 Makefile.in   |7 ++
 solenv/gbuild/JunitTest.mk|   14 +++--
 solenv/gbuild/Module.mk   |   10 +++
 solenv/gbuild/gbuild.mk   |4 +
 solenv/gbuild/platform/unxgcc.mk  |   26 +-
 unotest/source/java/org/openoffice/test/OfficeConnection.java |6 --
 6 files changed, 53 insertions(+), 14 deletions(-)

New commits:
commit bb149de2b4d3458c0db1958edbbb75e79a8a53c4
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Nov 25 15:14:09 2011 +0100

some hints cleanup

diff --git a/Makefile.in b/Makefile.in
index 9f58d33..443305b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,13 +46,18 @@ dev-install: build
 printf \
 '\nDeveloper installation finished, you can now execute:\n\n' \
  \
-if test `uname -s` = Darwin; then \
+if test `uname -s` = Linux; then \
+printf 'make debugrun\n'; \
+elif test `uname -s` = Darwin; then \
 printf 'open %s/install/LibreOffice.app\n' @abs_builddir@; \
 else \
 printf 'cd %s/install/program\n. ./ooenv\n./soffice.bin\n' \
 @abs_builddir@; \
 fi
 
+debugrun : dev-install
+   @. ./Env.Host.sh  $$GNUMAKE -f $$SRC_ROOT/GNUmakefile.mk debugrun
+
 check : allcheck
@true
 
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 33d068c..ab0d67f 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -58,9 +58,15 @@ $(call gb_JunitTest_get_target,%) :
-e 'at java.lang.reflect.' \
-e 'at sun.reflect.' $@.log \
 echo see full error log at $@.log \
-echo to rerun just this failed test without all others, run 
either: \
-echo cd \$$MODULE  make $@ \
-echo make -f $(SRCDIR)/GNUmakefile.mk $@  false))  \
+echo to rerun just this failed test without all others, 
run: \
+echo  echo make $@  echo \
+echo add \-f $(SRCDIR)/GNUmakefile.mk\ if you are not in 
the module dir \
+echo Or to do interactive debugging, run two shells with 
(Linux only): \
+echo \
+echo make debugrun \
+echo make gb_JunitTest_DEBUGRUN=T $@ \
+echo \
+false))  \
 rm -rf $(call gb_JunitTest_get_userdir,$*))
$(CLEAN_CMD)
 
commit a65b46b71d0f95119b343f4e931a318703889b08
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Nov 25 14:38:18 2011 +0100

remove debugcommand -- debugrun is superceding it

diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java 
b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index 8f99076..ae2cae0 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -105,12 +105,6 @@ public final class OfficeConnection {
 assertNull(waitForProcess(process, 1000)); // 1 sec
 }
 }
-try {
-ProcessBuilder debugbp = new ProcessBuilder(
-Argument.get(debugcommand).split( ));
-debugbp.start();
-Thread.sleep(1000);
-} catch(Exception e) {}
 }
 
 /** Shut down the OOo instance.
commit b684a5bb0374719976accaa9cedca44fa3d821ad
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Nov 25 14:36:18 2011 +0100

create debugrun target, adjust JunitTests to them

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 3003c9d..33d068c 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -50,8 +50,6 @@ $(call gb_JunitTest_get_target,%) :
mkdir -p $(call gb_JunitTest_get_userdir,$*)  \
 ($(gb_JunitTest_JAVACOMMAND) \
 -cp $(CLASSPATH) \
-$(if $(strip $(gb_JunitTest_DEBUGCOMMAND)),\
-
'-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
 $(DEFS) \
 org.junit.runner.JUnitCore \
 $(CLASSES) 21  $@.log || \
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 82da041..582d960 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -112,6 +112,10 @@ check : unitcheck
$(call gb_Output_announce_title,all tests checked.)
$(call gb_Output_announce_bell)

+debugrun : build
+   $(call gb_Module_DEBUGRUNCOMMAND)
+
+
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 check : subsequentcheck
@@ -149,6 +153,10 @@ endif
 
 endef
 
+# Dont recurse in subdirs for help an debugrun
+
+ifeq ($(filter help debugrun,$(MAKECMDGOALS)),)
+
 define

[Libreoffice-commits] .: Makefile.in

2011-11-25 Thread Bjoern Michaelsen

 Makefile.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 19b5d81f92363f1448dcf41930d973b8b04db11b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Nov 25 15:24:49 2011 +0100

move workaround for old build system to other workarounds

diff --git a/Makefile.in b/Makefile.in
index 443305b..82dca9a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,7 @@ dev-install: build
 @abs_builddir@; \
 fi
 
-debugrun : dev-install
+debugrun:
@. ./Env.Host.sh  $$GNUMAKE -f $$SRC_ROOT/GNUmakefile.mk debugrun
 
 check : allcheck
@@ -173,3 +173,4 @@ findunusedcode:
 unitcheck: build
 subsequentcheck: dev-install
 allcheck : dev-install
+debugrun : dev-install
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - Makefile.in solenv/gbuild

2011-11-25 Thread Bjoern Michaelsen

 Makefile.in  |   12 ++--
 solenv/gbuild/platform/unxgcc.mk |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f8b7720ca56e16d718593da8fc394dd91362fbf1
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Nov 25 16:44:45 2011 +0100

dev-install seems to poison the env

diff --git a/Makefile.in b/Makefile.in
index 78608d7..86acb64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,4 +173,4 @@ findunusedcode:
 unitcheck: build
 subsequentcheck: dev-install
 allcheck : dev-install
-debugrun : dev-install
+#debugrun : dev-install # disabled for now, this dep seems to poison the 
debugrun !?
commit c036777b4930e5c4ab34f035b8de749a7f80e42a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Nov 25 16:41:28 2011 +0100

gbuild need no env anymore

diff --git a/Makefile.in b/Makefile.in
index 82dca9a..78608d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,16 +56,16 @@ dev-install: build
 fi
 
 debugrun:
-   @. ./Env.Host.sh  $$GNUMAKE -f $$SRC_ROOT/GNUmakefile.mk debugrun
+   @ @GNUMAKE@ -f $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/GNUmakefile.mk debugrun
 
 check : allcheck
@true
 
 %check:
-   @. ./Env.Host.sh  $$GNUMAKE -f $$SRC_ROOT/GNUmakefile.mk -r \
-   $(if @VERBOSE@,,-s) --jobs=$(if \
-  
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@) \
-   $(patsubst allcheck,check,$@)
+   @ @GNUMAKE@ -f $(dir $(realpath $(firstword 
$)MAKEFILE_LIST/GNUmakefile.mk -r \
+   $(if @VERBOSE@,,-s) --jobs=$(if \
+  
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@) \
+   $(patsubst allcheck,check,$@)
 
 cross-build-toolset:
@. ./Env.Build.sh  \
commit faa11fecdbca8cdba62a6cc5610c311fcbe0e607
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Nov 25 16:40:02 2011 +0100

fix default junit soffice path

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d34d4a1..9d07c9f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -383,7 +383,7 @@ else
 ifneq ($(gb_JunitTest_DEBUGRUN),)
 gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
 else
-gb_JunitTest_SOFFICEARG:=$(OUTDIR)/installation/opt/program/soffice 
+gb_JunitTest_SOFFICEARG:=path:$(OUTDIR)/installation/opt/program/soffice
 endif
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-25 Thread Bjoern Michaelsen

 solenv/gbuild/platform/unxgcc.mk |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 3d37661a095c8d0a2a4376a859fa73c99a45ca56
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sat Nov 26 01:54:14 2011 +0100

dont attach, start own instance as otherwise it might be blocked 
via/proc/sys/kernel/yama/ptrace_scope

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 9d07c9f..c5c0324 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -401,11 +401,10 @@ endef
 
 define gb_Module_DEBUGRUNCOMMAND
 OFFICESCRIPT=`mktemp`  \
-echo . $(OUTDIR)/installation/opt/program/ooenv  $${OFFICESCRIPT}  \
-echo $(OUTDIR)/installation/opt/program/soffice.bin --norestore --nologo 
\--accept=pipe,name=$(USER);urp;\ 
-env:UserInstallation=file://$(OUTDIR)/installation/   $${OFFICESCRIPT}  \
-echo OFFICEPID=\$$!  $${OFFICESCRIPT}  \
-echo echo \office started as \$${OFFICEPID}\  $${OFFICESCRIPT}  \
-echo gdb -ex \at \$${OFFICEPID}\ -ex \c\  $${OFFICESCRIPT}  \
+printf . $(OUTDIR)/installation/opt/program/ooenv\\n  $${OFFICESCRIPT}  \
+printf gdb $(OUTDIR)/installation/opt/program/soffice.bin  
$${OFFICESCRIPT}  \
+printf  -ex \set args --norestore --nologo 
\\\--accept=pipe,name=$(USER);urp;\\\ 
-env:UserInstallation=file://$(OUTDIR)/installation/\  $${OFFICESCRIPT}  \
+printf  -ex \r\\\n  $${OFFICESCRIPT}  \
 $(SHELL) $${OFFICESCRIPT}  \
 rm $${OFFICESCRIPT}
 endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

2011-11-24 Thread Bjoern Michaelsen

 patches/dev300/apply|1 
 patches/dev300/mention-java-common-package.diff |   56 
 2 files changed, 57 deletions(-)

New commits:
commit bd4f6ffc37e76996f97368bc73844ce68e63acbe
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Nov 24 15:51:28 2011 +0100

remove mention-java-common-package.diff, downstreamed to 
debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ce5a4d6..9967d1a 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -345,7 +345,6 @@ debian-default-cairo-disable.diff
 # read variables from /etc/libreoffice/sofficerc, since 
/usr/lib/libreoffice/sofficerc
 # just refers to it
 oosplash-etc-libreoffice-sofficerc.diff
-mention-java-common-package.diff, ccheney
 
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere
diff --git a/patches/dev300/mention-java-common-package.diff 
b/patches/dev300/mention-java-common-package.diff
deleted file mode 100644
index 766d0a0..000
--- a/patches/dev300/mention-java-common-package.diff
+++ /dev/null
@@ -1,56 +0,0 @@
 svtools/source/java/javainteractionhandler.cxx~2008-04-21 
21:43:59.249678235 +0200
-+++ svtools/source/java/javainteractionhandler.cxx 2008-04-21 
22:12:26.615433459 +0200
-@@ -75,9 +75,10 @@
- #include svtools/javainteractionhandler.hxx
- #include svtools/javacontext.hxx
- 
-+#define DEFINE_CONST_UNICODE(CONSTASCII) 
UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
-+
- using namespace com::sun::star::uno;
- using namespace com::sun::star::task;
--
- namespace svt
- {
- 
-@@ -184,6 +185,9 @@
- aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND ));
- 
- aWarningBox.SetText( aTitle );
-+String aText = String(aWarningBox.GetMessText());
-+aText.Append(DEFINE_CONST_UNICODE(\nPlease install the 
libreoffice-java-common package for this functionality.));
-+aWarningBox.SetMessText( aText );
- nResult = aWarningBox.Execute();
- 
- }
-@@ -256,6 +260,9 @@
- aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED ));
- 
- aQueryBox.SetText( aTitle );
-+String aText = String(aQueryBox.GetMessText());
-+aText.Append(DEFINE_CONST_UNICODE(\nPlease install the 
libreoffice-java-common package for this functionality.));
-+aQueryBox.SetMessText( aText );
- nResult = aQueryBox.Execute();
- if ( nResult == RET_YES )
- {
-@@ -297,6 +304,9 @@
- aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED));
- 
- aErrorBox.SetText( aTitle );
-+String aText = String(aErrorBox.GetMessText());
-+aText.Append(DEFINE_CONST_UNICODE(\nPlease install the 
libreoffice-java-common package for this functionality.));
-+aErrorBox.SetMessText( aText );
- nResult = aErrorBox.Execute();
- }
- else
 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx.orig  2008-04-11 
05:19:31.0 -0500
-+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx   2009-03-05 
19:54:38.0 -0600
-@@ -111,6 +111,9 @@
- if (errcode == JFW_E_NO_JAVA_FOUND)
- {
- fprintf(stderr,javaldx: Could not find a Java Runtime 
Environment! \n);
-+fprintf(stderr,Please ensure that a JVM and the package 
libreoffice-java-common\n);
-+fprintf(stderr,is installed.\n);
-+fprintf(stderr,If it is already installed then try removing 
~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n);
- return false;
- }
- else if (errcode != JFW_E_NONE  errcode != JFW_E_DIRECT_MODE)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

2011-11-24 Thread Bjoern Michaelsen

 patches/dev300/apply  |2 --
 patches/dev300/help-msg-add-package-info.diff |   11 ---
 2 files changed, 13 deletions(-)

New commits:
commit 2a81e5d48e60fd9dd2729dbcd2cd1dfd6d6c2bd0
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Nov 24 17:15:34 2011 +0100

remove help-msg-add-package-info.diff, downstreamed to 
debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9967d1a..c958f4b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -359,8 +359,6 @@ sensible-browser.diff
 # add JDK paths for MySQL, PostgreSQL, JTDS
 jdbc-driver-classpaths-debian.diff
 
-help-msg-add-package-info.diff
-
 soffice-opengl-and-locking-config.diff, mklose
 
 #configures-explicit-arch.diff
diff --git a/patches/dev300/help-msg-add-package-info.diff 
b/patches/dev300/help-msg-add-package-info.diff
deleted file mode 100644
index 510cf00..000
--- a/patches/dev300/help-msg-add-package-info.diff
+++ /dev/null
@@ -1,11 +0,0 @@
 sfx2/source/appl/sfxhelp.cxx~  2006-02-15 02:53:15.839949000 +0100
-+++ sfx2/source/appl/sfxhelp.cxx   2006-02-15 02:55:01.389949000 +0100
-@@ -151,7 +151,7 @@
- 
- NoHelpErrorBox::NoHelpErrorBox( Window* _pParent ) :
- 
--ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) ) )
-+ErrorBox( _pParent, WB_OK, String( SfxResId( RID_STR_HLPFILENOTEXIST ) 
).Append(String(DEFINE_CONST_UNICODE(.\nPlease install the 
openoffice.org-help-en-us package or the locale specific help package 
openoffice.org-help-language-code.))) )
- {
- // Error message: No help available
- }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

2011-11-24 Thread Bjoern Michaelsen

 patches/dev300/apply|1 
 patches/dev300/sensible-ooomua.diff |   44 
 2 files changed, 45 deletions(-)

New commits:
commit 9238fa2c3543fc8b41533bc5b1a8fdcc338ec887
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Nov 24 17:37:46 2011 +0100

remove sensible-ooomua.diff, downstreamed to debian-experimental-3.5

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c958f4b..fc3f05f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -353,7 +353,6 @@ reportdesign-mention-package.diff, rengelha
 # build using -O2 on x86 and sparc according to Debian policy.
 debian-opt.diff
 
-sensible-ooomua.diff
 sensible-browser.diff
 
 # add JDK paths for MySQL, PostgreSQL, JTDS
diff --git a/patches/dev300/sensible-ooomua.diff 
b/patches/dev300/sensible-ooomua.diff
deleted file mode 100644
index 0023884..000
--- a/patches/dev300/sensible-ooomua.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: Common.xcu
-===
-RCS file: /cvs/util/officecfg/registry/data/org/openoffice/Office/Common.xcu,v
-retrieving revision 1.31
-diff -u -u -r1.31 Common.xcu
 officecfg/registry/data/org/openoffice/Office/Common.xcu   23 Mar 2005 
10:53:46 -  1.31
-+++ officecfg/registry/data/org/openoffice/Office/Common.xcu   25 May 2005 
23:23:30 -
-@@ -651,8 +651,7 @@
-   /node
-   node oor:name=ExternalMailer install:module=unixdesktop
- prop oor:name=Program
--  value oor:external=
--  com.sun.star.configuration.backend.DesktopBackend ExternalMailer/
-+  valuesensible-ooomua/value
- /prop
-   /node
-   node oor:name=Font
-Index: shell/source/unix/misc/senddoc.sh
-===
-RCS file: /cvs/gsl/shell/source/unix/misc/senddoc.sh,v
-retrieving revision 1.8
-diff -u -u -r1.8 senddoc.sh
 shell/source/unix/misc/senddoc.sh  27 Sep 2005 12:55:00 -  1.8
-+++ shell/source/unix/misc/senddoc.sh  16 Feb 2006 00:38:29 -
-@@ -91,6 +91,19 @@
-   shift
- fi
- 
-+case `basename $MAILER` in
-+sensible-ooomua)
-+if [ -n $GNOME_DESKTOP_SESSION_ID -a -x /usr/bin/evolution ]; then
-+MAILER=/usr/bin/evolution
-+elif [ -n $KDE_FULL_SESSION -a -x /usr/bin/kmail ]; then
-+MAILER=/usr/bin/kmail
-+elif [ -x /usr/bin/evolution ]; then
-+# default
-+MAILER=/usr/bin/evolution
-+fi
-+;;
-+esac
-+
- # autodetect mail client from executable name
- case `basename $MAILER | sed 's/-.*$//'` in
- 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - patches/dev300

2011-11-24 Thread Bjoern Michaelsen

 patches/dev300/apply|3 ---
 patches/dev300/open-url-support-iceanimals.diff |   22 --
 patches/dev300/seamonkey-is-iceape.diff |   22 --
 3 files changed, 47 deletions(-)

New commits:
commit e0335749ad65bdb78f4da2315197b6066bb24563
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Nov 24 18:37:45 2011 +0100

upstream patches/dev300/seamonkey-is-iceape.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f4af29b..73b9c4e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -481,8 +481,6 @@ novell-win32-agfa-monotype-fonts.diff, tml
 
 
 [ DebianOnly ]
-seamonkey-is-iceape.diff
-
 # build against xulrunner 1.9.1+
 xulrunner-1.9.1.diff, ccheney
 
diff --git a/patches/dev300/seamonkey-is-iceape.diff 
b/patches/dev300/seamonkey-is-iceape.diff
deleted file mode 100644
index 10fccb6..000
--- a/patches/dev300/seamonkey-is-iceape.diff
+++ /dev/null
@@ -1,22 +0,0 @@
 configure.in-old   2008-05-03 23:27:00.0 +0200
-+++ configure.in   2008-05-03 23:27:37.0 +0200
-@@ -795,7 +795,7 @@
-   components cannot be built against a contemporary
-   mozilla. The flavour used can be specified by
-   --with-system-mozilla=flavour. Supported are:
--  libxul (default), xulrunner, firefox, seamonkey,
-+  libxul (default), xulrunner, firefox, iceape,
-   mozilla
- ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
-
-@@ -4134,8 +4134,8 @@
-   MOZ_FLAVOUR=libxul
- elif test -n $with_system_mozilla  test $with_system_mozilla = 
xulrunner; then
-   MOZ_FLAVOUR=xulrunner
--elif test -n $with_system_mozilla  test $with_system_mozilla = 
seamonkey; then
--  MOZ_FLAVOUR=seamonkey
-+elif test -n $with_system_mozilla  test $with_system_mozilla = 
iceape; then
-+  MOZ_FLAVOUR=iceape
- elif test -n $with_system_mozilla  test $with_system_mozilla = 
firefox; then
-   MOZ_FLAVOUR=firefox
- elif test -n $with_system_mozilla  test $with_system_mozilla = 
mozilla; then
commit 4264a8542d6b6da19b548c192662f5d7565c31ca
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Nov 24 18:36:26 2011 +0100

upstream open-url-support-iceanimals.dif

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ceb0678..f4af29b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -481,7 +481,6 @@ novell-win32-agfa-monotype-fonts.diff, tml
 
 
 [ DebianOnly ]
-open-url-support-iceanimals.diff
 seamonkey-is-iceape.diff
 
 # build against xulrunner 1.9.1+
diff --git a/patches/dev300/open-url-support-iceanimals.diff 
b/patches/dev300/open-url-support-iceanimals.diff
deleted file mode 100644
index 3928954..000
--- a/patches/dev300/open-url-support-iceanimals.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: open-url.sh
-===
 shell/source/unix/misc/open-url.sh (Revision 277618)
-+++ shell/source/unix/misc/open-url.sh (Arbeitskopie)
-@@ -58,7 +58,7 @@
- exit 0
-   fi
-   # mozilla derivates may need -remote semantics
--  for i in thunderbird mozilla netscape; do
-+  for i in icedove thunderbird iceape mozilla netscape; do
- mailer=`which $i`
- if [ ! -z $mailer ]; then
-   run_mozilla $mailer $1
-@@ -84,7 +84,7 @@
- exit 0
-   fi
-   # mozilla derivates may need -remote semantics
--  for i in firefox mozilla netscape; do
-+  for i in iceweasel firefox iceape mozilla netscape; do
- browser=`which $i`
- if [ ! -z $browser ]; then
-   run_mozilla $browser $1
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild unotest/source

2011-11-24 Thread Bjoern Michaelsen

 solenv/gbuild/platform/IOS_ARM_GCC.mk |1 
 solenv/gbuild/platform/macosx.mk  |1 
 solenv/gbuild/platform/solaris.mk |1 
 solenv/gbuild/platform/unxgcc.mk  |2 
 solenv/gbuild/platform/unxgcc_gdbforjunit.sh  |   52 ++
 unotest/source/java/org/openoffice/test/OfficeConnection.java |   81 ++
 6 files changed, 110 insertions(+), 28 deletions(-)

New commits:
commit 74f44646ba5b400cc39d78940677f136711459b5
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Nov 25 04:16:28 2011 +0100

gdb stacktraces for subsequentchecks

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 8f013fb..f8d4454 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -302,6 +302,7 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}
 \
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
+   -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) 
\
 
 endef
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4b84db4..3beb093 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -383,6 +383,7 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice}
 \
-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
+   -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) 
\
 
 endef
 
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 28dbba8..a51edbf 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -367,6 +367,7 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}
 \
-Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \
-Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
+   -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) 
\
 
 endef
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 7df93f0..8c8380c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -382,6 +382,8 @@ $(call gb_JunitTest_get_target,$(1)) : DEFS := \

-Dorg.openoffice.test.arg.soffice={OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice}
 \
-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR) \
-Dorg.openoffice.test.arg.user=file://$(call 
gb_JunitTest_get_userdir,$(1)) \
+   -Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) 
\
+   
-Dorg.openoffice.test.arg.postprocesscommand=$(GBUILDDIR)/platform/unxgcc_gdbforjunit.sh
 \
 
 endef
 
diff --git a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh 
b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
new file mode 100755
index 000..ced0444
--- /dev/null
+++ b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+#
+# 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.
+#
+# The Initial Developer of the Original Code is
+#   Bjoern Michaelsen bjoern.michael...@canonical.com
+# Portions created by the Initial Developer are Copyright (C) 2010 Canonical,
+# Ltd. . All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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.
+#
+
+# we expect our work directory to be where soffice had been started
+# $(1) should be the path to the executable
+
+OFFICEFILE=${1}
+WORKDIR=${2}
+
+if test -e ${WORKDIR}/core
+then
+STORELOCATION=`mktemp

[Libreoffice-commits] .: patches/dev300

2011-11-20 Thread Bjoern Michaelsen

 patches/dev300/apply|5 -
 patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff |   47 
--
 2 files changed, 52 deletions(-)

New commits:
commit 6715e1c1572d6b8902d841389ba9fbf162174f66
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sun Nov 20 13:59:06 2011 +0100

fdo#43105 related: patch does not help for the supposed testcase

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ee2f3d5..37041fe 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -189,11 +189,6 @@ svx-hacky-htmlselect-control-import.diff, n#523191, 
noelpwer
 
 sd-slideshow-slideshowview-transformation-fix.diff, rodo
 
-# temporary fix. does no harm and gets the job done but its not
-# beautiful. Since the whole section needs to be refactored anyway decided not
-# to waste for time with this fix but to focus on the refactoring
-sw-nested-positionned-tables-ww8-import-fix.diff, n#376688, flr
-
 # FIXME dev300-m83 xmloff_dis26300_conformance.diff, n#396280, flr
 
 # FIXME: 2009-09-11: I wonder when this has been commented out, and
diff --git a/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff 
b/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff
deleted file mode 100644
index 2fe086c..000
--- a/patches/dev300/sw-nested-positionned-tables-ww8-import-fix.diff
+++ /dev/null
@@ -1,47 +0,0 @@

- sw/source/filter/ww8/ww8par.cxx |   10 --
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
-index 1101227..e89e330 100644
 sw/source/filter/ww8/ww8par.cxx
-+++ sw/source/filter/ww8/ww8par.cxx
-@@ -2075,6 +2075,8 @@ bool SwWW8ImplReader::ProcessSpecial(bool rbReSync, 
WW8_CP nStartCp)
- nCellLevel = 0 != pPlcxMan-HasParaSprm(0x244B);
- }
- 
-+ mark:
-+
- WW8_TablePos *pTabPos=0;
- WW8_TablePos aTabPos;
- if (nCellLevel  !bVer67)
-@@ -2088,7 +2090,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool rbReSync, 
WW8_CP nStartCp)
- if (const BYTE *pLevel = pPlcxMan-HasParaSprm(0x6649))
- nCellLevel = *pLevel;
- 
--bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, nCellLevel-1);
-+bool bHasRowEnd = SearchRowEnd(pPap, nMyStartCp, 
(nInTablenCellLevel?nInTable:nCellLevel-1));
- 
- //Bad Table, remain unchanged in level, e.g. #i19667#
- if (!bHasRowEnd)
-@@ -2169,12 +2171,16 @@ bool SwWW8ImplReader::ProcessSpecial(bool rbReSync, 
WW8_CP nStartCp)
- // in Tabellen
- while (nInTable  nCellLevel)
- {
--if (StartTable(nStartCp))
-+if (StartTable(nStartCp)) {
- ++nInTable;
-+}
- else
- break;
- 
- maApos.push_back(false);
-+if (nInTablenCellLevel)
-+   goto mark;
-+
- }
- // nach StartTable ist ein ReSync noetig ( eigentlich nur, falls die
- // Tabelle ueber eine FKP-Grenze geht
--- 
-1.7.0.1
-
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: binfilter/filter

2011-11-18 Thread Bjoern Michaelsen

 binfilter/filter/source/bf_offwrp/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 28b2bf8f375fa16587ba32e489480174f510dde1
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Jul 8 11:04:50 2011 +0200

another fix for --as-needed

diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk 
b/binfilter/filter/source/bf_offwrp/makefile.mk
index d65beed..0545931 100644
--- a/binfilter/filter/source/bf_offwrp/makefile.mk
+++ b/binfilter/filter/source/bf_offwrp/makefile.mk
@@ -52,7 +52,6 @@ SHL1STDLIBS=\
 $(BFSVTOOLLIB) \
 $(BFOFALIB)\
 $(VCLLIB)  \
-$(SOTLIB)  \
 $(SALLIB)  \
 $(TOOLSLIB)\
 $(CPPULIB) \
@@ -64,6 +63,7 @@ SHL1STDLIBS=\
 $(BFSCLIB)  \
 $(BFSVXLIB) \
 $(BFSO3LIB)\
+$(SOTLIB)  \
 $(UNOTOOLSLIB) \
 $(COMPHELPERLIB)   \
 $(LEGACYSMGRLIB)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

2011-11-17 Thread Bjoern Michaelsen

 patches/dev300/apply   |3 --
 patches/dev300/gcj-32bit-runtime-path.diff |   33 -
 2 files changed, 36 deletions(-)

New commits:
commit dd5b3aad28f19f2e2402b1cfebd6ea2ea6afaea6
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Nov 17 11:25:42 2011 +0100

gcj-32bit-runtime-path.diff is obsolete as per original author (doko)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0af2244..697760c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -173,8 +173,6 @@ desktop-application-octet-stream-mime-type.diff, i#73301, 
flr
 # FIXME: temporarily disabled as this causes a race condition in calc's cell 
format dialog.
 #vcl-kerning-fix.diff, n#464436, i#26519, cbosdo
 
-# check real help path defined in registry instead of the $(instpath)/help
-sfx-check-real-help-path.diff, i#81139, pmladek
 svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
 goodies-eps-filter-unix.diff, n#200053, rodo
 
@@ -368,7 +366,6 @@ win32-gw-send-mail.diff, i#34264, n#418407, tml
 SectionOwner = rengelha
 
 debian-default-cairo-disable.diff
-gcj-32bit-runtime-path.diff, i#64888, mklose
 # read variables from /etc/libreoffice/sofficerc, since 
/usr/lib/libreoffice/sofficerc
 # just refers to it
 oosplash-etc-libreoffice-sofficerc.diff
diff --git a/patches/dev300/gcj-32bit-runtime-path.diff 
b/patches/dev300/gcj-32bit-runtime-path.diff
deleted file mode 100644
index f071092..000
--- a/patches/dev300/gcj-32bit-runtime-path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx~  2006-09-04 
20:24:48.710718000 +0200
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx   2006-09-04 
20:37:56.620718000 +0200
-@@ -37,6 +37,11 @@
- #include osl/thread.h
- #include gnujre.hxx
- #include util.hxx
-+extern C
-+{
-+#include sys/utsname.h
-+#include string.h
-+}
- 
- using namespace rtl;
- using namespace std;
-@@ -153,7 +158,18 @@
- return false;
- 
- if (!m_sJavaHome.getLength())
-+#if defined (__linux__)  defined (__i386__)
-+{
-+   struct utsname uts;
-+   uname(uts);
-+   if(!strcmp(x86_64,uts.machine))
-+   m_sJavaHome = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///usr/lib32));
-+   else
-+   m_sJavaHome = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///usr/lib));
-+}
-+#else
- m_sJavaHome = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(file:///usr/lib));
-+#endif
- 
- // init m_sRuntimeLibrary
- OSL_ASSERT(m_sHome.getLength());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

2011-11-17 Thread Bjoern Michaelsen

 patches/dev300/apply|3 ++-
 patches/dev300/vcl-permit-global-shortcuts.diff |1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f5c9ac6229d3ec756bda5f49d51168687978
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Nov 17 14:26:09 2011 +0100

add warning to vcl-permit-global-shortcuts.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 697760c..ee2f3d5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -215,7 +215,8 @@ sfx2-privateprotectedpublic.diff
 #optional-outplace-ole.diff, i#98970, thorsten
 # let ctrl-keycode stuff pass dlg keyboard handling, to permit
 # global application-wide shortcuts also in open dialogs
-vcl-permit-global-shortcuts.diff, i#105676, thorsten
+# disabled for now because of sideeffects (see comments in i#105676), would 
need investigation before upstreaming
+#vcl-permit-global-shortcuts.diff, i#105676, thorsten
 
 # unresolved Base64 Java classes
 base64.diff, i#100620, hmth
diff --git a/patches/dev300/vcl-permit-global-shortcuts.diff 
b/patches/dev300/vcl-permit-global-shortcuts.diff
index a34e55f..f970873 100644
--- a/patches/dev300/vcl-permit-global-shortcuts.diff
+++ b/patches/dev300/vcl-permit-global-shortcuts.diff
@@ -1,3 +1,4 @@
+# disabled for now because of sideeffects (see comments in i#105676), would 
need investigation before upstreaming
 ---
  vcl/source/window/dlgctrl.cxx |4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: patches/dev300

2011-11-16 Thread Bjoern Michaelsen

 patches/dev300/sfx-check-real-help-path.diff |   73 ---
 1 file changed, 73 deletions(-)

New commits:
commit e165ab7c2daed295a1d947cd81de1bb65c8dba59
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Nov 16 18:37:12 2011 +0100

remove patches/dev300/sfx-check-real-help-path.diff, obsolete as per 
original author (pmladek)

diff --git a/patches/dev300/sfx-check-real-help-path.diff 
b/patches/dev300/sfx-check-real-help-path.diff
deleted file mode 100644
index 131b6d2..000
--- a/patches/dev300/sfx-check-real-help-path.diff
+++ /dev/null
@@ -1,73 +0,0 @@

- sfx2/source/appl/sfxhelp.cxx   |   19 +--
- unotools/source/config/pathoptions.cxx |6 +-
- 2 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git sfx2/source/appl/sfxhelp.cxx sfx2/source/appl/sfxhelp.cxx
-index d5e6f24..df94b19 100644
 sfx2/source/appl/sfxhelp.cxx
-+++ sfx2/source/appl/sfxhelp.cxx
-@@ -53,10 +53,10 @@
- #include com/sun/star/system/SystemShellExecuteFlags.hpp
- #include unotools/configmgr.hxx
- #include unotools/configitem.hxx
-+#include unotools/localfilehelper.hxx
- #include svtools/helpopt.hxx
- #include unotools/moduleoptions.hxx
- #include tools/urlobj.hxx
--#include unotools/configmgr.hxx
- #include ucbhelper/content.hxx
- #include unotools/pathoptions.hxx
- #include rtl/ustring.hxx
-@@ -126,13 +126,13 @@ rtl::OUString HelpLocaleString()
- aLocaleStr = aEnglish;
- else
- {
--rtl::OUString aBaseInstallPath;
--// utl::Bootstrap::PathStatus aBaseLocateResult =
--utl::Bootstrap::locateBaseInstallation(aBaseInstallPath);
--static const char *szHelpPath = /help/;
-+String sBaseHelpPathString;
-+::utl::LocalFileHelper::ConvertPhysicalNameToURL( 
SvtPathOptions().GetHelpPath(), sBaseHelpPathString );
-+
-+rtl::OUString sBaseHelpPath( sBaseHelpPathString );
-+sBaseHelpPath += rtl::OUString::createFromAscii(/);
- 
--rtl::OUString sHelpPath = aBaseInstallPath +
--rtl::OUString::createFromAscii(szHelpPath) + aLocaleStr;
-+rtl::OUString sHelpPath = sBaseHelpPath + aLocaleStr;
- osl::DirectoryItem aDirItem;
- 
- if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == 
osl::FileBase::E_None)
-@@ -143,9 +143,8 @@ rtl::OUString HelpLocaleString()
- if (nSepPos != STRING_NOTFOUND)
- {
- bOk = true;
--sLang = sLang.Copy( 0, nSepPos );
--sHelpPath = aBaseInstallPath +
--rtl::OUString::createFromAscii(szHelpPath) + sLang;
-+sLang = sLang.Copy( 0, nSepPos );
-+sHelpPath = sBaseHelpPath + sLang;
- if (!osl::DirectoryItem::get(sHelpPath, aDirItem) == 
osl::FileBase::E_None)
- bOk = false;
- }
-diff --git unotools/source/config/pathoptions.cxx 
unotools/source/config/pathoptions.cxx
-index b02f912..f16e68f 100644
 unotools/source/config/pathoptions.cxx
-+++ unotools/source/config/pathoptions.cxx
-@@ -299,7 +299,11 @@ const String SvtPathOptions_Impl::GetPath( 
SvtPathOptions::Pathes ePath )
- {
- // These office paths have to be converted to system pathes
- utl::LocalFileHelper::ConvertURLToPhysicalName( aPathValue, 
aResult );
--aPathValue = aResult;
-+// FIXME: The initial value (not modified by SetPath) is just a 
path, so the URL-conversion fails.
-+//The best solution is to fix the module xmlhelp to 
accept the URL. Then we could remove
-+//all these ugly conversions.
-+if ( aResult.Len() != 0 )
-+aPathValue = aResult;
- }
- 
- m_aPathArray[ ePath ] = aPathValue;
--- 
-1.7.0.1
-
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dbaccess/source

2011-11-15 Thread Bjoern Michaelsen

 dbaccess/source/ui/browser/dbtreeview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6bfc7f28e6d3454fa90d6c32b36cd9bf898ba933
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Nov 15 17:35:36 2011 +0100

 Address data source ordering x#62860

information from the apply file:
 patchname: addrbk-datasrc-ordering.diff
 issues:
 author: michael
 section: Misc
 comment:
  Address data source ordering x#62860
 sectioncomment:

git log from build repository:
commit bfa619922b90a021e5d856333dd398512389ad67
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon Jun 21 22:11:19 2010 +0200

Update patches to dev300-m83.

* [...]

commit 256381886a238d80b9ddab795b500576d92404cc
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed May 19 12:16:00 2010 +0200

Updated patches do dev300-m77.

* [...]

commit df913735fd729978d20f0282fe32d14bf597891f
Author: Jan Holesovsky ke...@suse.cz
Date:   Mon May 17 01:21:36 2010 +0200

Patches adopted to the tabs - spaces fixes + trailing whitespace 
cleanup.

* [...]

commit c6847e9b022184e98942391a2b5711c31eb25ba3
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri May 14 14:32:23 2010 +0200

Convert tabs to spaces in all the code introduced by the patches.

* [...]

commit 09774df8a62bf886c78c0f84d56b2d518ae8107e
Author: Jan Holesovsky ke...@suse.cz
Date:   Tue Apr 29 14:04:53 2008 +

Src680/

* Some cleaning action: src680/* - dev300/

* patches/dev300/gstreamer-sd.diff,
patches/dev300/gstreamer-slideshow.diff,
patches/dev300/letter-wizard-resource-id.diff: Moved to
patches/gstreamer.

* patches/dev300/mono-build.diff: Moved to patches/mono.

* patches/dev300/sc-hacky-handle-boolean.diff,
patches/dev300/vba-workbook-worksheet-events.diff: Moved to
patches/vba.

* patches/src680/unittesting-*: Moved...
patches/unittesting/*: ...here.

* patches/src680/*: Moved...
patches/dev300/*: ...here.

* patches/dev300/apply,
patches/Makefile.am: Add the unittesting subdir, remove src680.

diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx 
b/dbaccess/source/ui/browser/dbtreeview.cxx
index b69c67b..25fee5b 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -53,7 +53,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference 
XMultiServiceFactory 
 {
 DBG_CTOR(DBTreeView,NULL);
 
-m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_HASLINES | WB_SORT | 
WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT,sal_True);
+m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_BORDER | WB_HASLINES | 
WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT);
 m_pTreeListBox-EnableCheckButton(NULL);
 m_pTreeListBox-SetDragDropMode( 0 );
 m_pTreeListBox-EnableInplaceEditing( sal_True );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-11-15 Thread Bjoern Michaelsen

 sw/source/ui/dbui/dbtree.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03324dbbe2c0973a2f71c77cc72d852314b8da77
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Nov 15 18:02:39 2011 +0100

Address data source ordering x#62860 (part 2)

diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index ec7294e..3804eaa 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -216,7 +216,7 @@ void SwDBTreeList::InitTreeList()
 if(!pImpl-HasContext()  pImpl-GetWrtShell())
 return;
 SetSelectionMode(SINGLE_SELECTION);
-
SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
+
SetStyle(GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL);
 // don't set font, so that the Control's font is being applied!
 SetSpaceBetweenEntries(0);
 SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 5 commits - patches/dev300

2011-11-15 Thread Bjoern Michaelsen

 patches/dev300/addrbk-datasrc-ordering.diff   |   34 
 patches/dev300/apply  |   30 
 patches/dev300/gcc-HelpLinker.diff|   37 -
 patches/dev300/odf-converter-ignore-writerfilter.diff |  141 ---
 patches/dev300/office-cfg-linux-common-template-dir.diff  |   41 -
 patches/dev300/oox-pptx-export-update-to-ooo320.diff  |  198 -
 patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff |  355 --
 7 files changed, 1 insertion(+), 835 deletions(-)

New commits:
commit dd851e09a287c75bb894e4b38ea9616e62c7c95a
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Nov 15 20:07:03 2011 +0100

gcc-HelpLinker.diff should be obsolete

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 37ab886..0af2244 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -10,7 +10,7 @@ 
PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql
 OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
 
 #  Functional sub-sets 
-Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Features, Misc, 
CalcFixes, EasterEgg, GnomeVFS, VBAObjects, OOXML, FedoraCommonFixes, 
WriterDocComparison, MySQL
+Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Misc, CalcFixes, 
EasterEgg, GnomeVFS, VBAObjects, OOXML, FedoraCommonFixes, WriterDocComparison, 
MySQL
 
 LinuxCommon : Common, LinuxOnly, CliMonoCommon, Mono, MonoComp, Netbook
 MacOSXCommon : Common
@@ -147,9 +147,6 @@ warning-return-values-stlport.diff, jholesov
 # gcc OOMs here otherwise (x86_64)
 writerfilter-qnametostr-NOOPTFILES.diff
 
-# don't let HelpLinker be miscompiled with g++ 4.3
-gcc-HelpLinker.diff # RENAMED transex3 - l10ntools
-
 # included in dev300 for OOo-3.4
 # add the .archive flag to some instsetoo_native/util/makefile.mk rules
 buildfix-instsetoo_native-archive.diff, i#111617
@@ -496,19 +493,6 @@ win32-prebuilt-writingaids-zip-scp2.diff
 # Optimal Page Wrap should be default for graphics insertion (X#59831)
 writer-default-as-optimal-page-wrap.diff, i#38108, jody
 
-[ Features ]
-# ask user on logout/shutdown to save documents
-# It seems to be better not to use this. It interfers with upstream's
-# handling of the issue. See discussion in bnc#525331. --tml
-# session-management.diff, i#63156, rodo
-
-# embed generic media files inside odf docs, plus various related
-# sound fixes from rodo
-#impressmedia-features.diff, i#83753, n#515553, thorsten
-#slideshow-sound.diff, n#515553, rodo
-
-# Pre- and postprocessing capabilities for loading and saving.
-sfx2-pre-and-postprocess-during-save-load.diff, i#71939, flr
 
 [ BuildBits ]
 build-identification.diff, tml
diff --git a/patches/dev300/gcc-HelpLinker.diff 
b/patches/dev300/gcc-HelpLinker.diff
deleted file mode 100644
index 3266a6d..000
--- a/patches/dev300/gcc-HelpLinker.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-From e038b9fdc8a8f997d6e85e2194911bb5b742fbe3 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky ke...@suse.cz
-Date: Fri, 14 May 2010 16:53:24 +0200
-Subject: [PATCH 051/878] gcc-HelpLinker.diff
-

- transex3/source/help/makefile.mk |1 +
- transex3/source/makefile.mk  |1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/transex3/source/help/makefile.mk 
b/transex3/source/help/makefile.mk
-index 3196d23..2841da2 100644
 l10ntools/source/help/makefile.mk
-+++ l10ntools/source/help/makefile.mk
-@@ -36,6 +36,7 @@ TARGETTYPE=CUI
- 
- .INCLUDE : settings.mk
- .INCLUDE : helplinker.pmk
-+CDEFS+= -O0
-  
- .IF $(SYSTEM_LIBXSLT) == YES
- CFLAGS+= $(LIBXSLT_CFLAGS)
-diff --git a/transex3/source/makefile.mk b/transex3/source/makefile.mk
-index ab54779..e08e0ac 100644
 l10ntools/source/makefile.mk
-+++ l10ntools/source/makefile.mk
-@@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE
- .INCLUDE :  settings.mk
- CDEFS+= -DYY_NEVER_INTERACTIVE=1
- #CDEFS+= -pg
-+CDEFS+= -O0
- 
- .IF $(SYSTEM_EXPAT) == YES
- CFLAGS+=-DSYSTEM_EXPAT
--- 
-1.7.0.1
-
diff --git a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff 
b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
deleted file mode 100644
index a3c6d27..000
--- a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff
+++ /dev/null
@@ -1,355 +0,0 @@

- package/source/xstor/xstorage.cxx |8 +-
- sfx2/source/doc/objstor.cxx   |  257 -
- 2 files changed, 251 insertions(+), 14 deletions(-)
-
-diff --git package/source/xstor/xstorage.cxx package/source/xstor/xstorage.cxx
-index c6cc37f..848c7c6 100644
 package/source/xstor/xstorage.cxx
-+++ package/source/xstor/xstorage.cxx
-@@ -4458,13 +4458,7 @@ sal_Bool SAL_CALL OStorage::hasByName( const 
::rtl::OUString aName )
- catch ( uno::Exception aException )
- {
-m_pImpl-AddLog( aException.Message );
--   m_pImpl-AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 
OSL_LOG_PREFIX

[Libreoffice-commits] .: sw/qa

2011-11-14 Thread Bjoern Michaelsen

 sw/qa/complex/writer/CheckBookmarks.java |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit fe7026d72b1b88f60e009fd4de2f53306e0d1c4e
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Nov 14 23:03:23 2011 +0100

fdo#40819, i#116193: disable WW8 roundtrip as it breaks on big bookmark 
counts

diff --git a/sw/qa/complex/writer/CheckBookmarks.java 
b/sw/qa/complex/writer/CheckBookmarks.java
index 405ca0d..c922da2 100644
--- a/sw/qa/complex/writer/CheckBookmarks.java
+++ b/sw/qa/complex/writer/CheckBookmarks.java
@@ -107,9 +107,8 @@ public class CheckBookmarks {
 result.m_nDeleteRandomHash = new 
BigInteger(-3ec87e810b46d734677c351ad893bbbf9ea10f55,16);
 result.m_nLinebreakHash = new 
BigInteger(3ae08c284ea0d6e738cb43c0a8105e718a633550,16);
 result.m_nOdfReloadHash = new 
BigInteger(3ae08c284ea0d6e738cb43c0a8105e718a633550,16);
-// MsWord Hash changed from DEV300m41 = behaviour change, possible 
regression?
+// MsWord Hash is unstable over different systems
// result.m_nMsWordReloadHash = new 
BigInteger(3ae08c284ea0d6e738cb43c0a8105e718a633550,16);
-   result.m_nMsWordReloadHash = new 
BigInteger(-53193413016049203700369483764549874348805475606,10);
 return result;
 }
 
@@ -136,14 +135,14 @@ public class CheckBookmarks {
 actualHashes.m_nLinebreakHash = 
BookmarkHashes.getBookmarksHash(m_xDoc);
 m_xOdfReloadedDoc = reloadFrom(StarOffice XML (Writer), odf);
 actualHashes.m_nOdfReloadHash = 
BookmarkHashes.getBookmarksHash(m_xOdfReloadedDoc);
-m_xMsWordReloadedDoc = reloadFrom(MS Word 97, doc);
-actualHashes.m_nMsWordReloadHash = 
BookmarkHashes.getBookmarksHash(m_xMsWordReloadedDoc);
+//m_xMsWordReloadedDoc = reloadFrom(MS Word 97, doc);
+//actualHashes.m_nMsWordReloadHash = 
BookmarkHashes.getBookmarksHash(m_xMsWordReloadedDoc);
 }
 
 @After public void tearDownDocuments() {
 util.DesktopTools.closeDoc(m_xDoc);
 util.DesktopTools.closeDoc(m_xOdfReloadedDoc);
-util.DesktopTools.closeDoc(m_xMsWordReloadedDoc);
+//util.DesktopTools.closeDoc(m_xMsWordReloadedDoc);
 }
 
 @BeforeClass public static void setUpConnection() throws Exception {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sw/JunitTest_sw_complex.mk sw/qa sw/source

2011-11-10 Thread Bjoern Michaelsen

 sw/JunitTest_sw_complex.mk   |   13 +
 sw/qa/complex/writer/CheckBookmarks.java |8 +---
 sw/source/core/unocore/unocoll.cxx   |   18 +-
 3 files changed, 15 insertions(+), 24 deletions(-)

New commits:
commit 650592cf0181e219921d5e6bc3ffe007c95dc192
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Nov 10 11:33:05 2011 +0100

fdo#40819 lp#868229: reenable CheckBookmarks subsequenttest

* MsWord Hash changed from DEV300m41 = behaviour change, possible 
regression?

diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 5551577..3c330b6 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_JunitTest_add_jars,sw_complex,\
 
 $(eval $(call gb_JunitTest_add_classes,sw_complex,\
 complex.accessibility.AccessibleRelationSet \
+complex.writer.CheckBookmarks \
 complex.checkColor.CheckChangeColor \
 complex.writer.CheckCrossReferences \
 complex.writer.CheckFlies \
@@ -66,17 +67,5 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
 # fd#35657 test disabled - reenable if fixed
 #complex.writer.TextPortionEnumerationTest \
 
-# Currently fails on all platforms, as getBookmarksHash in
-# sw/qa/complex/writer/CheckBookmarks.java obtains from
-# xBookmarks.getElementNames() names like __UnoMark__1910_1361181355 that
-# cause NoSuchElementException, see
-# https://bugs.freedesktop.org/show_bug.cgi?id=40819 CheckBookmarks fails
-# with NoSuchElementException on names __UnoMark__1910_1361181355:
-# # CheckBookmarks currently fails on windows because the hashes are different:
-# ifneq ($(OS),WNT)
-# $(eval $(call gb_JunitTest_add_classes,sw_complex,\
-# complex.writer.CheckBookmarks \
-# ))
-# endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/sw/qa/complex/writer/CheckBookmarks.java 
b/sw/qa/complex/writer/CheckBookmarks.java
index 84bfe15..405ca0d 100644
--- a/sw/qa/complex/writer/CheckBookmarks.java
+++ b/sw/qa/complex/writer/CheckBookmarks.java
@@ -100,14 +100,16 @@ public class CheckBookmarks {
 private XTextDocument m_xMsWordReloadedDoc = null;
 private final BookmarkHashes actualHashes = new BookmarkHashes();
 
-private BookmarkHashes getDEV300m41Expectations() {
+private BookmarkHashes get2010Expectations() {
 BookmarkHashes result = new BookmarkHashes();
 result.m_nSetupHash = new 
BigInteger(-4b0706744e8452fe1ae9d5e1c28cf70fb6194795,16);
 result.m_nInsertRandomHash = new 
BigInteger(25aa0fad3f4881832dcdfe658ec2efa8a1a02bc5,16);
 result.m_nDeleteRandomHash = new 
BigInteger(-3ec87e810b46d734677c351ad893bbbf9ea10f55,16);
 result.m_nLinebreakHash = new 
BigInteger(3ae08c284ea0d6e738cb43c0a8105e718a633550,16);
 result.m_nOdfReloadHash = new 
BigInteger(3ae08c284ea0d6e738cb43c0a8105e718a633550,16);
-result.m_nMsWordReloadHash = new 
BigInteger(3ae08c284ea0d6e738cb43c0a8105e718a633550,16);
+// MsWord Hash changed from DEV300m41 = behaviour change, possible 
regression?
+   // result.m_nMsWordReloadHash = new 
BigInteger(3ae08c284ea0d6e738cb43c0a8105e718a633550,16);
+   result.m_nMsWordReloadHash = new 
BigInteger(-53193413016049203700369483764549874348805475606,10);
 return result;
 }
 
@@ -116,7 +118,7 @@ public class CheckBookmarks {
 com.sun.star.io.IOException,
 java.security.NoSuchAlgorithmException
 {
-actualHashes.assertExpectation(getDEV300m41Expectations());
+actualHashes.assertExpectation(get2010Expectations());
 }
 
 @Before public void setUpDocuments() throws Exception {
commit 54edd57f21519ab283fc1e0fb85b47b0beb59486
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Nov 10 11:28:20 2011 +0100

fdo#40819: Revert field-patch-uno-fix.diff: enhanced fields UNO fix

This reverts commit 693b095ee8b7406c4aa0fd5b2bd0221bdcab304f.

diff --git a/sw/source/core/unocore/unocoll.cxx 
b/sw/source/core/unocore/unocoll.cxx
index a2e0dbc..38ae22c 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1633,7 +1633,7 @@ sal_Int32 SwXBookmarks::getCount(void)
 SolarMutexGuard aGuard;
 if(!IsValid())
 throw uno::RuntimeException();
-return GetDoc()-getIDocumentMarkAccess()-getMarksCount();
+return GetDoc()-getIDocumentMarkAccess()-getBookmarksCount();
 }
 
 uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
@@ -1643,11 +1643,11 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
 if(!IsValid())
 throw uno::RuntimeException();
 IDocumentMarkAccess* const pMarkAccess = 
GetDoc()-getIDocumentMarkAccess();
-if(nIndex  0 || nIndex = pMarkAccess-getMarksCount())
+if(nIndex  0 || nIndex = pMarkAccess-getBookmarksCount())
 throw IndexOutOfBoundsException();
 
 uno::Any aRet;
-::sw::mark::IMark* pBkmk = pMarkAccess-getMarksBegin()[nIndex].get();
+::sw

[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk

2011-11-08 Thread Bjoern Michaelsen

 desktop/Executable_soffice.bin.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f222b01170f57ca65ef28239dcf20c1f5a533f6c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Nov 8 14:19:36 2011 +0100

there is no rule for the manifest, so we need to depend on the lib only
 - or maybe better: have an rule for manifest files on windows, instead of 
creating them as a sideeffect

diff --git a/desktop/Executable_soffice.bin.mk 
b/desktop/Executable_soffice.bin.mk
index b32a444..776b84f 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -85,8 +85,8 @@ $(call gb_Module_get_target,desktop) : 
$(OUTDIR)/bin/soffice.bin.manifest
 
 $(OUTDIR)/bin/soffice.bin.manifest : $(call 
gb_Executable_get_target,$(sofficebin))
 $(call gb_Executable_get_clean_target,$(sofficebin)) : 
$(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
-$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call 
gb_Executable_get_linktargetname,$(sofficebin))).manifest $(call 
gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(sofficebin)))
-   $(call gb_Deliver_deliver,$,$@)
+$(OUTDIR)/bin/soffice.bin.manifest : $(call gb_LinkTarget_get_target,$(call 
gb_Executable_get_linktargetname,$(sofficebin)))
+   $(call gb_Deliver_deliver,$.manifest,$@)
 
 .PHONY : $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest
 $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - smoketestoo_native/makefile.mk

2011-11-01 Thread Bjoern Michaelsen

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

New commits:
commit 0d1b57b3b1c47b3d2348ca6b37ab0074c728896b
Merge: 0bcda87... 84ae3c9...
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Nov 1 20:28:21 2011 -0400

Merge ssh://git.freedesktop.org/git/libreoffice/core

commit 0bcda87664af59e01f4e1048991e5cf752547556
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Nov 1 20:24:57 2011 -0400

fix smoketest linkage

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index cd80184..8c7d811 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -42,7 +42,7 @@ SHL1IMPLIB = i$(SHL1TARGET)
 SHL1TARGET = smoketest
 SHL1OBJS = $(SLO)/smoketest.obj
 SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(TESTLIB)
+SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(UNOTESTLIB)
 SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/gbuild' - 2 commits - offapi/UnoApi_offapi.mk offapi/UnoApi_types.mk oovbaapi/UnoApi_oovbaapi.mk solenv/gbuild udkapi/UnoApi_udkapi.mk udkapi/UnoApi_uretypes.m

2011-10-25 Thread Bjoern Michaelsen

 offapi/UnoApi_offapi.mk  |2 +-
 offapi/UnoApi_types.mk   |2 +-
 oovbaapi/UnoApi_oovbaapi.mk  |2 +-
 solenv/gbuild/UnoApiTarget.mk|5 -
 solenv/gbuild/platform/unxgcc.mk |2 ++
 udkapi/UnoApi_udkapi.mk  |2 +-
 udkapi/UnoApi_uretypes.mk|2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 55bebb553dbbcf69c3b0d5d72033a5146c813fcf
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Oct 25 14:18:59 2011 +0200

add -Wl,--export-dynamic for executables on unxgcc platforms

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 01421da..ecff556 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -328,6 +328,7 @@ $(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1))  \
$(gb_CXX) \
$(if $(filter Library 
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+   $(if $(filter 
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
$(subst \d,$$,$(RPATH)) \
$(T_LDFLAGS) \
@@ -440,6 +441,7 @@ gb_StaticLibrary_StaticLibrary_platform =
 
 # Executable class
 
+gb_Library_TARGETTYPEFLAGS := -Wl,--export-dynamic
 gb_Executable_EXT :=
 
 gb_Executable_LAYER := \
commit 2cffbfab9cd80c44b7b13bbfb56eee721eeadf94
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Oct 25 02:22:28 2011 +0200

kill multi repo support for UnoApiTarget

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 1f3ab32..8ae72cb 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi))
 
 $(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\
 udkapi \
diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApi_types.mk
index 02b9953..df0da06 100644
--- a/offapi/UnoApi_types.mk
+++ b/offapi/UnoApi_types.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,types,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,types))
 
 $(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\
 udkapi \
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index c204aa6..340c5d0 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi))
 
 $(eval $(call gb_UnoApiTarget_add_rdbfiles,oovbaapi,\
 udkapi \
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 816fb85..e4d1785 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -35,7 +35,6 @@ $(call gb_Package_get_target,$(1)_inc) : $(call 
gb_UnoApiTarget_get_target,$(1))
 
 endef
 
-# TODO: make multi repo safe
 define gb_UnoApiTarget_autopackage_idl
 $$(eval $$(call gb_Package_Package,$(1)_idl,$(SRCDIR)))
 $(foreach onefile,$(gb_UnoApiTarget_IDLFILES_$(1)), \
@@ -47,10 +46,6 @@ $(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call 
gb_UnoApiTarget_get_ta
mkdir -p $$(dir $$@)
 
 define gb_UnoApiTarget_UnoApiTarget
-$(if $(filter $(2),$(gb_Helper_REPOSITORYNAMES)),,\
- $(error UnoApiTarget: no or invalid repository given; known repositories: \
-  $(gb_Helper_REPOSITORYNAMES)))
-gb_UnoApiTarget_REPO_$(1) := $(2)
 $$(eval $$(call gb_Module_register_target,$(call 
gb_UnoApiOutTarget_get_target,$(1)),$(call 
gb_UnoApiOutTarget_get_clean_target,$(1
 $(call gb_UnoApiOutTarget_get_target,$(1)) : $(call 
gb_UnoApiTarget_get_target,$(1))
 $(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call 
gb_UnoApiTarget_get_clean_target,$(1))
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 1572c13..fb1ac94 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi))
 
 $(eval $(call gb_UnoApiTarget_set_include,udkapi,\
$$(INCLUDE) \
diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApi_uretypes.mk
index ad5c8f1..d61d079 100644
--- a/udkapi/UnoApi_uretypes.mk
+++ b/udkapi/UnoApi_uretypes.mk
@@ -26,7 +26,7 @@
 #
 #*
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types))
 
 $(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\
 udkapi

[Libreoffice-commits] .: solenv/gbuild

2011-10-22 Thread Bjoern Michaelsen

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

New commits:
commit 237c5f0290169aa31e10990c05b7ea39d9fc70bd
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sat Oct 22 12:36:07 2011 +0200

another fix for 68dd19a368fb4afbf3eba4cb722f56b87f8ea7c1 on OSX

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index fc58e4d..3e71c97 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -251,7 +251,7 @@ gb_ObjCxxObject_get_source = $(1)/$(2).mm
 # defined by platform
 #  gb_ObjCxxObject__command
 
-$(call gb_ObjCxxObject_get_target,%) : $(call 
gb_ObjCxxObject_get_source,$(1),%)
+$(call gb_ObjCxxObject_get_target,%) : $(call 
gb_ObjCxxObject_get_source,$(SRCDIR),%)
$(call gb_ObjCxxObject__command,$@,$*,$,$(call 
gb_ObjCxxObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 13 commits - GNUmakefile.mk rsc/Executable_rsc.mk solenv/gbuild

2011-10-21 Thread Bjoern Michaelsen

 GNUmakefile.mk  |2 
 rsc/Executable_rsc.mk   |4 
 solenv/gbuild/AllLangResTarget.mk   |   31 +-
 solenv/gbuild/BuildDirs.mk  |   19 ---
 solenv/gbuild/ComponentTarget.mk|   23 +---
 solenv/gbuild/ExternalLib.mk|6 -
 solenv/gbuild/LinkTarget.mk |  136 +---
 solenv/gbuild/TargetLocations.mk|7 -
 solenv/gbuild/UnoApiTarget.mk   |   12 --
 solenv/gbuild/WinResTarget.mk   |6 -
 solenv/gbuild/extensions/post_SetupLocal.mk |   68 --
 solenv/gbuild/gbuild.mk |8 +
 solenv/gbuild/platform/ios.mk   |4 
 solenv/gbuild/platform/macosx.mk|6 -
 solenv/gbuild/platform/unxgcc.mk|4 
 solenv/gbuild/platform/windows.mk   |4 
 solenv/gbuild/platform/winmingw.mk  |4 
 17 files changed, 100 insertions(+), 244 deletions(-)

New commits:
commit 7bf06ba95d6ba0e673f2aff5b4412dbf08702590
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Oct 21 21:08:47 2011 +0200

rename YaccObject to YaccTarget

the object is a GenCxxObject just like those from CustomTargets, we only 
need to get the generation right

diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index 058dfd7..e1ed345 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Executable_set_include,rsc,\
$$(INCLUDE) \
-I$(SRCDIR)/rsc/inc \
-I$(SRCDIR)/rsc/inc/pch \
-   -I$(WORKDIR)/YaccObject/rsc/source/parser \
+   -I$(WORKDIR)/YaccTarget/rsc/source/parser \
 ))
 
 $(eval $(call gb_Executable_add_api,rsc,\
@@ -58,7 +58,7 @@ $(eval $(call gb_Executable_add_grammars,rsc,\
rsc/source/parser/rscyacc \
 ))
 
-$(call gb_YaccObject_get_target,rsc/source/parser/rscyacc): T_CXXFLAGS := 
$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
+$(call gb_YaccTarget_get_target,rsc/source/parser/rscyacc): T_CXXFLAGS := 
$(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
 
 $(eval $(call gb_Executable_add_exception_objects,rsc,\
rsc/source/parser/erscerr \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index bbaa479..271ce81 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -224,25 +224,25 @@ endif
 
 gb_GenCxxObject_GenCxxObject =
 
-# YaccObject class
-gb_YaccObject_get_source = $(1)/$(2).y
+# YaccTarget class
+gb_YaccTarget_get_source = $(1)/$(2).y
 
-.PHONY : $(call gb_YaccObject_get_clean_target,%)
-$(call gb_YaccObject_get_clean_target,%) :
+.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_YaccObject_get_header_target,$*) $(call 
gb_YaccObject_get_target,$*))
+   rm -f $(call gb_YaccTarget_get_header_target,$*) $(call 
gb_YaccTarget_get_target,$*))
 
-$(call gb_YaccObject_get_target,%) : $(call 
gb_YaccObject_get_source,$(SRCDIR),%)
-   $(call gb_YaccObject__command,$,$*,$@,$(call 
gb_YaccObject_get_header_target,$*))
+$(call gb_YaccTarget_get_target,%) : $(call 
gb_YaccTarget_get_source,$(SRCDIR),%)
+   $(call gb_YaccTarget__command,$,$*,$@,$(call 
gb_YaccTarget_get_header_target,$*))
 
-gb_YaccObject_YaccObject =
+gb_YaccTarget_YaccTarget =
 
 gb_YACC := bison
 
-# YaccObject class
+# YaccTarget class
 # defined by platform
-# gb_YaccObject__command(grammar-file, stem-for-message, source-target, 
include-target)
+# gb_YaccTarget__command(grammar-file, stem-for-message, source-target, 
include-target)
 
 # ObjCxxObject class
 #
@@ -852,13 +852,13 @@ endef
 # Add a bison grammar to the build.
 # gb_LinkTarget_add_grammar(component,grammar file)
 define gb_LinkTarget_add_grammar
-$(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccObject/$(2))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(call 
gb_YaccObject_get_clean_target,$(2))
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call 
gb_YaccObject_get_header_target,$(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_YaccObject_YaccObject,$(2))
+#$(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 e602a37..9205d44 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -125,8 +125,8 @@ gb_UnoApiTarget_get_header_target = 
$(WORKDIR)/UnoApiHeaders/$(1)
 gb_WinResTarget_get_target = 
$(WORKDIR

[Libreoffice-commits] .: solenv/gbuild

2011-10-21 Thread Bjoern Michaelsen

 solenv/gbuild/LinkTarget.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8c86c64f22b0dfef3cc502f59f509e20c1f5643c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Oct 21 23:44:20 2011 +0200

restore accidentally removed line

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 271ce81..fc58e4d 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -247,6 +247,7 @@ gb_YACC := bison
 # ObjCxxObject class
 #
 
+gb_ObjCxxObject_get_source = $(1)/$(2).mm
 # defined by platform
 #  gb_ObjCxxObject__command
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-10-10 Thread Bjoern Michaelsen

 solenv/gbuild/CustomTarget.mk |4 ++--
 solenv/gbuild/LinkTarget.mk   |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 04e1536d4e77242a47afa5c573add7ab619e6762
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Oct 10 11:13:07 2011 +0200

fixing error handling for generated files again

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 19279a4..20cd29a 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -59,8 +59,8 @@ $(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\
 gb_CustomTarget_REPO_$(1) := $(2)
 $(call gb_CustomTarget_get_target,$(1)) : \
   $(call gb_CustomTarget__get_makefile,$($(2)),$(1))
-$(call gb_CustomTarget_get_workdir,$(1))/% : \
-  $(call gb_CustomTarget_get_target,$(1))
+$(call gb_CustomTarget_get_workdir,$(1))/% : $(call 
gb_CustomTarget_get_target,$(1))
+   test -f $@ || (echo Missing file $@ which should have been generated 
from CustomTarget $(1), but was not.  false)
 endef
 
 
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index dea4aaa..49dd076 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -197,7 +197,7 @@ gb_GenCObject_get_source = $(WORKDIR)/$(1).c
 #  gb_CObject__command
 
 $(call gb_GenCObject_get_target,%) : $(call gb_GenCObject_get_source,%)
-   $(if $(wildcard $),,$(eval $(call gb_Output_error,No such source file 
$)))
+   test -f $ || (echo Missing generated source file $  false)
$(call gb_CObject__command,$@,$*,$,$(call 
gb_GenCObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -216,7 +216,7 @@ gb_GenCxxObject_get_source = $(WORKDIR)/$(1).cxx
 #  gb_CxxObject__command
 
 $(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%)
-   $(if $(wildcard $),,$(eval $(call gb_Output_error,No such source file 
$)))
+   test -f $ || (echo Missing generated source file $  false)
$(call gb_CxxObject__command,$@,$*,$,$(call 
gb_GenCxxObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-10-07 Thread Bjoern Michaelsen

 solenv/gbuild/LinkTarget.mk |   29 +++--
 1 file changed, 7 insertions(+), 22 deletions(-)

New commits:
commit 6055a5df7b6e7452987a9584d10f436ca2d349fd
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Oct 7 16:40:22 2011 +0200

no more gbuild loops: break early on nonexistent objects (this commit 
breaks multi-repo support)

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3b5356c..44eae00 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -132,9 +132,6 @@ endef
 
 $(foreach repo,$(gb_CObject_REPOS),$(eval $(call gb_CObject__rules,$(repo
 
-$(call gb_CObject_get_dep_target,%) :
-   $(eval $(call gb_Output_error,Unable to find plain C file $(call 
gb_CObject_get_source,,$*) in the repositories: $(gb_CObject_REPOS)))
-
 gb_CObject_CObject =
 
 
@@ -190,12 +187,6 @@ endef
 
 $(foreach repo,$(gb_CxxObject_REPOS),$(eval $(call 
gb_CxxObject__rules,$(repo
 
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_CxxObject_get_dep_target,%) :
-   $(eval $(call gb_Output_error,Unable to find C++ file $(call 
gb_CxxObject_get_source,,$*) in repositories: $(gb_CxxObject_REPOS)))
-
-endif
-
 gb_CxxObject_CxxObject =
 
 
@@ -280,11 +271,6 @@ endef
 
 $(foreach repo,$(gb_ObjCxxObject_REPOS),$(eval $(call 
gb_ObjCxxObject__rules,$(repo
 
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_ObjCxxObject_get_dep_target,%) :
-   $(eval $(call gb_Output_error,Unable to find Objective C++ file $(call 
gb_ObjCxxObject_get_source,,$*) in repositories: $(gb_ObjCxxObject_REPOS)))
-endif
-
 gb_ObjCxxObject_ObjCxxObject =
 
 # ObjCObject class
@@ -320,11 +306,6 @@ endef
 
 $(foreach repo,$(gb_ObjCObject_REPOS),$(eval $(call 
gb_ObjCObject__rules,$(repo
 
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_ObjCObject_get_dep_target,%) :
-   $(eval $(call gb_Output_error,Unable to find Objective C++ file $(call 
gb_ObjCObject_get_source,,$*) in repositories: $(gb_ObjCObject_REPOS)))
-endif
-
 gb_ObjCObject_ObjCObject =
 
 
@@ -351,9 +332,6 @@ endef
 
 $(foreach repo,$(gb_AsmObject_REPOS),$(eval $(call 
gb_AsmObject__rules,$(repo
 
-$(call gb_AsmObject_get_dep_target,%) :
-   $(eval $(call gb_Output_error,Unable to find asm file $(call 
gb_AsmObject_get_source,,$*) in the repositories: $(gb_AsmObject_REPOS)))
-
 gb_AsmObject_AsmObject =
 
 
@@ -773,6 +751,7 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : 
$$(foreach lib,$(2),$$(
 endef
 
 define gb_LinkTarget_add_cobject
+$(if $(wildcard $(call gb_CObject_get_source,$(SRCDIR),$(2))),,$(eval $(call 
gb_Output_error,No such source file $(call 
gb_CObject_get_source,$(SRCDIR),$(2)
 $(call gb_LinkTarget_get_target,$(1)) : COBJECTS += $(2)
 $(call gb_LinkTarget_get_clean_target,$(1)) : COBJECTS += $(2)
 
@@ -793,6 +772,7 @@ endif
 endef
 
 define gb_LinkTarget_add_cxxobject
+$(if $(wildcard $(call gb_CxxObject_get_source,$(SRCDIR),$(2))),,$(eval $(call 
gb_Output_error,No such source file $(call 
gb_CxxObject_get_source,$(SRCDIR),$(2)
 $(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS += $(2)
 $(call gb_LinkTarget_get_clean_target,$(1)) : CXXOBJECTS += $(2)
 
@@ -813,6 +793,7 @@ endif
 endef
 
 define gb_LinkTarget_add_objcobject
+$(if $(wildcard $(call gb_ObjCObject_get_source,$(SRCDIR),$(2))),,$(eval 
$(call gb_Output_error,No such source file $(call 
gb_ObjCObject_get_source,$(SRCDIR),$(2)
 $(call gb_LinkTarget_get_target,$(1)) : OBJCOBJECTS += $(2)
 $(call gb_LinkTarget_get_clean_target,$(1)) : OBJCOBJECTS += $(2)
 
@@ -833,6 +814,7 @@ endif
 endef
 
 define gb_LinkTarget_add_objcxxobject
+$(if $(wildcard $(call gb_ObjCxxObject_get_source,$(SRCDIR),$(2))),,$(eval 
$(call gb_Output_error,No such source file $(call 
gb_ObjCxxObject_get_source,$(SRCDIR),$(2)
 $(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS += $(2)
 $(call gb_LinkTarget_get_clean_target,$(1)) : OBJCXXOBJECTS += $(2)
 
@@ -853,6 +835,7 @@ endif
 endef
 
 define gb_LinkTarget_add_asmobject
+$(if $(wildcard $(call gb_AsmObject_get_source,$(SRCDIR),$(2))),,$(eval $(call 
gb_Output_error,No such source file $(call 
gb_AsmObject_get_source,$(SRCDIR),$(2)
 $(call gb_LinkTarget_get_target,$(1)) : ASMOBJECTS += $(2)
 $(call gb_LinkTarget_get_clean_target,$(1)) : ASMOBJECTS += $(2)
 
@@ -872,6 +855,7 @@ endif
 endef
 
 define gb_LinkTarget_add_generated_c_object
+$(if $(wildcard $(call gb_GenCObject_get_source,$(SRCDIR),$(2))),,$(eval 
$(call gb_Output_error,No such source file $(call 
gb_GenCObject_get_source,$(SRCDIR),$(2)
 $(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2)
 $(call gb_LinkTarget_get_clean_target,$(1)) : GENCOBJECTS += $(2)
 
@@ -892,6 +876,7 @@ endif
 endef
 
 define gb_LinkTarget_add_generated_cxx_object
+$(if $(wildcard $(call gb_GenCxxObject_get_source,$(SRCDIR),$(2))),,$(eval 
$(call gb_Output_error,No such source file $(call 
gb_GenCxxObject_get_source,$(SRCDIR),$(2)
 $(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2)
 $(call

[Libreoffice-commits] .: solenv/gbuild

2011-10-07 Thread Bjoern Michaelsen

 solenv/gbuild/LinkTarget.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 49861a0246547554e285b4d14f049a28addd4ddc
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Oct 7 19:05:48 2011 +0200

error on missing generated files too

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 78375bf..dea4aaa 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -197,6 +197,7 @@ gb_GenCObject_get_source = $(WORKDIR)/$(1).c
 #  gb_CObject__command
 
 $(call gb_GenCObject_get_target,%) : $(call gb_GenCObject_get_source,%)
+   $(if $(wildcard $),,$(eval $(call gb_Output_error,No such source file 
$)))
$(call gb_CObject__command,$@,$*,$,$(call 
gb_GenCObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
@@ -215,6 +216,7 @@ gb_GenCxxObject_get_source = $(WORKDIR)/$(1).cxx
 #  gb_CxxObject__command
 
 $(call gb_GenCxxObject_get_target,%) : $(call gb_GenCxxObject_get_source,%)
+   $(if $(wildcard $),,$(eval $(call gb_Output_error,No such source file 
$)))
$(call gb_CxxObject__command,$@,$*,$,$(call 
gb_GenCxxObject_get_dep_target,$*))
 
 ifeq ($(gb_FULLDEPS),$(true))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

2011-10-04 Thread Bjoern Michaelsen

 scp2/source/ooo/file_library_ooo.scp |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e944e135bc157d092532fff0829390fa7d4fa958
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Oct 4 14:27:35 2011 +0200

Revert fix invalid superflous #endif from 
5bd2890a56125d391b42f34d51e2e0c57b0a80b0

This reverts commit d2f633c5464fd4339e9e804c97596a78bfa58e62.

diff --git a/scp2/source/ooo/file_library_ooo.scp 
b/scp2/source/ooo/file_library_ooo.scp
index b6b5e2c..03e2f93 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -206,6 +206,8 @@ File gid_File_Lib_Cmis
   #endif
 End
 
+#endif
+
 #ifndef SYSTEM_DB
 
 File gid_File_Lib_Db
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 11 commits - hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Module_hwpfilter.mk hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk i18npool/CppunitTest_i18npool_test

2011-10-04 Thread Bjoern Michaelsen

 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk  |   11 -
 hwpfilter/Module_hwpfilter.mk  |1 
 hwpfilter/RdbTarget_hwpfilter_test_hwpfilter.mk|   44 
 i18npool/CppunitTest_i18npool_test_breakiterator.mk|6 
 i18npool/Module_i18npool.mk|1 
 i18npool/RdbTarget_i18npool_test_breakiterator.mk  |   35 +++
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk |6 
 lotuswordpro/Module_lotuswordpro.mk|1 
 lotuswordpro/RdbTarget_lotuswordpro_test_lotuswordpro.mk   |   39 +++
 sc/CppunitTest_sc_filters_test.mk  |  106 +
 sc/CppunitTest_sc_test_filters.mk  |  139 -
 sc/CppunitTest_sc_ucalc.mk |   14 -
 sc/Module_sc.mk|4 
 sc/RdbTarget_sc_filters_test.mk|   64 +
 sc/RdbTarget_sc_ucalc.mk   |   46 
 sd/CppunitTest_sd_uimpress.mk  |7 
 sd/Module_sd.mk|1 
 sd/RdbTarget_sd_uimpress.mk|   36 +++
 solenv/gbuild/RdbTarget.mk |4 
 starmath/CppunitTest_starmath_qa_cppunit.mk|   22 --
 starmath/Module_starmath.mk|6 
 starmath/RdbTarget_starmath_qa_cppunit.mk  |   51 
 sw/CppunitTest_sw_filters_test.mk  |   94 
 sw/CppunitTest_sw_swdoc_test.mk|   16 -
 sw/CppunitTest_sw_test_filters.mk  |  116 --
 sw/Module_sw.mk|4 
 sw/RdbTarget_sw_filters_test.mk|   53 
 sw/RdbTarget_sw_swdoc_test.mk  |   47 
 writerfilter/CppunitTest_writerfilter_rtftok.mk|   11 -
 writerfilter/Module_writerfilter.mk|1 
 writerfilter/RdbTarget_writerfilter_rtftok.mk  |   42 +++
 31 files changed, 678 insertions(+), 350 deletions(-)

New commits:
commit 266598b810b5325bf8948c01c78438210d21b49e
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Oct 4 18:33:36 2011 +0200

adapt i18npool unittests to separate RdbTarget makefile requirement

diff --git a/i18npool/CppunitTest_i18npool_test_breakiterator.mk 
b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
index 28a8c39..5be23d7 100644
--- a/i18npool/CppunitTest_i18npool_test_breakiterator.mk
+++ b/i18npool/CppunitTest_i18npool_test_breakiterator.mk
@@ -63,12 +63,6 @@ $(eval $(call 
gb_CppunitTest_set_args,i18npool_test_breakiterator,\
--protector unoexceptionprotector$(gb_Library_DLLEXT) unoexceptionprotector 
\
 ))
 
-$(eval $(call gb_RdbTarget_RdbTarget,i18npool_test_breakiterator))
-
-$(eval $(call gb_RdbTarget_add_components,i18npool_test_breakiterator,\
-   i18npool/util/i18npool \
-))
-
 $(call gb_CppunitTest_get_target,i18npool_test_breakiterator) : $(call 
gb_Module_get_target,i18npool)
 
 # vim: set noet sw=4 ts=4:
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 022e85f..8b6947b 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -59,6 +59,7 @@ endif
 
 $(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_breakiterator \
+   RdbTarget_i18npool_test_breakiterator \
 ))
 
 ifeq ($(OS),IOS)
diff --git a/i18npool/RdbTarget_i18npool_test_breakiterator.mk 
b/i18npool/RdbTarget_i18npool_test_breakiterator.mk
new file mode 100644
index 000..994e08e
--- /dev/null
+++ b/i18npool/RdbTarget_i18npool_test_breakiterator.mk
@@ -0,0 +1,35 @@
+# -*- 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.
+#
+# The Initial Developer of the Original Code is
+#   MatÃºÅ¡ Kukan matus.ku...@gmail.com
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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

[Libreoffice-commits] .: solenv/gbuild

2011-10-04 Thread Bjoern Michaelsen

 solenv/gbuild/RdbTarget.mk |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 8412974348794d6ab1419baecbaae51c2e15d5c7
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Oct 5 02:52:45 2011 +0200

split records for awks little brain (also improve readability)

diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 5ced7ed..fa9ab78 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -34,8 +34,13 @@ $(call gb_RdbTarget_get_target,%) :
mkdir -p $(dir $@)  \
echo '?xml version=1.0?components 
xmlns=http://openoffice.org/2010/uno-components;'  $@  \
$(gb_AWK) -- \
-   '/^\?xml version.*/ { next; } \
-   { gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, 
vnd.sun.star.expand:$$OOO_BASE_DIR,$$0); 
gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, 
vnd.sun.star.expand:$$BRAND_BASE_DIR,$$0); print; }' \
+   ' BEGIN { RS=; } \
+   /^\?xml version.*/ { next; } \
+   /.*[^\r\n\t\s].*/ { \
+   
gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, 
vnd.sun.star.expand:$$OOO_BASE_DIR,$$0); \
+   
gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, 
vnd.sun.star.expand:$$BRAND_BASE_DIR,$$0); \
+   print $$0 ; \
+   }' \
$(foreach component,$(COMPONENTS),$(call 
gb_ComponentTarget_get_target,$(component))) \
$(foreach component,$(OLD_COMPONENTS),$(call 
gb_RdbTarget__get_old_component_target,$(component))) \
 $@  \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-10-04 Thread Bjoern Michaelsen

 solenv/gbuild/Module.mk |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 04280a3788ebff10992ac54be8cd5e8cf93d9146
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Oct 5 03:24:33 2011 +0200

OOO_SUBSEQUENT_TESTS is gone

diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index cac27a4..912 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -84,11 +84,6 @@ $(call gb_Module_get_target,%) :
 
 all : build unitcheck
 
-# compatibility with the old build system
-ifneq ($(strip $(OOO_SUBSEQUENT_TESTS)),)
-.DEFAULT_GOAL := subsequentcheck
-endif
-
 build : 
$(call gb_Output_announce,top level modules: $(foreach 
module,$(filter-out deliverlog,$^),$(notdir $(module))),$(true),ALL,6)
$(call gb_Output_announce,loaded modules: $(sort 
$(gb_Module_ALLMODULES)),$(true),ALL,6)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - solenv/gbuild

2011-09-30 Thread Bjoern Michaelsen

 solenv/gbuild/CppunitTest.mk  |2 +-
 solenv/gbuild/platform/ios.mk |1 +
 solenv/gbuild/platform/macosx.mk  |1 +
 solenv/gbuild/platform/solaris.mk |1 +
 solenv/gbuild/platform/unxgcc.mk  |1 +
 solenv/gbuild/platform/windows.mk |1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 848bb3202cecd63926c468191eeb2c108ada4538
Merge: 2b9e302... 8bd171e...
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Sep 30 11:28:32 2011 +0200

Merge branch 'master' of 
/home/bjoern/.jenkins/jobs/repo-mirror/workspace/core

commit 2b9e302f0aee867412fa45275d42cb68929fb4b5
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Sep 30 11:24:21 2011 +0200

keep platform stuff in the platform subdir

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e2010d5..a463b76 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -72,7 +72,7 @@ $(if $(strip $(UNO_SERVICES)),\
$(call gb_CppunitTarget__make_url,$(call 
gb_RdbTarget_get_target,$(rdb) \
 $(if $(URE),\
$(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\
-   -env:$(dir)=file://$(if $(filter 
WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)))
+   -env:$(dir)=file://$(gb_CppunitTest_LIBDIR)))
 endef
 
 .PHONY : $(call gb_CppunitTest_get_clean_target,%)
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index e9653ed..e5a398f 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -381,6 +381,7 @@ endef
 gb_CppunitTest_CPPTESTPRECOMMAND := :
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
+gb_CppunitTest_EXT := $(OUTDIR)/lib
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 01ff9d0..6e72767 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -469,6 +469,7 @@ endef
 gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
+gb_CppunitTest_LIBDIR := $(OUTDIR)/lib
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index 313dae8..ad7c5cc 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -344,6 +344,7 @@ endef
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .so
+gb_CppunitTest_LIBDIR := $(OUTDIR)/lib
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index f1c1989..2317fc0 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -455,6 +455,7 @@ endef
 gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .so
+gb_CppunitTest_LIBDIR := $(OUTDIR)/lib
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = $(gb_CppunitTest_get_filename)
 
diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index e91d5b0..873c6fb 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -601,6 +601,7 @@ gb_CppunitTest_CPPTESTPRECOMMAND := PATH=`cygpath -u 
$(OUTDIR)`/bin:$${PATH}
 
 gb_CppunitTest_SYSPRE := itest_
 gb_CppunitTest_EXT := .lib
+gb_CppunitTest_LIBDIR := $(OUTDIR)/bin
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
 gb_CppunitTest_get_libfilename = test_$(1).dll
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - vcl/unx

2011-09-27 Thread Bjoern Michaelsen

 vcl/unx/inc/plugins/gtk/gtkdata.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b3d61e7991192986dcd7103d3c86ee50f8425504
Author: Radek Doulik r...@novell.com
Date:   Tue Jun 21 13:25:16 2011 +0200

fix crash when changing screen resolution

 - m_aXineramaScreenIndexMap in GtkSalDisplay was shadowing
   the same field in SalDisplay, which led to crash in saldisp.cxx
   code in SalDisplay::addXineramaScreenUnique

Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com
Signed-off-by: Michael Meeks michael.me...@novell.com

diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx 
b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
index 93443f9..db7ebcf 100644
--- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
@@ -60,7 +60,6 @@ class GtkSalDisplay : public SalDisplay
 GdkDisplay*m_pGdkDisplay;
 GdkCursor  *m_aCursors[ POINTER_COUNT ];
 boolm_bStartupCompleted;
-std::vector int   m_aXineramaScreenIndexMap;
 
 GdkCursor* getFromXPM( const unsigned char *pBitmap, const unsigned char 
*pMask,
int nWidth, int nHeight, int nXHot, int nYHot );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-09-26 Thread Bjoern Michaelsen

 configure.in |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 3136120275834b17f9ff628273cee169d171566e
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Mon Sep 26 21:22:07 2011 +0200

partially revert 6985b28d533c1324896a1647304499c23e553239 as it breaks the 
whole idea of testing for bug 20033

diff --git a/configure.in b/configure.in
index f1a38b7..6a98396 100644
--- a/configure.in
+++ b/configure.in
@@ -2552,11 +2552,11 @@ A := \$(wildcard *.a)
 
 .PHONY: all
 all: \$(A:.a=.b)
-@echo survived bug20033.
+   @echo survived bug20033. #dont kill these tabs, you will break the 
Makefile
 
 .PHONY: setup
 setup:
-@touch 1.a 2.a 3.a 4.a 5.a 6.a
+   @touch 1.a 2.a 3.a 4.a 5.a 6.a
 
 define d1
 @echo lala \$(1)
@@ -2569,9 +2569,9 @@ define d2
 endef
 
 %.b : %.a
-\$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
-\$(call d1,\$(CHECKSUM)),\
-\$(call d2,\$(CHECKSUM)))
+   \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
+   \$(call d1,\$(CHECKSUM)),\
+   \$(call d2,\$(CHECKSUM)))
 EOF
 if test -z `(cd $TESTGMAKEBUG20033  $GNUMAKE setup  $GNUMAKE -j)|grep 
survived`; then
 no_parallelism_make=YES
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sw/source

2011-09-26 Thread Bjoern Michaelsen

 sw/source/core/layout/newfrm.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit 6a3faed5b459ea133c39ef5243dad8e366ca00c3
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Sep 23 01:13:34 2011 +0200

fdo#39510: comment added

Signed-off-by: Michael Stahl m...@openoffice.org

diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 7f19c1a..3943336 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -607,7 +607,17 @@ SwRootFrm::~SwRootFrm()
 {
 bTurboAllowed = sal_False;
 pTurbo = 0;
+// fdo#39510 crash on document close with footnotes
+// Object ownership in writer and esp. in layout are a mess: Before the
+// document/layout split SwDoc and SwRootFrm were essentially one object
+// and magically/uncleanly worked around their common destruction by call
+// to SwDoc::IsInDtor() -- even from the layout. As of now destuction of
+// the layout proceeds forward through the frames. Since SwTxtFtn::DelFrms
+// also searches backwards to find the master of footnotes, they must be
+// considered to be owned by the SwRootFrm and also be destroyed here,
+// before tearing down the (now footnote free) rest of the layout.
 AllRemoveFtns();
+
 if(pBlink)
 pBlink-FrmDelete( this );
 if ( static_castSwFrmFmt*(GetRegisteredInNonConst()) )
commit f8f5d9bff5051cc88d06b10d855548a441de
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Sep 22 18:47:21 2011 +0200

fdo#39510 lp#854626: crash on closing document with footnotes

Signed-off-by: Michael Stahl m...@openoffice.org

diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 86eefcb..7f19c1a 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -607,6 +607,7 @@ SwRootFrm::~SwRootFrm()
 {
 bTurboAllowed = sal_False;
 pTurbo = 0;
+AllRemoveFtns();
 if(pBlink)
 pBlink-FrmDelete( this );
 if ( static_castSwFrmFmt*(GetRegisteredInNonConst()) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-09-22 Thread Bjoern Michaelsen

 sw/source/core/layout/newfrm.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ac1912ecb13709082026428d2b2a56c4915b939f
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Thu Sep 22 18:47:21 2011 +0200

fdo#39510 lp#854626: crash on closing document with footnotes

diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 98444b4..924bdb3 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -603,6 +603,7 @@ SwRootFrm::~SwRootFrm()
 {
 bTurboAllowed = sal_False;
 pTurbo = 0;
+AllRemoveFtns();
 if(pBlink)
 pBlink-FrmDelete( this );
 if ( static_castSwFrmFmt*(GetRegisteredInNonConst()) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-09-22 Thread Bjoern Michaelsen

 sw/source/core/layout/newfrm.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 1b37830b605972649fe54c29fbb952df0e4c9682
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Fri Sep 23 01:13:34 2011 +0200

fdo#39510: comment added

diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 924bdb3..4504e6e 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -603,7 +603,17 @@ SwRootFrm::~SwRootFrm()
 {
 bTurboAllowed = sal_False;
 pTurbo = 0;
+// fdo#39510 crash on document close with footnotes
+// Object ownership in writer and esp. in layout are a mess: Before the
+// document/layout split SwDoc and SwRootFrm were essentially one object
+// and magically/uncleanly worked around their common destruction by call
+// to SwDoc::IsInDtor() -- even from the layout. As of now destuction of
+// the layout proceeds forward through the frames. Since SwTxtFtn::DelFrms
+// also searches backwards to find the master of footnotes, they must be
+// considered to be owned by the SwRootFrm and also be destroyed here,
+// before tearing down the (now footnote free) rest of the layout.
 AllRemoveFtns();
+
 if(pBlink)
 pBlink-FrmDelete( this );
 if ( static_castSwFrmFmt*(GetRegisteredInNonConst()) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild

2011-09-19 Thread Bjoern Michaelsen

 solenv/gbuild/platform/macosx.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a87a8ee5a1919f6f6b4b35668456c03bdd499c85
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Sep 19 21:39:46 2011 +0200

Call macosx-change-install-names on executables in gbuild, too.

Signed-off-by: Bjoern Michaelsen bjoern.michael...@canonical.com

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 2def0c9..ff7 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -274,6 +274,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
-o $(1) \
`cat $${DYLIB_FILE}`  \
+   $(if $(filter Executable,$(TARGETTYPE)),\
+   $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl 
Executable $(LAYER) $(1) ) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),\
$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl Library 
$(LAYER) $(1)  \
ln -sf $(1) $(patsubst %.dylib,%.jnilib,$(1)) ) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: configure.in

2011-09-17 Thread Bjoern Michaelsen

 configure.in |   36 +++-
 1 file changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 7fff462959e50ee36b5410f3bf859af9f3e63c0d
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Sat Sep 17 22:27:06 2011 +0200

check make 3.81 for bug 20033 and only disable parallelism if needed

diff --git a/configure.in b/configure.in
index 6ea36b4..75c0385 100755
--- a/configure.in
+++ b/configure.in
@@ -2540,7 +2540,41 @@ if test $_make_longver -ge 038200 ; then
 
 elif test $_make_longver -ge 038100 ; then
 AC_MSG_RESULT([$GNUMAKE $_make_version])
-no_parallelism_make=YES
+AC_MSG_CHECKING([for GNU make bug 20033])
+TESTGMAKEBUG20033=`mktemp -d`
+cat  $TESTGMAKEBUG20033/Makefile  EOF
+A := \$(wildcard *.a)
+
+.PHONY: all
+all: \$(A:.a=.b)
+   @echo survived bug20033.
+
+.PHONY: setup
+setup:
+   @touch 1.a 2.a 3.a 4.a 5.a 6.a
+
+define d1
+@echo lala \$(1)
+@sleep 1
+endef
+
+define d2
+@echo tyty \$(1)
+@sleep 1
+endef
+
+%.b : %.a
+   \$(eval CHECKSUM := \$(word 1,\$(shell cat \$^ | sha1sum))) \$(if 
\$(wildcard \$(CACHEDIR)/\$(CHECKSUM)),\
+   \$(call d1,\$(CHECKSUM)),\
+   \$(call d2,\$(CHECKSUM)))
+EOF
+if test -z `(cd $TESTGMAKEBUG20033  $GNUMAKE setup  $GNUMAKE -j)|grep 
survived`; then
+no_parallelism_make=YES
+AC_MSG_RESULT([yes, disable parallelism])
+else
+AC_MSG_RESULT([no, keep parallelism enabled])
+fi
+rm -rf $TESTGMAKEBUG20033
 else
 AC_MSG_ERROR([failed ($GNUMAKE version = 3.81 needed])
 fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

88 matches

Mail list logo