[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sal/osl set_soenv.in

2012-01-26 Thread Stephan Bergmann 
 sal/osl/unx/system.c |4 ++--
 set_soenv.in |3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 12f9d1032b02b7e2b87c2f35fa84554df8101eca
Author: François Tigeot ftig...@wolfpond.org
Date:   Wed Jan 25 19:43:17 2012 +0100

NetBSD also needs the internal gethostbyname_r() implementation

Reported by: Thomas Klausner w...@netbsd.org
(cherry picked from commit 5f32a5558e8672ed56d5d393228aefacc632846c)

Conflicts:

sal/osl/unx/system.c

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index bf8607d..ba782f6 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -33,7 +33,7 @@
 static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* struct passwd differs on some platforms */
-#if defined(MACOSX) || defined(IOS)
+#if defined(MACOSX) || defined(IOS) || defined(NETBSD)
 
 extern int h_errno;
 
@@ -124,7 +124,7 @@ struct hostent *gethostbyname_r(const char *name, struct 
hostent *result,
 
   return res;
 }
-#endif // OSX || IOS
+#endif // OSX || IOS || NETBSD
 
 #if defined(MACOSX)
 /*
commit c2c9eb11b8a095833074611c3e40279ee4ff21f7
Author: François Tigeot ftig...@wolfpond.org
Date:   Wed Jan 25 18:50:35 2012 +0100

Ensure Env.Host.sh always return a zero exit code

* On some NetBSD systems, the last unset command returns a
  non-zero exit code

* This made the make(1) processes terminate immediately in
  source-env-and-recurse, breaking the build.

Reported by: Thomas Klausner w...@netbsd.org
(cherry picked from commit a79889083b25d69ae6b801ed8cee90b5dd9199c4)

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/set_soenv.in b/set_soenv.in
index afaac53..817693e 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2063,6 +2063,9 @@ ToFile( ENV_SCRIPT, $outfile, e );
 #
 print OUT export $exportvars$newline;
 print OUT unset $unsetvars$newline;
+# unset may return a non-zero value and make the initial
+# make(1) processes terminate with an error
+print OUT true $newline;
 
 #
 #---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - writerperfect/source

2012-01-26 Thread Fridrich Strba 
 writerperfect/source/filter/OdtGenerator.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a8afa224362619387cc87928d8a0392396eb8bb2
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jan 26 09:39:32 2012 +0100

Revert TEMP

Sorry, for this one, pushed by mistake :(

This reverts commit 31c02baa10f7da947aa073f8af3f8e370acabd90.

diff --git a/sc/source/filter/xml/xmlstyli.cxx 
b/sc/source/filter/xml/xmlstyli.cxx
index 6e5ae54..7691c4b 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -26,7 +26,7 @@
  *
  /
 
-#include stdio.h
+
 
 #include xmlstyli.hxx
 #include xmloff/nmspmap.hxx
@@ -173,13 +173,9 @@ void 
ScXMLCellImportPropertyMapper::finished(::std::vector XMLPropertyState 
 table::BorderLine2 aBorderLineWidth;
 pBorderWidths[i]-maValue = aBorderLineWidth;
 aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
-   printf(OuterLineWidth %f\n, 
aBorderLineWidth.OuterLineWidth);
 aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
-   printf(InnerLineWidth %f\n, 
aBorderLineWidth.InnerLineWidth);
 aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-   printf(LineDistance %f\n, 
aBorderLineWidth.LineDistance);
 aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
-   printf(LineWidth %f\n, 
aBorderLineWidth.LineWidth);
 pBorders[i]-maValue = aBorderLine;
 }
 }
commit 79299dcae534943f6107afc99542ddf028d20117
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jan 26 08:57:13 2012 +0100

Fix crashes due to inexisting attribute

diff --git a/writerperfect/source/filter/OdtGenerator.cxx 
b/writerperfect/source/filter/OdtGenerator.cxx
index 94e46c9..ecb29bb 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -1264,7 +1264,7 @@ void OdtGenerator::insertBinaryObject(const 
WPXPropertyList propList, const WPX
 else
 // assuming we have a binary image or a object_ole that we can just 
insert as it is
 {
-if (propList[libwpg:mime-type]-getStr() == object/ole)
+if (propList[libwpd:mimetype]-getStr() == object/ole)
 mpImpl-mpCurrentContentElements-push_back(new 
TagOpenElement(draw:object-ole));
 else
 mpImpl-mpCurrentContentElements-push_back(new 
TagOpenElement(draw:image));
@@ -1277,7 +1277,7 @@ void OdtGenerator::insertBinaryObject(const 
WPXPropertyList propList, const WPX
 
 mpImpl-mpCurrentContentElements-push_back(new 
TagCloseElement(office:binary-data));
 
-if (propList[libwpg:mime-type]-getStr() == object/ole)
+if (propList[libwpd:mimetype]-getStr() == object/ole)
 mpImpl-mpCurrentContentElements-push_back(new 
TagCloseElement(draw:object-ole));
 else
 mpImpl-mpCurrentContentElements-push_back(new 
TagCloseElement(draw:image));
commit 31c02baa10f7da947aa073f8af3f8e370acabd90
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Jan 25 11:02:31 2012 +0100

TEMP

diff --git a/sc/source/filter/xml/xmlstyli.cxx 
b/sc/source/filter/xml/xmlstyli.cxx
index 7691c4b..6e5ae54 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -26,7 +26,7 @@
  *
  /
 
-
+#include stdio.h
 
 #include xmlstyli.hxx
 #include xmloff/nmspmap.hxx
@@ -173,9 +173,13 @@ void 
ScXMLCellImportPropertyMapper::finished(::std::vector XMLPropertyState 
 table::BorderLine2 aBorderLineWidth;
 pBorderWidths[i]-maValue = aBorderLineWidth;
 aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
+   printf(OuterLineWidth %f\n, 
aBorderLineWidth.OuterLineWidth);
 aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
+   printf(InnerLineWidth %f\n, 
aBorderLineWidth.InnerLineWidth);
 aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
+   printf(LineDistance %f\n, 
aBorderLineWidth.LineDistance);
 aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
+   printf(LineWidth %f\n, 
aBorderLineWidth.LineWidth);
 pBorders[i]-maValue = aBorderLine;
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - 2 commits - sal/osl set_soenv.in

2012-01-26 Thread Norbert Thiebaud 
 sal/osl/unx/system.c |4 ++--
 set_soenv.in |3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit e4b21face9d9b62c7ab2a8e9237dad01f39cc645
Author: François Tigeot ftig...@wolfpond.org
Date:   Wed Jan 25 19:43:17 2012 +0100

NetBSD also needs the internal gethostbyname_r() implementation

Reported by: Thomas Klausner w...@netbsd.org
(cherry picked from commit 5f32a5558e8672ed56d5d393228aefacc632846c)

Conflicts:

sal/osl/unx/system.c

Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index bf8607d..ba782f6 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -33,7 +33,7 @@
 static pthread_mutex_t getrtl_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* struct passwd differs on some platforms */
-#if defined(MACOSX) || defined(IOS)
+#if defined(MACOSX) || defined(IOS) || defined(NETBSD)
 
 extern int h_errno;
 
@@ -124,7 +124,7 @@ struct hostent *gethostbyname_r(const char *name, struct 
hostent *result,
 
   return res;
 }
-#endif // OSX || IOS
+#endif // OSX || IOS || NETBSD
 
 #if defined(MACOSX)
 /*
commit 675206498ec023ffe74d14cf4b364b40b0e26767
Author: François Tigeot ftig...@wolfpond.org
Date:   Wed Jan 25 18:50:35 2012 +0100

Ensure Env.Host.sh always return a zero exit code

* On some NetBSD systems, the last unset command returns a
  non-zero exit code

* This made the make(1) processes terminate immediately in
  source-env-and-recurse, breaking the build.

Reported by: Thomas Klausner w...@netbsd.org
(cherry picked from commit a79889083b25d69ae6b801ed8cee90b5dd9199c4)

Signed-off-by: Stephan Bergmann sberg...@redhat.com
Signed-off-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/set_soenv.in b/set_soenv.in
index afaac53..817693e 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2063,6 +2063,9 @@ ToFile( ENV_SCRIPT, $outfile, e );
 #
 print OUT export $exportvars$newline;
 print OUT unset $unsetvars$newline;
+# unset may return a non-zero value and make the initial
+# make(1) processes terminate with an error
+print OUT true $newline;
 
 #
 #---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-26 Thread Michael Meeks 
 sc/source/ui/unoobj/cellsuno.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 85387446a7bd839e880b35c89fe6fd0a0c8e9576
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Jan 25 21:03:24 2012 +0100

ScTableSheetObj::findAll does not return the correct range, fdo#43462

Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index ca59caf..fc38a45 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -3907,10 +3907,8 @@ uno::Referencecontainer::XIndexAccess SAL_CALL 
ScCellRangesBase::findAll(
 *pSearchItem, nCol, nRow, nTab, aMark, aMatchedRanges, 
aDummyUndo, NULL);
 if (bFound)
 {
-ScRangeList aNewRanges;
-aMark.FillRangeListWithMarks( aNewRanges, sal_True );
 //  bei findAll immer CellRanges, egal wieviel gefunden 
wurde
-xRet.set(new ScCellRangesObj( pDocShell, aNewRanges ));
+xRet.set(new ScCellRangesObj( pDocShell, aMatchedRanges ));
 }
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: xmlreader/source

2012-01-26 Thread Stephan Bergmann 
 xmlreader/source/xmlreader.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit b7da8304477428c317e20e1df7e469077bd1d8a3
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jan 26 11:00:50 2012 +0100

Better exception message.

diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx
index 05782ee..0845662 100644
--- a/xmlreader/source/xmlreader.cxx
+++ b/xmlreader/source/xmlreader.cxx
@@ -72,7 +72,9 @@ XmlReader::XmlReader(rtl::OUString const  fileUrl)
 css::container::NoSuchElementException, css::uno::RuntimeException)):
 fileUrl_(fileUrl)
 {
-switch (osl_openFile(fileUrl_.pData, fileHandle_, osl_File_OpenFlag_Read))
+oslFileError e = osl_openFile(
+fileUrl_.pData, fileHandle_, osl_File_OpenFlag_Read);
+switch (e)
 {
 case osl_File_E_None:
 break;
@@ -82,10 +84,11 @@ XmlReader::XmlReader(rtl::OUString const  fileUrl)
 default:
 throw css::uno::RuntimeException(
 (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(cannot open )) +
- fileUrl_),
+ fileUrl_ + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(: )) +
+ rtl::OUString::valueOf(static_cast sal_Int32 (e))),
 css::uno::Reference css::uno::XInterface ());
 }
-oslFileError e = osl_getFileSize(fileHandle_, fileSize_);
+e = osl_getFileSize(fileHandle_, fileSize_);
 if (e == osl_File_E_None) {
 e = osl_mapFile(
 fileHandle_, fileAddress_, fileSize_, 0,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-26 Thread Stephan Bergmann 
 writerperfect/source/filter/OdtGenerator.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a169b1d67447183b83fd5e8f165c99493c114125
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jan 26 08:57:13 2012 +0100

Fix crashes due to inexisting attribute
(cherry picked from commit 79299dcae534943f6107afc99542ddf028d20117)

Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/writerperfect/source/filter/OdtGenerator.cxx 
b/writerperfect/source/filter/OdtGenerator.cxx
index 94e46c9..ecb29bb 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -1264,7 +1264,7 @@ void OdtGenerator::insertBinaryObject(const 
WPXPropertyList propList, const WPX
 else
 // assuming we have a binary image or a object_ole that we can just 
insert as it is
 {
-if (propList[libwpg:mime-type]-getStr() == object/ole)
+if (propList[libwpd:mimetype]-getStr() == object/ole)
 mpImpl-mpCurrentContentElements-push_back(new 
TagOpenElement(draw:object-ole));
 else
 mpImpl-mpCurrentContentElements-push_back(new 
TagOpenElement(draw:image));
@@ -1277,7 +1277,7 @@ void OdtGenerator::insertBinaryObject(const 
WPXPropertyList propList, const WPX
 
 mpImpl-mpCurrentContentElements-push_back(new 
TagCloseElement(office:binary-data));
 
-if (propList[libwpg:mime-type]-getStr() == object/ole)
+if (propList[libwpd:mimetype]-getStr() == object/ole)
 mpImpl-mpCurrentContentElements-push_back(new 
TagCloseElement(draw:object-ole));
 else
 mpImpl-mpCurrentContentElements-push_back(new 
TagCloseElement(draw:image));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android' - jvmfwk/plugins sal/android sal/inc sal/osl sal/Package_inc.mk solenv/inc vcl/android vcl/inc

2012-01-26 Thread Michael Meeks 
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |2 
 sal/Package_inc.mk  |1 
 sal/android/lo-bootstrap.c  |2 
 sal/inc/osl/detail/android-bootstrap.h  |   80 
 sal/osl/unx/file.cxx|2 
 sal/osl/unx/file_misc.cxx   |4 -
 sal/osl/unx/module.c|2 
 sal/osl/unx/process_impl.cxx|2 
 sal/osl/unx/thread.c|   18 
 sal/osl/unx/uunxapi.cxx |2 
 solenv/inc/unxandr/lo-bootstrap.h   |   77 ---
 vcl/android/androidinst.cxx |   26 --
 vcl/inc/android/androidinst.hxx |1 
 13 files changed, 126 insertions(+), 93 deletions(-)

New commits:
commit 7c4c1832ccd4830f903d7d647466f96aa6755711
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Jan 26 10:29:38 2012 +

android: move lo-bootstrap to osl/detail, Attach threads as created

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index a8d8258..f288821 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -65,7 +65,7 @@
 #include diagnostics.h
 
 #ifdef ANDROID
-#include lo-bootstrap.h
+#include osl/detail/android-bootstrap.h
 #endif
 
 #if defined HAVE_VALGRIND_H
diff --git a/sal/Package_inc.mk b/sal/Package_inc.mk
index e43de3e..304ab9d 100644
--- a/sal/Package_inc.mk
+++ b/sal/Package_inc.mk
@@ -65,6 +65,7 @@ $(eval $(call 
gb_Package_add_file,sal_inc,inc/osl/time.h,osl/time.h))
 $(eval $(call gb_Package_add_file,sal_inc,inc/osl/util.h,osl/util.h))
 $(eval $(call 
gb_Package_add_file,sal_inc,inc/osl/detail/file.h,osl/detail/file.h))
 $(eval $(call 
gb_Package_add_file,sal_inc,inc/osl/detail/android_native_app_glue.h,osl/detail/android_native_app_glue.h))
+$(eval $(call 
gb_Package_add_file,sal_inc,inc/osl/detail/android-bootstrap.h,osl/detail/android-bootstrap.h))
 $(eval $(call 
gb_Package_add_file,sal_inc,inc/rtl/allocator.hxx,rtl/allocator.hxx))
 $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/alloc.h,rtl/alloc.h))
 $(eval $(call gb_Package_add_file,sal_inc,inc/rtl/bootstrap.h,rtl/bootstrap.h))
diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 55bc643..98db089 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -48,7 +48,7 @@
 
 #include uthash.h
 
-#include lo-bootstrap.h
+#include osl/detail/android-bootstrap.h
 
 #pragma GCC diagnostic ignored -Wdeclaration-after-statement
 
diff --git a/sal/inc/osl/detail/android-bootstrap.h 
b/sal/inc/osl/detail/android-bootstrap.h
new file mode 100644
index 000..6539687
--- /dev/null
+++ b/sal/inc/osl/detail/android-bootstrap.h
@@ -0,0 +1,80 @@
+/* -*- 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 Tor Lillqvist t...@iki.fi (initial developer)
+ * Copyright (C) 2011 SUSE Linux http://suse.com (initial developer's employer)
+ *
+ * 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.
+ */
+
+#ifndef ANDROID_BOOSTRAP_H
+#define ANDROID_BOOSTRAP_H
+#if defined(ANDROID)
+
+#include jni.h
+#include dlfcn.h
+#include dirent.h
+
+#ifdef __cplusplus
+extern C {
+#endif
+
+typedef struct lo_apk_dir lo_apk_dir;
+
+char **lo_dlneeds(const char *library);
+
+void *lo_dlopen(const char *library);
+
+void *lo_dlsym(void *handle,
+   const char *symbol);
+
+int lo_dladdr(void *addr,
+  Dl_info *info);
+
+void *lo_apkentry(const char *filename,
+  size_t *size);
+
+lo_apk_dir *lo_apk_opendir(const char *dirname);
+
+struct dirent *lo_apk_readdir(lo_apk_dir *dirp);
+
+int lo_apk_closedir(lo_apk_dir *dirp);
+
+int lo_apk_lstat(const char *path, struct stat *statp);
+
+int lo_dlcall_argc_argv(void *function,
+

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

2012-01-26 Thread Michael Meeks 
 writerperfect/source/filter/OdtGenerator.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c82d91e040b7716141cd87d1c774e01ca2e1593e
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jan 26 08:57:13 2012 +0100

Fix crashes due to inexisting attribute

diff --git a/writerperfect/source/filter/OdtGenerator.cxx 
b/writerperfect/source/filter/OdtGenerator.cxx
index 94e46c9..ecb29bb 100644
--- a/writerperfect/source/filter/OdtGenerator.cxx
+++ b/writerperfect/source/filter/OdtGenerator.cxx
@@ -1264,7 +1264,7 @@ void OdtGenerator::insertBinaryObject(const 
WPXPropertyList propList, const WPX
 else
 // assuming we have a binary image or a object_ole that we can just 
insert as it is
 {
-if (propList[libwpg:mime-type]-getStr() == object/ole)
+if (propList[libwpd:mimetype]-getStr() == object/ole)
 mpImpl-mpCurrentContentElements-push_back(new 
TagOpenElement(draw:object-ole));
 else
 mpImpl-mpCurrentContentElements-push_back(new 
TagOpenElement(draw:image));
@@ -1277,7 +1277,7 @@ void OdtGenerator::insertBinaryObject(const 
WPXPropertyList propList, const WPX
 
 mpImpl-mpCurrentContentElements-push_back(new 
TagCloseElement(office:binary-data));
 
-if (propList[libwpg:mime-type]-getStr() == object/ole)
+if (propList[libwpd:mimetype]-getStr() == object/ole)
 mpImpl-mpCurrentContentElements-push_back(new 
TagCloseElement(draw:object-ole));
 else
 mpImpl-mpCurrentContentElements-push_back(new 
TagCloseElement(draw:image));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android' - 2 commits - sal/android

2012-01-26 Thread Tor Lillqvist 
 sal/android/lo-bootstrap.c |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 052fe1a7700e834d9363be6da88d3fea71e879c3
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Jan 26 12:45:42 2012 +0200

Call the JavaVM's AttachCurrentThread(), can't hurt...

diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 59960b3..9c2c3da 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1491,6 +1491,8 @@ android_main(struct android_app* state)
 sleep(sleep_time);
 }
 
+(*(*state-activity-vm)-AttachCurrentThread)(state-activity-vm, env, 
0);
+
 app = state;
 
 memset(engine, 0, sizeof(engine));
commit 85f0cd34dbfc0dcc81da5ac0a046812673b40bb6
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Jan 26 12:42:29 2012 +0200

Move the sleep earlier, and log it

diff --git a/sal/android/lo-bootstrap.c b/sal/android/lo-bootstrap.c
index 98db089..59960b3 100644
--- a/sal/android/lo-bootstrap.c
+++ b/sal/android/lo-bootstrap.c
@@ -1482,9 +1482,15 @@ __attribute__ ((visibility(default)))
 void
 android_main(struct android_app* state)
 {
+JNIEnv *env;
 struct engine engine;
 Dl_info lo_main_info;
 
+if (sleep_time != 0) {
+LOGI(android_main: Sleeping for %d seconds, start ndk-gdb NOW if that 
is your intention, sleep_time);
+sleep(sleep_time);
+}
+
 app = state;
 
 memset(engine, 0, sizeof(engine));
@@ -1495,9 +1501,6 @@ android_main(struct android_app* state)
 lo_main_argv[0] = lo_main_info.dli_fname;
 }
 
-if (sleep_time != 0)
-sleep(sleep_time);
-
 patch_libgnustl_shared();
 
 extract_files(UNPACK_TREE);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-26 Thread Eike Rathke 
 sc/source/filter/xml/xmlstyli.cxx |5 +++--
 sc/source/ui/unoobj/cellsuno.cxx  |4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 34315e7ec4062f9521cd19951b5f7f6ad9ce0d2e
Author: Eike Rathke er...@redhat.com
Date:   Thu Jan 26 14:03:13 2012 +0100

resolved fdo#38595 border width lost in ODF import

diff --git a/sc/source/filter/xml/xmlstyli.cxx 
b/sc/source/filter/xml/xmlstyli.cxx
index 7691c4b..72155e6 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -170,12 +170,14 @@ void 
ScXMLCellImportPropertyMapper::finished(::std::vector XMLPropertyState 
 pBorders[i]-maValue = aBorderLine;
 if( pBorderWidths[i] )
 {
+// Merge style:border-line-width values to fo:border values. Do
+// not override fo:border line width or line style with an
+// empty value!
 table::BorderLine2 aBorderLineWidth;
 pBorderWidths[i]-maValue = aBorderLineWidth;
 aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
 aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
 aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
 pBorders[i]-maValue = aBorderLine;
 }
 }
@@ -194,7 +196,6 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector 
XMLPropertyState 
 aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
 aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
 aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
 pDiagBorders[i]-maValue = aBorderLine;
 if (pDiagBorderWidths[i])
 pDiagBorderWidths[i]-mnIndex = -1;
commit 97c66b3b13528cc50f271217663718b3d6681bd9
Author: Eike Rathke er...@redhat.com
Date:   Thu Jan 26 14:03:12 2012 +0100

cast from BorderLine to BorderLine2 is not valid

Don't access a css::table::BorderLine struct as if it was
a css::table::BorderLine2 struct, which it isn't. A proper implementation
would need to pass BorderLine2 structs around for which it would need
a css::table::TableBorder2 struct that holds BorderLine2 instead of
BorderLine, and adapt various places for API compatibility to support both.
For now use the default table::BorderLineStyle::SOLID to set the line style 
at
::editeng::SvxBorderLine

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 73419fc..075421c 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -59,6 +59,7 @@
 #include com/sun/star/table/ShadowFormat.hpp
 #include com/sun/star/table/TableBorder.hpp
 #include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/table/BorderLineStyle.hpp
 #include com/sun/star/sheet/CellFlags.hpp
 #include com/sun/star/sheet/FormulaResult.hpp
 #include com/sun/star/beans/PropertyAttribute.hpp
@@ -952,8 +953,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal( 
sheet::GeneralFunction eSummary )
 const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine( 
::editeng::SvxBorderLine rLine, const table::BorderLine rStruct )
 {
 //  Calc needs Twips, and there are 1/100mm in the Uno structure
-const table::BorderLine2 rBorder2 = static_cast const 
table::BorderLine2 ( rStruct );
-rLine.SetStyle( ::editeng::SvxBorderStyle( rBorder2.LineStyle ) );
+rLine.SetStyle( ::editeng::SvxBorderStyle( table::BorderLineStyle::SOLID ) 
);
 rLine.GuessLinesWidths( rLine.GetStyle(),
 (sal_uInt16)HMMToTwips( rStruct.OuterLineWidth ),
 (sal_uInt16)HMMToTwips( rStruct.InnerLineWidth ),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-26 Thread Cédric Bosdonnat 
 sw/source/filter/rtf/swparrtf.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 85fb62b9103428ee83e5b9f9ef7bdcb736e04ff9
Author: Miklos Vajna vmik...@frugalware.org
Date:   Wed Jan 25 16:33:25 2012 +0100

fdo#43869 use the old rtf importer for paste

Signed-off-by: Cédric Bosdonnat cedric.bosdon...@free.fr

diff --git a/sw/source/filter/rtf/swparrtf.cxx 
b/sw/source/filter/rtf/swparrtf.cxx
index 5378d07..2fc6756 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -34,6 +34,7 @@
 #include tools/stream.hxx
 #include svl/itemiter.hxx
 #include svtools/rtftoken.h
+#include svtools/miscopt.hxx
 #include svl/intitem.hxx
 #include editeng/fhgtitem.hxx
 #include editeng/ulspitem.hxx
@@ -161,6 +162,11 @@ sal_uLong SwRTFReader::Read( SwDoc rDoc, const String 
/*rBaseURL*/, SwPaM /*r
 
 extern C SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportRTF()
 {
+// Use the old rtf importer by default for paste, till the new one supports
+// undo stack and PaM.
+SvtMiscOptions aMiscOptions;
+if (!aMiscOptions.IsExperimentalMode())
+return new RtfReader();
 return new SwRTFReader();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-26 Thread Caolán McNamara 
 filter/source/config/cache/typedetection.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b31d924cc7c30d09113a959f4a1b4bfd04da80f5
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jan 26 14:30:24 2012 +0100

Sort the catch-all detection at the end
(cherry picked from commit 0d9aa8cce792d69d5147a2230b61b1cbdc089206)

Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index cc91746..25b3742 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -814,9 +814,9 @@ namespace
 if (rA == rB)
 return false;
 if 
(rA.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.FormatDetector)))
-return true;
-if 
(rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.FormatDetector)))
 return false;
+if 
(rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.FormatDetector)))
+return true;
 return rA  rB;
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-26 Thread Petr Mladek 
 sw/source/filter/rtf/swparrtf.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 20196b4e7c7de25c1863e7919d205d0352616c56
Author: Miklos Vajna vmik...@frugalware.org
Date:   Wed Jan 25 16:33:25 2012 +0100

fdo#43869 use the old rtf importer for paste

Signed-off-by: Cédric Bosdonnat cedric.bosdon...@free.fr
Signed-off-by: Lubos Lunak l.lu...@suse.cz
Signed-off-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/filter/rtf/swparrtf.cxx 
b/sw/source/filter/rtf/swparrtf.cxx
index 5378d07..2fc6756 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -34,6 +34,7 @@
 #include tools/stream.hxx
 #include svl/itemiter.hxx
 #include svtools/rtftoken.h
+#include svtools/miscopt.hxx
 #include svl/intitem.hxx
 #include editeng/fhgtitem.hxx
 #include editeng/ulspitem.hxx
@@ -161,6 +162,11 @@ sal_uLong SwRTFReader::Read( SwDoc rDoc, const String 
/*rBaseURL*/, SwPaM /*r
 
 extern C SAL_DLLPUBLIC_EXPORT Reader* SAL_CALL ImportRTF()
 {
+// Use the old rtf importer by default for paste, till the new one supports
+// undo stack and PaM.
+SvtMiscOptions aMiscOptions;
+if (!aMiscOptions.IsExperimentalMode())
+return new RtfReader();
 return new SwRTFReader();
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: README.cross

2012-01-26 Thread Miklos Vajna 
 README.cross |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit edf0a7e36754f485aa787769f3a82ac92f548f7f
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Jan 26 15:28:41 2012 +0100

README.cross: LibO-dev - LOdev in the mingw section

diff --git a/README.cross b/README.cross
index f3c62b2..153f4b9 100644
--- a/README.cross
+++ b/README.cross
@@ -186,8 +186,8 @@ CXX_FOR_BUILD=ccache g++
 Once you have compiled it, you may want to try to run it:
 
 $ cd /tmp
-$ tar xf 
your-build-dir/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_OOO350m1_Win_x86_install-arc_en-US.tar.gz
-$ cd LibO-Dev_OOO350m1_Win_x86_install-arc_en-US/LibO-dev\ 3.5/program
+$ tar xf 
your-build-dir/instsetoo_native/wntgcci.pro/LibreOffice_Dev/archive/install/en-US/LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US.tar.gz
+$ cd LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US/LOdev\ 3.6/program
 $ wine soffice.exe
 
 NB. it is important to unpack somewhere low in the hierarchy structure (like
@@ -196,13 +196,13 @@ in /tmp as advised above), otherwise you'll get 
BerkeleyDB errors on startup.
 And if you are brave enough, you can even debug it.  First you have to add the
 URE dll's to the wine's PATH using 'wine regedit' - see
 http://www.winehq.org/docs/wineusr-guide/environment-variables, and add
-Z:\tmp\LibO-Dev_OOO350m1_Win_x86_install-arc_en-US\LibO-dev 3.5\URE\bin
+Z:\tmp\LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US\LOdev 3.6\URE\bin
 to Path in My Computer-HKEY_CURRENT_USER-Environment.
 
 Then run linkoo, so that when you rebuild something, you can directly see the
 changes the next time you run it:
 
-solenv/bin/linkoo '/tmp/LibO-Dev_OOO350m1_Win_x86_install-arc_en-US/LibO-dev 
3.5' your_clone_dir
+solenv/bin/linkoo '/tmp/LibO-Dev_3.6.0alpha0_Win_x86_install-arc_en-US/LOdev 
3.6' your_clone_dir
 
 And start debugging:
 
___
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 - sc/source

2012-01-26 Thread Michael Meeks 
 sc/source/filter/xml/xmlstyli.cxx |5 +++--
 sc/source/ui/unoobj/cellsuno.cxx  |4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 6e891a42560c6811e490fc68c90b8477e71d281a
Author: Eike Rathke er...@redhat.com
Date:   Thu Jan 26 14:03:13 2012 +0100

resolved fdo#38595 border width lost in ODF import

diff --git a/sc/source/filter/xml/xmlstyli.cxx 
b/sc/source/filter/xml/xmlstyli.cxx
index b22bbf4..c20f6e9 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -170,12 +170,14 @@ void 
ScXMLCellImportPropertyMapper::finished(::std::vector XMLPropertyState 
 pBorders[i]-maValue = aBorderLine;
 if( pBorderWidths[i] )
 {
+// Merge style:border-line-width values to fo:border values. Do
+// not override fo:border line width or line style with an
+// empty value!
 table::BorderLine2 aBorderLineWidth;
 pBorderWidths[i]-maValue = aBorderLineWidth;
 aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
 aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
 aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
 pBorders[i]-maValue = aBorderLine;
 }
 }
@@ -194,7 +196,6 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector 
XMLPropertyState 
 aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
 aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
 aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
 pDiagBorders[i]-maValue = aBorderLine;
 if (pDiagBorderWidths[i])
 pDiagBorderWidths[i]-mnIndex = -1;
commit b1718b9dd74e13cd0f7aeccdb1187729c68687f3
Author: Eike Rathke er...@redhat.com
Date:   Thu Jan 26 14:03:12 2012 +0100

cast from BorderLine to BorderLine2 is not valid

Don't access a css::table::BorderLine struct as if it was
a css::table::BorderLine2 struct, which it isn't. A proper implementation
would need to pass BorderLine2 structs around for which it would need
a css::table::TableBorder2 struct that holds BorderLine2 instead of
BorderLine, and adapt various places for API compatibility to support both.
For now use the default table::BorderLineStyle::SOLID to set the line style 
at
::editeng::SvxBorderLine

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index fc38a45..423e324 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -59,6 +59,7 @@
 #include com/sun/star/table/ShadowFormat.hpp
 #include com/sun/star/table/TableBorder.hpp
 #include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/table/BorderLineStyle.hpp
 #include com/sun/star/sheet/CellFlags.hpp
 #include com/sun/star/sheet/FormulaResult.hpp
 #include com/sun/star/beans/PropertyAttribute.hpp
@@ -952,8 +953,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal( 
sheet::GeneralFunction eSummary )
 const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine( 
::editeng::SvxBorderLine rLine, const table::BorderLine rStruct )
 {
 //  Calc needs Twips, and there are 1/100mm in the Uno structure
-const table::BorderLine2 rBorder2 = static_cast const 
table::BorderLine2 ( rStruct );
-rLine.SetStyle( ::editeng::SvxBorderStyle( rBorder2.LineStyle ) );
+rLine.SetStyle( ::editeng::SvxBorderStyle( table::BorderLineStyle::SOLID ) 
);
 rLine.GuessLinesWidths( rLine.GetStyle(),
 (sal_uInt16)HMMToTwips( rStruct.OuterLineWidth ),
 (sal_uInt16)HMMToTwips( rStruct.InnerLineWidth ),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android' - vcl/android vcl/inc

2012-01-26 Thread Michael Meeks 
 vcl/android/androidinst.cxx |   17 +++--
 vcl/inc/android/androidinst.hxx |2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit 0c2de3df0982b0c77987c640a9af38d310325a55
Author: Michael Meeks michael.me...@suse.com
Date:   Thu Jan 26 14:36:25 2012 +

android: get at least something onto the screen

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index d867fa8..d8ba0b0 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -152,6 +152,7 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow 
*pWindow)
 SvpSalFrame *pFrame = static_castSvpSalFrame *(*it);
 BlitFrameToWindow (pWindow, pFrame-getDevice());
 }
+mbQueueReDraw = false;
 }
 
 void AndroidSalInstance::onAppCmd (struct android_app* app, int32_t cmd)
@@ -167,7 +168,6 @@ void AndroidSalInstance::onAppCmd (struct android_app* app, 
int32_t cmd)
 fprintf (stderr, we have an app window ! %p %dx%x (%d)\n,
  pWindow, aRect.right, aRect.bottom,
  ANativeWindow_getFormat(pWindow));
-mbQueueReDraw = true;
 break;
 }
 case APP_CMD_WINDOW_RESIZED:
@@ -178,12 +178,12 @@ void AndroidSalInstance::onAppCmd (struct android_app* 
app, int32_t cmd)
 fprintf (stderr, app window resized to ! %p %dx%x (%d)\n,
  pWindow, aRect.right, aRect.bottom,
  ANativeWindow_getFormat(pWindow));
-mbQueueReDraw = true;
 break;
 }
 
 case APP_CMD_WINDOW_REDRAW_NEEDED:
 {
+fprintf (stderr, redraw needed\n);
 mbQueueReDraw = true;
 break;
 }
@@ -248,15 +248,21 @@ AndroidSalInstance *AndroidSalInstance::getInstance()
 }
 
 extern C {
-void onAppCmd_cb (struct android_app* app, int32_t cmd)
+void onAppCmd_cb (struct android_app *app, int32_t cmd)
 {
 AndroidSalInstance::getInstance()-onAppCmd(app, cmd);
 }
 
-int32_t onInputEvent_cb (struct android_app* app, AInputEvent* event)
+int32_t onInputEvent_cb (struct android_app *app, AInputEvent *event)
 {
 return AndroidSalInstance::getInstance()-onInputEvent(app, event);
 }
+void onNativeWindowRedrawNeeded_cb(ANativeActivity * /* activity */,
+   ANativeWindow *pWindow)
+{
+fprintf (stderr, onNativeWindowRedrawNeeded_cb\n);
+AndroidSalInstance::getInstance()-RedrawWindows (pWindow);
+}
 }
 
 AndroidSalInstance::AndroidSalInstance( SalYieldMutex *pMutex )
@@ -275,6 +281,7 @@ AndroidSalInstance::AndroidSalInstance( SalYieldMutex 
*pMutex )
 mpApp-onInputEvent = onInputEvent_cb;
 if (mpApp-window != NULL)
 onAppCmd_cb (mpApp, APP_CMD_INIT_WINDOW);
+mpApp-activity-callbacks-onNativeWindowRedrawNeeded = 
onNativeWindowRedrawNeeded_cb;
 pthread_mutex_unlock (mpApp-mutex);
 }
 }
@@ -317,8 +324,6 @@ void AndroidSalInstance::DoReleaseYield (int nTimeoutMS)
 mpApp-cmdPollSource.process(mpApp, mpApp-cmdPollSource);
 else if (nRet == LOOPER_ID_INPUT)
 mpApp-inputPollSource.process(mpApp, mpApp-inputPollSource);
-else if (mbQueueReDraw)
-RedrawWindows (mpApp-window);
 }
 
 bool AndroidSalInstance::AnyInput( sal_uInt16 nType )
diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx
index e39f147..8efb963 100644
--- a/vcl/inc/android/androidinst.hxx
+++ b/vcl/inc/android/androidinst.hxx
@@ -37,7 +37,6 @@
 
 class AndroidSalInstance : public SvpSalInstance
 {
-void RedrawWindows(ANativeWindow *pWindow);
 void BlitFrameToWindow(ANativeWindow *pWindow,
const basebmp::BitmapDeviceSharedPtr aDev);
 public:
@@ -54,6 +53,7 @@ public:
 // incoming android event handlers:
 voidonAppCmd (struct android_app* app, int32_t cmd);
 int32_t onInputEvent (struct android_app* app, AInputEvent* event);
+voidRedrawWindows(ANativeWindow *pWindow);
 protected:
 virtual void DoReleaseYield( int nTimeoutMS );
 struct android_app *mpApp;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-26 Thread Cédric Bosdonnat 
 sw/source/core/fields/reffld.cxx|   37 +---
 sw/source/ui/docvw/PageBreakWin.cxx |   22 +++--
 2 files changed, 38 insertions(+), 21 deletions(-)

New commits:
commit 5e51960dede5015b862df05b7b16f02884647889
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Thu Jan 26 15:30:01 2012 +0100

fdo#35669: properly merge ref fields in master documents

diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index e031700..5f1aa3a 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -972,6 +972,26 @@ void _RefIdsMap::Init( SwDoc rDoc, SwDoc rDestDoc, 
sal_Bool bField )
 {
 GetFieldIdsFromDoc( rDestDoc, aIds );
 GetFieldIdsFromDoc( rDoc, aDstIds );
+
+// Define the mappings now
+sal_uInt16 nMaxDstId = *aIds.end();
+
+// Map all the src fields to their value + nMaxDstId
+for ( std::setsal_uInt16::iterator pIt = aDstIds.begin(); pIt != 
aDstIds.end(); ++pIt )
+AddId( nMaxDstId++, *pIt );
+
+// Change the Sequence number of all the SetExp fields in the 
destination document
+SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, false );
+if( pType )
+{
+SwIteratorSwFmtFld,SwFieldType aIter( *pType );
+for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
+if( pF-GetTxtFld() )
+{
+sal_uInt16 n = 
((SwSetExpField*)pF-GetFld())-GetSeqNumber( );
+((SwSetExpField*)pF-GetFld())-SetSeqNumber( 
sequencedIds[ n ] );
+}
+}
 }
 else
 {
@@ -1030,21 +1050,8 @@ void _RefIdsMap::Check( SwDoc rDoc, SwDoc rDestDoc, 
SwGetRefField rFld,
 AddId( n, nSeqNo );
 rFld.SetSeqNo( n );
 
-// und noch die Felder oder Fuss-/EndNote auf die neue
-// Id umsetzen
-if( bField )
-{
-SwFieldType* pType = rDoc.GetFldType( RES_SETEXPFLD, aName, 
false );
-if( pType )
-{
-SwIteratorSwFmtFld,SwFieldType aIter( *pType );
-for( SwFmtFld* pF = aIter.First(); pF; pF = aIter.Next() )
-if( pF-GetTxtFld()  nSeqNo ==
-((SwSetExpField*)pF-GetFld())-GetSeqNumber() )
-((SwSetExpField*)pF-GetFld())-SetSeqNumber( n );
-}
-}
-else
+// und noch die Fuss-/EndNote auf die neue Id umsetzen
+if( !bField )
 {
 SwTxtFtn* pFtnIdx;
 for( sal_uInt16 i = 0, nCnt = rDoc.GetFtnIdxs().Count(); i  
nCnt; ++i )
commit 5fd72b4dc0191610e4d7b9cc30c5ec5b345150cb
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Fri Jan 20 16:20:55 2012 +0100

Revert Page Breaks: IsLeaveWindow() is unreliable, we do not need it here.

This reverts commit 60c968e9a2ef14aa289e677bd7f40d2c4724fd12. This
introduced flickering page break button

diff --git a/sw/source/ui/docvw/PageBreakWin.cxx 
b/sw/source/ui/docvw/PageBreakWin.cxx
index ff5050b..0edeb61 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -83,11 +83,17 @@ namespace
 
 void SwBreakDashedLine::MouseMove( const MouseEvent rMEvt )
 {
-Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !m_pWin-Contains( aEventPos ) )
-m_pWin-Fade( false );
+if ( rMEvt.IsLeaveWindow() )
+{
+// don't fade if we just move to the 'button'
+Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !m_pWin-Contains( aEventPos ) )
+m_pWin-Fade( false );
+}
 else if ( !m_pWin-IsVisible() )
+{
 m_pWin-Fade( true );
+}
 
 if ( !rMEvt.IsSynthetic() )
 {
@@ -303,9 +309,13 @@ void SwPageBreakWin::Select( )
 
 void SwPageBreakWin::MouseMove( const MouseEvent rMEvt )
 {
-Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !Contains( aEventPos )  !PopupMenu::IsInExecute() )
-Fade( false );
+if ( rMEvt.IsLeaveWindow() )
+{
+// don't fade if we just move to the 'line', or the popup menu is open
+Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !Contains( aEventPos )  !PopupMenu::IsInExecute() )
+Fade( false );
+}
 else if ( !IsVisible() )
 Fade( true );
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - officecfg/registry

2012-01-26 Thread Caolán McNamara 
 officecfg/registry/data/org/openoffice/VCL.xcu |   40 ++---
 1 file changed, 10 insertions(+), 30 deletions(-)

New commits:
commit 6136ac974a5e141baf346dc64186fb3ef2d27239
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 24 19:01:44 2012 +0100

remove bn-IN node, we have bn
(cherry picked from commit 9b55eeba78d4e6418750a12c3dad4b42e2dd3f03)

Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 3f26f43..32ffec3 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -856,26 +856,6 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn-IN oor:op=replace
-  prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
-  /prop
-  prop oor:name=CTL_DISPLAY oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_HEADING oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_PRESENTATION oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_SPREADSHEET oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_TEXT oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-/node
 node oor:name=hi oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial 
Unicode MS;Lucida Sans Unicode;clearlyU/value
commit 90ac513d63d93b8654b88d3179e8e49e77266a9c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 24 16:22:15 2012 +0100

Fix build: dupplicate node/prop /VCL/DefaultFonts/bn
(cherry picked from commit 86bf32c487852f4e466b27320e3724266cb53dba)

Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 8b779cc..3f26f43 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -856,7 +856,7 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn oor:op=replace
+node oor:name=bn-IN oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
commit 99e1bce4394b1c24c27f2697974ac7cfc487
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 24 14:56:35 2012 +0100

country code 'IN' is not in use for these locales fdo#44208, fdo#45107
(cherry picked from commit 82e0266b05dd53d0ce8b12bd5c76ae25872b87a9)

Signed-off-by: Caolán McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 9a14e02..8b779cc 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -836,7 +836,7 @@
 valueLohit Nepali;Kalimati;Samanata;Sans/value
   /prop
 /node
-node oor:name=as-IN oor:op=replace
+node oor:name=as oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale 
Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -856,7 +856,7 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn-IN oor:op=replace
+node oor:name=bn oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -876,7 +876,7 @@
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=hi-IN oor:op=replace
+node oor:name=hi oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial 
Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -896,7 +896,7 @@
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-

[Libreoffice-commits] .: cui/source fpicker/source sfx2/source unotools/inc unotools/Library_utl.mk unotools/Package_inc.mk unotools/source

2012-01-26 Thread Stephan Bergmann 
 cui/source/options/optinet2.cxx  |1 
 fpicker/source/office/iodlg.cxx  |1 
 sfx2/source/appl/app.cxx |1 
 sfx2/source/appl/appcfg.cxx  |  103 --
 unotools/Library_utl.mk  |1 
 unotools/Package_inc.mk  |1 
 unotools/inc/unotools/inetoptions.hxx|  102 --
 unotools/inc/unotools/itemholderbase.hxx |1 
 unotools/source/config/inetoptions.cxx   |  485 ---
 unotools/source/config/itemholder1.cxx   |5 
 10 files changed, 71 insertions(+), 630 deletions(-)

New commits:
commit 252e599b22f08a8138b78e4215c33a86f5889fef
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jan 26 16:26:15 2012 +0100

Replace SvtInetOptions with (simplified) direct configuration access.

diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index bcf0c60..361ce96 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -43,7 +43,6 @@
 #include tools/inetdef.hxx
 #include svl/urihelper.hxx
 #include svl/cntwids.hrc
-#include unotools/inetoptions.hxx
 #include sfx2/app.hxx
 #include sfx2/objsh.hxx
 #include unotools/bootstrap.hxx
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index fd02d6b..014388f 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -42,7 +42,6 @@
 #include unotools/pathoptions.hxx
 #include unotools/viewoptions.hxx
 #include svtools/fileview.hxx
-#include unotools/inetoptions.hxx
 #include svtools/sfxecode.hxx
 #include svl/svarray.hxx
 #include svtools/svtabbx.hxx
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 4931518..7e29777 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -125,7 +125,6 @@
 #include unotools/startoptions.hxx
 #include unotools/securityoptions.hxx
 #include unotools/localisationoptions.hxx
-#include unotools/inetoptions.hxx
 #include unotools/fontoptions.hxx
 #include unotools/internaloptions.hxx
 #include unotools/workingsetoptions.hxx
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index f68f72d..cd91d40 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -51,6 +51,7 @@
 
 #include svl/isethint.hxx
 
+#include officecfg/Inet.hxx
 #include unotools/configmgr.hxx
 #include tools/urlobj.hxx
 #include unotools/saveopt.hxx
@@ -58,7 +59,6 @@
 #include unotools/undoopt.hxx
 #include unotools/securityoptions.hxx
 #include unotools/pathoptions.hxx
-#include unotools/inetoptions.hxx
 #include svtools/miscopt.hxx
 #include vcl/toolbox.hxx
 #include unotools/localfilehelper.hxx
@@ -171,7 +171,6 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet rSet )
 SvtSaveOptions aSaveOptions;
 SvtUndoOptions aUndoOptions;
 SvtHelpOptions aHelpOptions;
-SvtInetOptions aInetOptions;
 SvtSecurityOptions  aSecurityOptions;
 SvtMiscOptions aMiscOptions;
 
@@ -395,33 +394,54 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet rSet )
 #endif
 break;
 case SID_INET_PROXY_TYPE :
-{
-if( rSet.Put( SfxUInt16Item ( rPool.GetWhich( 
SID_INET_PROXY_TYPE ),
-(sal_uInt16)aInetOptions.GetProxyType() )))
-bRet = sal_True;
+if (rSet.Put(
+SfxUInt16Item(
+rPool.GetWhich(SID_INET_PROXY_TYPE),
+
officecfg::Inet::Settings::ooInetProxyType::get(
+
comphelper::getProcessComponentContext()
+{
+bRet = true;
+}
 break;
-}
 case SID_INET_HTTP_PROXY_NAME :
-{
-if ( rSet.Put( SfxStringItem ( 
rPool.GetWhich(SID_INET_HTTP_PROXY_NAME ),
-aInetOptions.GetProxyHttpName() )))
-bRet = sal_True;
+if (rSet.Put(
+SfxStringItem(
+rPool.GetWhich(SID_INET_HTTP_PROXY_NAME),
+
officecfg::Inet::Settings::ooInetHTTPProxyName::get(
+
comphelper::getProcessComponentContext()
+{
+bRet = true;
+}
 break;
-}
 case SID_INET_HTTP_PROXY_PORT :
-if ( rSet.Put( SfxInt32Item( 
rPool.GetWhich(SID_INET_HTTP_PROXY_PORT ),
-aInetOptions.GetProxyHttpPort() )))
-bRet = sal_True;
+if (rSet.Put(
+SfxInt32Item(
+rPool.GetWhich(SID_INET_HTTP_PROXY_PORT),
+

[Libreoffice-commits] .: Branch 'feature/android' - vcl/android

2012-01-26 Thread Tor Lillqvist 
 vcl/android/androidinst.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 612fc199c3884b48770740acf8b441f3506b47e1
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Jan 26 17:45:00 2012 +0200

Include the separate tag argument in the __android_log_print() calls

It's the *third* argument that is the printf-style format string.

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index d8ba0b0..8235603 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -363,7 +363,7 @@ void SalAbort( const rtl::OUString rErrorText, bool 
bDumpCore )
 aError = rtl::OUString::createFromAscii(Unknown application error);
 ::fprintf( stderr, %s\n, rtl::OUStringToOString(rErrorText, 
osl_getThreadTextEncoding()).getStr() );
 
-__android_log_print(ANDROID_LOG_INFO, SalAbort: '%s',
+__android_log_print(ANDROID_LOG_INFO, LibreOffice, SalAbort: '%s',
 rtl::OUStringToOString(aError, 
RTL_TEXTENCODING_ASCII_US).getStr());
 if( bDumpCore )
 abort();
@@ -414,7 +414,7 @@ int AndroidSalSystem::ShowNativeDialog( const 
rtl::OUString rTitle,
 fprintf (stderr, LibreOffice native dialog '%s': '%s'\n,
  rtl::OUStringToOString(rTitle, 
RTL_TEXTENCODING_ASCII_US).getStr(),
  rtl::OUStringToOString(rMessage, 
RTL_TEXTENCODING_ASCII_US).getStr());
-__android_log_print(ANDROID_LOG_INFO, LibreOffice - dialog '%s': '%s',
+__android_log_print(ANDROID_LOG_INFO, LibreOffice, Dialog '%s': '%s',
 rtl::OUStringToOString(rTitle, 
RTL_TEXTENCODING_ASCII_US).getStr(),
 rtl::OUStringToOString(rMessage, 
RTL_TEXTENCODING_ASCII_US).getStr());
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android' - vcl/android

2012-01-26 Thread Tor Lillqvist 
 vcl/android/androidinst.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit d044d38d32e86fae0184890e19de3dbcb2ab477d
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Jan 26 18:10:25 2012 +0200

Add reply to question in comment;)

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 8235603..9791dbf 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -421,6 +421,13 @@ int AndroidSalSystem::ShowNativeDialog( const 
rtl::OUString rTitle,
 if (AndroidSalInstance::getInstance() != NULL)
 {
 // Does Android have a native dialog ? if not,. we have to do this ...
+
+// Of course it has. android.app.AlertDialog seems like a good
+// choice, it even has one, two or three buttons. Naturally,
+// it intended to be used from Java, so some verbose JNI
+// horror would be needed to use it directly here. Probably we
+// want some easier to use magic wrapper, hmm.
+
 ErrorBox aVclErrBox( NULL, WB_OK, rTitle );
 aVclErrBox.SetText( rMessage );
 aVclErrBox.Execute();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-26 Thread Cédric Bosdonnat 
 filter/source/config/cache/typedetection.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 611472edb12ba1d8a38bda1857c952eef0bb3568
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jan 26 14:30:24 2012 +0100

Sort the catch-all detection at the end

Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index cc91746..25b3742 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -814,9 +814,9 @@ namespace
 if (rA == rB)
 return false;
 if 
(rA.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.FormatDetector)))
-return true;
-if 
(rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.FormatDetector)))
 return false;
+if 
(rB.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.FormatDetector)))
+return true;
 return rA  rB;
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

2012-01-26 Thread Miklos Vajna 
 solenv/bin/modules/installer/scriptitems.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 439e5279c5d334f849a6ab7b51bad1bb12f13aae
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Jan 26 17:27:03 2012 +0100

solenv: handle error code from ./g

This avoids Cannot find the git binary! Is git installed and is in
PATH? strings in the about dialog when building from a tarball.

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index a8963a4..905b37e 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -815,8 +815,8 @@ sub replace_setup_variables
 
 if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; }   # 
using 680 instead of src680
 
-my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h- ; 
git describe --abbrev=0`;
-if (!$buildidstring) {
+my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-  
git describe --abbrev=0`;
+if ($? || !$buildidstring) {
 $buildidstring = $localbuild . $localminor . (Build: . 
$installer::globals::buildid . );
 }
 else {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/bin

2012-01-26 Thread Caolán McNamara 
 solenv/bin/modules/installer/scriptitems.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9abb0b6bbe2de65988065f78354ccf5ebde4a7ae
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Jan 26 17:27:03 2012 +0100

solenv: handle error code from ./g

This avoids Cannot find the git binary! Is git installed and is in
PATH? strings in the about dialog when building from a tarball.
(cherry picked from commit 439e5279c5d334f849a6ab7b51bad1bb12f13aae)

Conflicts:

solenv/bin/modules/installer/scriptitems.pm

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index bb8fe55..fb5c9c4 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -816,7 +816,7 @@ sub replace_setup_variables
 if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; }   # 
using 680 instead of src680
 
 my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-`;
-if (!$buildidstring) {
+if ($? || !$buildidstring) {
 $buildidstring = $localbuild . $localminor . (Build: . 
$installer::globals::buildid . );
 }
 else {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

2012-01-26 Thread Stefan Knorr 
 sc/source/ui/src/namedlg.src |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f1cb0a4ab4f11dc015be1696c7c7751802171915
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date:   Thu Jan 26 14:36:16 2012 +0100

Make named ranges dialog more consistent, localizable

diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index 6c1c46a..71bbc95 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -95,15 +95,15 @@ ModelessDialog RID_SCDLG_NAMES
 Edit ED_NAME2
 {
 Border = TRUE ;
-Pos = MAP_APPFONT ( 50 , 140 ) ;
-Size = MAP_APPFONT ( 168 , 12 ) ;
+Pos = MAP_APPFONT ( 60 , 140 ) ;
+Size = MAP_APPFONT ( 155 , 12 ) ;
 TabStop = TRUE ;
 };
 ListBox LB_SCOPE
 {
 Border = TRUE ;
-Pos = MAP_APPFONT ( 50 , 170 ) ;
-Size = MAP_APPFONT ( 168 , 80 ) ;
+Pos = MAP_APPFONT ( 60 , 170 ) ;
+Size = MAP_APPFONT ( 155 , 80 ) ;
 TabStop = TRUE ;
 DropDown = TRUE ;
 };
@@ -112,8 +112,8 @@ ModelessDialog RID_SCDLG_NAMES
 {
 HelpID = sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 50 , 155 ) ;
-Size = MAP_APPFONT ( 152 , 12 ) ;
+Pos = MAP_APPFONT ( 60 , 155 ) ;
+Size = MAP_APPFONT ( 142 , 12 ) ;
 TabStop = TRUE ;
 };
 ImageButton RB_ASSIGN
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2012-01-26 Thread Kohei Yoshida 
 sc/source/ui/unoobj/cellsuno.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5dfc55962087d1947ab41bea41bcdad99a1d93a5
Author: Eike Rathke er...@redhat.com
Date:   Thu Jan 26 14:03:12 2012 +0100

cast from BorderLine to BorderLine2 is not valid

Don't access a css::table::BorderLine struct as if it was
a css::table::BorderLine2 struct, which it isn't. A proper implementation
would need to pass BorderLine2 structs around for which it would need
a css::table::TableBorder2 struct that holds BorderLine2 instead of
BorderLine, and adapt various places for API compatibility to support both.
For now use the default table::BorderLineStyle::SOLID to set the line style 
at
::editeng::SvxBorderLine

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index fc38a45..423e324 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -59,6 +59,7 @@
 #include com/sun/star/table/ShadowFormat.hpp
 #include com/sun/star/table/TableBorder.hpp
 #include com/sun/star/table/BorderLine2.hpp
+#include com/sun/star/table/BorderLineStyle.hpp
 #include com/sun/star/sheet/CellFlags.hpp
 #include com/sun/star/sheet/FormulaResult.hpp
 #include com/sun/star/beans/PropertyAttribute.hpp
@@ -952,8 +953,7 @@ ScSubTotalFunc lcl_SummaryToSubTotal( 
sheet::GeneralFunction eSummary )
 const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine( 
::editeng::SvxBorderLine rLine, const table::BorderLine rStruct )
 {
 //  Calc needs Twips, and there are 1/100mm in the Uno structure
-const table::BorderLine2 rBorder2 = static_cast const 
table::BorderLine2 ( rStruct );
-rLine.SetStyle( ::editeng::SvxBorderStyle( rBorder2.LineStyle ) );
+rLine.SetStyle( ::editeng::SvxBorderStyle( table::BorderLineStyle::SOLID ) 
);
 rLine.GuessLinesWidths( rLine.GetStyle(),
 (sal_uInt16)HMMToTwips( rStruct.OuterLineWidth ),
 (sal_uInt16)HMMToTwips( rStruct.InnerLineWidth ),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

2012-01-26 Thread Ivan Timofeev 
 sfx2/source/view/sfxbasecontroller.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e2407767b39df00c4057a8174391ab70b97a39a5
Author: Ivan Timofeev timofeev@gmail.com
Date:   Wed Jan 25 23:37:30 2012 +0400

remember that map has been initialized

diff --git a/sfx2/source/view/sfxbasecontroller.cxx 
b/sfx2/source/view/sfxbasecontroller.cxx
index f8903d6..932c2f5 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -193,6 +193,7 @@ sal_Int16 MapGroupIDToCommandGroup( sal_Int16 nGroupID )
 GroupIDCommandGroupMap[i].nCommandGroup ));
 ++i;
 }
+bGroupIDMapInitialized = sal_True;
 }
 
 GroupHashMap::const_iterator pIter = mHashMap.find( nGroupID );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/android' - 2 commits - sal/android vcl/android

2012-01-26 Thread Tor Lillqvist 
 sal/android/android_native_app_glue.c |2 +-
 vcl/android/androidinst.cxx   |   28 +++-
 2 files changed, 28 insertions(+), 2 deletions(-)

New commits:
commit d396ec82510f8a871d9d7310a4ce53180278fa37
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Jan 26 21:32:48 2012 +0200

Add APP_CMD_FOO symbolic printout

diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index 9791dbf..5adc357 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -155,9 +155,35 @@ void AndroidSalInstance::RedrawWindows(ANativeWindow 
*pWindow)
 mbQueueReDraw = false;
 }
 
+static const char *app_cmd_name(int cmd)
+{
+switch (cmd) {
+case APP_CMD_INPUT_CHANGED: return INPUT_CHANGED;
+case APP_CMD_INIT_WINDOW: return INIT_WINDOW;
+case APP_CMD_TERM_WINDOW: return TERM_WINDOW;
+case APP_CMD_WINDOW_RESIZED: return WINDOW_RESIZED;
+case APP_CMD_WINDOW_REDRAW_NEEDED: return WINDOW_REDRAW_NEEDED;
+case APP_CMD_CONTENT_RECT_CHANGED: return CONTENT_RECT_CHANGED;
+case APP_CMD_GAINED_FOCUS: return GAINED_FOCUS;
+case APP_CMD_LOST_FOCUS: return LOST_FOCUS;
+case APP_CMD_CONFIG_CHANGED: return CONFIG_CHANGED;
+case APP_CMD_LOW_MEMORY: return LOW_MEMORY;
+case APP_CMD_START: return START;
+case APP_CMD_RESUME: return RESUME;
+case APP_CMD_SAVE_STATE: return SAVE_STATE;
+case APP_CMD_PAUSE: return PAUSE;
+case APP_CMD_STOP: return STOP;
+case APP_CMD_DESTROY: return DESTROY;
+default:
+static char buf[10];
+sprintf(buf, %d, cmd);
+return buf;
+}
+}
+
 void AndroidSalInstance::onAppCmd (struct android_app* app, int32_t cmd)
 {
-fprintf (stderr, app cmd for app %p, cmd %d\n, app, cmd);
+fprintf (stderr, app cmd for app %p: %s\n, app, app_cmd_name(cmd));
 ANativeWindow *pWindow = mpApp-window;
 switch (cmd) {
 case APP_CMD_INIT_WINDOW:
commit 04fbc6be65cce5f91f753eabb1a74877a2e6ebf8
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Jan 26 21:25:06 2012 +0200

Use lo-bootstrap as the log tag

diff --git a/sal/android/android_native_app_glue.c 
b/sal/android/android_native_app_glue.c
index cf5d8e8..cacc3bb 100644
--- a/sal/android/android_native_app_glue.c
+++ b/sal/android/android_native_app_glue.c
@@ -25,7 +25,7 @@
 #include osl/detail/android_native_app_glue.h
 #include android/log.h
 
-#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, threaded_app, 
__VA_ARGS__))
+#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, lo-bootstrap, 
__VA_ARGS__))
 
 static void free_saved_state(struct android_app* android_app) {
 pthread_mutex_lock(android_app-mutex);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - solenv/bin

2012-01-26 Thread Eike Rathke 
 solenv/bin/modules/installer/scriptitems.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2461c1d1deb589930c9078bc4728c6b9120b9a8b
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Jan 26 17:27:03 2012 +0100

solenv: handle error code from ./g

This avoids Cannot find the git binary! Is git installed and is in
PATH? strings in the about dialog when building from a tarball.
(cherry picked from commit 439e5279c5d334f849a6ab7b51bad1bb12f13aae)

Conflicts:

solenv/bin/modules/installer/scriptitems.pm
(cherry picked from commit 9abb0b6bbe2de65988065f78354ccf5ebde4a7ae)

Signed-off-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index bb8fe55..fb5c9c4 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -816,7 +816,7 @@ sub replace_setup_variables
 if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; }   # 
using 680 instead of src680
 
 my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-`;
-if (!$buildidstring) {
+if ($? || !$buildidstring) {
 $buildidstring = $localbuild . $localminor . (Build: . 
$installer::globals::buildid . );
 }
 else {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source svtools/source svx/source unotools/inc unotools/Library_utl.mk unotools/Package_inc.mk unotools/source

2012-01-26 Thread Stephan Bergmann 
 cui/source/options/optgdlg.cxx  |1 
 cui/source/options/optmemory.cxx|   76 +++-
 cui/source/options/optmemory.hxx|2 
 svtools/source/graphic/grfmgr.cxx   |   17 -
 svx/source/svdraw/svdetc.cxx|9 
 unotools/Library_utl.mk |1 
 unotools/Package_inc.mk |1 
 unotools/inc/unotools/cacheoptions.hxx  |  176 ---
 unotools/source/config/cacheoptions.cxx |  493 
 unotools/source/config/itemholder1.cxx  |1 
 10 files changed, 71 insertions(+), 706 deletions(-)

New commits:
commit d3e30409530a94470a3c19612663b26a9eafa683
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jan 26 20:56:06 2012 +0100

Replace SvtCacheOptions with (simplified) direct configuration access.

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 25a45c6..fc1b0ad 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -41,7 +41,6 @@
 #include i18npool/mslangid.hxx
 #include unotools/compatibility.hxx
 #include unotools/useroptions.hxx
-#include unotools/cacheoptions.hxx
 #include unotools/fontoptions.hxx
 #include svtools/menuoptions.hxx
 #include unotools/startoptions.hxx
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 9c5ed51..6146620 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -26,6 +26,12 @@
  *
  /
 
+#include sal/config.h
+
+#include algorithm
+
+#include comphelper/processfactory.hxx
+#include officecfg/Office/Common.hxx
 #include svtools/langtab.hxx
 #include svl/zforlist.hxx
 #include svtools/grfmgr.hxx
@@ -39,7 +45,6 @@
 #include rtl/math.hxx
 #include unotools/undoopt.hxx
 #include unotools/useroptions.hxx
-#include unotools/cacheoptions.hxx
 #include unotools/fontoptions.hxx
 #include svtools/menuoptions.hxx
 #include unotools/startoptions.hxx
@@ -80,9 +85,9 @@ using namespace ::sfx2;
 #define BYTES2NF(1.0/NF2BYTES)  // 10/2^20
 
 
-inline long OfaMemoryOptionsPage::GetNfGraphicCacheVal( void ) const
+sal_Int32 OfaMemoryOptionsPage::GetNfGraphicCacheVal() const
 {
-return static_castlong(aNfGraphicCache.GetValue()  20);
+return aNfGraphicCache.GetValue()  20;
 }
 
 inline void OfaMemoryOptionsPage::SetNfGraphicCacheVal( long nSizeInBytes )
@@ -180,30 +185,45 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet 
rSet )
 {
 sal_Bool bModified = sal_False;
 
-SvtCacheOptions aCacheOptions;
-
 // Undo-Schritte
 if ( aUndoEdit.GetText() != aUndoEdit.GetSavedValue() )
 SvtUndoOptions().SetUndoCount((sal_uInt16)aUndoEdit.GetValue());
 
-// GraphicCache
-aCacheOptions.SetGraphicManagerTotalCacheSize( GetNfGraphicCacheVal() );
-aCacheOptions.SetGraphicManagerObjectCacheSize( 
GetNfGraphicObjectCacheVal() );
+boost::shared_ptr unotools::ConfigurationChanges  batch(
+unotools::ConfigurationChanges::create(
+comphelper::getProcessComponentContext()));
 
-   const Time aTime( aTfGraphicObjectTime.GetTime() );
-aCacheOptions.SetGraphicManagerObjectReleaseTime( aTime.GetSec() + 
aTime.GetMin() * 60 + aTime.GetHour() * 3600 );
+// GraphicCache
+sal_Int32 totalCacheSize = GetNfGraphicCacheVal();
+officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(
+comphelper::getProcessComponentContext(), batch, totalCacheSize);
+sal_Int32 objectCacheSize = GetNfGraphicObjectCacheVal();
+officecfg::Office::Common::Cache::GraphicManager::ObjectCacheSize::set(
+comphelper::getProcessComponentContext(), batch, objectCacheSize);
+
+const Time aTime( aTfGraphicObjectTime.GetTime() );
+sal_Int32 objectReleaseTime =
+aTime.GetSec() + aTime.GetMin() * 60 + aTime.GetHour() * 3600;
+officecfg::Office::Common::Cache::GraphicManager::ObjectReleaseTime::set(
+comphelper::getProcessComponentContext(), batch, objectReleaseTime);
 
 // create a dummy graphic object to get access to the common GraphicManager
 GraphicObject   aDummyObject;
 GraphicManager rGrfMgr = aDummyObject.GetGraphicManager();
 
-rGrfMgr.SetMaxCacheSize( aCacheOptions.GetGraphicManagerTotalCacheSize() );
-rGrfMgr.SetMaxObjCacheSize( 
aCacheOptions.GetGraphicManagerObjectCacheSize(), sal_True );
-rGrfMgr.SetCacheTimeout( 
aCacheOptions.GetGraphicManagerObjectReleaseTime() );
+rGrfMgr.SetMaxCacheSize(totalCacheSize);
+rGrfMgr.SetMaxObjCacheSize(objectCacheSize, true);
+rGrfMgr.SetCacheTimeout(objectReleaseTime);
 
 // OLECache
-aCacheOptions.SetWriterOLE_Objects( 
static_castlong(aNfOLECache.GetValue()) );
-aCacheOptions.SetDrawingEngineOLE_Objects( 
static_castlong(aNfOLECache.GetValue()) );
+officecfg::Office::Common::Cache::Writer::OLE_Objects::set(
+comphelper::getProcessComponentContext(), batch,
+

[Libreoffice-commits] .: sc/source

2012-01-26 Thread Kohei Yoshida 
 sc/source/core/data/column3.cxx  |7 +++
 sc/source/core/data/dpoutput.cxx |5 -
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit af70bc00c6714eb8695babdf5af07416552f7034
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Thu Jan 26 15:47:52 2012 -0500

fdo#44143: Keep cells with broadcasters alive during deletion.

Or else it would partially break formula reference chain.

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 73c0bbb..8bd0a45 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -35,6 +35,7 @@
 #include sfx2/objsh.hxx
 #include svl/zforlist.hxx
 #include svl/zformat.hxx
+#include svl/broadcast.hxx
 
 #include scitems.hxx
 #include column.hxx
@@ -414,6 +415,12 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE 
nEndIndex, sal_uInt16 nDe
 if( pNote || pBC )
 pNoteCell = new ScNoteCell( pNote, pBC );
 }
+else
+{
+SvtBroadcaster* pBC = pOldCell-GetBroadcaster();
+if (pBC  pBC-HasListeners())
+pNoteCell = new ScNoteCell(pOldCell-ReleaseNote(), 
pBC);
+}
 
 // remove cell entry in cell item list
 SCROW nOldRow = maItems[nIdx].nRow;
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index 32179e3..ccec280 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -973,11 +973,6 @@ void ScDPOutput::Output()
 if ( bSizeOverflow || bResultsError )   // does output area exceed sheet 
limits?
 return; // nothing
 
-//  clear whole (new) output area
-//! when modifying table, clear old area
-//! include IDF_OBJECTS ???
-pDoc-DeleteAreaTab( aStartPos.Col(), aStartPos.Row(), nTabEndCol, 
nTabEndRow, nTab, IDF_ALL );
-
 if ( bDoFilter )
 lcl_DoFilterButton( pDoc, aStartPos.Col(), aStartPos.Row(), nTab );
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: offapi/com udkapi/com

2012-01-26 Thread Thorsten Behrens 
 offapi/com/sun/star/awt/XDialogProvider2.idl |   10 --
 offapi/com/sun/star/frame/XTitle.idl |   12 +---
 offapi/com/sun/star/presentation/XSlideShowView.idl  |6 +++---
 offapi/com/sun/star/rendering/XCanvas.idl|6 +++---
 offapi/com/sun/star/rendering/XTextLayout.idl|2 +-
 offapi/com/sun/star/text/GlobalDocument.idl  |2 ++
 offapi/com/sun/star/text/WebDocument.idl |2 ++
 offapi/com/sun/star/ucb/CertificateValidationRequest.idl |3 +++
 offapi/com/sun/star/xml/crypto/SEInitializer.idl |4 
 offapi/com/sun/star/xml/crypto/XSEInitializer.idl|4 
 offapi/com/sun/star/xml/crypto/XSecurityEnvironment.idl  |4 
 offapi/com/sun/star/xml/crypto/XXMLSecurityContext.idl   |4 
 udkapi/com/sun/star/task/XInteractionHandler2.idl|2 ++
 13 files changed, 29 insertions(+), 32 deletions(-)

New commits:
commit 00de339c15a048c874bc856e321973df0ea238de
Author: Thorsten Behrens tbehr...@suse.com
Date:   Thu Jan 26 22:44:03 2012 +0100

Fixup over-ambitious previous revert.

There were actually some useful bits hidden in that mass-publishing
of uno api.

diff --git a/offapi/com/sun/star/awt/XDialogProvider2.idl 
b/offapi/com/sun/star/awt/XDialogProvider2.idl
index b6bd5cb..10ca564 100644
--- a/offapi/com/sun/star/awt/XDialogProvider2.idl
+++ b/offapi/com/sun/star/awt/XDialogProvider2.idl
@@ -120,12 +120,10 @@ interface XDialogProvider2 : 
::com::sun::star::awt::XDialogProvider {
 /p
 */
 
-XDialog createDialogWithArguments(
-[in] string URL,
-[in] sequence ::com::sun::star::beans::NamedValue  Arguments
-)
-raises  (   com::sun::star::lang::IllegalArgumentException
-);
+XDialog createDialogWithArguments
+( [in] string URL,
+  [in] sequence ::com::sun::star::beans::NamedValue  Arguments )
+raises  (   com::sun::star::lang::IllegalArgumentException );
 };
 
 //=
diff --git a/offapi/com/sun/star/frame/XTitle.idl 
b/offapi/com/sun/star/frame/XTitle.idl
index 59b82e8..51033e4 100644
--- a/offapi/com/sun/star/frame/XTitle.idl
+++ b/offapi/com/sun/star/frame/XTitle.idl
@@ -36,17 +36,23 @@
  module com {  module sun {  module star {  module frame {
 
 //=
-/** todo document me
+/** an interface representing an entity with a modifyable title.
  */
 interface XTitle : com::sun::star::uno::XInterface
 {
 //-
-/** todo document me
+/** Returns the title of the object.
+ *
+ * @returns
+ * The title.
  */
 string getTitle ();
 
 //-
-/** todo document me
+/** Sets the title of the object.
+ *
+ * @param sTitle
+ * The title.
  */
 void setTitle ( [in] string sTitle );
 };
diff --git a/offapi/com/sun/star/presentation/XSlideShowView.idl 
b/offapi/com/sun/star/presentation/XSlideShowView.idl
index 6e39d9b..15e2cc4 100644
--- a/offapi/com/sun/star/presentation/XSlideShowView.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowView.idl
@@ -68,9 +68,9 @@ interface XSlideShowView : ::com::sun::star::uno::XInterface
 
 /** Query the current transformation matrix for this view.p
 
-   This method returns the transformation matrix of the
-   view. When notified via the transformation change listener,
-   the show will be displayed using the new transformation.p
+This method returns the transformation matrix of the
+view. When notified via the transformation change listener,
+the show will be displayed using the new transformation.p
 
 @return the view transformation matrix. Note that the slide
 show itself will paint all slides as one-by-one boxes, one
diff --git a/offapi/com/sun/star/rendering/XCanvas.idl 
b/offapi/com/sun/star/rendering/XCanvas.idl
index 81bd8e1..0ad3145 100644
--- a/offapi/com/sun/star/rendering/XCanvas.idl
+++ b/offapi/com/sun/star/rendering/XCanvas.idl
@@ -132,7 +132,7 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 
  /** Draw a point in device resolution on the device.
 
- @param aPoint
+@param aPoint
 The point to draw.
 
 @param aViewState
@@ -153,10 +153,10 @@ interface XCanvas : ::com::sun::star::uno::XInterface
 /** Draw a line in device resolution width (i.e. one device pixel
 wide).
 
- @param aStartPoint
+@param aStartPoint
 The start point of the line to draw.
 
- @param aEndPoint
+@param aEndPoint
 The end point of the line to draw.
 
 @param aViewState
diff --git

[Libreoffice-commits] .: dbaccess/Module_dbaccess.mk

2012-01-26 Thread Lionel Elie Mamane 
 dbaccess/Module_dbaccess.mk |2 --
 1 file changed, 2 deletions(-)

New commits:
commit b86c6ac65c9fae4da5fc8faf1ed194007de37afc
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Jan 27 06:57:28 2012 +0100

Disable Adabas UI, too

diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 73b3e58..b7788c1 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -29,13 +29,11 @@
 $(eval $(call gb_Module_Module,dbaccess))
 
 $(eval $(call gb_Module_add_targets,dbaccess,\
-AllLangResTarget_adabasui \
 AllLangResTarget_dba \
 AllLangResTarget_dbmm \
 AllLangResTarget_dbu \
 AllLangResTarget_sdbt \
 $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \
-Library_adabasui \
 Library_dba \
 Library_dbaxml \
 Library_dbmm \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

2012-01-26 Thread Lionel Elie Mamane 
 scp2/source/base/file_base.scp |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit d9ebbe3e5f0beb31364df524b9136958012558cf
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Jan 27 08:01:09 2012 +0100

Disable Adabas UI *installation*, too

diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index d54b5e1..59b0f74 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -57,9 +57,6 @@ STD_RES_FILE( gid_File_Res_Dbp, dbp)
 STD_LIB_FILE( gid_File_Lib_Dbu, dbu )
 STD_RES_FILE( gid_File_Res_Dbu, dbu)
 
-STD_LIB_FILE( gid_File_Lib_Adabasui, adabasui )
-STD_RES_FILE( gid_File_Res_Adabasui, adabasui)
-
 STD_RES_FILE( gid_File_Res_Cnr, cnr)
 STD_RES_FILE( gid_File_Res_Sdbcl, sdbcl)
 STD_RES_FILE( gid_File_Res_Sdberr, sdberr)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits