date:20130522

[Libreoffice-commits] core.git: sfx2/source

2013-05-22 Thread Tor Lillqvist

 sfx2/source/sidebar/ControllerFactory.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e84fe1e99e3df4ef1db7ad947f7866de16d7c662
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed May 22 09:04:01 2013 +0300

WaE: unreferenced local variable

Change-Id: Ib1d6a1c154d521a9de211467799a723f83d48554

diff --git a/sfx2/source/sidebar/ControllerFactory.cxx 
b/sfx2/source/sidebar/ControllerFactory.cxx
index cc5fe34..7919639 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -191,7 +191,7 @@ Referenceframe::XToolbarController 
ControllerFactory::CreateToolBarController(
 UNO_QUERY);
 }
 }
-catch (Exception rException)
+catch (Exception)
 {
 // Ignore exception.
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 4 commits - extensions/source languagetool/ExternalProject_languagetool.mk offapi/com qadevOOo/runner qadevOOo/tests

2013-05-22 Thread Stephan Bergmann

 extensions/source/update/check/updatehdl.cxx|   27 
+-
 extensions/source/update/check/updatehdl.hxx|2 
 languagetool/ExternalProject_languagetool.mk|6 
 offapi/com/sun/star/awt/PrinterServer.idl   |7 
 qadevOOo/runner/util/AccessibilityTools.java|  100 
+-
 qadevOOo/tests/java/mod/_sc/AccessibleEditableTextPara_PreviewCell.java |4 
 qadevOOo/tests/java/mod/_toolkit/AccessibleListBox.java |4 
 7 files changed, 40 insertions(+), 110 deletions(-)

New commits:
commit e4d8eaab8c9413fa102a56364c5f3c632e3ca43e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 21 17:16:18 2013 +0200

Clean up

Change-Id: I9f58a08ec0867237b80da6787bc1840f0a6bbba8
(cherry picked from commit 355180f3e574b069fcd68df08f4909521fa7e6a0)

diff --git a/offapi/com/sun/star/awt/PrinterServer.idl 
b/offapi/com/sun/star/awt/PrinterServer.idl
index e323939..3725eee 100644
--- a/offapi/com/sun/star/awt/PrinterServer.idl
+++ b/offapi/com/sun/star/awt/PrinterServer.idl
@@ -15,11 +15,10 @@
 module com {  module sun {  module star {  module awt {
 
 /** mechanism to discover and manage printers
+
+@since LibreOffice 4.1
  */
-service PrinterServer
-{
-interface com::sun::star::awt::XPrinterServer;
-};
+service PrinterServer: com::sun::star::awt::XPrinterServer;
 
 }; }; }; };
 
commit aedb02a728532d256318472742b31e90ccdf1d51
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 21 17:02:09 2013 +0200

Missing dependencies

cf. the various ext.ooo.*.lib in the tarball's build.xml

Change-Id: If58534c78b04768ab2d0524079d70bdd8ad16c00
(cherry picked from commit 90e2ad99a594c185ccc578c36121da83eaf8885f)

diff --git a/languagetool/ExternalProject_languagetool.mk 
b/languagetool/ExternalProject_languagetool.mk
index fdee1ad..1035bb6 100644
--- a/languagetool/ExternalProject_languagetool.mk
+++ b/languagetool/ExternalProject_languagetool.mk
@@ -13,7 +13,11 @@ $(eval $(call 
gb_ExternalProject_register_targets,languagetool,\
build \
 ))
 
-$(call gb_ExternalProject_get_state_target,languagetool,build) : $(call 
gb_Jar_get_outdir_target,juh)
+$(call gb_ExternalProject_get_state_target,languagetool,build) : \
+$(call gb_Jar_get_outdir_target,juh) \
+$(call gb_Jar_get_outdir_target,jurt) \
+$(call gb_Jar_get_outdir_target,ridl) \
+$(call gb_Jar_get_outdir_target,unoil)
cd $(call gb_UnpackedTarball_get_dir,languagetool)  \
$(ICECREAM_RUN) $(ANT) \
-q \
commit 7696bbddaeb9e6748bcd64cf1b6ab5b59e7311ca
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue May 21 16:40:03 2013 +0200

Revert Java cleanup, AccessibilityTools..

This reverts commit d702dd4396161f8e2e7396f5c24554088b752fcb, which 
reproducibly
broke JunitTest_sc_unoapi:

java.lang.NullPointerException
 at 
util.AccessibilityTools.getAccessibleObjectForRole_(AccessibilityTools.java:177)
 at 
util.AccessibilityTools.getAccessibleObjectForRole(AccessibilityTools.java:95)
 at 
mod._sc.AccessibleEditableTextPara_PreviewCell.createTestEnvironment(AccessibleEditableTextPara_PreviewCell.java:149)
 at lib.TestCase.getTestEnvironment(TestCase.java:121)
 at base.java_fat.getTestEnvironment(java_fat.java:319)
 at base.java_fat.executeTest(java_fat.java:167)
 at org.openoffice.Runner.run(Runner.java:234)
 at org.openoffice.test.UnoApiTest.test(UnoApiTest.java:38)
 at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
 at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
 at java.lang.reflect.Method.invoke(Method.java:601)
 at 
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:45)
 at 
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15)
 at 
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:42)
 at 
org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20)
 at 
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:28)
 at 
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:30)
 at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:263)
 at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:68)
 at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:47)
 at org.junit.runners.ParentRunner$3.run(ParentRunner.java:231)
 at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:60)
 at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:229)
 at

[Libreoffice-commits] core.git: nss/ExternalProject_nss.mk nss/nss_macosx.patch

2013-05-22 Thread Stephan Bergmann

 nss/ExternalProject_nss.mk |   14 ++-
 nss/nss_macosx.patch   |   55 +
 2 files changed, 68 insertions(+), 1 deletion(-)

New commits:
commit 2bb3500284182756116890e24fa12be8dace0753
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 22 08:35:30 2013 +0200

Fix nss library paths for Mac OS X

nss uses hard-coded @executable_path (which is wrong, consider e.g. the 
case of
the URE uno executable), so patch it to use @_..._OOO instead (and no need 
to
set --prefix), and pass the resulting libs through 
macosx-change-install-names
(which requires the generated libs to be writable).

Change-Id: I0f04533f0f0581ee7b9dfd8929b8629c0842cc1b

diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index 5bd5361..8a1d489 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -20,7 +20,6 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
mozilla/nsprpub/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \
-   $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 sed -e 's%@prefix@%$(OUTDIR)%' \
-e 's%@includedir@%$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss%' \
-e 's%@MOD_MAJOR_VERSION@%$(NSS_MAJOR)%' \
@@ -73,6 +72,19 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalProject
NSINSTALL=$(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/nss/nsinstall.py) \
NSDISTMODE=copy \
$(MAKE) -j1 nss_build_all \
+   $(if $(filter MACOSX,$(OS)), $(PERL) \
+   $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libfreebl3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnspr4.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnss3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssckbi.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssdbm3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssutil3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libplc4.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libplds4.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libsmime3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libsoftokn3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libssl3.dylib) \
,mozilla/security/nss)
 
 endif
diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch
index ac6fe71..6b50960 100644
--- a/nss/nss_macosx.patch
+++ b/nss/nss_macosx.patch
@@ -10,3 +10,58 @@
  ifdef USE_DEBUG_RTL
  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  endif
+--- misc/nss-3.13.5/mozilla/nsprpub/configure
 misc/build/nss-3.13.5/mozilla/nsprpub/configure
+@@ -3888,7 +3889,7 @@
+ fi
+ 
+ DSO_CFLAGS=-fPIC
+-DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 
-all_load -install_name @executable_path/$@ -headerpad_max_install_names'
++DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 
-all_load -install_name 
@__OOO/$@ 
-headerpad_max_install_names'
+ _OPTIMIZE_FLAGS=-O2
+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ STRIP=$STRIP -x -S
+--- misc/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in
 misc/build/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in
+@@ -143,7 +143,7 @@
+ 
+ export:: $(TARGETS)
+   $(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
+-  $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
++  $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
+ ifdef SHARED_LIBRARY
+ ifeq ($(OS_ARCH),HP-UX)
+   $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
+--- misc/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in
 misc/build/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in
+@@ -144,7 +144,7 @@
+ #
+ 
+ export:: $(TARGETS)
+-  $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
++  $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
+ ifdef SHARED_LIBRARY
+ ifeq ($(OS_ARCH),HP-UX)
+   $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
+--- misc/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in
 misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in
+@@ -365,7 +365,7 @@
+ #
+ 
+ build:: $(TARGETS)
+-  $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
++  $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
+ ifdef

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - nss/ExternalProject_nss.mk nss/nss_macosx.patch

2013-05-22 Thread Stephan Bergmann

 nss/ExternalProject_nss.mk |   14 ++-
 nss/nss_macosx.patch   |   55 +
 2 files changed, 68 insertions(+), 1 deletion(-)

New commits:
commit 5110964b590f5e6af70ed190e34320567c655793
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 22 08:35:30 2013 +0200

Fix nss library paths for Mac OS X

nss uses hard-coded @executable_path (which is wrong, consider e.g. the 
case of
the URE uno executable), so patch it to use @_..._OOO instead (and no need 
to
set --prefix), and pass the resulting libs through 
macosx-change-install-names
(which requires the generated libs to be writable).

Change-Id: I0f04533f0f0581ee7b9dfd8929b8629c0842cc1b
(cherry picked from commit 2bb3500284182756116890e24fa12be8dace0753)

diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index 5bd5361..8a1d489 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -20,7 +20,6 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
mozilla/nsprpub/configure --includedir=$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \
-   $(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
 sed -e 's%@prefix@%$(OUTDIR)%' \
-e 's%@includedir@%$(call 
gb_UnpackedTarball_get_dir,nss)/mozilla/dist/public/nss%' \
-e 's%@MOD_MAJOR_VERSION@%$(NSS_MAJOR)%' \
@@ -73,6 +72,19 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalProject
NSINSTALL=$(call gb_ExternalExecutable_get_command,python) 
$(SRCDIR)/nss/nsinstall.py) \
NSDISTMODE=copy \
$(MAKE) -j1 nss_build_all \
+   $(if $(filter MACOSX,$(OS)), $(PERL) \
+   $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libfreebl3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnspr4.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnss3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssckbi.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssdbm3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnssutil3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libplc4.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libplds4.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libsmime3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libsoftokn3.dylib \
+   
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libssl3.dylib) \
,mozilla/security/nss)
 
 endif
diff --git a/nss/nss_macosx.patch b/nss/nss_macosx.patch
index ac6fe71..6b50960 100644
--- a/nss/nss_macosx.patch
+++ b/nss/nss_macosx.patch
@@ -10,3 +10,58 @@
  ifdef USE_DEBUG_RTL
  NSPR_CONFIGURE_OPTS += --enable-debug-rtl
  endif
+--- misc/nss-3.13.5/mozilla/nsprpub/configure
 misc/build/nss-3.13.5/mozilla/nsprpub/configure
+@@ -3888,7 +3889,7 @@
+ fi
+ 
+ DSO_CFLAGS=-fPIC
+-DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 
-all_load -install_name @executable_path/$@ -headerpad_max_install_names'
++DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 
-all_load -install_name 
@__OOO/$@ 
-headerpad_max_install_names'
+ _OPTIMIZE_FLAGS=-O2
+ MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+ STRIP=$STRIP -x -S
+--- misc/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in
 misc/build/nss-3.13.5/mozilla/nsprpub/lib/ds/Makefile.in
+@@ -143,7 +143,7 @@
+ 
+ export:: $(TARGETS)
+   $(INSTALL) -m 444 $(HEADERS) $(dist_includedir)
+-  $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
++  $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
+ ifdef SHARED_LIBRARY
+ ifeq ($(OS_ARCH),HP-UX)
+   $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
+--- misc/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in
 misc/build/nss-3.13.5/mozilla/nsprpub/lib/libc/src/Makefile.in
+@@ -144,7 +144,7 @@
+ #
+ 
+ export:: $(TARGETS)
+-  $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
++  $(INSTALL) -m 664 $(TARGETS) $(dist_libdir)
+ ifdef SHARED_LIBRARY
+ ifeq ($(OS_ARCH),HP-UX)
+   $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
+--- misc/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in
 misc/build/nss-3.13.5/mozilla/nsprpub/pr/src/Makefile.in
+@@ -365,7 +365,7 @@
+ #
+ 
+ build:: $(TARGETS)
+-  $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-05-22 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Jorendc joren.libreoff...@telenet.be changed:

   What|Removed |Added

 Depends on||63840

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-05-22 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Jorendc joren.libreoff...@telenet.be changed:

   What|Removed |Added

 Depends on|63840   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: mdds broken

2013-05-22 Thread Stephan Bergmann


On 05/22/2013 03:08 AM, Kohei Yoshida wrote:

On 05/21/2013 05:17 AM, Stephan Bergmann wrote:

Building recent master, at least on Fedora 18 with --enable-dbgutil,
fails in various tests due to problems in mdds headers, likely since
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9785579ed0ec8e2e3e826c7e4cbbcaf51f8cb0d4
Update mdds to 0.8.1.

[...]

Anyway, this commit

http://cgit.freedesktop.org/libreoffice/core/commit/?id=4169a1264f8b491e80740c82bada9f6c34e4d26e


*should* fix it.  There were other uno api test breakages even after the
fix, though, but none of them looked related to the mdds problem.


But the mdds-related attempt to compare iterators from different 
sequences failure I described in the original mail is still there.


Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

2013-05-22 Thread László Németh

 vcl/source/glyphs/graphite_layout.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 56ae7a8c50c4040a7634986a055161b3aeb5819a
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Wed May 22 09:11:13 2013 +0200

fdo#52540 fix hyphenation of Graphite ligatures

Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 8b19c31..72e48c9 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -591,6 +591,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs 
rArgs)
 }
 size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+if (rArgs.mnMinCharPos + numchars  limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

2013-05-22 Thread Stephan Bergmann

 offapi/com/sun/star/frame/PopupMenuControllerFactory.idl |7 +--
 offapi/com/sun/star/frame/StatusbarControllerFactory.idl |7 +--
 offapi/com/sun/star/frame/ToolbarControllerFactory.idl   |7 +--
 3 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 66e39940d763586060c4bcc8c3cd213495c40b79
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 22 09:17:06 2013 +0200

Use implicit default constructors

...instead of explicit ones without arguments.  The former internally call
css.lang.XMultiComponentFactory.createInstanceWithContext while the latter 
call
css.lang.createInstanceWithArgumentsAndContext, which in turn uses 
css.lang.XInitialization.initialize,
which could fail with a less forgiving factory than 
cppu::OSingleFactoryHelper
(cppuhelper/source/factory.cxx) if the service implementation does not 
support XInitialization.

Change-Id: Iff3b2ceacdd3d4e165004b841e5bbf9dbe0b98a5

diff --git a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl 
b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
index d873e3d..f6c55b0 100644
--- a/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
+++ b/offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
@@ -34,12 +34,7 @@ module com { module sun { module star { module frame {
 
 @since OOo 2.0
 */
-service PopupMenuControllerFactory : XUIControllerFactory
-{
-/** service constructor
- */
-create();
-};
+service PopupMenuControllerFactory : XUIControllerFactory;
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl 
b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
index 7572c6c..abf 100644
--- a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl
@@ -35,12 +35,7 @@ module com { module sun { module star { module frame {
 
 @since OOo 2.0
 */
-service StatusbarControllerFactory : XUIControllerFactory
-{
-/** service constructor
- */
-create();
-};
+service StatusbarControllerFactory : XUIControllerFactory;
 
 }; }; }; };
 
diff --git a/offapi/com/sun/star/frame/ToolbarControllerFactory.idl 
b/offapi/com/sun/star/frame/ToolbarControllerFactory.idl
index 220046e..69b1314 100644
--- a/offapi/com/sun/star/frame/ToolbarControllerFactory.idl
+++ b/offapi/com/sun/star/frame/ToolbarControllerFactory.idl
@@ -31,12 +31,7 @@ module com { module sun { module star { module frame {
 @since OOo 2.0
 */
 
-service ToolbarControllerFactory : XUIControllerFactory
-{
-/** service constructor
- */
-create();
-};
+service ToolbarControllerFactory : XUIControllerFactory;
 
 }; }; }; };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch mdds/UnpackedTarball_mdds.mk

2013-05-22 Thread Kohei Yoshida

 mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch |   31 +
 mdds/UnpackedTarball_mdds.mk   |1 
 2 files changed, 32 insertions(+)

New commits:
commit 91714a9430e4b83b91cd1f6fc56ea398bfc685d0
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue May 21 16:01:06 2013 -0400

Try not to crash in mdds when _GLIBCXX_DEBUG is defined.

Change-Id: Id3a5ca97129177cae27cc38ec044f4fa62f08477

diff --git a/mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch 
b/mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch
new file mode 100644
index 000..acddb8b
--- /dev/null
+++ b/mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch
@@ -0,0 +1,31 @@
+From e77d3ba18a2fd53488048b78264be011db5423f6 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida kohei.yosh...@gmail.com
+Date: Tue, 21 May 2013 15:38:51 -0400
+Subject: [PATCH] Avoid crash when _GLIBCXX_DEBUG is defined.
+
+I'm not sure why gcc's STL debug complains when swapping two iterators
+when one of them is a singular, but doesn't when I assign one to the
+other via assignment. But whichever works
+---
+ include/mdds/multi_type_vector_itr.hpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/include/mdds/multi_type_vector_itr.hpp 
b/include/mdds/multi_type_vector_itr.hpp
+index a7954d2..7923a22 100644
+--- a/b/include/mdds/multi_type_vector_itr.hpp
 u/r/screwed/include/mdds/multi_type_vector_itr.hpp
+@@ -216,8 +216,9 @@ public:
+ 
+ iterator_common_base operator= (const iterator_common_base other)
+ {
+-iterator_common_base assigned(other);
+-swap(assigned);
++m_cur_node = other.m_cur_node;
++m_pos = other.m_pos;
++m_end = other.m_end;
+ return *this;
+ }
+ 
+-- 
+1.8.0
+
diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index b33bc1b..1891f29 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
mdds/mdds_0.6.0.patch \
mdds/0001-Workaround-for-gcc-bug.patch \
mdds/mdds_0.7.0_unreachable_warning.patch.1 \
+   mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/inc

2013-05-22 Thread Bjoern Michaelsen

 vcl/inc/unx/gtk/gtksalmenu.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit da3c2dc8cb1e9d0bce1cc773dda5e1baba08e00d
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed May 22 07:22:33 2013 +0200

fdo#63840 lp#1182082: disable internal unity integration against glib2.36

* that is: use internal unity integration from Ubuntu 13.04 raring
  upwards only

Change-Id: I08b9d950245b21e8d92c1e76905d53e97afdf685

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index d161c61..89c1af0 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -19,7 +19,7 @@
 #include unx/gtk/gtkframe.hxx
 
 #if defined(ENABLE_DBUS)  defined(ENABLE_GIO)  \
-(GLIB_MAJOR_VERSION  2 || GLIB_MINOR_VERSION = 32)
+(GLIB_MAJOR_VERSION  2 || GLIB_MINOR_VERSION = 36)
 #  define ENABLE_GMENU_INTEGRATION
 #  include unx/gtk/glomenu.h
 #  include unx/gtk/gloactiongroup.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-05-22 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Björn Michaelsen bjoern.michael...@canonical.com changed:

   What|Removed |Added

 Depends on|63840   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-05-22 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Björn Michaelsen bjoern.michael...@canonical.com changed:

   What|Removed |Added

 Depends on||63840

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] fdo#52540 fix hyphenation of Graphite ligatures

2013-05-22 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3999

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/3999/1

fdo#52540 fix hyphenation of Graphite ligatures

Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf
---
M vcl/source/glyphs/graphite_layout.cxx
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 7b663bd..8a99bb4 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -596,6 +596,7 @@
 }
 size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+if (rArgs.mnMinCharPos + numchars  limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);

-- 
To view, visit https://gerrit.libreoffice.org/3999
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Németh László nem...@numbertext.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-1] fdo#52540 fix hyphenation of Graphite ligatures

2013-05-22 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4000

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/00/4000/1

fdo#52540 fix hyphenation of Graphite ligatures

Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf
---
M vcl/source/glyphs/graphite_layout.cxx
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 8b19c31..72e48c9 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -591,6 +591,7 @@
 }
 size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+if (rArgs.mnMinCharPos + numchars  limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);

-- 
To view, visit https://gerrit.libreoffice.org/4000
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Németh László nem...@numbertext.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - oox/source

2013-05-22 Thread Jan Holesovsky

 oox/source/drawingml/customshapegeometry.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c4345bcf488d24a45a6412cda41474de6baf00da
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed May 15 16:08:26 2013 +0200

bnc#819614: Fix runaway lines.

Change-Id: I360ec44872dbb555870d7d3fc8a9ed81c95e8c07

diff --git a/oox/source/drawingml/customshapegeometry.cxx 
b/oox/source/drawingml/customshapegeometry.cxx
index dada581..55cf132 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -407,8 +407,9 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( 
CustomShapeProperties rCu
 n = rValue[ 1 ];
 }
 if ( ( n = '0' )  ( n = '9' ) )
-{   // seems to be a ST_Coordinate
-aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) );
+{
+// seems to be a ST_Coordinate - convert EMUs to 1/100th mm
+aRet.Value = Any( GetCoordinate( rValue ) );
 aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - oox/source

2013-05-22 Thread Jan Holesovsky

 oox/source/drawingml/customshapegeometry.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e520e6fc9b226c683c209c3c01cf828f947e9048
Author: Jan Holesovsky ke...@suse.cz
Date:   Wed May 15 16:08:26 2013 +0200

bnc#819614: Fix runaway lines.

Change-Id: I360ec44872dbb555870d7d3fc8a9ed81c95e8c07

diff --git a/oox/source/drawingml/customshapegeometry.cxx 
b/oox/source/drawingml/customshapegeometry.cxx
index c76c77f..a94ef68 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -416,8 +416,9 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( 
CustomShapeProperties rCu
 n = rValue[ 1 ];
 }
 if ( ( n = '0' )  ( n = '9' ) )
-{   // seems to be a ST_Coordinate
-aRet.Value = Any( (sal_Int32)(rValue.toInt32() ) );
+{
+// seems to be a ST_Coordinate - convert EMUs to 1/100th mm
+aRet.Value = Any( GetCoordinate( rValue ) );
 aRet.Type = EnhancedCustomShapeParameterType::NORMAL;
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

2013-05-22 Thread László Németh

 vcl/source/glyphs/graphite_layout.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4233b2d5c13887f4b8e68fb59a54aa2b09c9a66b
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Wed May 22 09:11:13 2013 +0200

fdo#52540 fix hyphenation of Graphite ligatures

Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf
Reviewed-on: https://gerrit.libreoffice.org/4000
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 8b19c31..72e48c9 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -591,6 +591,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs 
rArgs)
 }
 size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+if (rArgs.mnMinCharPos + numchars  limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/source

2013-05-22 Thread László Németh

 vcl/source/glyphs/graphite_layout.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7d1e6cb0564a1eb886fd8f95adbcc7d8b9aa028f
Author: LÃ¡szlÃ³ NÃ©meth nem...@numbertext.org
Date:   Wed May 22 09:11:13 2013 +0200

fdo#52540 fix hyphenation of Graphite ligatures

Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf
Reviewed-on: https://gerrit.libreoffice.org/3999
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 7b663bd..8a99bb4 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -596,6 +596,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs 
rArgs)
 }
 size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+if (rArgs.mnMinCharPos + numchars  limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
 rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-0] fdo#52540 fix hyphenation of Graphite ligatures

2013-05-22 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3999

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3999
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Németh László nem...@numbertext.org
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED libreoffice-4-1] fdo#52540 fix hyphenation of Graphite ligatures

2013-05-22 Thread Fridrich Strba (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4000

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4000
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3c6aef6d845a7494d54b3c902654b21f3939e8cf
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Németh László nem...@numbertext.org
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Use the new type-checking Reference constructor to reduce co...

2013-05-22 Thread Noel Grandin (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4001

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/4001/1

Use the new type-checking Reference constructor to reduce code noise

Also create a Clang compiler plugin to detect such cases.

Change-Id: I61ad1a1d6b1c017eeb51f226d2dde0e9bb7f1752
---
M basctl/source/basicide/baside3.cxx
M basctl/source/basicide/moduldl2.cxx
M basic/source/basmgr/basicmanagerrepository.cxx
M basic/source/uno/dlgcont.cxx
M basic/source/uno/namecont.cxx
M comphelper/source/processfactory/processfactory.cxx
A compilerplugins/clang/store/referencecasting.cxx
A compilerplugins/clang/store/referencecasting.hxx
M cui/source/dialogs/hangulhanjadlg.cxx
M cui/source/options/optdict.cxx
M dbaccess/source/core/dataaccess/ModelImpl.cxx
M dbaccess/source/core/dataaccess/connection.cxx
M dbaccess/source/core/dataaccess/datasource.cxx
M dbaccess/source/core/dataaccess/documentdefinition.cxx
M dbaccess/source/core/recovery/subcomponentloader.cxx
M dbaccess/source/ext/macromigration/migrationengine.cxx
M dbaccess/source/ui/app/subcomponentmanager.cxx
M dbaccess/source/ui/browser/exsrcbrw.cxx
M dbaccess/source/ui/dlg/dbwizsetup.cxx
M desktop/source/app/app.cxx
M extensions/source/abpilot/datasourcehandling.cxx
M extensions/source/bibliography/datman.cxx
M extensions/source/propctrlr/formcomponenthandler.cxx
M extensions/source/propctrlr/formgeometryhandler.cxx
M extensions/source/propctrlr/formlinkdialog.cxx
M filter/source/msfilter/svdfppt.cxx
M filter/source/svg/svgexport.cxx
M filter/source/svg/svgwriter.cxx
M filter/source/xsltdialog/xmlfiltertestdialog.cxx
M forms/source/component/FormattedField.cxx
M forms/source/component/navigationbar.cxx
M forms/source/component/scrollbar.cxx
M forms/source/component/spinbutton.cxx
M forms/source/misc/InterfaceContainer.cxx
M forms/source/xforms/model.cxx
M forms/source/xforms/model_ui.cxx
M forms/source/xforms/submission.cxx
M forms/source/xforms/submission/replace.cxx
M framework/source/fwe/helper/actiontriggerhelper.cxx
M framework/source/fwe/helper/documentundoguard.cxx
M framework/source/fwe/xml/menuconfiguration.cxx
M framework/source/fwe/xml/statusbarconfiguration.cxx
M framework/source/layoutmanager/layoutmanager.cxx
M framework/source/services/backingwindow.cxx
M framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
M framework/source/uiconfiguration/uiconfigurationmanager.cxx
M framework/source/uielement/toolbarmanager.cxx
M framework/source/uifactory/menubarfactory.cxx
M framework/source/uifactory/uielementfactorymanager.cxx
M framework/source/xml/imagesconfiguration.cxx
M oox/source/drawingml/chart/converterbase.cxx
M oox/source/drawingml/textfield.cxx
M oox/source/drawingml/textparagraph.cxx
M oox/source/drawingml/textrun.cxx
M oox/source/export/drawingml.cxx
M oox/source/export/shapes.cxx
M oox/source/helper/containerhelper.cxx
M package/source/manifest/ManifestWriter.cxx
M sc/source/filter/excel/xecontent.cxx
M sc/source/filter/excel/xichart.cxx
M sc/source/filter/oox/stylesbuffer.cxx
M sc/source/filter/oox/viewsettings.cxx
M sc/source/filter/oox/workbookhelper.cxx
M sc/source/filter/oox/worksheetbuffer.cxx
M scripting/source/dlgprov/dlgprov.cxx
M scripting/source/provider/BrowseNodeFactoryImpl.cxx
M scripting/source/stringresource/stringresource.cxx
M sd/source/core/CustomAnimationEffect.cxx
M sd/source/core/sdpage2.cxx
M sd/source/core/stlpool.cxx
M sd/source/filter/eppt/pptexanimations.cxx
M sd/source/ui/animations/CustomAnimationPane.cxx
M sd/source/ui/framework/factories/BasicViewFactory.cxx
M sd/source/ui/view/ViewShellBase.cxx
M sdext/source/minimizer/graphiccollector.cxx
M sdext/source/presenter/PresenterViewFactory.cxx
M sfx2/source/appl/newhelp.cxx
M sfx2/source/dialog/taskpane.cxx
M sfx2/source/view/frame2.cxx
M sfx2/source/view/viewfrm.cxx
M svtools/source/contnr/templwin.cxx
M svx/source/dialog/rubydialog.cxx
M svx/source/form/filtnav.cxx
M svx/source/form/fmobj.cxx
M svx/source/form/fmpgeimp.cxx
M svx/source/form/fmshimp.cxx
M svx/source/form/fmtools.cxx
M svx/source/form/fmundo.cxx
M svx/source/form/fmvwimp.cxx
M svx/source/form/formcontroller.cxx
M svx/source/form/formcontrolling.cxx
M svx/source/form/navigatortree.cxx
M svx/source/form/navigatortreemodel.cxx
M sw/source/filter/xml/xmlexp.cxx
M sw/source/filter/xml/xmltbli.cxx
M sw/source/ui/dbui/dbmgr.cxx
M sw/source/ui/dbui/dbtree.cxx
M toolkit/source/controls/controlmodelcontainerbase.cxx
M toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
M toolkit/source/controls/tabpagecontainer.cxx
M ucb/source/cacher/dynamicresultsetwrapper.cxx
M ucb/source/ucp/file/bc.cxx
M ucb/source/ucp/file/filglob.cxx
M ucb/source/ucp/ftp/ftpcontent.cxx
M unotools/source/config/configitem.cxx
M unoxml/source/dom/attr.cxx
M unoxml/source/dom/characterdata.cxx
M unoxml/source/dom/document.cxx
M unoxml/source/dom/element.cxx
M unoxml/source/dom/node.cxx
M unoxml/source/dom/node.hxx
M

[Libreoffice-commits] core.git: 2 commits - sd/AllLangResTarget_sd.mk sd/source sd/uiconfig sd/UIConfig_simpress.mk vcl/source

2013-05-22 Thread Caolán McNamara

 sd/AllLangResTarget_sd.mk  |1 
 sd/UIConfig_simpress.mk|1 
 sd/source/ui/dlg/masterlayoutdlg.cxx   |   69 +++
 sd/source/ui/dlg/masterlayoutdlg.src   |  105 -
 sd/source/ui/inc/dialogs.hrc   |1 
 sd/source/ui/inc/masterlayoutdlg.hrc   |   30 
 sd/source/ui/inc/masterlayoutdlg.hxx   |   22 ++
 sd/uiconfig/simpress/ui/masterlayoutdlg.ui |   46 
 vcl/source/glyphs/graphite_layout.cxx  |2 
 9 files changed, 67 insertions(+), 210 deletions(-)

New commits:
commit 6a0a33444255fcdbe16500de24fc5bfd74adca4b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 09:26:32 2013 +0100

WaE: signed/unsigned comparison

Change-Id: Iaa439c268eda24d700471560927d8f4c0f2e017b

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 72e48c9..3898ab1 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -589,7 +589,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs 
rArgs)
 nSegCharLimit - rArgs.mnEndCharPos, bRtl);
 }
 }
-size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
+int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
 if (rArgs.mnMinCharPos + numchars  limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
 if (mpFeatures)
commit 38b7f28268fc48e2761f963ffc7652ebdf2a8e9b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Tue May 21 20:50:44 2013 +0100

adapt code to use masterlayoutdlg .ui

Change-Id: I4fd8530d461701c736beaf15ca6cf66dfdf58f86

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 5f25e41..0e59384 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -55,7 +55,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/dlg/inspagob.src \
 sd/source/ui/dlg/ins_paste.src \
 sd/source/ui/dlg/LayerDialog.src \
-sd/source/ui/dlg/masterlayoutdlg.src \
 sd/source/ui/dlg/morphdlg.src \
 sd/source/ui/dlg/navigatr.src \
 sd/source/ui/dlg/PaneDockingWindow.src \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index f5d088f..8234765 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/definecustomslideshow \
+   sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/presentationdialog \
sd/uiconfig/simpress/ui/printeroptions \
sd/uiconfig/simpress/ui/photoalbum \
diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx 
b/sd/source/ui/dlg/masterlayoutdlg.cxx
index b0fd86f..e080822 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -24,23 +24,21 @@
 #include strings.hrc
 #include dialogs.hrc
 #include masterlayoutdlg.hxx
-#include masterlayoutdlg.hrc
 #include drawdoc.hxx
 
 using namespace ::sd;
 
 MasterLayoutDialog::MasterLayoutDialog( Window* pParent, SdDrawDocument* pDoc, 
SdPage* pCurrentPage )
-:   ModalDialog( pParent, SdResId( RID_SD_DLG_MASTER_LAYOUT ) ),
-mpDoc( pDoc ),
-mpCurrentPage( pCurrentPage ),
-maFLPlaceholders( this, SdResId( FL_PLACEHOLDERS ) ),
-maCBDate( this, SdResId( CB_DATE ) ),
-maCBPageNumber( this, SdResId( CB_PAGE_NUMBER ) ),
-maCBHeader( this, SdResId( CB_HEADER ) ),
-maCBFooter( this, SdResId( CB_FOOTER ) ),
-maPBOK( this, SdResId( BT_OK ) ),
-maPBCancel( this, SdResId( BT_CANCEL ) )
+: ModalDialog(pParent, MasterLayoutDialog, 
modules/simpress/ui/masterlayoutdlg.ui)
+, mpDoc(pDoc)
+, mpCurrentPage(pCurrentPage)
 {
+get(mpCBDate, datetime);
+get(mpCBPageNumber, pagenumber);
+get(mpCBSlideNumber, slidenumber);
+get(mpCBHeader, header);
+get(mpCBFooter, footer);
+
 if( mpCurrentPage  !mpCurrentPage-IsMasterPage() )
 {
 mpCurrentPage = (SdPage*)((mpCurrentPage-TRG_GetMasterPage()));
@@ -54,40 +52,27 @@ MasterLayoutDialog::MasterLayoutDialog( Window* pParent, 
SdDrawDocument* pDoc, S
 
 switch( mpCurrentPage-GetPageKind() )
 {
-case PK_STANDARD:
-{
-//  aTitle = String( SdResId( STR_MASTER_LAYOUT_TITLE ) );
-maCBHeader.Enable( sal_False );
-String aSlideNumberStr( SdResId( STR_SLIDE_NUMBER ) );
-maCBPageNumber.SetText( aSlideNumberStr );
-break;
+case PK_STANDARD:
+{
+mpCBHeader-Enable(false);
+mpCBPageNumber-SetText(mpCBSlideNumber-GetText());
+break;
+}
+case PK_NOTES:
+break;
+case PK_HANDOUT:
+

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

2013-05-22 Thread Caolán McNamara

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

New commits:
commit a49b81cd06aed28322b993ba49b61465d26348af
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 09:26:32 2013 +0100

WaE: signed/unsigned comparison

Change-Id: Iaa439c268eda24d700471560927d8f4c0f2e017b
(cherry picked from commit 6a0a33444255fcdbe16500de24fc5bfd74adca4b)

diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 72e48c9..3898ab1 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -589,7 +589,7 @@ gr_segment * GraphiteLayout::CreateSegment(ImplLayoutArgs 
rArgs)
 nSegCharLimit - rArgs.mnEndCharPos, bRtl);
 }
 }
-size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
+int numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
 if (rArgs.mnMinCharPos + numchars  limit) numchars = limit - 
rArgs.mnMinCharPos; // fdo#52540
 if (mpFeatures)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 4 commits - sc/qa

2013-05-22 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx |  152 ---
 1 file changed, 73 insertions(+), 79 deletions(-)

New commits:
commit 8268267d6a89a71106827c8f211efc387a315234
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue May 21 22:53:30 2013 -0400

Adjust a bit.

Change-Id: I74be2d40d9eb92813836a35892f461fe27b79aeb
(cherry picked from commit 563f15a609f5c637cd73d831830a68bdb61fb4d8)

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index dcce938..36a59fa 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -566,7 +566,7 @@ void Test::testPerf()
 MeasureTimeSwitch aTime(diff, scale);
 clearRange(m_pDoc, ScRange(1,1,0,1,9,0));
 }
-PERF_ASSERT(diff, 2000, Removal of a large array of formula cells);
+PERF_ASSERT(diff, 3000, Removal of a large array of formula cells);
 }
 
 clearRange(m_pDoc, ScRange(0,0,0,1,MAXROW,0)); // Clear columns A:B.
commit 8399e9c9f34095478f6713638e2a8e582b3828a5
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue May 21 22:22:26 2013 -0400

Hopefully this will disable testPerf for Windows too... Untested.

Change-Id: I6d06b8e2b3cdb22948e606a7d928c57ea9347cea
(cherry picked from commit 80648e06cac011c01e624cba91ce71fdf431e78a)

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index c48d310..dcce938 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -283,7 +283,7 @@ public:
 void testCondFormatINSDEL();
 
 CPPUNIT_TEST_SUITE(Test);
-#ifndef DBG_UTIL
+#if !defined(DBG_UTIL)  !defined(_WIN32_WINNT)
 CPPUNIT_TEST(testPerf);
 #endif
 CPPUNIT_TEST(testCollator);
commit d5cbc8e2b58e6591ef5ba2c0c75be603d945ca1c
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue May 21 20:48:42 2013 -0400

Disable the perf test for dbgutil build.

Change-Id: Ifd95ea4f88175b9010f93a4a064be5d908b2a224
(cherry picked from commit df4d6b134bfe45e380416f0d9eecb482843e8a47)

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 8248419..c48d310 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -283,7 +283,9 @@ public:
 void testCondFormatINSDEL();
 
 CPPUNIT_TEST_SUITE(Test);
+#ifndef DBG_UTIL
 CPPUNIT_TEST(testPerf);
+#endif
 CPPUNIT_TEST(testCollator);
 CPPUNIT_TEST(testRangeList);
 CPPUNIT_TEST(testInput);
commit ce63a5ea777b5e0120acc3a0d43c21e5ad8fc8fb
Author: Michael Meeks michael.me...@suse.com
Date:   Tue May 21 16:27:09 2013 +0100

make calc tests use some sort of pseudo-cycle measurement

Change-Id: I9f58a7b00a6e4441c08254ef99829fab805beef8
(cherry picked from commit 7141c7517db5bbb9814308aa4c68bc95beb4de8c)

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 59201d4..8248419 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -445,11 +445,20 @@ public:
 class MeasureTimeSwitch
 {
 double mrDiff;
+double mnScale;
 TimeValue maTimeBefore;
 public:
 MeasureTimeSwitch(double rDiff) : mrDiff(rDiff)
 {
 mrDiff = .0;
+mnScale = 1.0;
+osl_getSystemTime(maTimeBefore);
+}
+// Scaled pseudo-time
+MeasureTimeSwitch(double rDiff, const double nScale ) : mrDiff(rDiff)
+{
+mrDiff = .0;
+mnScale = nScale;
 osl_getSystemTime(maTimeBefore);
 }
 
@@ -457,7 +466,7 @@ public:
 {
 TimeValue aTimeAfter;
 osl_getSystemTime(aTimeAfter);
-mrDiff = getTimeDiff(aTimeAfter, maTimeBefore);
+mrDiff = getTimeDiff(aTimeAfter, maTimeBefore) / mnScale;
 }
 };
 
@@ -486,25 +495,58 @@ void Test::tearDown()
 BootstrapFixture::tearDown();
 }
 
+#define PERF_ASSERT(df,time,message) \
+do { \
+if ((df) = (time)) \
+{ \
+std::ostringstream os; \
+os  message   took   diff   psuedo-cycles, expected:  
 time; \
+/* debugging - fprintf (stderr, '%s'\n, os.str().c_str()); */ \
+CPPUNIT_FAIL(os.str().c_str()); \
+} \
+} while (0)
+
 void Test::testPerf()
 {
 CPPUNIT_ASSERT_MESSAGE (failed to insert sheet, m_pDoc-InsertTab (0, 
foo));
 
-double diff = .0;
+// First do a set of simple operations to try to work out
+// how fast (or not) this particular machine is:
+double scale;
+{
+MeasureTimeSwitch aTime(scale);
+for (int i = 0; i  1000; ++i)
+{
+// Bang on the allocator
+volatile ScRange *pRange = new ScRange (ScAddress (0,0,0));
+// Calc does quite a bit of string conversion
+volatile double it = OUString::number ((double)i/253.0).toDouble();
+// Do we have floating point math ?
+volatile double another = rtl::math::sin (it);
+(void)another;
+delete pRange;
+}
+}
+printf(CPU scale factor %g\n, scale);
+
+// FIXME: we should check if this already took too long
+// and if so

[Libreoffice-commits] core.git: sc/source

2013-05-22 Thread Noel Power

 sc/source/filter/oox/numberformatsbuffer.cxx |2 +-
 sc/source/filter/oox/stylesbuffer.cxx|   25 +++--
 2 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit bf8e9b29aaebcbdd8f2f06b42ac97b8d9f8f4503
Author: Noel Power noel.po...@suse.com
Date:   Wed May 22 10:00:34 2013 +0100

fix for bnc#819865 itemstate in parent style incorrectly reported as set

Problem occurs because attrs set with default values are reported as set 
when queried

Change-Id: I89d6c3b09312fb78052d87ff20aa12c6fbe7bc98

diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx 
b/sc/source/filter/oox/numberformatsbuffer.cxx
index 4baa33e..8f7935d 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -2049,7 +2049,7 @@ void NumberFormatsBuffer::insertBuiltinFormats()
 {
 // do not put the current system locale for default table
 Locale aLocale;
-if( (*aVIt)-mpcLocale[ 0 ] != '\0' )
+if( (*aVIt)-mpcParent[ 0 ] != '\0' )
 aLocale = aSysLocale;
 for( const BuiltinFormat* pBuiltin = (*aVIt)-mpFormats; pBuiltin  
(pBuiltin-mnNumFmtId = 0); ++pBuiltin )
 {
diff --git a/sc/source/filter/oox/stylesbuffer.cxx 
b/sc/source/filter/oox/stylesbuffer.cxx
index fc3ee80..4d4a205 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -2274,7 +2274,6 @@ void Xf::finalizeImport()
 // alignment and protection
 maAlignment.finalizeImport();
 maProtection.finalizeImport();
-createPattern();
 }
 
 FontRef Xf::getFont() const
@@ -2371,8 +2370,12 @@ Xf::createPattern( bool bSkipPoolDefs )
 StylesBuffer rStyles = getStyles();
 
 const Xf* pStyleXf = isCellXf() ? rStyles.getStyleXf( maModel.mnStyleXfId 
).get() : 0;
-if( pStyleXf )
+if( pStyleXf  !mpStyleSheet )
 {
+rStyles.createCellStyle( maModel.mnStyleXfId );
+mpStyleSheet = rStyles.getCellStyleSheet(  maModel.mnStyleXfId );
+OSL_ENSURE( mpStyleSheet, Xf::createPattern - no parentStyle created 
);
+
 const XfModel rStyleData = pStyleXf-maModel;
 if( !maModel.mbFontUsed )
 maModel.mbFontUsed = !rStyleData.mbFontUsed || (maModel.mnFontId 
!= rStyleData.mnFontId);
@@ -2741,8 +2744,13 @@ void CellStyle::createCellStyle()
 {
 
 // #i1624# #i1768# ignore unnamed user styles
+bool bDefStyle = maModel.isDefaultStyle();
 if( !mbCreated )
+{
+if ( bDefStyle  maFinalName.isEmpty() )
+maFinalName = ScGlobal::GetRscString( STR_STYLENAME_STANDARD );
 mbCreated = maFinalName.isEmpty();
+}
 
 if( !mbCreated  !mpStyleSheet )
 {
@@ -2750,12 +2758,11 @@ void CellStyle::createCellStyle()
 Xf* pXF = getStyles().getStyleXf( maModel.mnXfId ).get();
 ::ScDocument rDoc = getScDocument();
 
-bool bDefStyle = maModel.isDefaultStyle();
 if( bDefStyle )
 {
 // use existing Default style sheet
 mpStyleSheet = static_cast ScStyleSheet* ( static_cast 
ScStyleSheetPool* ( rDoc.GetStyleSheetPool() )-Find(
-getStyles().getDefaultStyleName(), SFX_STYLE_FAMILY_PARA ) );
+ScGlobal::GetRscString( STR_STYLENAME_STANDARD ), 
SFX_STYLE_FAMILY_PARA ) );
 OSL_ENSURE( mpStyleSheet, CellStyle::createStyle - Default style 
not found );
 bCreatePattern = true;
 }
@@ -2891,16 +2898,6 @@ void CellStyleBuffer::finalizeImport()
 
 // set final names and create user-defined and modified built-in cell 
styles
 aCellStyles.forEachMemWithKey( CellStyle::finalizeImport );
-
-if (mxDefStyle)
-{
-ReferenceXNameAccess xNA(getStyleFamily(false), UNO_QUERY_THROW);
-if (xNA-hasByName(Default))
-{
-PropertySet aPropSet(xNA-getByName(Default));
-getStyles().writeStyleXfToPropertySet(aPropSet, 
mxDefStyle-getModel().mnXfId);
-}
-}
 }
 
 sal_Int32 CellStyleBuffer::getDefaultXfId() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH libreoffice-4-1] Revert Thread-safe version of osl_getGlobalTime

2013-05-22 Thread Norbert Thiebaud (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4002

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/4002/1

Revert Thread-safe version of osl_getGlobalTime

This reverts commit d8d55787b81cdc955b73c8befa4ab608f46e32aa.
and 9b76439dff638d6fd773f2b63c377c2124810a39

as the change failed to work correctly on MacOSX causing a CPU-Loop
in UpdateCheckThread::run()

Change-Id: Ide86a5b7dce9550bbc15dfe691d4ed6199a88cc3
---
M sal/osl/unx/salinit.cxx
M sal/osl/unx/time.c
M sal/osl/w32/salinit.cxx
M sal/osl/w32/time.c
4 files changed, 31 insertions(+), 83 deletions(-)



diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index c71c6a3..327ca0e 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -38,9 +38,6 @@
 
 extern C {
 
-//From time.c
-void sal_initGlobalTimer();
-
 void sal_detail_initialize(int argc, char ** argv) {
 #if defined MACOSX
 // On Mac OS X, soffice can restart itself via exec (see restartOnMac in
@@ -67,7 +64,6 @@
 close(fd);
 }
 #endif
-sal_initGlobalTimer();
 #if HAVE_SYSLOG_H
 const char *use_syslog = getenv(SAL_LOG_SYSLOG);
 sal_use_syslog = use_syslog != NULL  !strcmp(use_syslog, 1);
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index b71dd7d..c99036b 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -23,15 +23,9 @@
 #include osl/diagnose.h
 #include osl/time.h
 #include time.h
-#include assert.h
-#include unistd.h
-
-#if defined(MACOSX) || defined(IOS)
-#include mach/mach_time.h
-#endif
 
 /* FIXME: detection should be done in configure script */
-#if defined(MACOSX) || defined(IOS) || defined(FREEBSD) || defined(NETBSD) || \
+#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \
 defined(LINUX) || defined(OPENBSD) || defined(DRAGONFLY)
 #define STRUCT_TM_HAS_GMTOFF 1
 
@@ -39,36 +33,20 @@
 #define HAS_ALTZONE 1
 #endif
 
-#if defined(MACOSX) || defined(IOS)
-typedef sal_uInt64 osl_time_t;
-static double adjust_time_factor;
-#else
-#if defined(_POSIX_TIMERS)
-#define USE_CLOCK_GETTIME
-typedef struct timespec osl_time_t;
-#else
-typedef struct timeval osl_time_t;
-#endif
-#endif
-static osl_time_t startTime;
-
-
 /*--
  * osl_getSystemTime
  *-*/
 
 sal_Bool SAL_CALL osl_getSystemTime(TimeValue* tv)
 {
-#if defined(MACOSX) || defined(IOS)
-double diff = (double)(mach_absolute_time() - startTime) * 
adjust_time_factor;
-tv-Seconds = (sal_uInt32)diff;
-tv-Nanosec = (sal_uInt32)((diff - tv-Seconds) * 1e9);
-#else
 int res;
-osl_time_t tp;
-#if defined(USE_CLOCK_GETTIME)
+#if defined(LINUX)
+struct timespec tp;
+
 res = clock_gettime(CLOCK_REALTIME, tp);
 #else
+struct timeval tp;
+
 res = gettimeofday(tp, NULL);
 #endif
 
@@ -78,12 +56,12 @@
 }
 
 tv-Seconds = tp.tv_sec;
-#if defined(USE_CLOCK_GETTIME)
+#if defined(LINUX)
 tv-Nanosec = tp.tv_nsec;
 #else
 tv-Nanosec = tp.tv_usec * 1000;
 #endif
-#endif
+
 return sal_True;
 }
 
@@ -275,54 +253,28 @@
 return sal_False;
 }
 
-void sal_initGlobalTimer()
-{
-#if defined(MACOSX) || defined(IOS)
-  mach_timebase_info_data_t timebase;
-  mach_timebase_info(timebase);
-  adjust_time_factor = 1e-9 * (double)timebase.numer / 
(double)(timebase.denom);
-  startTime = mach_absolute_time();
-#else /* ! (MACOSX || IOS) */
-  int res;
-#if defined(USE_CLOCK_GETTIME)
-  res = clock_gettime(CLOCK_REALTIME, startTime);
-#else /* Ndef USE_CLOCK_GETTIME */
-  res = gettimeofday( startTime, NULL );
-#endif /* NDef USE_CLOCK_GETTIME */
-  assert(res == 0);
-  (void) res;
-#endif /* ! (MACOSX || IOS) */
-}
+
+
+static struct timeval startTime;
+static sal_Bool bGlobalTimer = sal_False;
 
 sal_uInt32 SAL_CALL osl_getGlobalTimer()
 {
-sal_uInt32 nSeconds;
+  struct timeval currentTime;
+  sal_uInt32 nSeconds;
 
-#if defined(MACOSX) || defined(IOS)
-double diff = (double)(mach_absolute_time() - startTime) * 
adjust_time_factor * 1000;
-nSeconds = (sal_uInt32)diff;
-#else
-osl_time_t currentTime;
-int res;
+  // FIXME: not thread safe !!
+  if ( bGlobalTimer == sal_False )
+  {
+  gettimeofday( startTime, NULL );
+  bGlobalTimer=sal_True;
+  }
 
-#if defined(USE_CLOCK_GETTIME)
-res = clock_gettime(CLOCK_REALTIME, currentTime);
-#else
-res = gettimeofday( currentTime, NULL );
-#endif
-assert(res == 0);
+  gettimeofday( currentTime, NULL );
 
-if (res != 0)
-return 0;
+  nSeconds = (sal_uInt32)( currentTime.tv_sec - startTime.tv_sec );
 
-nSeconds = (sal_uInt32)( currentTime.tv_sec - startTime.tv_sec );
-#if defined(USE_CLOCK_GETTIME)
-nSeconds = ( nSeconds * 1000 ) + (long) (( currentTime.tv_nsec - 
startTime.tv_nsec) / 100 );
-#else
-nSeconds = ( nSeconds * 1000 ) + (long) (( currentTime.tv_usec - 
startTime.tv_usec) / 1000 );
-#endif
-#endif
-return nSeconds;
+

[Libreoffice-commits] core.git: sd/uiconfig

2013-05-22 Thread Caolán McNamara

 sd/uiconfig/simpress/ui/masterlayoutdlg.ui |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit a83ed57808669bdb5e71305e854a2bffbf96edb7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 10:14:06 2013 +0100

use attributes, not markup for bold titles

Change-Id: Ib4fe3b2aa234ab636f1f1b222600617bb09ea806

diff --git a/sd/uiconfig/simpress/ui/masterlayoutdlg.ui 
b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui
index 40d391d..e7a82e2 100644
--- a/sd/uiconfig/simpress/ui/masterlayoutdlg.ui
+++ b/sd/uiconfig/simpress/ui/masterlayoutdlg.ui
@@ -159,13 +159,10 @@
   object class=GtkLabel id=Placeholders
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=label 
translatable=yeslt;bgt;Placeholderslt;/bgt;/property
-property name=use_markupTrue/property
-child internal-child=accessible
-  object class=AtkObject id=Placeholders-atkobject
-property name=AtkObject::accessible-name 
translatable=yesPlaceholders/property
-  /object
-/child
+property name=label 
translatable=yesPlaceholders/property
+attributes
+  attribute name=weight value=bold/
+/attributes
   /object
 /child
   /object
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] mso-dumper.git: src/docstream.py

2013-05-22 Thread Miklos Vajna

 src/docstream.py |   69 +++
 1 file changed, 34 insertions(+), 35 deletions(-)

New commits:
commit 5e13b5a103883762c9047ce2f5c49417be4690f6
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed May 22 10:10:58 2013 +0200

doc: don't try to bytes as text outside Clx

When e.g. ChpxFkp refers to byte ranges defined by offsets, we try to be
helpful and print the matching text, to see a given character property
is applied to what characters. However, it's possible that these offets
refer to picture data -- so only show these bytes as text in case they
are referred as text in Clx. fdo34222-4.doc is a reproducer for this
problem.

diff --git a/src/docstream.py b/src/docstream.py
index ee196ce..37db294 100644
--- a/src/docstream.py
+++ b/src/docstream.py
@@ -895,44 +895,35 @@ class WordDocumentStream(DOCDirStream):
 for i in fields:
 self.printAndSet(i, self.readuInt32())
 
-def __findText(self, plcPcd, cp):
-Find the largest i such that plcPcd.aCp[i] = cp.
-for i in range(len(plcPcd.aCp)):
-if plcPcd.aCp[i] = cp:
-index = i
-return index
-
-def __isOffsetCompressed(self, off):
-Is the given offset compressed?
-compressed = None
-plcPcd = self.clx.pcdt.plcPcd
-for i in range(len(plcPcd.aCp)):
-aPcd = plcPcd.aPcd[i]
-fcCompressed = aPcd.fc
-if fcCompressed.fCompressed == 1:
-offset = fcCompressed.fc/2
-else:
-offset = fcCompressed.fc
-if offset = off:
-compressed = fcCompressed.fCompressed
-return compressed
-
 def retrieveOffset(self, start, end):
 Retrieves text, defined by raw byte offsets.
 
-compressed = self.__isOffsetCompressed(start)
-if compressed == None:
-compressed = self.__isOffsetCompressed(end)
+startCp = self.__offsetToCP(start)
+endCp = self.__offsetToCP(end)
+if startCp is None or endCp is None:
+return 
+return self.retrieveCPs(startCp, endCp)
 
-if compressed == None:
-raise Exception(should not happen)
-
-if compressed:
-return globals.encodeName(self.bytes[start:end])
-else:
-return globals.encodeName(self.bytes[start:end].decode('utf-16'), 
lowOnly = True)
-
-def retrieveCP(self, cp):
+def __offsetToCP(self, offset):
+plcPcd = self.clx.pcdt.plcPcd
+for i in range(len(plcPcd.ranges)):
+start, end = plcPcd.ranges[i]
+# Count offset of the last-but-one CP, the last CP is in fact not 
included in the range.
+end -= 1
+startOffset, compressed = self.__cpToOffset(start)
+endOffset = self.__cpToOffset(end)[0]
+if compressed:
+endOffset += 1
+else:
+endOffset += 2
+if offset = startOffset and offset = endOffset:
+if compressed:
+divider = 1
+else:
+divider = 2
+return (start + ((offset - startOffset) / divider))
+
+def __cpToOffset(self, cp):
 Implements 2.4.1 Retrieving Text.
 plcPcd = self.clx.pcdt.plcPcd
 for i in range(len(plcPcd.aCp)):
@@ -941,9 +932,17 @@ class WordDocumentStream(DOCDirStream):
 aPcd = plcPcd.aPcd[index]
 fcCompressed = aPcd.fc
 if fcCompressed.fCompressed == 1:
-return globals.encodeName(self.bytes[(fcCompressed.fc/2) + (cp - 
plcPcd.aCp[index])])
+pos = (fcCompressed.fc/2) + (cp - plcPcd.aCp[index])
+return pos, True
 else:
 pos = fcCompressed.fc + 2 * (cp - plcPcd.aCp[index])
+return pos, False
+
+def retrieveCP(self, cp):
+pos, compressed = self.__cpToOffset(cp)
+if compressed:
+return globals.encodeName(self.bytes[pos])
+else:
 return globals.encodeName(self.bytes[pos:pos+2].decode('utf-16'), 
lowOnly = True)
 
 def retrieveCPs(self, start, end):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst libodfgen/ExternalPackage_libodfgen.mk

2013-05-22 Thread Fridrich Štrba

 download.lst   |2 +-
 libodfgen/ExternalPackage_libodfgen.mk |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 63e6c7408974e35e7c09efa1039c0c770f541e29
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed May 22 11:43:14 2013 +0200

Uploading libodfgen-0.0.2

Change-Id: I83ebc1a052227c6ac224018d00aab21e7d0a2eec

diff --git a/download.lst b/download.lst
index f827956..38466ab 100644
--- a/download.lst
+++ b/download.lst
@@ -68,7 +68,7 @@ export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := 
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
-export ODFGEN_TARBALL := 
d77fa4a6e3e485553e30ced8d9bb3b50-libodfgen-0.0.1.tar.bz2
+export ODFGEN_TARBALL := 
8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
 export OPENSSL_TARBALL := 
51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
 export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
diff --git a/libodfgen/ExternalPackage_libodfgen.mk 
b/libodfgen/ExternalPackage_libodfgen.mk
index 6bbe90f..bfa163f 100644
--- a/libodfgen/ExternalPackage_libodfgen.mk
+++ b/libodfgen/ExternalPackage_libodfgen.mk
@@ -10,10 +10,10 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libodfgen,libodfgen))
 
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libodfgen,inc/external/libodfgen,\
-   src/libodfgen.hxx \
-   src/OdfDocumentHandler.hxx \
-   src/OdtGenerator.hxx \
-   src/OdgGenerator.hxx \
+   inc/libodfgen/libodfgen.hxx \
+   inc/libodfgen/OdfDocumentHandler.hxx \
+   inc/libodfgen/OdtGenerator.hxx \
+   inc/libodfgen/OdgGenerator.hxx \
 ))
 
 $(eval $(call gb_ExternalPackage_use_external_project,libodfgen,libodfgen))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-05-22 Thread Caolán McNamara

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

New commits:
commit ce0adb96c5401e466b2c74cbcef62dd638362571
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 10:42:59 2013 +0100

Updated core
Project: help  0017d64c762e63fd66e8d853459343995bb86b61

diff --git a/helpcontent2 b/helpcontent2
index cfcc328..0017d64 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cfcc32824c195ca37339ef33c99a099f9b7afe1e
+Subproject commit 0017d64c762e63fd66e8d853459343995bb86b61
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

2013-05-22 Thread Caolán McNamara

 helpers/help_hid.lst |5 -
 source/text/simpress/01/03151100.xhp |   21 +++--
 2 files changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 0017d64c762e63fd66e8d853459343995bb86b61
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 10:42:59 2013 +0100

update help ids for master layout .ui conversion

Change-Id: Ia752635fba74ea24f3eb94897281984479a32b74

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index a73fe62..bbe3e95 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6816,10 +6816,6 @@ sd_CheckBox_DLG_PUBLISHING_PAGE4_CREATED,1085850700,
 sd_CheckBox_DLG_PUBLISHING_PAGE4_DOWNLOAD,1085850699,
 sd_CheckBox_DLG_PUBLISHING_PAGE5_TEXTONLY,1085850706,
 sd_CheckBox_DLG_VECTORIZE_CB_FILLHOLES,1084457985,
-sd_CheckBox_RID_SD_DLG_MASTER_LAYOUT_CB_DATE,1090143234,
-sd_CheckBox_RID_SD_DLG_MASTER_LAYOUT_CB_FOOTER,1090143237,
-sd_CheckBox_RID_SD_DLG_MASTER_LAYOUT_CB_HEADER,1090143236,
-sd_CheckBox_RID_SD_DLG_MASTER_LAYOUT_CB_PAGE_NUMBER,1090143235,
 sd_CheckBox_RID_SD_TABPAGE_HEADERFOOTER_CB_DATETIME,553255938,
 sd_CheckBox_RID_SD_TABPAGE_HEADERFOOTER_CB_FOOTER,553255946,
 sd_CheckBox_RID_SD_TABPAGE_HEADERFOOTER_CB_HEADER,553255958,
@@ -6934,7 +6930,6 @@ sd_ModalDialog_DLG_PRINTDIALOG,1104003072,
 sd_ModalDialog_DLG_PRINT_WARNINGS,1087307776,
 sd_ModalDialog_DLG_PUBLISHING,1085849600,
 sd_ModalDialog_DLG_TABLEDESIGNPANE,1417379840,
-sd_ModalDialog_RID_SD_DLG_MASTER_LAYOUT,1090142208,
 sd_MultiLineEdit_DLG_ASS_EDT_PAGE4_ASKINFORMATION,1088490011,
 sd_MultiLineEdit_DLG_PUBLISHING_PAGE4_MISC,1085852234,
 sd_NumericField_DLG_VECTORIZE_NM_LAYERS,1084463105,
diff --git a/source/text/simpress/01/03151100.xhp 
b/source/text/simpress/01/03151100.xhp
index 2f08afd..ee7832b 100644
--- a/source/text/simpress/01/03151100.xhp
+++ b/source/text/simpress/01/03151100.xhp
@@ -30,22 +30,23 @@
 /meta
 body
 section id=master
-!-- removed HID SID_MASTER_LAYOUTS_SLIDE --paragraph role=heading 
id=par_idN10537 xml-lang=en-US level=1 l10n=NEWlink 
href=text/simpress/01/03151100.xhpMaster Layout/link/paragraph
-paragraph role=paragraph id=par_idN1053B xml-lang=en-US 
l10n=CHGahelp hid=SID_MASTER_LAYOUTS_SLIDEAdds or removes header, 
footer, date, and slide number placeholders to the layout of the slide 
master./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/masterlayoutdlg/MasterLayoutDialog 
id=bm_id8343456 localize=false/
+paragraph role=heading id=par_idN10537 xml-lang=en-US level=1 
l10n=NEWlink href=text/simpress/01/03151100.xhpMaster 
Layout/link/paragraph
+paragraph role=paragraph id=par_idN1053B xml-lang=en-US 
l10n=CHGahelp 
hid=modules/simpress/ui/masterlayoutdlg/MasterLayoutDialogAdds or removes 
header, footer, date, and slide number placeholders to the layout of the slide 
master./ahelp/paragraph
 /section
 section id=howtoget
   embed href=text/simpress/00/0403.xhp#master/
 /section
 section id=placeholders
 paragraph role=heading id=par_idN1054A xml-lang=en-US level=2 
l10n=NEWPlaceholders/paragraph
-bookmark xml-lang=en-US 
branch=hid/sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_HEADER id=bm_id8343455 
localize=false/paragraph role=heading id=par_idN10556 xml-lang=en-US 
level=3 l10n=NEWHeader/paragraph
-paragraph role=paragraph id=par_idN1055A xml-lang=en-US 
l10n=CHGahelp hid=sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_HEADERAdds a 
header placeholder to the slide master for notes./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_DATE id=bm_id2532731 
localize=false/paragraph role=heading id=par_idN10571 xml-lang=en-US 
level=3 l10n=NEWDate/time/paragraph
-paragraph role=paragraph id=par_idN10575 xml-lang=en-US 
l10n=CHGahelp hid=sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_DATEAdds a 
date/time placeholder to the slide master./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_FOOTER id=bm_id3733634 
localize=false/paragraph role=heading id=par_idN1058C xml-lang=en-US 
level=3 l10n=NEWFooter/paragraph
-paragraph role=paragraph id=par_idN10590 xml-lang=en-US 
l10n=CHGahelp hid=sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_FOOTERAdds a 
footer placeholder to the slide master./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_PAGE_NUMBER 
id=bm_id2174443 localize=false/paragraph role=heading id=par_idN105A7 
xml-lang=en-US level=3 l10n=NEWSlide number/paragraph
-paragraph role=paragraph id=par_idN105AB xml-lang=en-US 
l10n=CHGahelp 
hid=sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_PAGE_NUMBERAdds a slide number 
placeholder to the slide master./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/simpress/ui/masterlayoutdlg/header id=bm_id8343455 
localize=false/paragraph role=heading id=par_idN10556 xml-lang=en-US 
level=3 l10n=NEWHeader/paragraph
+paragraph role=paragraph id=par_idN1055A xml-lang=en-US 
l10n=CHGahelp hid=modules/simpress/ui/masterlayoutdlg/headerAdds a 
header

Re: Font family case-sensitiveness

2013-05-22 Thread Stephan Bergmann


On 05/20/2013 03:35 PM, Caolán McNamara wrote:

On Sun, 2013-05-19 at 18:24 +0200, Thomas Arnhold wrote:

And maybe there is more work with GetFamilyName()..., see
79e5615fa103a52ce41ed682b624c13fd9a9d1eb.


Well, its kind of weird to have a test to see if the names are the same,
before going on to see if their foldedcase versions are the same too.
if( rFontName == GetFamilyName() ||
rFontName.equalsIgnoreAsciiCase( GetFamilyName() ) )
the OUString::equalsIgnoreAsciiCase does a (if both-share-the-ptr) opt
so I suggest you make those just into

if (rFontName.equalsIgnoreAsciiCase(GetFamilyName())) ?


I already addressed that with 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=7131fe8dd10a5b3b4e501e3379a95320313382db 
Redundant check while working my way through the commit list backlog 
ahead of working my way through the dev list backlog.


Stephan

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: harfbuzz/harfbuzz.configure.patch.1

2013-05-22 Thread Khaled Hosny

 harfbuzz/harfbuzz.configure.patch.1 |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit a2e3f7786f78234a5b5d0fe19ea715c2ad2f3ad7
Author: Khaled Hosny khaledho...@eglug.org
Date:   Wed May 22 12:04:22 2013 +0200

Blind attempt to fix HarfBuzz build

Change-Id: Iaa61bc2c82ab6bd6391c8c81951ca55c5ce133ab

diff --git a/harfbuzz/harfbuzz.configure.patch.1 
b/harfbuzz/harfbuzz.configure.patch.1
index 937a06e..c66e2b7 100644
--- a/harfbuzz/harfbuzz.configure.patch.1
+++ b/harfbuzz/harfbuzz.configure.patch.1
@@ -64,7 +64,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
  fi
  if test $have_icu_le != true; then
if test -n $ac_tool_prefix; then
-@@ -17555,7 +17555,7 @@
+@@ -17555,12 +17555,12 @@
{ $as_echo $as_me:${as_lineno-$LINENO}: checking for ICU_LE by using 
icu-config fallback 5
  $as_echo_n checking for ICU_LE by using icu-config fallback...  6; }
if test $ICU_CONFIG != no  $ICU_CONFIG --version /dev/null; 
then
@@ -73,6 +73,12 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
# We don't use --cflags as this gives us a lot of things that 
we don't
# necessarily want, like debugging and optimization flags
# See man (1) icu-config for more info.
+   ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags`
+-  ICU_LE_LIBS=`$ICU_CONFIG --ldflags-searchpath 
--ldflags-libsonly --ldflags-layout`
++  ICU_LE_LIBS=`$ICU_CONFIG --ldflags-searchpath 
--ldflags-libsonly --ldflags-layout | tr \n  `
+
+
+   { $as_echo $as_me:${as_lineno-$LINENO}: result: yes 5
 @@ -17654,7 +17654,7 @@
GRAPHITE2_LIBS=$pkg_cv_GRAPHITE2_LIBS
  { $as_echo $as_me:${as_lineno-$LINENO}: result: yes 5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] QA on - experimental features in 4.1 ...

2013-05-22 Thread Michael Meeks

Hi Stuart,

On Tue, 2013-05-21 at 15:11 +, V Stuart Foote wrote:
 And, unless I am really misreading the git logs, has been included
 in the libreoffice-4-1 branch

Glad someone's watching the logs :-)

 So while it is too soon for the 4.1 tinderboxes to verify that 

It seems pretty clear that this feature is not yet ready; so it is
currently setup like this:

+ you need to enable an experimental option in 'Advanced'
+ you have to re-start the app after toggling that
+ then you need to turn it on in the View menu ;-)

So - as with other experimental features, this is a preview. It's not
something we need to invest much, if any amount of QA effort into - I
anticipate all manner of problems with it. In general, I think we should
be focusing any manual QA we have on the default setup - interop.
issues, file format updates, bug changes, the Java wizard port, and/or
any other of the major features that people listed so far here:

http://wiki.documentfoundation.org/ReleaseNotes/4.1

We have a lot of useful new features that will get wider exposure
there. My expectation is that we'll continue to do fixes and
improvements on the sidebar past the freeze date, and it will be
available as a demo / proof-of-concept for the adventurous. There are
lots of discussion about how to properly integrate the feature into the
LibreOffice UI in a way that makes sense that havn't happened yet.
Hopefully having it as an experimental feature enables -some- of that
discussion to start.

*But* - personally, I'd rather delay that - and have a focus on QA /
bug-fixing / etc. while we go through the beta phase - and not get
distracted :-)

Does that make sense ?

ATB,

Michael.

-- 
michael.me...@suse.com  , Pseudo Engineer, itinerant idiot

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: starmath/uiconfig

2013-05-22 Thread Alia Almusaireae

 starmath/uiconfig/smath/ui/alignment.ui |  172 
 1 file changed, 172 insertions(+)

New commits:
commit 114e445e9cbb84697328421ac018ec943ed13b4f
Author: Alia Almusaireae almusair...@kacst.edu.sa
Date:   Mon May 20 10:07:47 2013 +0300

alignment.ui widget

Change-Id: I45c7351e934ebd557af0ab07767ec0b61ce2299f
Reviewed-on: https://gerrit.libreoffice.org/3970
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/starmath/uiconfig/smath/ui/alignment.ui 
b/starmath/uiconfig/smath/ui/alignment.ui
new file mode 100644
index 000..5e92705
--- /dev/null
+++ b/starmath/uiconfig/smath/ui/alignment.ui
@@ -0,0 +1,172 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=alignment
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesAlignment/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox3
+property name=can_focusFalse/property
+property name=spacing12/property
+child internal-child=action_area
+  object class=GtkButtonBox id=dialog-action_area3
+property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=layout_stylestart/property
+child
+  object class=GtkButton id=ok
+property name=labelgtk-ok/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=has_defaultTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkButton id=help
+property name=labelgtk-help/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+property name=use_stockTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position2/property
+  /packing
+/child
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=top_padding6/property
+property name=left_padding12/property
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=orientationvertical/property
+child
+  object class=GtkRadioButton id=radiobutton1
+property name=label 
translatable=yes_Left/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property

[PUSHED] alignment.ui widget

2013-05-22 Thread via Code Review

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3970

Approvals:
  Caolán McNamara: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/3970
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I45c7351e934ebd557af0ab07767ec0b61ce2299f
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Aliah Almusaireae almusair...@kacst.edu.sa
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: include/toolkit

2013-05-22 Thread Stephan Bergmann

 include/toolkit/controls/dialogcontrol.hxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 697a007c61b9cabceb9767fad87cd5822b300452
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 22 12:32:46 2013 +0200

Fix exception specifications

Change-Id: Ic2384073bba833224815582d4b9fee88c1ead782

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index 812bb3d..f92652a 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -178,21 +178,21 @@ public:
 
 
 // overrides to resolve ambiguity
-virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const 
rtl::OUString p1) throw (::com::sun::star::uno::RuntimeException)
+virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const 
rtl::OUString p1) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::getPropertyValue(p1); }
-virtual void SAL_CALL setPropertyValue(const OUString p1, const 
com::sun::star::uno::Any p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL setPropertyValue(const OUString p1, const 
com::sun::star::uno::Any p2) throw 
(com::sun::star::beans::UnknownPropertyException, 
com::sun::star::beans::PropertyVetoException, 
com::sun::star::lang::IllegalArgumentException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::setPropertyValue(p1, 
p2); }
-virtual void SAL_CALL addPropertyChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL addPropertyChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::addPropertyChangeListener(p1,
 p2); }
-virtual void SAL_CALL removePropertyChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL removePropertyChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::removePropertyChangeListener(p1,
 p2); }
-virtual void SAL_CALL addVetoableChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL addVetoableChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::addVetoableChangeListener(p1,
 p2); }
-virtual void SAL_CALL removeVetoableChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL removeVetoableChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::removeVetoableChangeListener(p1,
 p2); }
-virtual com::sun::star::uno::Referencecom::sun::star::uno::XInterface 
SAL_CALL createInstance(const OUString p1) throw 
(::com::sun::star::uno::RuntimeException)
+virtual com::sun::star::uno::Referencecom::sun::star::uno::XInterface 
SAL_CALL createInstance(const OUString p1) throw 
(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::createInstance(p1); }
-virtual com::sun::star::uno::Referencecom::sun::star::uno::XInterface 
SAL_CALL createInstanceWithArguments(const OUString p1, const 
com::sun::star::uno::Sequencecom::sun::star::uno::Any p2) throw 
(::com::sun::star::uno::RuntimeException)
+virtual

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/toolkit

2013-05-22 Thread Stephan Bergmann

 include/toolkit/controls/dialogcontrol.hxx |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 1f1b45ab5d076a77545c54ff1839b98bae53a009
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 22 12:32:46 2013 +0200

Fix exception specifications

Change-Id: Ic2384073bba833224815582d4b9fee88c1ead782
(cherry picked from commit 697a007c61b9cabceb9767fad87cd5822b300452)

diff --git a/include/toolkit/controls/dialogcontrol.hxx 
b/include/toolkit/controls/dialogcontrol.hxx
index 812bb3d..f92652a 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -178,21 +178,21 @@ public:
 
 
 // overrides to resolve ambiguity
-virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const 
rtl::OUString p1) throw (::com::sun::star::uno::RuntimeException)
+virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const 
rtl::OUString p1) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::getPropertyValue(p1); }
-virtual void SAL_CALL setPropertyValue(const OUString p1, const 
com::sun::star::uno::Any p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL setPropertyValue(const OUString p1, const 
com::sun::star::uno::Any p2) throw 
(com::sun::star::beans::UnknownPropertyException, 
com::sun::star::beans::PropertyVetoException, 
com::sun::star::lang::IllegalArgumentException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::setPropertyValue(p1, 
p2); }
-virtual void SAL_CALL addPropertyChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL addPropertyChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::addPropertyChangeListener(p1,
 p2); }
-virtual void SAL_CALL removePropertyChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL removePropertyChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XPropertyChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::removePropertyChangeListener(p1,
 p2); }
-virtual void SAL_CALL addVetoableChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL addVetoableChangeListener(const OUString p1, const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::addVetoableChangeListener(p1,
 p2); }
-virtual void SAL_CALL removeVetoableChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (::com::sun::star::uno::RuntimeException)
+virtual void SAL_CALL removeVetoableChangeListener(const OUString p1, 
const 
com::sun::star::uno::Referencecom::sun::star::beans::XVetoableChangeListener 
p2) throw (com::sun::star::beans::UnknownPropertyException, 
com::sun::star::lang::WrappedTargetException, 
com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::removeVetoableChangeListener(p1,
 p2); }
-virtual com::sun::star::uno::Referencecom::sun::star::uno::XInterface 
SAL_CALL createInstance(const OUString p1) throw 
(::com::sun::star::uno::RuntimeException)
+virtual com::sun::star::uno::Referencecom::sun::star::uno::XInterface 
SAL_CALL createInstance(const OUString p1) throw 
(com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException)
 { return 
UnoControlDialogModel_Base::ControlModelContainerBase::createInstance(p1); }
-virtual com::sun::star::uno::Referencecom::sun::star::uno::XInterface 
SAL_CALL createInstanceWithArguments(const OUString p1, const 
com::sun::star::uno::Sequencecom::sun::star::uno::Any p2) throw

[PUSHED] Use the new type-checking Reference constructor to reduce co...

2013-05-22 Thread Noel Grandin (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4001

Approvals:
  Noel Grandin: Verified; Looks good to me, approved
  LibreOffice gerrit bot: Verified


-- 
To view, visit https://gerrit.libreoffice.org/4001
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I61ad1a1d6b1c017eeb51f226d2dde0e9bb7f1752
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin noelgran...@gmail.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Noel Grandin noelgran...@gmail.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk

2013-05-22 Thread Caolán McNamara

 starmath/UIConfig_smath.mk|1 
 starmath/inc/dialog.hxx   |   15 --
 starmath/inc/helpids.h|1 
 starmath/inc/starmath.hrc |1 
 starmath/source/dialog.cxx|   56 ++-
 starmath/source/smres.src |   69 -
 starmath/uiconfig/smath/ui/alignment.ui   |  172 ---
 starmath/uiconfig/smath/ui/alignmentdialog.ui |  190 ++
 8 files changed, 215 insertions(+), 290 deletions(-)

New commits:
commit 7c04626ec7b54d8db2ff9bac19df75dd668ad8f7
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 11:27:10 2013 +0100

adapt code to alignment dialog .ui conversion

Change-Id: I8a64ddc076e177deaa61a450716d7d3dd8043303

diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index 9fe1f8f..83a127a 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/smath,\
 ))
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
+   starmath/uiconfig/smath/ui/alignmentdialog \
starmath/uiconfig/smath/ui/printeroptions \
 ))
 
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ac0508f..34511b9 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -271,20 +271,15 @@ public:
 
 class SmAlignDialog : public ModalDialog
 {
-RadioButton  aLeft;
-RadioButton  aCenter;
-RadioButton  aRight;
-FixedLineaFixedLine1;
-OKButton aOKButton1;
-HelpButton   aHelpButton1;
-CancelButton aCancelButton1;
-PushButton   aDefaultButton;
+RadioButton* m_pLeft;
+RadioButton* m_pCenter;
+RadioButton* m_pRight;
+PushButton*  m_pDefaultButton;
 
 DECL_LINK(DefaultButtonClickHdl, Button *);
-DECL_LINK(HelpButtonClickHdl, Button *);
 
 public:
-SmAlignDialog(Window *pParent, bool bFreeRes = true);
+SmAlignDialog(Window *pParent);
 
 void ReadFrom(const SmFormat rFormat);
 void WriteTo (SmFormat rFormat) const;
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 6d7f7bb..34fd0db 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -23,7 +23,6 @@
 #define HID_SMA_FONTSIZEDIALOG
STARMATH_HID_SMA_FONTSIZEDIALOG
 #define HID_SMA_FONTTYPEDIALOG
STARMATH_HID_SMA_FONTTYPEDIALOG
 #define HID_SMA_DISTANCEDIALOG
STARMATH_HID_SMA_DISTANCEDIALOG
-#define HID_SMA_ALIGNDIALOG   
STARMATH_HID_SMA_ALIGNDIALOG
 #define HID_SMA_SYMBOLDIALOG  
STARMATH_HID_SMA_SYMBOLDIALOG
 #define HID_SMA_SYMDEFINEDIALOG   
STARMATH_HID_SMA_SYMDEFINEDIALOG
 #define HID_SMA_WIN_DOCUMENT  
STARMATH_HID_SMA_WIN_DOCUMENT
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index a9bfbfa..c9dc005 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -85,7 +85,6 @@
 #define RID_FONTSIZEDIALOG  (RID_APP_START + 3)
 #define RID_FONTTYPEDIALOG  (RID_APP_START + 4)
 #define RID_DISTANCEDIALOG  (RID_APP_START + 5)
-#define RID_ALIGNDIALOG (RID_APP_START + 6)
 #define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
 #define RID_SYMBOLDIALOG(RID_APP_START + 8)
 #define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 005b41a..435911a 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -1077,33 +1077,15 @@ IMPL_LINK( SmAlignDialog, DefaultButtonClickHdl, Button 
*, EMPTYARG /*pButton*/
 }
 
 
-IMPL_LINK( SmAlignDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
+SmAlignDialog::SmAlignDialog(Window * pParent)
+: ModalDialog(pParent, AlignmentDialog,
+modules/smath/ui/alignmentdialog.ui)
 {
-// start help system
-Help* pHelp = Application::GetHelp();
-if( pHelp )
-{
-pHelp-Start( OUString( HID_SMA_ALIGNDIALOG ), aHelpButton1 );
-}
-return 0;
-}
-
-SmAlignDialog::SmAlignDialog(Window * pParent, bool bFreeRes)
-: ModalDialog(pParent, SmResId(RID_ALIGNDIALOG)),
-aLeft  (this, SmResId(1)),
-aCenter(this, SmResId(2)),
-aRight (this, SmResId(3)),
-aFixedLine1(this, SmResId(1)),
-aOKButton1 (this, SmResId(1)),
-aHelpButton1   (this, SmResId(1)),
-aCancelButton1 (this, SmResId(1)),
-aDefaultButton (this, SmResId(1))
-{
-if (bFreeRes)
-FreeResource();
-
-aDefaultButton.SetClickHdl(LINK(this, SmAlignDialog, 
DefaultButtonClickHdl));
-aHelpButton1.SetClickHdl(LINK(this, SmAlignDialog, HelpButtonClickHdl));
+get(m_pLeft, left);
+get(m_pCenter, center);
+get(m_pRight, right);
+get(m_pDefaultButton, default);
+

[Libreoffice-commits] core.git: helpcontent2

2013-05-22 Thread Caolán McNamara

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

New commits:
commit 36ea135d9b9cfbe34de364d32af52d8c9a0ace92
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 11:48:35 2013 +0100

Updated core
Project: help  2221e87b7de87cba44f8166d59949b30e6e8870b

diff --git a/helpcontent2 b/helpcontent2
index 0017d64..2221e87 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0017d64c762e63fd66e8d853459343995bb86b61
+Subproject commit 2221e87b7de87cba44f8166d59949b30e6e8870b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

2013-05-22 Thread Caolán McNamara

 helpers/help_hid.lst  |5 -
 source/text/smath/01/0504.xhp |   20 ++--
 2 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 2221e87b7de87cba44f8166d59949b30e6e8870b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 11:48:35 2013 +0100

update helpids for alignment dialog .ui conversion

Change-Id: I47d64daf90d6224a2180169ab7accf1a55bafd50

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index bbe3e95..226e299 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3508,7 +3508,6 @@ HID_SMA_ABSX,63130,
 HID_SMA_ACUTEX,63204,
 HID_SMA_ALEPH,63255,
 HID_SMA_ALIGNCX,63253,
-HID_SMA_ALIGNDIALOG,63030,
 HID_SMA_ALIGNLX,63252,
 HID_SMA_ALIGNRX,63254,
 HID_SMA_ARCCOSX,63143,
@@ -7118,7 +7117,6 @@ 
starmath_MetricField_RID_PRINTOPTIONPAGE_MF_ZOOM,864672280,
 starmath_ModalDialog_RID_FONTDIALOG,1401454592,
 starmath_ModalDialog_RID_SYMBOLDIALOG,1401552896,
 starmath_ModalDialog_RID_SYMDEFINEDIALOG,1401569280,
-starmath_PushButton_RID_ALIGNDIALOG_1,1401524737,
 starmath_PushButton_RID_DISTANCEDIALOG_1,1401508353,
 starmath_PushButton_RID_FONTSIZEDIALOG_1,1401475585,
 starmath_PushButton_RID_FONTTYPEDIALOG_2,1401491970,
@@ -7128,9 +7126,6 @@ starmath_PushButton_RID_SYMBOLDIALOG_3,1401557507,
 starmath_PushButton_RID_SYMDEFINEDIALOG_1,1401573889,
 starmath_PushButton_RID_SYMDEFINEDIALOG_2,1401573890,
 starmath_PushButton_RID_SYMDEFINEDIALOG_3,1401573891,
-starmath_RadioButton_RID_ALIGNDIALOG_1,1401520641,
-starmath_RadioButton_RID_ALIGNDIALOG_2,1401520642,
-starmath_RadioButton_RID_ALIGNDIALOG_3,1401520643,
 starmath_RadioButton_RID_PRINTOPTIONPAGE_RB_FIT_TO_PAGE,864666134,
 starmath_RadioButton_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE,864666133,
 starmath_RadioButton_RID_PRINTOPTIONPAGE_RB_ZOOM,864666135,
diff --git a/source/text/smath/01/0504.xhp 
b/source/text/smath/01/0504.xhp
index 8cb58b4..5e61b34 100644
--- a/source/text/smath/01/0504.xhp
+++ b/source/text/smath/01/0504.xhp
@@ -28,22 +28,22 @@
 body
 
 
-  bookmark branch=index xml-lang=en-US 
id=bm_id3148730bookmark_valuealigning; multi-line 
formulas/bookmark_valuebookmark_valuemulti-line formulas; 
aligning/bookmark_value/bookmarkbookmark branch=hid/.uno:ChangeAlignment 
xml-lang=en-US id=bm_id3145596 localize=false/paragraph role=heading 
level=1 id=hd_id3148730 l10n=U xml-lang=en-US 
oldref=1Alignment/paragraph
-  paragraph l10n=U role=paragraph id=par_id3152999 xml-lang=en-US 
oldref=2variable id=ausrichtungtextahelp hid=SID_ALIGN 
visibility=visibleYou can define the alignment of multi-line formulas as 
well as formulas with several elements in one line./ahelp Create multi-line 
formulas by entering a emphNEWLINE/emph command in the 
emphCommands/emph window./variable/paragraph
+  bookmark branch=index xml-lang=en-US 
id=bm_id3148730bookmark_valuealigning; multi-line 
formulas/bookmark_valuebookmark_valuemulti-line formulas; 
aligning/bookmark_value/bookmarkbookmark branch=hid/.uno:ChangeAlignment 
xml-lang=en-US id=bm_id3145596 localize=false/bookmark 
branch=hid/modules/smath/ui/alignmentdialog/AlignmentDialog xml-lang=en-US 
id=bm_id3145596 localize=false/paragraph role=heading level=1 
id=hd_id3148730 l10n=U xml-lang=en-US oldref=1Alignment/paragraph
+  paragraph l10n=U role=paragraph id=par_id3152999 xml-lang=en-US 
oldref=2variable id=ausrichtungtextahelp 
hid=modules/smath/ui/alignmentdialog/AlignmentDialog visibility=visibleYou 
can define the alignment of multi-line formulas as well as formulas with 
several elements in one line./ahelp Create multi-line formulas by entering a 
emphNEWLINE/emph command in the emphCommands/emph 
window./variable/paragraph
   section id=howtoget
   embed href=text/smath/00/0004.xhp#fmtarg/
 /section
   paragraph role=heading level=2 id=hd_id3153737 l10n=U 
xml-lang=en-US oldref=3Horizontal/paragraph
   paragraph role=paragraph id=par_id3148388 l10n=U xml-lang=en-US 
oldref=4Specifies the type of horizontal alignment for multi-line 
formulas./paragraph
-  bookmark branch=hid/starmath:RadioButton:RID_ALIGNDIALOG:1 
xml-lang=en-US id=bm_id3156063 localize=false/paragraph role=heading 
level=3 id=hd_id3148768 l10n=U xml-lang=en-US 
oldref=5Left/paragraph
-  paragraph l10n=U role=paragraph id=par_id3150566 xml-lang=en-US 
oldref=6ahelp hid=STARMATH:RADIOBUTTON:RID_ALIGNDIALOG:1 
visibility=visibleAligns the selected elements of a formula to the 
left./ahelp/paragraph
+  bookmark branch=hid/modules/smath/ui/alignmentdialog/left 
xml-lang=en-US id=bm_id3156063 localize=false/paragraph role=heading 
level=3 id=hd_id3148768 l10n=U xml-lang=en-US 
oldref=5Left/paragraph
+  paragraph l10n=U role=paragraph id=par_id3150566 xml-lang=en-US 
oldref=6ahelp hid=modules/smath/ui/alignmentdialog/left 
visibility=visibleAligns the selected elements of a formula to the 
left./ahelp/paragraph
   paragraph role=tip id=par_id3149709 l10n=U xml-lang=en-US 
oldref=21Text is always aligned left. /paragraph
-  bookmark

[Libreoffice-commits] core.git: solenv/bin solenv/gdb

2013-05-22 Thread Thorsten Behrens

 solenv/bin/install-gdb-printers   |4 
 solenv/gdb/libreoffice/basegfx.py |  170 ++
 2 files changed, 173 insertions(+), 1 deletion(-)

New commits:
commit eed0e18b21cc807b40217d8f4adbfd376cb5d475
Author: Thorsten Behrens tbehr...@suse.com
Date:   Wed May 22 12:33:06 2013 +0200

Add gdb pretty-printers for basegfx

First cut - polygons and B2DRange covered.

Change-Id: I042bff8c3fa5c889a926d450090494e2e20f76b1

diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index e55e305..6201e0c 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -157,13 +157,14 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
 fi
 
 if [[ -n ${MERGELIBS} ]]; then
-make_autoload merged program libmergedlo.$DYLIB merge svl tl `[[ 
${MERGELIBS} == ALL ]]  echo sw`
+make_autoload merged program libmergedlo.$DYLIB merge svl tl basegfx `[[ 
${MERGELIBS} == ALL ]]  echo sw`
 if [[ ${MERGELIBS} == ALL ]]; then
 make_autoload urelibs ure-link/lib liburelibs.$DYLIB merge cppu sal
 else
 make_autoload cppu ure-link/lib libuno_cppu.$DYLIB.3
 make_autoload sal ure-link/lib libuno_sal.$DYLIB.3
 make_autoload sw program libswlo.$DYLIB
+make_autoload basegfx program libbasegfxlo.$DYLIB
 fi
 else
 make_autoload cppu ure-link/lib libuno_cppu.$DYLIB.3
@@ -171,6 +172,7 @@ else
 make_autoload svl program libsvllo.$DYLIB
 make_autoload tl program libtllo.$DYLIB
 make_autoload sw program libswlo.$DYLIB
+make_autoload basegfx program libbasegfxlo.$DYLIB
 fi
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/gdb/libreoffice/basegfx.py 
b/solenv/gdb/libreoffice/basegfx.py
new file mode 100644
index 000..10381c1
--- /dev/null
+++ b/solenv/gdb/libreoffice/basegfx.py
@@ -0,0 +1,170 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+import gdb
+
+from libreoffice.util import printing
+
+class B2DRangePrinter(object):
+'''Prints a B2DRange object.'''
+
+def __init__(self, typename, value):
+self.typename = typename
+self.value = value
+# inject children() func dynamically
+if not self._isEmpty():
+self.children = self._children
+
+def to_string(self):
+if self._isEmpty():
+return empty %s % (self.typename)
+else:
+return %s % (self.typename)
+
+def _isEmpty(self):
+return (self.value['maRangeX']['mnMinimum']  
self.value['maRangeX']['mnMaximum']
+or self.value['maRangeY']['mnMinimum']  
self.value['maRangeY']['mnMaximum'])
+
+def _children(self):
+left = self.value['maRangeX']['mnMinimum']
+top = self.value['maRangeY']['mnMinimum']
+right = self.value['maRangeX']['mnMaximum']
+bottom = self.value['maRangeY']['mnMaximum']
+children = [('left', left), ('top', top), ('right', right), ('bottom', 
bottom)]
+return children.__iter__()
+
+class B2DPolygonPrinter(object):
+'''Prints a B2DPolygon object.'''
+
+def __init__(self, typename, value):
+self.typename = typename
+self.value = value
+# inject children() func dynamically
+if not self._isEmpty():
+self.children = self._children
+
+def to_string(self):
+if self._isEmpty():
+return empty %s % (self.typename)
+else:
+return %s %s % ('bezier curve' if self._hasCurves() else 
'straight line',
+  self.typename)
+
+def _count(self):
+return int(gdb.parse_and_eval(
+'((basegfx::B2DPolygon*)%d)-count()' % self.value.address))
+
+def _isEmpty(self):
+return self._count() == 0
+
+def _hasCurves(self):
+return int(gdb.parse_and_eval(
+'((basegfx::B2DPolygon*)%d)-areControlPointsUsed()' % 
self.value.address)) != 0
+
+def _children(self):
+if self._hasCurves():
+return self._bezierIterator(self._count(), self.value)
+else:
+return self._plainIterator(self._count(), self.value)
+
+class _plainIterator(object):
+def __init__(self, count, value):
+self.count = count
+self.value = value
+self.index = 0
+
+def __iter__(self):
+return self
+
+def next(self):
+if self.index = self.count:
+raise StopIteration()
+currPoint = gdb.parse_and_eval(
+'((basegfx::B2DPolygon*)%d)-getB2DPoint(%d)' % (
+  self.value.address, self.index))
+currPoint = gdb.parse_and_eval(
+

[Libreoffice-commits] core.git: xmloff/source

2013-05-22 Thread Tor Lillqvist

 xmloff/source/core/DomExport.cxx|2 +-
 xmloff/source/script/XMLEventExport.cxx |3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2dec489ebb75030ffaeaa6daf7d42472e23a5eb6
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed May 22 14:48:36 2013 +0300

WaE: function will cause runtime stack overflow

Revert misguided changes from 6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37
that obviously would cause endless recursion if these functions were
ever entered.

Thanks to MSVC2012 for the nice warning.

Change-Id: I8504aa8ac141164ec6e026cc4fa873f8273f92bd

diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx
index ca1190d..7e87c62 100644
--- a/xmloff/source/core/DomExport.cxx
+++ b/xmloff/source/core/DomExport.cxx
@@ -129,7 +129,7 @@ void visitNode( DomVisitor rVisitor, const 
ReferenceXNode xNode )
 
 void visit( DomVisitor rVisitor, const ReferenceXDocument xDocument )
 {
-visit( rVisitor, xDocument );
+visit( rVisitor, ReferenceXNode( xDocument, UNO_QUERY_THROW ) );
 }
 
 void visit( DomVisitor rVisitor, const ReferenceXNode xNode )
diff --git a/xmloff/source/script/XMLEventExport.cxx 
b/xmloff/source/script/XMLEventExport.cxx
index 4ddde6e..e619d96 100644
--- a/xmloff/source/script/XMLEventExport.cxx
+++ b/xmloff/source/script/XMLEventExport.cxx
@@ -106,7 +106,8 @@ void XMLEventExport::Export( ReferenceXEventsSupplier  
rSupplier,
 void XMLEventExport::Export( ReferenceXNameReplace  rReplace,
  sal_Bool bWhitespace)
 {
-Export(rReplace, bWhitespace);
+ReferenceXNameAccess xAccess(rReplace, UNO_QUERY);
+Export(xAccess, bWhitespace);
 }
 
 void XMLEventExport::Export( ReferenceXNameAccess  rAccess,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/aqua vcl/coretext vcl/generic vcl/source vcl/win

2013-05-22 Thread Jonathan Schultz

 vcl/aqua/source/gdi/atsui/salatslayout.cxx |   11 +++
 vcl/coretext/salcoretextlayout.cxx |4 
 vcl/generic/print/genpspgraphics.cxx   |2 +-
 vcl/source/gdi/pdfwriter_impl.cxx  |6 +++---
 vcl/source/gdi/sallayout.cxx   |8 ++--
 vcl/source/glyphs/graphite_layout.cxx  |   20 +++-
 vcl/win/source/gdi/winlayout.cxx   |   14 ++
 7 files changed, 58 insertions(+), 7 deletions(-)

New commits:
commit 0b70e4ea4fcf0adccdfdf4886e5cc45d46479692
Author: Jonathan Schultz jonat...@imatix.com
Date:   Wed May 22 14:08:12 2013 +0200

fdo#62846 incorrect glyph to Unicode mappings in PDFs

Change-Id: Idebc7f69f95d8f72626373475d8611ea68f1483a

diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx 
b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index 1b9776e..e99d276 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -619,6 +619,17 @@ int ATSLayout::GetNextGlyphs( int nLen, sal_GlyphId* 
pGlyphIDs, Point rPos, int
 break;
 }
 
+// update returned index-into-string array
+if( pCharIndexes )
+{
+int nCharPos;
+if( mpGlyphs2Chars )
+nCharPos = mpGlyphs2Chars[nStart];
+else
+nCharPos = nStart + mnMinCharPos;
+*(pCharIndexes++) = nCharPos;
+}
+
 return nCount;
 }
 
diff --git a/vcl/coretext/salcoretextlayout.cxx 
b/vcl/coretext/salcoretextlayout.cxx
index d2c2d48..12c2035 100644
--- a/vcl/coretext/salcoretextlayout.cxx
+++ b/vcl/coretext/salcoretextlayout.cxx
@@ -447,6 +447,10 @@ int CoreTextLayout::GetNextGlyphs( int nLen, sal_GlyphId* 
pGlyphIDs, Point rPos
 nStart += 1;
 }
 
+if( pCharIndexes ) {
+pCharIndexes[i] = mpGlyphs2Chars[mnCurrentGlyphIndex];
+}
+
 SAL_INFO( vcl.coretext.layout, GetNextGlyphs() returning   i );
 
 return i;
diff --git a/vcl/generic/print/genpspgraphics.cxx 
b/vcl/generic/print/genpspgraphics.cxx
index 10af660..344ff3f 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -731,7 +731,7 @@ static void DrawPrinterLayout( const SalLayout rLayout, 
::psp::PrinterGfx rGfx
 sal_Int32   aWidthAry[ nMaxGlyphs ];
 sal_Int32   aIdxAry  [ nMaxGlyphs ];
 sal_Unicode aUnicodes[ nMaxGlyphs ];
-int aCharPosAry [ nMaxGlyphs ];
+int aCharPosAry [ nMaxGlyphs+1 ];
 
 Point aPos;
 long nUnitsPerPixel = rLayout.GetUnitsPerPixel();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 3c7b186..4e84f07 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7619,7 +7619,7 @@ void PDFWriterImpl::drawLayout( SalLayout rLayout, const 
String rText, bool bT
 std::vectorsal_Ucs aUnicodes;
 aUnicodes.reserve( nMaxGlyphs );
 sal_Int32 pUnicodesPerGlyph[nMaxGlyphs];
-int pCharPosAry[nMaxGlyphs];
+int pCharPosAry[nMaxGlyphs+1];
 sal_Int32 nAdvanceWidths[nMaxGlyphs];
 const PhysicalFontFace* pFallbackFonts[nMaxGlyphs];
 bool bVertical = m_aCurrentPDFState.m_aFont.IsVertical();
@@ -7768,14 +7768,14 @@ void PDFWriterImpl::drawLayout( SalLayout rLayout, 
const String rText, bool bT
 aUnicodes.push_back( rText.GetChar( 
sal::static_int_castxub_StrLen(pCharPosAry[i]) ) );
 pUnicodesPerGlyph[i] = 1;
 // try to handle ligatures and such
-if( i  nGlyphs-1 )
+if( i  nGlyphs )
 {
 nChars = pCharPosAry[i+1] - pCharPosAry[i];
 // #i115618# fix for simple RTL+CTL cases
 // TODO: sanitize for RTL ligatures, more complex CTL, etc.
 if( nChars  0 )
 nChars = -nChars;
-else if( nChars == 0 )
+else if( nChars == 0 )
 nChars = 1;
 pUnicodesPerGlyph[i] = nChars;
 for( int n = 1; n  nChars; n++ )
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 6955679..705b8cc 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1427,7 +1427,11 @@ int GenericSalLayout::GetNextGlyphs( int nLen, 
sal_GlyphId* pGlyphs, Point rPos
 nOldFlags = pG-mnGlyphIndex; // GF_FLAGMASK not needed for test above
 }
 
-aRelativePos.X() /= mnUnitsPerPixel;
+// Calculate final pCharPosAry item
+if( pCharPosAry )
+*pCharPosAry = pG-mnCharPos;
+
+aRelativePos.X() /= mnUnitsPerPixel;
 aRelativePos.Y() /= mnUnitsPerPixel;
 rPos = GetDrawPosition( aRelativePos );
 
@@ -1675,7 +1679,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs rArgs )
 // prepare merge sort
 int nStartOld[ MAX_FALLBACK ];
 int nStartNew[ MAX_FALLBACK ];
-int nCharPos[ MAX_FALLBACK ];
+int nCharPos[ MAX_FALLBACK+1 ];

[Libreoffice-commits] core.git: sd/source

2013-05-22 Thread Tor Lillqvist

 sd/source/ui/dlg/masterlayoutdlg.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d19421db942cd08cc378e1b4dfea583f9bd5cd79
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed May 22 15:11:17 2013 +0300

WaE: unsafe mix of type 'bool' and type 'sal_Bool'

Change-Id: Ief8e7c0fe01809b6059aa85a4cc8d2ba713f902a

diff --git a/sd/source/ui/dlg/masterlayoutdlg.cxx 
b/sd/source/ui/dlg/masterlayoutdlg.cxx
index e080822..21aa64b 100644
--- a/sd/source/ui/dlg/masterlayoutdlg.cxx
+++ b/sd/source/ui/dlg/masterlayoutdlg.cxx
@@ -86,7 +86,7 @@ void MasterLayoutDialog::applyChanges()
 {
 mpDoc-BegUndo(GetText());
 
-if( (mpCurrentPage-GetPageKind() != PK_STANDARD)  (mbOldHeader != 
mpCBHeader-IsChecked() ) )
+if( (mpCurrentPage-GetPageKind() != PK_STANDARD)  (mbOldHeader != 
(bool) mpCBHeader-IsChecked() ) )
 {
 if( mbOldHeader )
 remove( PRESOBJ_HEADER );
@@ -94,7 +94,7 @@ void MasterLayoutDialog::applyChanges()
 create( PRESOBJ_HEADER );
 }
 
-if( mbOldFooter != mpCBFooter-IsChecked() )
+if( mbOldFooter != (bool) mpCBFooter-IsChecked() )
 {
 if( mbOldFooter )
 remove( PRESOBJ_FOOTER );
@@ -102,7 +102,7 @@ void MasterLayoutDialog::applyChanges()
 create( PRESOBJ_FOOTER );
 }
 
-if( mbOldDate != mpCBDate-IsChecked() )
+if( mbOldDate != (bool) mpCBDate-IsChecked() )
 {
 if( mbOldDate )
 remove( PRESOBJ_DATETIME );
@@ -110,7 +110,7 @@ void MasterLayoutDialog::applyChanges()
 create( PRESOBJ_DATETIME );
 }
 
-if( mbOldPageNumber != mpCBPageNumber-IsChecked() )
+if( mbOldPageNumber != (bool) mpCBPageNumber-IsChecked() )
 {
 if( mbOldPageNumber )
 remove( PRESOBJ_SLIDENUMBER );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: vcl/aqua vcl/coretext vcl/generic vcl/source vcl/win

2013-05-22 Thread Tor Lillqvist

 vcl/aqua/source/gdi/atsui/salatslayout.cxx |   11 ---
 vcl/coretext/salcoretextlayout.cxx |4 
 vcl/generic/print/genpspgraphics.cxx   |2 +-
 vcl/source/gdi/pdfwriter_impl.cxx  |6 +++---
 vcl/source/gdi/sallayout.cxx   |8 ++--
 vcl/source/glyphs/graphite_layout.cxx  |   20 +---
 vcl/win/source/gdi/winlayout.cxx   |   14 --
 7 files changed, 7 insertions(+), 58 deletions(-)

New commits:
commit d664f279602ae6ea9275b222f3f33634aeec97b3
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Wed May 22 15:30:36 2013 +0300

Revert fdo#62846 incorrect glyph to Unicode mappings in PDFs

Breaks the build for Windows: vcl/win/source/gdi/winlayout.cxx(1897) :
error C2065: 'nCharPos' : undeclared identifier

This reverts commit 0b70e4ea4fcf0adccdfdf4886e5cc45d46479692.

diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx 
b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index e99d276..1b9776e 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -619,17 +619,6 @@ int ATSLayout::GetNextGlyphs( int nLen, sal_GlyphId* 
pGlyphIDs, Point rPos, int
 break;
 }
 
-// update returned index-into-string array
-if( pCharIndexes )
-{
-int nCharPos;
-if( mpGlyphs2Chars )
-nCharPos = mpGlyphs2Chars[nStart];
-else
-nCharPos = nStart + mnMinCharPos;
-*(pCharIndexes++) = nCharPos;
-}
-
 return nCount;
 }
 
diff --git a/vcl/coretext/salcoretextlayout.cxx 
b/vcl/coretext/salcoretextlayout.cxx
index 12c2035..d2c2d48 100644
--- a/vcl/coretext/salcoretextlayout.cxx
+++ b/vcl/coretext/salcoretextlayout.cxx
@@ -447,10 +447,6 @@ int CoreTextLayout::GetNextGlyphs( int nLen, sal_GlyphId* 
pGlyphIDs, Point rPos
 nStart += 1;
 }
 
-if( pCharIndexes ) {
-pCharIndexes[i] = mpGlyphs2Chars[mnCurrentGlyphIndex];
-}
-
 SAL_INFO( vcl.coretext.layout, GetNextGlyphs() returning   i );
 
 return i;
diff --git a/vcl/generic/print/genpspgraphics.cxx 
b/vcl/generic/print/genpspgraphics.cxx
index 344ff3f..10af660 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -731,7 +731,7 @@ static void DrawPrinterLayout( const SalLayout rLayout, 
::psp::PrinterGfx rGfx
 sal_Int32   aWidthAry[ nMaxGlyphs ];
 sal_Int32   aIdxAry  [ nMaxGlyphs ];
 sal_Unicode aUnicodes[ nMaxGlyphs ];
-int aCharPosAry [ nMaxGlyphs+1 ];
+int aCharPosAry [ nMaxGlyphs ];
 
 Point aPos;
 long nUnitsPerPixel = rLayout.GetUnitsPerPixel();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 4e84f07..3c7b186 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -7619,7 +7619,7 @@ void PDFWriterImpl::drawLayout( SalLayout rLayout, const 
String rText, bool bT
 std::vectorsal_Ucs aUnicodes;
 aUnicodes.reserve( nMaxGlyphs );
 sal_Int32 pUnicodesPerGlyph[nMaxGlyphs];
-int pCharPosAry[nMaxGlyphs+1];
+int pCharPosAry[nMaxGlyphs];
 sal_Int32 nAdvanceWidths[nMaxGlyphs];
 const PhysicalFontFace* pFallbackFonts[nMaxGlyphs];
 bool bVertical = m_aCurrentPDFState.m_aFont.IsVertical();
@@ -7768,14 +7768,14 @@ void PDFWriterImpl::drawLayout( SalLayout rLayout, 
const String rText, bool bT
 aUnicodes.push_back( rText.GetChar( 
sal::static_int_castxub_StrLen(pCharPosAry[i]) ) );
 pUnicodesPerGlyph[i] = 1;
 // try to handle ligatures and such
-if( i  nGlyphs )
+if( i  nGlyphs-1 )
 {
 nChars = pCharPosAry[i+1] - pCharPosAry[i];
 // #i115618# fix for simple RTL+CTL cases
 // TODO: sanitize for RTL ligatures, more complex CTL, etc.
 if( nChars  0 )
 nChars = -nChars;
-else if( nChars == 0 )
+else if( nChars == 0 )
 nChars = 1;
 pUnicodesPerGlyph[i] = nChars;
 for( int n = 1; n  nChars; n++ )
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 705b8cc..6955679 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1427,11 +1427,7 @@ int GenericSalLayout::GetNextGlyphs( int nLen, 
sal_GlyphId* pGlyphs, Point rPos
 nOldFlags = pG-mnGlyphIndex; // GF_FLAGMASK not needed for test above
 }
 
-// Calculate final pCharPosAry item
-if( pCharPosAry )
-*pCharPosAry = pG-mnCharPos;
-
-aRelativePos.X() /= mnUnitsPerPixel;
+aRelativePos.X() /= mnUnitsPerPixel;
 aRelativePos.Y() /= mnUnitsPerPixel;
 rPos = GetDrawPosition( aRelativePos );
 
@@ -1679,7 +1675,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs rArgs )
 // prepare merge sort

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sal/osl

2013-05-22 Thread Norbert Thiebaud

 sal/osl/unx/salinit.cxx |4 --
 sal/osl/unx/time.c  |   94 +++-
 sal/osl/w32/salinit.cxx |4 --
 sal/osl/w32/time.c  |   12 --
 4 files changed, 31 insertions(+), 83 deletions(-)

New commits:
commit ac769f929d3e26bd9804789e9ef0bd20080fe4a7
Author: Norbert Thiebaud nthieb...@gmail.com
Date:   Wed May 22 04:08:57 2013 -0500

Revert Thread-safe version of osl_getGlobalTime

This reverts commit d8d55787b81cdc955b73c8befa4ab608f46e32aa.
and 9b76439dff638d6fd773f2b63c377c2124810a39

as the change failed to work correctly on MacOSX causing a CPU-Loop
in UpdateCheckThread::run()

Change-Id: Ide86a5b7dce9550bbc15dfe691d4ed6199a88cc3
Reviewed-on: https://gerrit.libreoffice.org/4002
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/sal/osl/unx/salinit.cxx b/sal/osl/unx/salinit.cxx
index c71c6a3..327ca0e 100644
--- a/sal/osl/unx/salinit.cxx
+++ b/sal/osl/unx/salinit.cxx
@@ -38,9 +38,6 @@ extern bool sal_use_syslog;
 
 extern C {
 
-//From time.c
-void sal_initGlobalTimer();
-
 void sal_detail_initialize(int argc, char ** argv) {
 #if defined MACOSX
 // On Mac OS X, soffice can restart itself via exec (see restartOnMac in
@@ -67,7 +64,6 @@ void sal_detail_initialize(int argc, char ** argv) {
 close(fd);
 }
 #endif
-sal_initGlobalTimer();
 #if HAVE_SYSLOG_H
 const char *use_syslog = getenv(SAL_LOG_SYSLOG);
 sal_use_syslog = use_syslog != NULL  !strcmp(use_syslog, 1);
diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index b71dd7d..c99036b 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -23,15 +23,9 @@
 #include osl/diagnose.h
 #include osl/time.h
 #include time.h
-#include assert.h
-#include unistd.h
-
-#if defined(MACOSX) || defined(IOS)
-#include mach/mach_time.h
-#endif
 
 /* FIXME: detection should be done in configure script */
-#if defined(MACOSX) || defined(IOS) || defined(FREEBSD) || defined(NETBSD) || \
+#if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \
 defined(LINUX) || defined(OPENBSD) || defined(DRAGONFLY)
 #define STRUCT_TM_HAS_GMTOFF 1
 
@@ -39,36 +33,20 @@
 #define HAS_ALTZONE 1
 #endif
 
-#if defined(MACOSX) || defined(IOS)
-typedef sal_uInt64 osl_time_t;
-static double adjust_time_factor;
-#else
-#if defined(_POSIX_TIMERS)
-#define USE_CLOCK_GETTIME
-typedef struct timespec osl_time_t;
-#else
-typedef struct timeval osl_time_t;
-#endif
-#endif
-static osl_time_t startTime;
-
-
 /*--
  * osl_getSystemTime
  *-*/
 
 sal_Bool SAL_CALL osl_getSystemTime(TimeValue* tv)
 {
-#if defined(MACOSX) || defined(IOS)
-double diff = (double)(mach_absolute_time() - startTime) * 
adjust_time_factor;
-tv-Seconds = (sal_uInt32)diff;
-tv-Nanosec = (sal_uInt32)((diff - tv-Seconds) * 1e9);
-#else
 int res;
-osl_time_t tp;
-#if defined(USE_CLOCK_GETTIME)
+#if defined(LINUX)
+struct timespec tp;
+
 res = clock_gettime(CLOCK_REALTIME, tp);
 #else
+struct timeval tp;
+
 res = gettimeofday(tp, NULL);
 #endif
 
@@ -78,12 +56,12 @@ sal_Bool SAL_CALL osl_getSystemTime(TimeValue* tv)
 }
 
 tv-Seconds = tp.tv_sec;
-#if defined(USE_CLOCK_GETTIME)
+#if defined(LINUX)
 tv-Nanosec = tp.tv_nsec;
 #else
 tv-Nanosec = tp.tv_usec * 1000;
 #endif
-#endif
+
 return sal_True;
 }
 
@@ -275,54 +253,28 @@ sal_Bool SAL_CALL osl_getSystemTimeFromLocalTime( 
TimeValue* pLocalTimeVal, Time
 return sal_False;
 }
 
-void sal_initGlobalTimer()
-{
-#if defined(MACOSX) || defined(IOS)
-  mach_timebase_info_data_t timebase;
-  mach_timebase_info(timebase);
-  adjust_time_factor = 1e-9 * (double)timebase.numer / 
(double)(timebase.denom);
-  startTime = mach_absolute_time();
-#else /* ! (MACOSX || IOS) */
-  int res;
-#if defined(USE_CLOCK_GETTIME)
-  res = clock_gettime(CLOCK_REALTIME, startTime);
-#else /* Ndef USE_CLOCK_GETTIME */
-  res = gettimeofday( startTime, NULL );
-#endif /* NDef USE_CLOCK_GETTIME */
-  assert(res == 0);
-  (void) res;
-#endif /* ! (MACOSX || IOS) */
-}
+
+
+static struct timeval startTime;
+static sal_Bool bGlobalTimer = sal_False;
 
 sal_uInt32 SAL_CALL osl_getGlobalTimer()
 {
-sal_uInt32 nSeconds;
+  struct timeval currentTime;
+  sal_uInt32 nSeconds;
 
-#if defined(MACOSX) || defined(IOS)
-double diff = (double)(mach_absolute_time() - startTime) * 
adjust_time_factor * 1000;
-nSeconds = (sal_uInt32)diff;
-#else
-osl_time_t currentTime;
-int res;
+  // FIXME: not thread safe !!
+  if ( bGlobalTimer == sal_False )
+  {
+  gettimeofday( startTime, NULL );
+  bGlobalTimer=sal_True;
+  }
 
-#if defined(USE_CLOCK_GETTIME)
-res = clock_gettime(CLOCK_REALTIME, currentTime);
-#else
-res = gettimeofday( currentTime, NULL );
-#endif
-assert(res == 0);
+  gettimeofday( currentTime, NULL );
 
-if

[Libreoffice-commits] core.git: chart2/source offapi/com

2013-05-22 Thread Noel Grandin

 chart2/source/model/main/Title.cxx |8 
 chart2/source/model/main/Title.hxx |8 
 offapi/com/sun/star/chart2/XTitle2.idl |5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 03c3cd90930d6fb7d0f498e4b21871b1746d9b2d
Author: Noel Grandin n...@peralex.com
Date:   Wed May 22 14:34:28 2013 +0200

fix maybevoid attributes

..from commit d256dbede60533369d1aac64cca34721183f6a8a
Convert chart2::Title service to new style

Change-Id: Ib4b8a9126f1042c7d0b8cc07505444f25fe9c55a

diff --git a/chart2/source/model/main/Title.cxx 
b/chart2/source/model/main/Title.cxx
index 5eb9686..70db368 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -386,18 +386,18 @@ double Title::getPropertyDouble(const OUString 
aPropertyName) throw (css::uno::
return b;
 }
 
-awt::Size Title::getReferencePageSize() throw(css::uno::RuntimeException)
+beans::Optionalawt::Size Title::getReferencePageSize() 
throw(css::uno::RuntimeException)
 {
uno::Any any = getPropertyValue(ReferencePageSize);
-   awt::Size b;
+   beans::Optionalawt::Size b;
any = b;
return b;
 }
 
-chart2::RelativePosition Title::getRelativePosition() 
throw(css::uno::RuntimeException)
+beans::Optionalchart2::RelativePosition Title::getRelativePosition() 
throw(css::uno::RuntimeException)
 {
uno::Any any = getPropertyValue(RelativePosition);
-   chart2::RelativePosition b;
+   beans::Optionalchart2::RelativePosition b;
any = b;
return b;
 }
diff --git a/chart2/source/model/main/Title.hxx 
b/chart2/source/model/main/Title.hxx
index 32c7c17..62a2e0cd 100644
--- a/chart2/source/model/main/Title.hxx
+++ b/chart2/source/model/main/Title.hxx
@@ -89,11 +89,11 @@ public:
 { return getPropertyBool(StackCharacters); }
 virtual void SAL_CALL setStackCharacters(sal_Bool p1) 
throw(css::uno::RuntimeException)
 { setPropertyBool(StackCharacters, p1); }
-virtual com::sun::star::chart2::RelativePosition SAL_CALL 
getRelativePosition() throw(css::uno::RuntimeException);
-virtual void SAL_CALL setRelativePosition(const 
com::sun::star::chart2::RelativePosition p1) throw(css::uno::RuntimeException)
+virtual css::beans::Optionalcom::sun::star::chart2::RelativePosition 
SAL_CALL getRelativePosition() throw(css::uno::RuntimeException);
+virtual void SAL_CALL setRelativePosition(const 
css::beans::Optionalcss::chart2::RelativePosition p1) 
throw(css::uno::RuntimeException)
 { setPropertyValue(RelativePosition, css::uno::Any(p1)); }
-virtual com::sun::star::awt::Size SAL_CALL getReferencePageSize() 
throw(css::uno::RuntimeException);
-virtual void SAL_CALL setReferencePageSize(const 
com::sun::star::awt::Size p1) throw(css::uno::RuntimeException)
+virtual css::beans::Optionalcom::sun::star::awt::Size SAL_CALL 
getReferencePageSize() throw(css::uno::RuntimeException);
+virtual void SAL_CALL setReferencePageSize(const 
css::beans::Optionalcss::awt::Size p1) throw(css::uno::RuntimeException)
 { setPropertyValue(ReferencePageSize, css::uno::Any(p1)); }
 
 
diff --git a/offapi/com/sun/star/chart2/XTitle2.idl 
b/offapi/com/sun/star/chart2/XTitle2.idl
index d993f75..64019d2 100644
--- a/offapi/com/sun/star/chart2/XTitle2.idl
+++ b/offapi/com/sun/star/chart2/XTitle2.idl
@@ -23,6 +23,7 @@
 #include com/sun/star/chart2/XTitle.idl
 #include com/sun/star/chart2/RelativePosition.idl
 #include com/sun/star/beans/XPropertySet.idl
+#include com/sun/star/beans/Optional.idl
 #include com/sun/star/drawing/LineProperties.idl
 #include com/sun/star/drawing/FillProperties.idl
 //FIXME does not exist com/sun/star/layout/LayoutElement.idl
@@ -67,7 +68,7 @@ interface XTitle2
 pIf a relative position is given the title is not automatically 
placed,
 but instead is placed relative on the page./p
  */
-[attribute] ::com::sun::star::chart2::RelativePosition RelativePosition;
+[attribute] 
::com::sun::star::beans::Optional::com::sun::star::chart2::RelativePosition 
RelativePosition;
 
 
 /** contains the size of the page at the time when properties were
@@ -76,7 +77,7 @@ interface XTitle2
 pThis way it is possible to resize objects (like text) in
 the view without modifying the model./p
  */
-[attribute]  com::sun::star::awt::Size   ReferencePageSize;
+[attribute]  ::com::sun::star::beans::Optionalcom::sun::star::awt::Size  
 ReferencePageSize;
 };
 
 }; }; }; };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED libreoffice-4-1] Revert Thread-safe version of osl_getGlobalTime

2013-05-22 Thread Norbert Thiebaud (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4002

Approvals:
  Norbert Thiebaud: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4002
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ide86a5b7dce9550bbc15dfe691d4ed6199a88cc3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: framework/source

2013-05-22 Thread Noel Grandin

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

New commits:
commit 9fa7dd98ccf91a2862f4c61d5d94aff2a1bbe4bf
Author: Noel Grandin n...@peralex.com
Date:   Wed May 22 15:46:15 2013 +0200

fix Mac build

Change-Id: I7870cabf5a241d5255f0b2a6cf995c17b664fd27

diff --git a/framework/source/dispatch/closedispatcher.cxx 
b/framework/source/dispatch/closedispatcher.cxx
index 2ff7916..6a87dfb 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -388,7 +388,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
 // get quickstart service
 try
 {
-css::uno::Reference css::beans::XFastPropertySet  xSet( 
xSMGR-createInstance(IMPLEMENTATIONNAME_QUICKLAUNCHER), 
css::uno::UNO_QUERY_THROW );
+css::uno::Reference css::beans::XFastPropertySet  xSet( 
xContext-getServiceManager()-createInstanceWithContext(IMPLEMENTATIONNAME_QUICKLAUNCHER,
 xContext), css::uno::UNO_QUERY_THROW );
 if( xSet.is() )
 {
 css::uno::Any aVal( xSet-getFastPropertyValue( 0 ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dictionaries

2013-05-22 Thread Andras Timar

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

New commits:
commit e535c1333e5ab25e125e131bd38d94706f78dbe3
Author: Andras Timar ati...@suse.com
Date:   Wed May 22 14:50:18 2013 +0200

Updated core
Project: dictionaries  70970c63ec62b2fefac614f648a90c0e4162d38e

diff --git a/dictionaries b/dictionaries
index 04713be..70970c6 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 04713bee714f746dd599e5ef81b783e17e7d57b2
+Subproject commit 70970c63ec62b2fefac614f648a90c0e4162d38e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-1' - gd_GB/description.xml

2013-05-22 Thread Andras Timar

 gd_GB/description.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 70970c63ec62b2fefac614f648a90c0e4162d38e
Author: Andras Timar ati...@suse.com
Date:   Wed May 22 14:50:18 2013 +0200

restore gd_GB dictionary description

Change-Id: I543e84d00bdae4c6d4f709a2fb3661e213b02029

diff --git a/gd_GB/description.xml b/gd_GB/description.xml
index a82ad2f..7652d36 100644
--- a/gd_GB/description.xml
+++ b/gd_GB/description.xml
@@ -26,7 +26,7 @@
 entry for each language it implements and one default English entry.
 The default entry is the one listed first. --
 display-name
-name lang=enScottish Gaelic spell checker/name
+name lang=en-USScottish Gaelic spelling dictionary/name
 /display-name
 
 !-- Dictionaries should work with all platforms... --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dictionaries

2013-05-22 Thread Andras Timar

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

New commits:
commit d003010030b0ca5b828d1c6bf02be6dd350375f2
Author: Andras Timar ati...@suse.com
Date:   Wed May 22 14:50:18 2013 +0200

Updated core
Project: dictionaries  5f7183ff8e2358287bd99b64d7036475f1f0ff6a

diff --git a/dictionaries b/dictionaries
index 09bd32f7..5f7183f 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 09bd32f75110b15e6be8a7bfc116535cead5682b
+Subproject commit 5f7183ff8e2358287bd99b64d7036475f1f0ff6a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: gd_GB/description.xml

2013-05-22 Thread Andras Timar

 gd_GB/description.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5f7183ff8e2358287bd99b64d7036475f1f0ff6a
Author: Andras Timar ati...@suse.com
Date:   Wed May 22 14:50:18 2013 +0200

restore gd_GB dictionary description

Change-Id: I543e84d00bdae4c6d4f709a2fb3661e213b02029

diff --git a/gd_GB/description.xml b/gd_GB/description.xml
index a82ad2f..7652d36 100644
--- a/gd_GB/description.xml
+++ b/gd_GB/description.xml
@@ -26,7 +26,7 @@
 entry for each language it implements and one default English entry.
 The default entry is the one listed first. --
 display-name
-name lang=enScottish Gaelic spell checker/name
+name lang=en-USScottish Gaelic spelling dictionary/name
 /display-name
 
 !-- Dictionaries should work with all platforms... --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] selectively disable applications from the suite

2013-05-22 Thread David Ostrovsky (via Code Review)

David Ostrovsky has abandoned this change.

Change subject: selectively disable applications from the suite
..


Patch Set 4: Abandoned

there are problems with tests with this approach

-- 
To view, visit https://gerrit.libreoffice.org/2778
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I7141f0bdedb398eca7f31a1d5c66f009056f4d23
Gerrit-PatchSet: 4
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com
Gerrit-Reviewer: Riccardo Magliocchetti riccardo.magliocche...@gmail.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sal/inc sd/source

2013-05-22 Thread Jürgen Schmidt

 sal/inc/sal/mathconf.h   |4 
 sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |1 +
 2 files changed, 5 insertions(+)

New commits:
commit e4b7f5d47ec26b9f96b612f13c87e2b80b281291
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Wed May 22 12:39:38 2013 +

fix isfinite error for gcc on MacOS

diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index f60d757..ae1ecb9 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -56,7 +56,11 @@ extern C {
 
 /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
 #if defined(__GNUC__)
+#if defined(MACOSX)
+#define SAL_MATH_FINITE(d) finite(d)
+#else
 #define SAL_MATH_FINITE(d) __builtin_isfinite(d) // gcc bug 14608
+#endif
 #elif defined(__STDC__)
 // isfinite() should be available in math.h according to 
C99,C++99,SUSv3,etc.
 // unless GCC bug 14608 hits us where cmath undefines isfinite as macro
commit a3d234a12b037327688d4743c82f76da732ec70e
Author: Andre Fischer a...@apache.org
Date:   Wed May 22 12:22:32 2013 +

i122354: Fix notification of slide change when caused by slide sorter key 
event.

diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx 
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index e0bf682..ea434b0 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -446,6 +446,7 @@ void SelectionFunction::NotifyDragFinished (void)
 sal_Bool SelectionFunction::KeyInput (const KeyEvent rEvent)
 {
 view::SlideSorterView::DrawLock aDrawLock (mrSlideSorter);
+PageSelector::BroadcastLock aBroadcastLock (mrSlideSorter);
 PageSelector::UpdateLock aLock (mrSlideSorter);
 FocusManager rFocusManager (mrController.GetFocusManager());
 sal_Bool bResult = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: liborcus/UnpackedTarball_liborcus.mk liborcus/visibility.patch

2013-05-22 Thread Stephan Bergmann

 liborcus/UnpackedTarball_liborcus.mk |4 
 liborcus/visibility.patch|   11 +++
 2 files changed, 15 insertions(+)

New commits:
commit 913ba61d008c6629272ba3df8d22dbff0e2dc4f9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 22 16:09:33 2013 +0200

Make liborcus -fvisibility setting consistent with LO one

Esp. since LO links against a liborcus.a, this would otherwise cause linker
warnings like

  ld: warning: direct access in orcus::orcus_xml::read_file(char const*) to
  global weak symbol boost::unordered_detail::prime_list_templateunsigned
  long::value means the weak symbol cannot be overridden at runtime. This 
was
  likely caused by different translation units being compiled with different
  visibility settings.

on Mac OS X (where HAVE_GCC_VISIBILITY_FEATURE is unset).

Change-Id: I6f09b61aa77b6d5c3f8b53407d8faff4fb3bb8a1

diff --git a/liborcus/UnpackedTarball_liborcus.mk 
b/liborcus/UnpackedTarball_liborcus.mk
index e43144d..cb61573 100644
--- a/liborcus/UnpackedTarball_liborcus.mk
+++ b/liborcus/UnpackedTarball_liborcus.mk
@@ -26,6 +26,10 @@ ifeq ($(OS),MACOSX)
 liborcus_patches += liborcus_0.1.0-tac.patch
 endif
 
+ifneq ($(HAVE_GCC_VISIBILITY_FEATURE),TRUE)
+liborcus_patches += visibility.patch
+endif
+
 # https://gitorious.org/orcus/orcus/merge_requests/2#
 # f60d6eecee72349993a392a9a63ddf3383d3b8c8-
 # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2:
diff --git a/liborcus/visibility.patch b/liborcus/visibility.patch
new file mode 100644
index 000..a5af639
--- /dev/null
+++ b/liborcus/visibility.patch
@@ -0,0 +1,11 @@
+--- configure
 configure
+@@ -3211,7 +3211,7 @@
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS 5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-CXXFLAGS=$CXXFLAGS -O2 -fvisibility=hidden -Wall
++CXXFLAGS=$CXXFLAGS -O2 -Wall
+ 
+ # ===
+ # Find required base packages
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.1.0.0.beta1'

2013-05-22 Thread Petr Mladek

Tag 'libreoffice-4.1.0.0.beta1' created by Petr Mladek pmla...@suse.cz at 
2013-05-22 15:12 -0700

Tag libreoffice-4.1.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRnNJHAAoJEPQ0oe+v7q6jo58QAKlrPHIn4cOQKhHMr5+0nYsq
N3eqo8BobJRNOUKS4pLZ7ClLS1DxUJh1KCdozJkL+aofOuJotp6DzLDJoKuWZyDZ
9v46WAaBiV6/hyEHiq6Sk2BBwDWzGER3GDa0sbSVPxkSOZ8WIzvkYxhTh1iukJfL
4SWCYIeCPGl28SGEQ8us9qt9t+KMrIUWNWmgCe4mSdDcKWkQit7FbeV9e/bld62x
hFOyiLaDdx/MXP+CcKwvNdOJDZ5JYSPDElVKvQn1b/Eo6OTcnEYMPUMi5yxUdFBA
3A2/EdSb/8X0vMSNAN9JPCsoIEboW4af2ZHGbH9Gy0lCgqcLsp3VjDZg+5kuqR2r
MZautTSLrDx9IreJyf/VECyLsvdMkZV+JQnEW71oizxDcM/lfB0Z2s7FBV9XdI1r
+ekdytciuzXtHahay3OTxaqMQtVZRqOHbTm+aYEyGv9JkLWuggG/zkhXFJ1qVjiH
E5tleATXDt6jeZKnKxV1aTSRxziVz8xsA7sdsW9jN4rtMQt/2/FeZZ8dPXmpMjkq
QjPGwOXtggQTRVrpzbHbPmezDKWcqpfww12YuS5b8NzKIiZ/SfjtL6+1lx5M7xTJ
s3UtomLUUq9JzLKKh7c+brIP/mu0WrOs/Ijbbrd9aqfAQ3kXgZ6dert68cHC2F/0
3tNfZJXGxVV5t6w6L//I
=n/Uq
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.1.0.0.beta1'

2013-05-22 Thread Petr Mladek

Tag 'libreoffice-4.1.0.0.beta1' created by Petr Mladek pmla...@suse.cz at 
2013-05-22 15:12 -0700

Tag libreoffice-4.1.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRnNJHAAoJEPQ0oe+v7q6jjNQP/0x4rhoR2ttcyoKdNqFDeLhe
WAwFQAfZi7gyJGjKQ3SzQO4ysqI9BRMW7Q+5tzeKaEC5wOTb42rqyUyb79d2auOH
z1DYekke1lOcpktDkG4ElHWAqtR2Cf+Wu5vO+KzkqS4AXw4VDzVNkY4mG00fDDWK
YAlBobKilihy68aZ53SrDvM5Eh/7HpdhMTlcSB6B8PkYQDEen1xlxleJNcSFBjNc
wcTtcM6MJVppE3twWw4BTzLm5ycVKZPs1Mh/k1z90puk6LfAClX5M5pUSho6Q/Z1
Z1YUlmXq5EzYT34NWLL0uem+lN2hgHC7qa7kmIYeQ5ImakuZLw5+4zZ9lE+s4R0P
ghlt6TfKjCBU5cwE96/LwloRtwbMiGybj1AWTDSMod+z9bFTQF8pJ7zdkAvjni7w
dOkubrK8edJwgVr5v9MI5010BSLtbdrGQn3PLBACQEEL9CNwjjzQBNk/MkzsWuZU
wj6c/iRlWmblf9Fb+oG2PPIrm99x9NmLtXMaT9mrmJMv/wfId9QQnUh6+IqZmolw
9506cmXuP6Fw5/pOdn0yn3GVOgDrJ1DHjuS/x/KwxwGDwTdh1Y3aHPBkQAiki/Z8
KcwHH9L5cuTprB59n+LbewyhT+DQxe2aL9Guz3K1AyWfeSKCAkMh6lyaA2zddjJQ
JTc7g/CC1a0PklO5YPda
=aJ0c
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-2:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.1.0.0.beta1'

2013-05-22 Thread Petr Mladek

Tag 'libreoffice-4.1.0.0.beta1' created by Petr Mladek pmla...@suse.cz at 
2013-05-22 15:12 -0700

Tag libreoffice-4.1.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRnNJHAAoJEPQ0oe+v7q6jIVMP/243kUH8z8lF1/S4WEr2EutL
ZeCh7WbnAzQDEyFQbPYiKHkdowHs14A/YGB7axWQDYgWOkY5zyJWEnfiC0SjpHcp
IaycTHH/OKOFYIMCo+ZfHzHdY2Hi9q4cb3rtehG+/mlaBfw9lWw+lRF9egdR7dRo
5YxVwuqeOtEkIjgxUHrYcQdFdcB5lFkLjFJPwbxFTr2chRk8p/rdew0lWlC/WFfF
h86N1GQ94P108tZtuJPfyIPhYpAmkPWA58OHhuipZvsR2Glo5KpM+5hpBq2QUYoz
8XOW6zoppud0FgpO7UtPXd6o3+WUDrkIbyQ7+ES1e3nCo8cSxo2akPxhMhLleWVo
uRPkPOS4woR6Nkg0b+5SMRAOPJRRsB3z32ClOKuo4TZm2dowoKpVfoR6789kw8bG
y/W4oxmmbikrfZmt5mFtR5cdanf60K9/cPLvRLVanYWc29YFsuRP35rqjPrO4gQS
Iu3HiaBn17GeOKlHrFgyn/gqjNept3ffZ0ojbg1OLNBhbXwruYL0KlVQFChVYstS
k7PLf/f+7blYLwDAccnrhbFuIX2XZSwdYNBjPqsVdsBh2MFOKV5PuD8XhODAuLL6
l6ny1bqhZWVty/uIPrJpGLQF1usDT7SltPs9a2nTn2qXoDfdYFBm0R9sKi3wc0St
Z9SPcm/r6p52awaJe9L1
=8rS+
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.1.0.0.beta1'

2013-05-22 Thread Petr Mladek

Tag 'libreoffice-4.1.0.0.beta1' created by Petr Mladek pmla...@suse.cz at 
2013-05-22 15:12 -0700

Tag libreoffice-4.1.0.0.beta1
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iQIcBAABAgAGBQJRnNJHAAoJEPQ0oe+v7q6jHeMP/1hoqys8fTdkKjDixaj7PLjz
rSEIe83jndbg4xhN3Mpxv1kehxjHZlAlIJcd9zZkM0xvz1ei8/WbWlyYH1XS3E8K
UMz+MSeP+H0/GBI3Jtu91Mo3Q7RxNqAO1QfbuupomVouLaPHGn6YeSGyoHG4YZDm
x5Y/Hr+IpWqQ1fd+cweop+EhM5BLc0lj84rOlJI8Hx0JzfZtAf6e8WLNByeDJANM
nDm71/a8+IzZNnVkoE/pq5nHUYYkCf6XfeJvJf5xg3oHcV2Lwlzj3TPinYh9ke2d
O8kzWt3bmV0tzhfHyCQ50npHMqjS4f+CeNYHBzJKJqoOIJY2XnRkY2a6VvNJIkAA
RikbtPR03HEN7y0qNxBgp8m45lvfVzULVsJcSg+/JZa6Pl/5ju1hDc9t+14/p1qA
/h2B4REzsGBMwhpuE2zZn1VDh5l4Sjwu7GgSQ1YWRuv8MM6TDbLzOjWrb4ei2dz+
HnzkgjquoMBED1pJZxhUlJTO/JjBGObL58D40Ep4ZLU9o7N5//VLuUn+RVajxdQC
OB2HD01ybVwO94/qPmdW6scA1qXHdIYGlr5folhMoM3eP6QsJFZm6mPwb+pg9no3
lXt3T94F5Y+oeyQuzfkN48Gcl1hBBVtMX/D9/rkoHylwxf26XL3Dpb94qR5yhcvc
8Yawsn3zOqGVn7maNi6k
=7l2g
-END PGP SIGNATURE-

Changes since libreoffice-4-1-branch-point-66:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/gbuild

2013-05-22 Thread Stephan Bergmann

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

New commits:
commit 65da24773fffea4e4bc81adfa265378064186488
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 22 16:16:03 2013 +0200

Be more picky about Mac OS X linker warnings

...useful for cases like 913ba61d008c6629272ba3df8d22dbff0e2dc4f9 Make 
liborcus
-fvisibility setting consistent with LO one.

Feel free to revert if it causes trouble, though.  (I was only able to test 
it
with a 10.7 build, not a 10.6 baseline one.)

Change-Id: Ic8e57cd917ef186f4dec8d876fc8da6d6db57b3d

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index eb03018..1da614b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -91,6 +91,7 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
 gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
 
 gb_LinkTarget_LDFLAGS := \
+   -Wl,-fatal_warnings \
$(SOLARLIB) \
 #man ld says: obsolete -Wl,-multiply_defined,suppress \
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: forms/source

2013-05-22 Thread Stephan Bergmann

 forms/source/component/FormattedFieldWrapper.cxx |1 +
 forms/source/component/Grid.cxx  |2 ++
 forms/source/richtext/richtextmodel.cxx  |1 +
 3 files changed, 4 insertions(+)

New commits:
commit ea2f06d7884f2b765394bff8a1e935f67f6c961d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 22 16:19:33 2013 +0200

Ensure SolarMutex is locked at DBG_TESTSOLARMUTEX checkpoints

f218110744cbb2ec79796d886042546e47334cca Get rid of
GlobalEditData::GetStdRefDevice() causes DBG_TESTSOLARMUTEX failures like

13 signal handler called
14 0x00396e035ba5 in raise () from /lib64/libc.so.6
15 0x00396e037358 in abort () from /lib64/libc.so.6
16 0x00396e02e972 in __assert_fail_base () from /lib64/libc.so.6
17 0x00396e02ea22 in __assert_fail () from /lib64/libc.so.6
18 0x2ee6e42f in ImplDbgTestSolarMutex () at 
vcl/source/app/dbggui.cxx:1750
19 0x2e21cf1b in DbgFunc (nAction=15, pParam=0x0) at 
tools/source/debug/debug.cxx:1118
20 0x2f12bbb5 in DbgTestSolarMutex () at include/tools/debug.hxx:295
21 0x2f151d4f in OutputDevice::ImplGetGraphics 
(this=0x2aab342127c0) at vcl/source/gdi/outdev.cxx:554
22 0x2f1562e9 in OutputDevice::DrawRect (this=0x2aab342127c0, 
rRect=Rectangle = {...}) at vcl/source/gdi/outdev.cxx:1665
23 0x2f14dc53 in OutputDevice::ImplDrawColorWallpaper 
(this=0x2aab342127c0, nX=0, nY=0, nWidth=1, nHeight=1, rWallpaper=...) at 
vcl/source/gdi/outdev6.cxx:775
24 0x2f14f68c in OutputDevice::ImplDrawWallpaper 
(this=0x2aab342127c0, nX=0, nY=0, nWidth=1, nHeight=1, rWallpaper=...) at 
vcl/source/gdi/outdev6.cxx:1080
25 0x2f14fa4c in OutputDevice::Erase (this=0x2aab342127c0) at 
vcl/source/gdi/outdev6.cxx:1141
26 0x2f2a8802 in VirtualDevice::ImplInitVirDev 
(this=0x2aab342127c0, pOutDev=0x2d93230, nDX=1, nDY=1, nBitCount=0, pData=0x0) 
at vcl/source/gdi/virdev.cxx:113
27 0x2f2a8a6e in VirtualDevice::VirtualDevice (this=0x2aab342127c0, 
nBitCount=0) at vcl/source/gdi/virdev.cxx:135
28 0x2aaacee3e6a1 in ImpEditEngine::SetRefDevice (this=0x2aab34212040, 
pRef=0x0) at editeng/source/editeng/impedit2.cxx:193
29 0x2aaacee3ddf7 in ImpEditEngine::ImpEditEngine (this=0x2aab34212040, 
pEE=0x2aab34211fe0, pItemPool=0x2aab34210780) at 
editeng/source/editeng/impedit2.cxx:154
30 0x2aaacedeec95 in EditEngine::EditEngine (this=0x2aab34211fe0, 
pItemPool=0x2aab34210780) at editeng/source/editeng/editeng.cxx:104
31 0x2aaaf63acf10 in frm::RichTextEngine::RichTextEngine 
(this=0x2aab34211fe0, _pPool=0x2aab34210780) at 
forms/source/richtext/richtextengine.cxx:102
32 0x2aaaf63ac8ea in frm::RichTextEngine::Create () at 
forms/source/richtext/richtextengine.cxx:52
33 0x2aaaf63bd661 in frm::ORichTextModel::ORichTextModel 
(this=0x2aab394e5728, _rxFactory=uno::Reference to (cppuhelper::ServiceManager 
*) 0x2aaabc565260) at forms/source/richtext/richtextmodel.cxx:68
34 0x2aaaf63c00e3 in frm::ORichTextModel::Create 
(_rxFactory=uno::Reference to (cppuhelper::ServiceManager *) 0x2aaabc565260) at 
forms/source/richtext/richtextmodel.cxx:242
35 0x2b81054e in 
cppu::OSingleFactoryHelper::createInstanceEveryTime (this=0x2aaaf5d3d070, 
xContext=uno::Reference to (cppu::ComponentContext *) 0x2aaabc54ef58) at 
cppuhelper/source/factory.cxx:171
36 0x2b810765 in 
cppu::OSingleFactoryHelper::createInstanceWithContext (this=0x2aaaf5d3d070, 
xContext=uno::Reference to (cppu::ComponentContext *) 0x2aaabc54ef58) at 
cppuhelper/source/factory.cxx:203
37 0x2b8111bf in 
cppu::OFactoryComponentHelper::createInstanceWithContext (this=0x2aaaf5d3d008, 
xContext=uno::Reference to (cppu::ComponentContext *) 0x2aaabc54ef58) at 
cppuhelper/source/factory.cxx:432
38 0x2b865ee6 in 
cppuhelper::ServiceManager::createInstanceWithContext (this=0x2aaabc565208, 
aServiceSpecifier=com.sun.star.form.component.RichTextControl, 
Context=uno::Reference to (cppu::ComponentContext *) 0x2aaabc54ef58) at 
cppuhelper/source/servicemanager.cxx:796
39 0x2b865990 in cppuhelper::ServiceManager::createInstance 
(this=0x2aaabc565208, 
aServiceSpecifier=com.sun.star.form.component.RichTextControl) at 
cppuhelper/source/servicemanager.cxx:745
40 0x2aaaf62db43d in frm::OControlModel::OControlModel 
(this=0x2aaaf5a5e408, _rxFactory=uno::Reference to (cppuhelper::ServiceManager 
*) 0x2aaabc565260, 
_rUnoControlModelTypeName=com.sun.star.form.component.RichTextControl, 
rDefault=com.sun.star.form.control.TextField, _bSetDelegator=0 '\000') at 
forms/source/component/FormComponent.cxx:598
41 0x2aaaf62def21 in frm::OBoundControlModel::OBoundControlModel 
(this=0x2aaaf5a5e408, _rxFactory=uno::Reference to (cppuhelper::ServiceManager 
*) 0x2aaabc565260, 
_rUnoControlModelTypeName=com.sun.star.form.component.RichTextControl,

[PUSHED] Ensure SolarMutex is locked at DBG_TESTSOLARMUTEX checkpoint...

2013-05-22 Thread Stephan Bergmann (via Code Review)

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3894


-- 
To view, visit https://gerrit.libreoffice.org/3894
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I017acf2886b813adb4d44562c5f1e22dd24aa884
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-1] Ensure SolarMutex is locked at DBG_TESTSOLARMUTEX checkpoint...

2013-05-22 Thread Stephan Bergmann (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4003

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/4003/1

Ensure SolarMutex is locked at DBG_TESTSOLARMUTEX checkpoints

f218110744cbb2ec79796d886042546e47334cca Get rid of
GlobalEditData::GetStdRefDevice() causes DBG_TESTSOLARMUTEX failures like

13 signal handler called
14 0x00396e035ba5 in raise () from /lib64/libc.so.6
15 0x00396e037358 in abort () from /lib64/libc.so.6
16 0x00396e02e972 in __assert_fail_base () from /lib64/libc.so.6
17 0x00396e02ea22 in __assert_fail () from /lib64/libc.so.6
18 0x2ee6e42f in ImplDbgTestSolarMutex () at 
vcl/source/app/dbggui.cxx:1750
19 0x2e21cf1b in DbgFunc (nAction=15, pParam=0x0) at 
tools/source/debug/debug.cxx:1118
20 0x2f12bbb5 in DbgTestSolarMutex () at include/tools/debug.hxx:295
21 0x2f151d4f in OutputDevice::ImplGetGraphics (this=0x2aab342127c0) at 
vcl/source/gdi/outdev.cxx:554
22 0x2f1562e9 in OutputDevice::DrawRect (this=0x2aab342127c0, 
rRect=Rectangle = {...}) at vcl/source/gdi/outdev.cxx:1665
23 0x2f14dc53 in OutputDevice::ImplDrawColorWallpaper 
(this=0x2aab342127c0, nX=0, nY=0, nWidth=1, nHeight=1, rWallpaper=...) at 
vcl/source/gdi/outdev6.cxx:775
24 0x2f14f68c in OutputDevice::ImplDrawWallpaper (this=0x2aab342127c0, 
nX=0, nY=0, nWidth=1, nHeight=1, rWallpaper=...) at 
vcl/source/gdi/outdev6.cxx:1080
25 0x2f14fa4c in OutputDevice::Erase (this=0x2aab342127c0) at 
vcl/source/gdi/outdev6.cxx:1141
26 0x2f2a8802 in VirtualDevice::ImplInitVirDev (this=0x2aab342127c0, 
pOutDev=0x2d93230, nDX=1, nDY=1, nBitCount=0, pData=0x0) at 
vcl/source/gdi/virdev.cxx:113
27 0x2f2a8a6e in VirtualDevice::VirtualDevice (this=0x2aab342127c0, 
nBitCount=0) at vcl/source/gdi/virdev.cxx:135
28 0x2aaacee3e6a1 in ImpEditEngine::SetRefDevice (this=0x2aab34212040, 
pRef=0x0) at editeng/source/editeng/impedit2.cxx:193
29 0x2aaacee3ddf7 in ImpEditEngine::ImpEditEngine (this=0x2aab34212040, 
pEE=0x2aab34211fe0, pItemPool=0x2aab34210780) at 
editeng/source/editeng/impedit2.cxx:154
30 0x2aaacedeec95 in EditEngine::EditEngine (this=0x2aab34211fe0, 
pItemPool=0x2aab34210780) at editeng/source/editeng/editeng.cxx:104
31 0x2aaaf63acf10 in frm::RichTextEngine::RichTextEngine 
(this=0x2aab34211fe0, _pPool=0x2aab34210780) at 
forms/source/richtext/richtextengine.cxx:102
32 0x2aaaf63ac8ea in frm::RichTextEngine::Create () at 
forms/source/richtext/richtextengine.cxx:52
33 0x2aaaf63bd661 in frm::ORichTextModel::ORichTextModel 
(this=0x2aab394e5728, _rxFactory=uno::Reference to (cppuhelper::ServiceManager 
*) 0x2aaabc565260) at forms/source/richtext/richtextmodel.cxx:68
34 0x2aaaf63c00e3 in frm::ORichTextModel::Create (_rxFactory=uno::Reference 
to (cppuhelper::ServiceManager *) 0x2aaabc565260) at 
forms/source/richtext/richtextmodel.cxx:242
35 0x2b81054e in cppu::OSingleFactoryHelper::createInstanceEveryTime 
(this=0x2aaaf5d3d070, xContext=uno::Reference to (cppu::ComponentContext *) 
0x2aaabc54ef58) at cppuhelper/source/factory.cxx:171
36 0x2b810765 in cppu::OSingleFactoryHelper::createInstanceWithContext 
(this=0x2aaaf5d3d070, xContext=uno::Reference to (cppu::ComponentContext *) 
0x2aaabc54ef58) at cppuhelper/source/factory.cxx:203
37 0x2b8111bf in 
cppu::OFactoryComponentHelper::createInstanceWithContext (this=0x2aaaf5d3d008, 
xContext=uno::Reference to (cppu::ComponentContext *) 0x2aaabc54ef58) at 
cppuhelper/source/factory.cxx:432
38 0x2b865ee6 in cppuhelper::ServiceManager::createInstanceWithContext 
(this=0x2aaabc565208, 
aServiceSpecifier=com.sun.star.form.component.RichTextControl, 
Context=uno::Reference to (cppu::ComponentContext *) 0x2aaabc54ef58) at 
cppuhelper/source/servicemanager.cxx:796
39 0x2b865990 in cppuhelper::ServiceManager::createInstance 
(this=0x2aaabc565208, 
aServiceSpecifier=com.sun.star.form.component.RichTextControl) at 
cppuhelper/source/servicemanager.cxx:745
40 0x2aaaf62db43d in frm::OControlModel::OControlModel 
(this=0x2aaaf5a5e408, _rxFactory=uno::Reference to (cppuhelper::ServiceManager 
*) 0x2aaabc565260, 
_rUnoControlModelTypeName=com.sun.star.form.component.RichTextControl, 
rDefault=com.sun.star.form.control.TextField, _bSetDelegator=0 '\000') at 
forms/source/component/FormComponent.cxx:598
41 0x2aaaf62def21 in frm::OBoundControlModel::OBoundControlModel 
(this=0x2aaaf5a5e408, _rxFactory=uno::Reference to (cppuhelper::ServiceManager 
*) 0x2aaabc565260, 
_rUnoControlModelTypeName=com.sun.star.form.component.RichTextControl, 
_rDefault=com.sun.star.form.control.TextField, _bCommitable=1 '\001', 
_bSupportExternalBinding=1 '\001', _bSupportsValidation=1 '\001') at 
forms/source/component/FormComponent.cxx:1257
42 0x2aaaf62a212c in frm::OEditBaseModel::OEditBaseModel 
(this=0x2aaaf5a5e408, _rxFactory=uno::Reference to (cppuhelper::ServiceManager 
*)

Re: mdds broken

2013-05-22 Thread Stephan Bergmann


On 05/22/2013 09:08 AM, Stephan Bergmann wrote:

But the mdds-related attempt to compare iterators from different
sequences failure I described in the original mail is still there.


FYI, with the attached mdds-broken.patch to disable the tests affected 
by that mdds-related attempt to compare iterators from different 
sequences failure, and a local revert of 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=d256dbede60533369d1aac64cca34721183f6a8a 
fdo#46808, Convert chart2::Title service to new style to work around a 
broken JunitTest_chart2_unoapi (sch.ChXChartDocument, sch.ChartTitle; of 
which Noel G. is informed), a current master 
(http://cgit.freedesktop.org/libreoffice/core/commit/?id=ea2f06d7884f2b765394bff8a1e935f67f6c961d 
Ensure SolarMutex is locked at DBG_TESTSOLARMUTEX checkpoints) make 
check works for me again (Fedora 18 x86_64, --enable-dbgutil).


Stephan
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 0b3970f..ae8a53d 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
 CppunitTest_sc_namedrangeobj \
 CppunitTest_sc_namedrangesobj \
 CppunitTest_sc_tablesheetobj \
-CppunitTest_sc_tablesheetsobj \
 CppunitTest_sc_editfieldobj_cell \
 CppunitTest_sc_editfieldobj_header \
 CppunitTest_sc_modelobj \
diff --git a/sc/qa/unoapi/sc.sce b/sc/qa/unoapi/sc.sce
index 4ececd9..ac3b540 100644
--- a/sc/qa/unoapi/sc.sce
+++ b/sc/qa/unoapi/sc.sce
@@ -88,7 +88,6 @@
 -o sc.ScIndexEnumeration_FunctionDescriptionEnumeration
 -o sc.ScIndexEnumeration_LabelRangesEnumeration
 -o sc.ScIndexEnumeration_NamedRangesEnumeration
--o sc.ScIndexEnumeration_ScenariosEnumeration
 -o sc.ScIndexEnumeration_SheetCellRangesEnumeration
 -o sc.ScIndexEnumeration_SheetLinksEnumeration
 -o sc.ScIndexEnumeration_SpreadsheetViewPanesEnumeration
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: chart2/source

2013-05-22 Thread Stephan Bergmann

 chart2/source/inc/macros.hxx |   13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit ba9613715288f3907185133892d1dbbaa9e006a9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed May 22 16:59:04 2013 +0200

Minor simplification

Change-Id: I8425971ed81b4f13be5e295a5a5b9ef443b9a4db

diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx
index 89a0e56..874a4dd 100644
--- a/chart2/source/inc/macros.hxx
+++ b/chart2/source/inc/macros.hxx
@@ -19,22 +19,17 @@
 #ifndef CHART_MACROS_HXX
 #define CHART_MACROS_HXX
 
+#include sal/config.h
+
 #include typeinfo
 
-/** shows an error-box for an exception ex
-else-branch necessary to avoid warning
-*/
-#if OSL_DEBUG_LEVEL  0
+#include sal/log.hxx
+
 #define ASSERT_EXCEPTION(ex)   \
   SAL_WARN(chart2, Exception caught. Type:  \
 typeid( ex ).name()  , Message:   \
 ex.Message )
-#else
-//avoid compilation warnings
-#define ASSERT_EXCEPTION(ex) (void)(ex)
-#endif
 
-// CHART_MACROS_HXX
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - download.lst harfbuzz/harfbuzz.configure.patch.1

2013-05-22 Thread Khaled Hosny

 download.lst|2 +-
 harfbuzz/harfbuzz.configure.patch.1 |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0ba159e33bb8f47250f57f377af40f7ca941c89c
Author: Khaled Hosny khaledho...@eglug.org
Date:   Wed May 22 12:04:22 2013 +0200

Blind attempt to fix HarfBuzz build

Change-Id: Iaa61bc2c82ab6bd6391c8c81951ca55c5ce133ab

diff --git a/harfbuzz/harfbuzz.configure.patch.1 
b/harfbuzz/harfbuzz.configure.patch.1
index 937a06e..c66e2b7 100644
--- a/harfbuzz/harfbuzz.configure.patch.1
+++ b/harfbuzz/harfbuzz.configure.patch.1
@@ -64,7 +64,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
  fi
  if test $have_icu_le != true; then
if test -n $ac_tool_prefix; then
-@@ -17555,7 +17555,7 @@
+@@ -17555,12 +17555,12 @@
{ $as_echo $as_me:${as_lineno-$LINENO}: checking for ICU_LE by using 
icu-config fallback 5
  $as_echo_n checking for ICU_LE by using icu-config fallback...  6; }
if test $ICU_CONFIG != no  $ICU_CONFIG --version /dev/null; 
then
@@ -73,6 +73,12 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
# We don't use --cflags as this gives us a lot of things that 
we don't
# necessarily want, like debugging and optimization flags
# See man (1) icu-config for more info.
+   ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags`
+-  ICU_LE_LIBS=`$ICU_CONFIG --ldflags-searchpath 
--ldflags-libsonly --ldflags-layout`
++  ICU_LE_LIBS=`$ICU_CONFIG --ldflags-searchpath 
--ldflags-libsonly --ldflags-layout | tr \n  `
+
+
+   { $as_echo $as_me:${as_lineno-$LINENO}: result: yes 5
 @@ -17654,7 +17654,7 @@
GRAPHITE2_LIBS=$pkg_cv_GRAPHITE2_LIBS
  { $as_echo $as_me:${as_lineno-$LINENO}: result: yes 5
commit 1cabbe033b395d5de985dd77ecd26dfc39a6feeb
Author: Khaled Hosny khaledho...@eglug.org
Date:   Tue May 21 19:46:06 2013 +0200

Update HarfBuzz to 0.9.17

Change-Id: If84a1eb7dbd54b4f1e3d876eb63cc3f2f8e51938
Reviewed-on: https://gerrit.libreoffice.org/3993
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/download.lst b/download.lst
index f02392e..f827956 100644
--- a/download.lst
+++ b/download.lst
@@ -38,7 +38,7 @@ export GRAPHITE_TARBALL := 
f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz
 export GLIBC_TARBALL := 
4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 export HUNSPELL_TARBALL := 
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
-export HARFBUZZ_TARBALL := 
90855e670c790c1fec4592908be3c0b8-harfbuzz-0.9.16.tar.bz2
+export HARFBUZZ_TARBALL := 
c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2
 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
 export ICU_TARBALL := 6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz
 export ICU_51_LAYOUT_FIX_TARBALL := 
7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz
diff --git a/harfbuzz/harfbuzz.configure.patch.1 
b/harfbuzz/harfbuzz.configure.patch.1
index ffabde5..937a06e 100644
--- a/harfbuzz/harfbuzz.configure.patch.1
+++ b/harfbuzz/harfbuzz.configure.patch.1
@@ -64,7 +64,7 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
  fi
  if test $have_icu_le != true; then
if test -n $ac_tool_prefix; then
-@@ -17555,12 +17555,12 @@
+@@ -17555,7 +17555,7 @@
{ $as_echo $as_me:${as_lineno-$LINENO}: checking for ICU_LE by using 
icu-config fallback 5
  $as_echo_n checking for ICU_LE by using icu-config fallback...  6; }
if test $ICU_CONFIG != no  $ICU_CONFIG --version /dev/null; 
then
@@ -73,12 +73,6 @@ diff -ur harfbuzz.org/configure harfbuzz/configure
# We don't use --cflags as this gives us a lot of things that 
we don't
# necessarily want, like debugging and optimization flags
# See man (1) icu-config for more info.
-   ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags`
--  ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout`
-+  ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout | 
tr \n  `
- 
- 
-   { $as_echo $as_me:${as_lineno-$LINENO}: result: yes 5
 @@ -17654,7 +17654,7 @@
GRAPHITE2_LIBS=$pkg_cv_GRAPHITE2_LIBS
  { $as_echo $as_me:${as_lineno-$LINENO}: result: yes 5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Libreoffice Android

2013-05-22 Thread ari illikainen


Hi

I have been searching for an odf-editor for my android-phone but have 
come up with nothing until I saw you guys have been working on it for a 
while now.

I understand itś under development but I would still like to give it a try.
Or maybe itś only going to be a reader?
If it is an editor I could use some instructions on how to install the 
files that are published at 
http://dev-builds.libreoffice.org/daily/master/Android-ARM@24-Bytemark-Hosting/current/, 
since I unfortunately do not possess that knowledge.


Would be Glad if you could help!

Sincerely:
Ari Illikainen
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa sc/source

2013-05-22 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx   |1 +
 sc/source/core/data/column.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 17ff1e0caceb20b90c780e4b45314e1ca5a18bb9
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 22 11:17:52 2013 -0400

Use the block position of the destination, not of the source.

And a test to catch this.

Change-Id: Ia73be239b4be96cbe029390efbbec5f49e429652

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index dcce938..6053039 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4494,6 +4494,7 @@ void Test::testPivotTableDocFunc()
 void Test::testSheetCopy()
 {
 m_pDoc-InsertTab(0, TestTab);
+m_pDoc-SetString(ScAddress(0,0,0), copy me);
 CPPUNIT_ASSERT_MESSAGE(document should have one sheet to begin with., 
m_pDoc-GetTableCount() == 1);
 SCROW nRow1, nRow2;
 bool bHidden = m_pDoc-RowHidden(0, 0, nRow1, nRow2);
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 10d36b6..dfbc21d 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1444,7 +1444,7 @@ void ScColumn::CopyToColumn(
 // Special case to allow removing of cell instances.  A
 // string cell with empty content is used to indicate an
 // empty cell.
-sc::ColumnBlockPosition* p = rCxt.getBlockPosition(nTab, 
nCol);
+sc::ColumnBlockPosition* p = 
rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol);
 if (pNew-GetCellType() == CELLTYPE_STRING)
 {
 OUString aStr = 
static_castScStringCell*(pNew)-GetString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/qa sc/source

2013-05-22 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx   |1 +
 sc/source/core/data/column.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6958b6a3ce9f28bed2a529939e7740452929a5b3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 22 11:17:52 2013 -0400

Use the block position of the destination, not of the source.

And a test to catch this.

Change-Id: Ia73be239b4be96cbe029390efbbec5f49e429652

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 36a59fa..90da5f0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4494,6 +4494,7 @@ void Test::testPivotTableDocFunc()
 void Test::testSheetCopy()
 {
 m_pDoc-InsertTab(0, TestTab);
+m_pDoc-SetString(ScAddress(0,0,0), copy me);
 CPPUNIT_ASSERT_MESSAGE(document should have one sheet to begin with., 
m_pDoc-GetTableCount() == 1);
 SCROW nRow1, nRow2;
 bool bHidden = m_pDoc-RowHidden(0, 0, nRow1, nRow2);
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 10d36b6..dfbc21d 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1444,7 +1444,7 @@ void ScColumn::CopyToColumn(
 // Special case to allow removing of cell instances.  A
 // string cell with empty content is used to indicate an
 // empty cell.
-sc::ColumnBlockPosition* p = rCxt.getBlockPosition(nTab, 
nCol);
+sc::ColumnBlockPosition* p = 
rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol);
 if (pNew-GetCellType() == CELLTYPE_STRING)
 {
 OUString aStr = 
static_castScStringCell*(pNew)-GetString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/qa sc/source

2013-05-22 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx   |1 +
 sc/source/core/data/column.cxx |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bbb2f7bfcc5ae4e572c34efc52a61401de5d63d7
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 22 11:17:52 2013 -0400

Use the block position of the destination, not of the source.

And a test to catch this.

Change-Id: Ia73be239b4be96cbe029390efbbec5f49e429652

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index dcce938..6053039 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4494,6 +4494,7 @@ void Test::testPivotTableDocFunc()
 void Test::testSheetCopy()
 {
 m_pDoc-InsertTab(0, TestTab);
+m_pDoc-SetString(ScAddress(0,0,0), copy me);
 CPPUNIT_ASSERT_MESSAGE(document should have one sheet to begin with., 
m_pDoc-GetTableCount() == 1);
 SCROW nRow1, nRow2;
 bool bHidden = m_pDoc-RowHidden(0, 0, nRow1, nRow2);
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 10d36b6..dfbc21d 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1444,7 +1444,7 @@ void ScColumn::CopyToColumn(
 // Special case to allow removing of cell instances.  A
 // string cell with empty content is used to indicate an
 // empty cell.
-sc::ColumnBlockPosition* p = rCxt.getBlockPosition(nTab, 
nCol);
+sc::ColumnBlockPosition* p = 
rCxt.getBlockPosition(rColumn.nTab, rColumn.nCol);
 if (pNew-GetCellType() == CELLTYPE_STRING)
 {
 OUString aStr = 
static_castScStringCell*(pNew)-GetString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: mdds broken

2013-05-22 Thread Kohei Yoshida


Fixed.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=6958b6a3ce9f28bed2a529939e7740452929a5b3

This particular one has nothing to do with mdds, but the error was on 
the Calc side.


Kohei
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Libreoffice Android

2013-05-22 Thread Tor Lillqvist

It is way too early. There is nothing worth trying. We need developers,
not testers.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[ANNOUNCE] libreoffice-4.1.0.0.beta1 tag created

2013-05-22 Thread Petr Mladek

Hi,

there have been created the libreoffice-4.1.0.0.beta1 tag. The
corresponding official builds will be available within next few days.

The list of changes and commits against 4.0.3.3 can be found at
http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-1-release-4.1.0.0.beta1.log
http://dev-builds.libreoffice.org/pre-releases/src/commits-libreoffice-4-1-release-4.1.0.0.beta1.log

In this case, the list of features might be more interesting, see
http://wiki.documentfoundation.org/ReleaseNotes/4.1


Now, you might switch your current 4-1 source tree to it using:

./g fetch --tags
./g checkout -b tag-libreoffice-4.1.0.0.beta1 libreoffice-4.1.0.0.beta1

Linux distro packages might find source tarballs at
http://dev-builds.libreoffice.org/pre-releases/src/
They will be available from the official page together with the builds.


See also the schedule at 
http://wiki.documentfoundation.org/ReleasePlan#4.1_release
and release criteria at http://wiki.documentfoundation.org/Release_Criteria


Best Regards,
Petr


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#64870 Duplicate shortcut on Text Import dialogue

2013-05-22 Thread Joren De Cuyper (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4004

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/4004/1

fdo#64870 Duplicate shortcut on Text Import dialogue

Accelerator 'o' is used for Open as well as Other,
'r' isn't used as accelerator in that dialog.

Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6
---
M sc/uiconfig/scalc/ui/textimportcsv.ui
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui 
b/sc/uiconfig/scalc/ui/textimportcsv.ui
index afe12d5..92012ad 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.ui
@@ -390,7 +390,7 @@
 property 
name=column_spacing12/property
 child
   object class=GtkCheckButton 
id=other
-property name=label 
translatable=yes_Other/property
+property name=label 
translatable=yesOthe_r/property
 property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
 property 
name=receives_defaultFalse/property

-- 
To view, visit https://gerrit.libreoffice.org/4004
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-0] fdo#64870 Duplicate shortcut on Text Import dialogue

2013-05-22 Thread Joren De Cuyper (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4006

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/4006/1

fdo#64870 Duplicate shortcut on Text Import dialogue

Accelerator 'o' is used for Open as well as Other,
'r' isn't used as accelerator in that dialog.

Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6
---
M sc/uiconfig/scalc/ui/textimportcsv.ui
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui 
b/sc/uiconfig/scalc/ui/textimportcsv.ui
index afe12d5..92012ad 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.ui
@@ -390,7 +390,7 @@
 property 
name=column_spacing12/property
 child
   object class=GtkCheckButton 
id=other
-property name=label 
translatable=yes_Other/property
+property name=label 
translatable=yesOthe_r/property
 property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
 property 
name=receives_defaultFalse/property

-- 
To view, visit https://gerrit.libreoffice.org/4006
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH libreoffice-4-1] fdo#64870 Duplicate shortcut on Text Import dialogue

2013-05-22 Thread Joren De Cuyper (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4005

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/4005/1

fdo#64870 Duplicate shortcut on Text Import dialogue

Accelerator 'o' is used for Open as well as Other,
'r' isn't used as accelerator in that dialog.

Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6
---
M sc/uiconfig/scalc/ui/textimportcsv.ui
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui 
b/sc/uiconfig/scalc/ui/textimportcsv.ui
index afe12d5..92012ad 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.ui
@@ -390,7 +390,7 @@
 property 
name=column_spacing12/property
 child
   object class=GtkCheckButton 
id=other
-property name=label 
translatable=yes_Other/property
+property name=label 
translatable=yesOthe_r/property
 property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
 property 
name=receives_defaultFalse/property

-- 
To view, visit https://gerrit.libreoffice.org/4005
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia25f03e437378c49e90376dff8aa0826d53265a6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Splitter::ImplInitHorVer(bool) should always initialize all ...

2013-05-22 Thread Mark Wielaard (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4007

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/4007/1

Splitter::ImplInitHorVer(bool) should always initialize all state.

When creating a new Splitter ImplInitHorVer(bool) should always
init all state independent from the current state because some
variables might not be initialized yet.

 Conditional jump or move depends on uninitialised value(s)
at 0x8293625: Splitter::ImplInitHorVer(bool) (split.cxx:70)
by 0x82936DF: Splitter::ImplInit(Window*, long) (split.cxx:100)
by 0x8293CC3: Splitter::Splitter(Window*, long) (split.cxx:157)
by 0x2686BC48: ScTabSplitter::ScTabSplitter(Window*, long, ScViewData*) 
(tabsplit.cxx:28)
...
  Uninitialised value was created by a heap allocation
at 0x4A08361: operator new(unsigned long) (vg_replace_malloc.c:298)
by 0x2687D8F1: ScTabView::Init() (tabview5.cxx:90)
by 0x2686C5D3: ScTabView::ScTabView(Window*, ScDocShell, ScTabViewShell*) 
(tabview.cxx:261)
...

The public method to change the internal state is Splitter::SetHorizontal()
which does check the current state (and calls Splitter::ImplInitHorVer()
only when there is a real state change). So the bNew != mbHorzSplit was
redundant anyway.

Change-Id: If84e8bff4c87d208416de3583202ce88d6982a99
---
M vcl/source/window/split.cxx
1 file changed, 18 insertions(+), 18 deletions(-)



diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 92a637e..13cc486 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -65,28 +65,28 @@
 
 // ---
 
+// Should only be called from a ImplInit method for initialization or
+// after checking bNew is different from the current mbHorzSplit value.
+// The public method that does that check is Splitter::SetHorizontal().
 void Splitter::ImplInitHorVer(bool bNew)
 {
-if(bNew != (bool)mbHorzSplit)
+mbHorzSplit = bNew;
+
+PointerStyle ePointerStyle;
+const StyleSettings rSettings = GetSettings().GetStyleSettings();
+
+if ( mbHorzSplit )
 {
-mbHorzSplit = bNew;
-
-PointerStyle ePointerStyle;
-const StyleSettings rSettings = GetSettings().GetStyleSettings();
-
-if ( mbHorzSplit )
-{
-ePointerStyle = POINTER_HSPLIT;
-SetSizePixel( Size( rSettings.GetSplitSize(), 
rSettings.GetScrollBarSize() ) );
-}
-else
-{
-ePointerStyle = POINTER_VSPLIT;
-SetSizePixel( Size( rSettings.GetScrollBarSize(), 
rSettings.GetSplitSize() ) );
-}
-
-SetPointer( Pointer( ePointerStyle ) );
+ePointerStyle = POINTER_HSPLIT;
+SetSizePixel( Size( rSettings.GetSplitSize(), 
rSettings.GetScrollBarSize() ) );
 }
+else
+{
+ePointerStyle = POINTER_VSPLIT;
+SetSizePixel( Size( rSettings.GetScrollBarSize(), 
rSettings.GetSplitSize() ) );
+}
+
+SetPointer( Pointer( ePointerStyle ) );
 }
 
 // ---

-- 
To view, visit https://gerrit.libreoffice.org/4007
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If84e8bff4c87d208416de3583202ce88d6982a99
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard m...@klomp.org

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa

2013-05-22 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx |   86 +++
 1 file changed, 39 insertions(+), 47 deletions(-)

New commits:
commit 414484fbec7bcca1236c96ba4c597adb0c67325c
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 22 12:07:23 2013 -0400

Disable Calc perf test by default  output both pseudo-cycles and real time.

Change-Id: I35120e576208640976cdda0a5628e355bbe2dc7c

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6053039..3f306d0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -77,6 +77,7 @@
 #include vector
 
 #define CALC_DEBUG_OUTPUT 0
+#define CALC_TEST_PERF 0
 
 #include helper/debughelper.hxx
 #include helper/qahelper.hxx
@@ -92,16 +93,6 @@ using ::std::vector;
 
 namespace {
 
-double getTimeDiff(const TimeValue t1, const TimeValue t2)
-{
-double tv1 = t1.Seconds;
-double tv2 = t2.Seconds;
-tv1 += t1.Nanosec / 10.0;
-tv2 += t2.Nanosec / 10.0;
-
-return tv1 - tv2;
-}
-
 class Test : public test::BootstrapFixture {
 public:
 Test();
@@ -283,7 +274,7 @@ public:
 void testCondFormatINSDEL();
 
 CPPUNIT_TEST_SUITE(Test);
-#if !defined(DBG_UTIL)  !defined(_WIN32_WINNT)
+#if CALC_TEST_PERF
 CPPUNIT_TEST(testPerf);
 #endif
 CPPUNIT_TEST(testCollator);
@@ -447,20 +438,11 @@ public:
 class MeasureTimeSwitch
 {
 double mrDiff;
-double mnScale;
 TimeValue maTimeBefore;
 public:
 MeasureTimeSwitch(double rDiff) : mrDiff(rDiff)
 {
 mrDiff = .0;
-mnScale = 1.0;
-osl_getSystemTime(maTimeBefore);
-}
-// Scaled pseudo-time
-MeasureTimeSwitch(double rDiff, const double nScale ) : mrDiff(rDiff)
-{
-mrDiff = .0;
-mnScale = nScale;
 osl_getSystemTime(maTimeBefore);
 }
 
@@ -468,7 +450,17 @@ public:
 {
 TimeValue aTimeAfter;
 osl_getSystemTime(aTimeAfter);
-mrDiff = getTimeDiff(aTimeAfter, maTimeBefore) / mnScale;
+mrDiff = getTimeDiff(aTimeAfter, maTimeBefore);
+}
+
+double getTimeDiff(const TimeValue t1, const TimeValue t2) const
+{
+double tv1 = t1.Seconds;
+double tv2 = t2.Seconds;
+tv1 += t1.Nanosec / 10.0;
+tv2 += t2.Nanosec / 10.0;
+
+return tv1 - tv2;
 }
 };
 
@@ -497,13 +489,13 @@ void Test::tearDown()
 BootstrapFixture::tearDown();
 }
 
-#define PERF_ASSERT(df,time,message) \
+#define PERF_ASSERT(df,scale,time,message) \
 do { \
-if ((df) = (time)) \
+double dfscaled = df / scale; \
+if ((dfscaled) = (time)) \
 { \
 std::ostringstream os; \
-os  message   took   diff   psuedo-cycles, expected:  
 time; \
-/* debugging - fprintf (stderr, '%s'\n, os.str().c_str()); */ \
+os  message   took   dfscaled   pseudo-cycles (  df 
  real-time seconds), expected:   time   pseudo-cycles.; \
 CPPUNIT_FAIL(os.str().c_str()); \
 } \
 } while (0)
@@ -545,10 +537,10 @@ void Test::testPerf()
 // second.  Flag failure if it takes more than one second.  Clearing 100
 // columns should be large enough to flag if something goes wrong.
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 clearRange(m_pDoc, ScRange(0,0,0,99,MAXROW,0));
 }
-PERF_ASSERT(diff, 1.0, Clearing an empty sheet);
+PERF_ASSERT(diff, scale, 1.0, Clearing an empty sheet);
 
 {
 // Switch to R1C1 to make it easier to input relative references in 
multiple cells.
@@ -563,10 +555,10 @@ void Test::testPerf()
 // Now, Delete B2:B10. This should complete in a fraction of a 
second
 // (0.06 sec on my machine).
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 clearRange(m_pDoc, ScRange(1,1,0,1,9,0));
 }
-PERF_ASSERT(diff, 2000, Removal of a large array of formula cells);
+PERF_ASSERT(diff, scale, 2000, Removal of a large array of formula 
cells);
 }
 
 clearRange(m_pDoc, ScRange(0,0,0,1,MAXROW,0)); // Clear columns A:B.
@@ -597,10 +589,10 @@ void Test::testPerf()
 aMark.SetMarkArea(aPasteRange);
 
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 m_pDoc-CopyFromClip(aPasteRange, aMark, IDF_CONTENTS, pUndoDoc, 
aClipDoc);
 }
-PERF_ASSERT(diff, 1500.0, Pasting a single cell to A2:A10);
+PERF_ASSERT(diff, scale, 1500.0, Pasting a single cell to 
A2:A10);
 
 ScDocument* pRedoDoc = new ScDocument(SCDOCMODE_UNDO);
 pRedoDoc-InitUndo(m_pDoc, 0, 0);
@@ -615,10 +607,10 @@ void Test::testPerf()
 CPPUNIT_ASSERT_EQUAL(m_pDoc-GetString(aPos), 
m_pDoc-GetString(aPasteRange.aEnd));
 
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);

Re: Libreoffice Android

2013-05-22 Thread Bjoern Michaelsen

On Wed, May 22, 2013 at 06:41:14PM +0300, Tor Lillqvist wrote:
 It is way too early. There is nothing worth trying. We need developers,
 not testers.

Well, we also need testers -- but not yet for Android. ;)

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Libreoffice Android

2013-05-22 Thread A-K Illikainen

Tack för svar.
Den 22 maj 2013 18:06 skrev Bjoern Michaelsen 
bjoern.michael...@canonical.com:

 On Wed, May 22, 2013 at 06:41:14PM +0300, Tor Lillqvist wrote:
  It is way too early. There is nothing worth trying. We need developers,
  not testers.

 Well, we also need testers -- but not yet for Android. ;)

 Best,

 Bjoern

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/qa

2013-05-22 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx |   86 +++
 1 file changed, 39 insertions(+), 47 deletions(-)

New commits:
commit 4fa7a0ce8131106a038ba441bcc230d0377690ac
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 22 12:14:24 2013 -0400

Disable Calc perf test by default  output both pseudo-cycles and real time.

Change-Id: I35120e576208640976cdda0a5628e355bbe2dc7c

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 90da5f0..3f306d0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -77,6 +77,7 @@
 #include vector
 
 #define CALC_DEBUG_OUTPUT 0
+#define CALC_TEST_PERF 0
 
 #include helper/debughelper.hxx
 #include helper/qahelper.hxx
@@ -92,16 +93,6 @@ using ::std::vector;
 
 namespace {
 
-double getTimeDiff(const TimeValue t1, const TimeValue t2)
-{
-double tv1 = t1.Seconds;
-double tv2 = t2.Seconds;
-tv1 += t1.Nanosec / 10.0;
-tv2 += t2.Nanosec / 10.0;
-
-return tv1 - tv2;
-}
-
 class Test : public test::BootstrapFixture {
 public:
 Test();
@@ -283,7 +274,7 @@ public:
 void testCondFormatINSDEL();
 
 CPPUNIT_TEST_SUITE(Test);
-#if !defined(DBG_UTIL)  !defined(_WIN32_WINNT)
+#if CALC_TEST_PERF
 CPPUNIT_TEST(testPerf);
 #endif
 CPPUNIT_TEST(testCollator);
@@ -447,20 +438,11 @@ public:
 class MeasureTimeSwitch
 {
 double mrDiff;
-double mnScale;
 TimeValue maTimeBefore;
 public:
 MeasureTimeSwitch(double rDiff) : mrDiff(rDiff)
 {
 mrDiff = .0;
-mnScale = 1.0;
-osl_getSystemTime(maTimeBefore);
-}
-// Scaled pseudo-time
-MeasureTimeSwitch(double rDiff, const double nScale ) : mrDiff(rDiff)
-{
-mrDiff = .0;
-mnScale = nScale;
 osl_getSystemTime(maTimeBefore);
 }
 
@@ -468,7 +450,17 @@ public:
 {
 TimeValue aTimeAfter;
 osl_getSystemTime(aTimeAfter);
-mrDiff = getTimeDiff(aTimeAfter, maTimeBefore) / mnScale;
+mrDiff = getTimeDiff(aTimeAfter, maTimeBefore);
+}
+
+double getTimeDiff(const TimeValue t1, const TimeValue t2) const
+{
+double tv1 = t1.Seconds;
+double tv2 = t2.Seconds;
+tv1 += t1.Nanosec / 10.0;
+tv2 += t2.Nanosec / 10.0;
+
+return tv1 - tv2;
 }
 };
 
@@ -497,13 +489,13 @@ void Test::tearDown()
 BootstrapFixture::tearDown();
 }
 
-#define PERF_ASSERT(df,time,message) \
+#define PERF_ASSERT(df,scale,time,message) \
 do { \
-if ((df) = (time)) \
+double dfscaled = df / scale; \
+if ((dfscaled) = (time)) \
 { \
 std::ostringstream os; \
-os  message   took   diff   psuedo-cycles, expected:  
 time; \
-/* debugging - fprintf (stderr, '%s'\n, os.str().c_str()); */ \
+os  message   took   dfscaled   pseudo-cycles (  df 
  real-time seconds), expected:   time   pseudo-cycles.; \
 CPPUNIT_FAIL(os.str().c_str()); \
 } \
 } while (0)
@@ -545,10 +537,10 @@ void Test::testPerf()
 // second.  Flag failure if it takes more than one second.  Clearing 100
 // columns should be large enough to flag if something goes wrong.
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 clearRange(m_pDoc, ScRange(0,0,0,99,MAXROW,0));
 }
-PERF_ASSERT(diff, 1.0, Clearing an empty sheet);
+PERF_ASSERT(diff, scale, 1.0, Clearing an empty sheet);
 
 {
 // Switch to R1C1 to make it easier to input relative references in 
multiple cells.
@@ -563,10 +555,10 @@ void Test::testPerf()
 // Now, Delete B2:B10. This should complete in a fraction of a 
second
 // (0.06 sec on my machine).
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 clearRange(m_pDoc, ScRange(1,1,0,1,9,0));
 }
-PERF_ASSERT(diff, 3000, Removal of a large array of formula cells);
+PERF_ASSERT(diff, scale, 2000, Removal of a large array of formula 
cells);
 }
 
 clearRange(m_pDoc, ScRange(0,0,0,1,MAXROW,0)); // Clear columns A:B.
@@ -597,10 +589,10 @@ void Test::testPerf()
 aMark.SetMarkArea(aPasteRange);
 
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 m_pDoc-CopyFromClip(aPasteRange, aMark, IDF_CONTENTS, pUndoDoc, 
aClipDoc);
 }
-PERF_ASSERT(diff, 1500.0, Pasting a single cell to A2:A10);
+PERF_ASSERT(diff, scale, 1500.0, Pasting a single cell to 
A2:A10);
 
 ScDocument* pRedoDoc = new ScDocument(SCDOCMODE_UNDO);
 pRedoDoc-InitUndo(m_pDoc, 0, 0);
@@ -615,10 +607,10 @@ void Test::testPerf()
 CPPUNIT_ASSERT_EQUAL(m_pDoc-GetString(aPos), 
m_pDoc-GetString(aPasteRange.aEnd));
 
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/qa

2013-05-22 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx |   86 +++
 1 file changed, 39 insertions(+), 47 deletions(-)

New commits:
commit 3ba3e52380e3016551733bcbba275ae5fc7d0713
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 22 12:07:23 2013 -0400

Disable Calc perf test by default  output both pseudo-cycles and real time.

Change-Id: I35120e576208640976cdda0a5628e355bbe2dc7c

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6053039..3f306d0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -77,6 +77,7 @@
 #include vector
 
 #define CALC_DEBUG_OUTPUT 0
+#define CALC_TEST_PERF 0
 
 #include helper/debughelper.hxx
 #include helper/qahelper.hxx
@@ -92,16 +93,6 @@ using ::std::vector;
 
 namespace {
 
-double getTimeDiff(const TimeValue t1, const TimeValue t2)
-{
-double tv1 = t1.Seconds;
-double tv2 = t2.Seconds;
-tv1 += t1.Nanosec / 10.0;
-tv2 += t2.Nanosec / 10.0;
-
-return tv1 - tv2;
-}
-
 class Test : public test::BootstrapFixture {
 public:
 Test();
@@ -283,7 +274,7 @@ public:
 void testCondFormatINSDEL();
 
 CPPUNIT_TEST_SUITE(Test);
-#if !defined(DBG_UTIL)  !defined(_WIN32_WINNT)
+#if CALC_TEST_PERF
 CPPUNIT_TEST(testPerf);
 #endif
 CPPUNIT_TEST(testCollator);
@@ -447,20 +438,11 @@ public:
 class MeasureTimeSwitch
 {
 double mrDiff;
-double mnScale;
 TimeValue maTimeBefore;
 public:
 MeasureTimeSwitch(double rDiff) : mrDiff(rDiff)
 {
 mrDiff = .0;
-mnScale = 1.0;
-osl_getSystemTime(maTimeBefore);
-}
-// Scaled pseudo-time
-MeasureTimeSwitch(double rDiff, const double nScale ) : mrDiff(rDiff)
-{
-mrDiff = .0;
-mnScale = nScale;
 osl_getSystemTime(maTimeBefore);
 }
 
@@ -468,7 +450,17 @@ public:
 {
 TimeValue aTimeAfter;
 osl_getSystemTime(aTimeAfter);
-mrDiff = getTimeDiff(aTimeAfter, maTimeBefore) / mnScale;
+mrDiff = getTimeDiff(aTimeAfter, maTimeBefore);
+}
+
+double getTimeDiff(const TimeValue t1, const TimeValue t2) const
+{
+double tv1 = t1.Seconds;
+double tv2 = t2.Seconds;
+tv1 += t1.Nanosec / 10.0;
+tv2 += t2.Nanosec / 10.0;
+
+return tv1 - tv2;
 }
 };
 
@@ -497,13 +489,13 @@ void Test::tearDown()
 BootstrapFixture::tearDown();
 }
 
-#define PERF_ASSERT(df,time,message) \
+#define PERF_ASSERT(df,scale,time,message) \
 do { \
-if ((df) = (time)) \
+double dfscaled = df / scale; \
+if ((dfscaled) = (time)) \
 { \
 std::ostringstream os; \
-os  message   took   diff   psuedo-cycles, expected:  
 time; \
-/* debugging - fprintf (stderr, '%s'\n, os.str().c_str()); */ \
+os  message   took   dfscaled   pseudo-cycles (  df 
  real-time seconds), expected:   time   pseudo-cycles.; \
 CPPUNIT_FAIL(os.str().c_str()); \
 } \
 } while (0)
@@ -545,10 +537,10 @@ void Test::testPerf()
 // second.  Flag failure if it takes more than one second.  Clearing 100
 // columns should be large enough to flag if something goes wrong.
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 clearRange(m_pDoc, ScRange(0,0,0,99,MAXROW,0));
 }
-PERF_ASSERT(diff, 1.0, Clearing an empty sheet);
+PERF_ASSERT(diff, scale, 1.0, Clearing an empty sheet);
 
 {
 // Switch to R1C1 to make it easier to input relative references in 
multiple cells.
@@ -563,10 +555,10 @@ void Test::testPerf()
 // Now, Delete B2:B10. This should complete in a fraction of a 
second
 // (0.06 sec on my machine).
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 clearRange(m_pDoc, ScRange(1,1,0,1,9,0));
 }
-PERF_ASSERT(diff, 2000, Removal of a large array of formula cells);
+PERF_ASSERT(diff, scale, 2000, Removal of a large array of formula 
cells);
 }
 
 clearRange(m_pDoc, ScRange(0,0,0,1,MAXROW,0)); // Clear columns A:B.
@@ -597,10 +589,10 @@ void Test::testPerf()
 aMark.SetMarkArea(aPasteRange);
 
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 m_pDoc-CopyFromClip(aPasteRange, aMark, IDF_CONTENTS, pUndoDoc, 
aClipDoc);
 }
-PERF_ASSERT(diff, 1500.0, Pasting a single cell to A2:A10);
+PERF_ASSERT(diff, scale, 1500.0, Pasting a single cell to 
A2:A10);
 
 ScDocument* pRedoDoc = new ScDocument(SCDOCMODE_UNDO);
 pRedoDoc-InitUndo(m_pDoc, 0, 0);
@@ -615,10 +607,10 @@ void Test::testPerf()
 CPPUNIT_ASSERT_EQUAL(m_pDoc-GetString(aPos), 
m_pDoc-GetString(aPasteRange.aEnd));
 
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - sc/qa sc/source

2013-05-22 Thread Kohei Yoshida

 sc/qa/unit/ucalc.cxx   |   87 ++---
 sc/source/core/data/column.cxx |2 
 2 files changed, 41 insertions(+), 48 deletions(-)

New commits:
commit 5cfb604159f0b73c94f528b5005da8734f2b2c2e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 22 12:14:24 2013 -0400

Disable Calc perf test by default  output both pseudo-cycles and real time.

Change-Id: I35120e576208640976cdda0a5628e355bbe2dc7c
(cherry picked from commit 4fa7a0ce8131106a038ba441bcc230d0377690ac)

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 90da5f0..3f306d0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -77,6 +77,7 @@
 #include vector
 
 #define CALC_DEBUG_OUTPUT 0
+#define CALC_TEST_PERF 0
 
 #include helper/debughelper.hxx
 #include helper/qahelper.hxx
@@ -92,16 +93,6 @@ using ::std::vector;
 
 namespace {
 
-double getTimeDiff(const TimeValue t1, const TimeValue t2)
-{
-double tv1 = t1.Seconds;
-double tv2 = t2.Seconds;
-tv1 += t1.Nanosec / 10.0;
-tv2 += t2.Nanosec / 10.0;
-
-return tv1 - tv2;
-}
-
 class Test : public test::BootstrapFixture {
 public:
 Test();
@@ -283,7 +274,7 @@ public:
 void testCondFormatINSDEL();
 
 CPPUNIT_TEST_SUITE(Test);
-#if !defined(DBG_UTIL)  !defined(_WIN32_WINNT)
+#if CALC_TEST_PERF
 CPPUNIT_TEST(testPerf);
 #endif
 CPPUNIT_TEST(testCollator);
@@ -447,20 +438,11 @@ public:
 class MeasureTimeSwitch
 {
 double mrDiff;
-double mnScale;
 TimeValue maTimeBefore;
 public:
 MeasureTimeSwitch(double rDiff) : mrDiff(rDiff)
 {
 mrDiff = .0;
-mnScale = 1.0;
-osl_getSystemTime(maTimeBefore);
-}
-// Scaled pseudo-time
-MeasureTimeSwitch(double rDiff, const double nScale ) : mrDiff(rDiff)
-{
-mrDiff = .0;
-mnScale = nScale;
 osl_getSystemTime(maTimeBefore);
 }
 
@@ -468,7 +450,17 @@ public:
 {
 TimeValue aTimeAfter;
 osl_getSystemTime(aTimeAfter);
-mrDiff = getTimeDiff(aTimeAfter, maTimeBefore) / mnScale;
+mrDiff = getTimeDiff(aTimeAfter, maTimeBefore);
+}
+
+double getTimeDiff(const TimeValue t1, const TimeValue t2) const
+{
+double tv1 = t1.Seconds;
+double tv2 = t2.Seconds;
+tv1 += t1.Nanosec / 10.0;
+tv2 += t2.Nanosec / 10.0;
+
+return tv1 - tv2;
 }
 };
 
@@ -497,13 +489,13 @@ void Test::tearDown()
 BootstrapFixture::tearDown();
 }
 
-#define PERF_ASSERT(df,time,message) \
+#define PERF_ASSERT(df,scale,time,message) \
 do { \
-if ((df) = (time)) \
+double dfscaled = df / scale; \
+if ((dfscaled) = (time)) \
 { \
 std::ostringstream os; \
-os  message   took   diff   psuedo-cycles, expected:  
 time; \
-/* debugging - fprintf (stderr, '%s'\n, os.str().c_str()); */ \
+os  message   took   dfscaled   pseudo-cycles (  df 
  real-time seconds), expected:   time   pseudo-cycles.; \
 CPPUNIT_FAIL(os.str().c_str()); \
 } \
 } while (0)
@@ -545,10 +537,10 @@ void Test::testPerf()
 // second.  Flag failure if it takes more than one second.  Clearing 100
 // columns should be large enough to flag if something goes wrong.
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 clearRange(m_pDoc, ScRange(0,0,0,99,MAXROW,0));
 }
-PERF_ASSERT(diff, 1.0, Clearing an empty sheet);
+PERF_ASSERT(diff, scale, 1.0, Clearing an empty sheet);
 
 {
 // Switch to R1C1 to make it easier to input relative references in 
multiple cells.
@@ -563,10 +555,10 @@ void Test::testPerf()
 // Now, Delete B2:B10. This should complete in a fraction of a 
second
 // (0.06 sec on my machine).
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 clearRange(m_pDoc, ScRange(1,1,0,1,9,0));
 }
-PERF_ASSERT(diff, 3000, Removal of a large array of formula cells);
+PERF_ASSERT(diff, scale, 2000, Removal of a large array of formula 
cells);
 }
 
 clearRange(m_pDoc, ScRange(0,0,0,1,MAXROW,0)); // Clear columns A:B.
@@ -597,10 +589,10 @@ void Test::testPerf()
 aMark.SetMarkArea(aPasteRange);
 
 {
-MeasureTimeSwitch aTime(diff, scale);
+MeasureTimeSwitch aTime(diff);
 m_pDoc-CopyFromClip(aPasteRange, aMark, IDF_CONTENTS, pUndoDoc, 
aClipDoc);
 }
-PERF_ASSERT(diff, 1500.0, Pasting a single cell to A2:A10);
+PERF_ASSERT(diff, scale, 1500.0, Pasting a single cell to 
A2:A10);
 
 ScDocument* pRedoDoc = new ScDocument(SCDOCMODE_UNDO);
 pRedoDoc-InitUndo(m_pDoc, 0, 0);
@@ -615,10 +607,10 @@ void Test::testPerf()
 CPPUNIT_ASSERT_EQUAL(m_pDoc-GetString(aPos), 
m_pDoc-GetString(aPasteRange.aEnd));

[PATCH] fix fdo#64872 infinite loop saving as doc

2013-05-22 Thread Luke Deller (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/4008

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/4008/1

fix fdo#64872 infinite loop saving as doc

When loading from odt, table cells which are covered (due to merging of
cells) are replacecd with an empty cell by
SwXMLTableContext::ReplaceWithEmptyCell.  However if there is a sequence
of cells covered from above then their replacements are accidentally
inserted in reverse order, which produces this infinite loop problem when
saving as doc.

The reverse ordering in SwXMLTableContext::ReplaceWithEmptyCell was because
the insert position came from SwXMLTableContext::GetPrevStartNode which was
very careful to skip previous covered cells.  However those cells have
already been replaced with an empty cell so they should not be skipped.

Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363
---
M sw/source/filter/xml/xmltbli.cxx
1 file changed, 6 insertions(+), 20 deletions(-)



diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 9cc801f..e0a214f 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1804,29 +1804,15 @@
 // The last cell is the right one here.
 pPrevCell = GetCell( pRows-size()-1U, GetColumnCount()-1UL );
 }
-else if( 0UL == nRow )
+else if( nCol  0UL )
 {
-// There are no vertically merged cells within the first row, so the
-// previous cell is the right one always.
-if( nCol  0UL )
-pPrevCell = GetCell( nRow, nCol-1UL );
+// The previous cell in this row.
+pPrevCell = GetCell( nRow, nCol-1UL );
 }
-else
+else if( nRow  0UL )
 {
-// If there is a previous cell in the current row that is not spanned
-// from the previous row, its the right one.
-const SwXMLTableRow_Impl *pPrevRow = (*pRows)[(sal_uInt16)nRow-1U];
-sal_uInt32 i = nCol;
-while( !pPrevCell   i  0UL )
-{
-i--;
-if( 1UL == pPrevRow-GetCell( i )-GetRowSpan() )
-pPrevCell = GetCell( nRow, i );
-}
-
-// Otherwise, the last cell from the previous row is the right one.
-if( !pPrevCell )
-pPrevCell = pPrevRow-GetCell( GetColumnCount()-1UL );
+// The last cell from the previous row.
+pPrevCell = GetCell( nRow-1UL, GetColumnCount()-1UL );
 }
 
 const SwStartNode *pSttNd = 0;

-- 
To view, visit https://gerrit.libreoffice.org/4008
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a022cd1490afa181dbc3e4b2d6ed4af3077b363
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luke Deller l...@deller.id.au

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - extras/source starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk vcl/source

2013-05-22 Thread Caolán McNamara

 extras/source/glade/libreoffice-catalog.xml.in |6 
 starmath/UIConfig_smath.mk |1 
 starmath/inc/dialog.hxx|   86 +++--
 starmath/inc/helpids.h |1 
 starmath/inc/starmath.hrc  |1 
 starmath/source/dialog.cxx |  395 +
 starmath/source/smres.src  |   83 -
 starmath/uiconfig/smath/ui/catalogdialog.ui|  207 +
 vcl/source/control/combobox.cxx|2 
 vcl/source/control/lstbox.cxx  |2 
 10 files changed, 476 insertions(+), 308 deletions(-)

New commits:
commit 102c6164cd3003f935f6a041113897d68cb83a27
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 12:07:21 2013 +0100

adapt code to catalog .ui conversion

Change-Id: If34cef7eef5ab26f52420685f54a85fcff2a0c12

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 91a087d..772ec0b 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -60,6 +60,12 @@
 glade-widget-class title=Font Preview name=svxlo-SvxFontPrevWindow
 generic-name=Font Preview Window 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
+glade-widget-class title=Show Math Symbol name=smlo-SmShowSymbol
+generic-name=Show Math Symbol parent=GtkDrawingArea
+icon-name=widget-gtk-drawingarea/
+glade-widget-class title=Math Symbol Selection 
name=smlo-SmShowSymbolSet
+generic-name=Math Symbol Selection 
parent=GtkDrawingArea
+icon-name=widget-gtk-drawingarea/
 glade-widget-class title=Number Preview name=cuilo-SvxNumberPreview
 generic-name=Number Preview Window 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index 83a127a..9c42043 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/smath,\
 
 $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/alignmentdialog \
+   starmath/uiconfig/smath/ui/catalogdialog \
starmath/uiconfig/smath/ui/printeroptions \
 ))
 
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 34511b9..89eec63 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -287,35 +287,56 @@ public:
 
 /**/
 
-class SmShowSymbolSet : public Control
+class SmShowSymbolSetWindow : public Control
 {
+ScrollBar*  m_pVScrollBar;
 SymbolPtrVec_t aSymbolSet;
-ScrollBar   aVScrollBar;
-SizeaOutputSize;
 LinkaSelectHdlLink;
 LinkaDblClickHdlLink;
-sal_uInt16  nLen;
-sal_uInt16  nRows, nColumns;
-sal_uInt16  nSelectSymbol;
+sal_uInt16  nLen;
+sal_uInt16  nRows, nColumns;
+sal_uInt16  nXOffset, nYOffset;
+sal_uInt16  nSelectSymbol;
+
+void SetScrollBarRange();
+Point OffsetPoint(const Point rPoint) const;
 
 virtual voidPaint(const Rectangle);
 virtual voidMouseButtonDown(const MouseEvent rMEvt);
 virtual voidKeyInput(const KeyEvent rKEvt);
+virtual voidResize();
+virtual SizeGetOptimalSize() const;
 
 DECL_LINK( ScrollHdl, ScrollBar* );
-
 public:
-SmShowSymbolSet(Window *pParent, const ResId rResId);
-
-voidSetSymbolSet(const SymbolPtrVec_t rSymbolSet);
-
+SmShowSymbolSetWindow(Window *pParent, WinBits nStyle);
+void setScrollbar(ScrollBar *pVScrollBar);
+void calccols();
 voidSelectSymbol(sal_uInt16 nSymbol);
 sal_uInt16  GetSelectSymbol() const { return nSelectSymbol; }
-
+void SetSymbolSet(const SymbolPtrVec_t rSymbolSet);
 void SetSelectHdl(const Link rLink)   { aSelectHdlLink = rLink; }
 void SetDblClickHdl(const Link rLink) { aDblClickHdlLink = rLink; }
 };
 
+class SmShowSymbolSet : public VclHBox
+{
+SmShowSymbolSetWindow aSymbolWindow;
+ScrollBar   aVScrollBar;
+SizeaOutputSize;
+
+public:
+SmShowSymbolSet(Window *pParent);
+
+voidSetSymbolSet(const SymbolPtrVec_t rSymbolSet) { 
aSymbolWindow.SetSymbolSet(rSymbolSet); }
+
+voidSelectSymbol(sal_uInt16 nSymbol) { 
aSymbolWindow.SelectSymbol(nSymbol); }
+sal_uInt16  GetSelectSymbol() const { return 
aSymbolWindow.GetSelectSymbol(); }
+
+void SetSelectHdl(const Link rLink)   { 
aSymbolWindow.SetSelectHdl(rLink); }
+void SetDblClickHdl(const Link rLink) { 
aSymbolWindow.SetDblClickHdl(rLink); }
+};
+
 

 
 class SmShowSymbol : public Control
@@

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

2013-05-22 Thread Caolán McNamara

 vcl/source/control/combobox.cxx |2 +-
 vcl/source/control/lstbox.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ce418f314f4674d9eb9954cc553cc0674ed4a82a
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 16:50:18 2013 +0100

setting max line count should allow extra values to be added later

Change-Id: Ia693c83b8d27cacbd257f81b5eae2936fc5f8a6f
(cherry picked from commit c19c9dfc69b73ae7dbd7d4b9e68ec0a7c7891913)

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 5234a52..e89bc53 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -569,7 +569,7 @@ void ComboBox::SetDropDownLineCount( sal_uInt16 nLines )
 void ComboBox::AdaptDropDownLineCountToMaximum()
 {
 // adapt to maximum allowed number
-SetDropDownLineCount(std::min(GetEntryCount(), 
GetSettings().GetStyleSettings().GetListBoxMaximumLineCount()));
+
SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
 }
 
 // ---
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 741558e..31dfde2 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -593,7 +593,7 @@ void ListBox::SetDropDownLineCount( sal_uInt16 nLines )
 void ListBox::AdaptDropDownLineCountToMaximum()
 {
 // adapt to maximum allowed number
-SetDropDownLineCount(std::min(GetEntryCount(), 
GetSettings().GetStyleSettings().GetListBoxMaximumLineCount()));
+
SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
 }
 
 // ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] catalog.ui widget

2013-05-22 Thread via Code Review

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/3971


-- 
To view, visit https://gerrit.libreoffice.org/3971
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a67c1c9b30b56d3c0739c2f77abfc24a941dad4
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Aliah Almusaireae almusair...@kacst.edu.sa
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [libreoffice-users] Ask.LibreOffice.org and Bugzilla Twitter accounts

2013-05-22 Thread Zeki Bildirici

Hi,

I want you to inform about some minor updates:

- I've moved the external service for Ask site to dlvr.it because of
detailed statistics
- I've added FIXED bugs to Bugzilla stream. I've selected Bug Status=
Resolved, Resouliton=Fixed criteria, if i should add more criteria
please notify me. So this was the fix of fdo#50096
(https://bugs.freedesktop.org/show_bug.cgi?id=50096)

Well, also i checked dlvr.it statistics for Bugzilla account, despite
of having only 24 followers at the moment- we had good number of
clicks(276), we have 2,2 click ratio per link. Which means a streamed
bugs report on bugzilla has seen by 2,2 people. Which is a good number
and it is additional traffic. The geographical distribution seems good
too.If we can increase the number of followers more traffic and
interest will be provided. For last 24 hours, 73 clicks, 24 posts
which means 24 new bug is opened, ratio is ~3.0 per click)

Also i tried to check the statistics for Ask site but twitterfeed has
limited statistics, nearly %80 of questions has clicks, some has more
than one. Which is also good for the moment which we have 44
followers.

If you have twitter accounts, please follow the streams -whichever
gets your interest and will to contribute

LibreOffice Bugzilla:
https://twitter.com/LibreOfficeBugs

Ask.LibreOffice.org:
https://twitter.com/AskLibreOffice

(Personally following this feeds increased my interest on both sites,
answered some questions and wanted to answer more but i have a very
limited time for the moment)

Also posting about this accounts on TDF
planet(http://planet.documentfoundation.org/) may help to promote this
twitter accounts.

I will be posting to Google+ page and Facebook Page to get more
followers and (weeks) later i may write a blog post about how to
contribute LibreOffice by doing simple QA jobs in bugzilla and just
simply answering others questions in ask site including this accounts.

Your individual promoting of this accounts will be very appreciated indeed :)

Well, for the moment i am very optimistic about the gain from this
accounts. May be the first excitement may be worse, but we will see in
numbers in next month and following months.

Sorry for multiple-list-disturbance but this issue is related with all.

Best regards and keep being awesome for LibreOffice!
Zeki
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

2013-05-22 Thread Miklos Vajna

 sw/source/filter/ww8/ww8par2.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit c1064997b24d2426e426c78ae4207e4d9bd77b43
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed May 22 19:26:32 2013 +0200

SwWW8ImplReader::StartTable: remove pointless assert

This is a valid situation since commit
8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de.

Change-Id: Iddb889e3fa05edcbe42cc4a9765ca29757f2195e

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 81841d5..887e5f4 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3385,11 +3385,6 @@ bool SwWW8ImplReader::StartTable(WW8_CP nStartCp)
 if( pTableDesc-Ok() )
 {
 int nNewInTable = nInTable + 1;
-if (InEqualApo(nNewInTable))
-{
-OSL_ENSURE(pSFlyPara-pFlyFmt,
-how could we be in a local apo and have no apo);
-}
 
 if ((eAnchor == FLY_AT_CHAR)
  !maTableStack.empty()  !InEqualApo(nNewInTable) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/uiconfig extras/source

2013-05-22 Thread Caolán McNamara

 cui/uiconfig/ui/backgroundpage.ui  |2 +-
 cui/uiconfig/ui/colorpage.ui   |2 +-
 extras/source/glade/libreoffice-catalog.xml.in |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 711135d2867dc2c53457fe7de7837c70873974b6
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 19:08:04 2013 +0100

wrong libraries name again

Change-Id: I5ee490c4d08e703b5ed825d2d4d0c981e21a1b9f

diff --git a/cui/uiconfig/ui/backgroundpage.ui 
b/cui/uiconfig/ui/backgroundpage.ui
index 78d761f..5fcb803 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -217,7 +217,7 @@
   /packing
 /child
 child
-  object class=svxlo-SvxColorValueSet 
id=backgroundcolorset
+  object class=svxcorelo-SvxColorValueSet 
id=backgroundcolorset
 property name=width_request150/property
 property name=height_request150/property
 property name=visibleTrue/property
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 0146da1..e190e4d 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -129,7 +129,7 @@
   /packing
 /child
 child
-  object class=svxlo-SvxColorValueSet id=colorset
+  object class=svxcorelo-SvxColorValueSet 
id=colorset
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 772ec0b..a84a229 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -84,7 +84,7 @@
 glade-widget-class title=ValueSet name=svtlo-ValueSet
 generic-name=Set of Value Options 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
-glade-widget-class title=ValueSet name=svxlo-SvxColorValueSet
+glade-widget-class title=ValueSet name=svxcorelo-SvxColorValueSet
 generic-name=Set of Value Options 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
 glade-widget-class title=ValueSet name=swuilo-ColumnValueSet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig extras/source

2013-05-22 Thread Caolán McNamara

 cui/uiconfig/ui/backgroundpage.ui  |2 +-
 cui/uiconfig/ui/colorpage.ui   |2 +-
 extras/source/glade/libreoffice-catalog.xml.in |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d601bab683779c2db47c13a965405cc1be7f9147
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 19:08:04 2013 +0100

wrong libraries name again

Change-Id: I5ee490c4d08e703b5ed825d2d4d0c981e21a1b9f
(cherry picked from commit 711135d2867dc2c53457fe7de7837c70873974b6)

diff --git a/cui/uiconfig/ui/backgroundpage.ui 
b/cui/uiconfig/ui/backgroundpage.ui
index 78d761f..5fcb803 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -217,7 +217,7 @@
   /packing
 /child
 child
-  object class=svxlo-SvxColorValueSet 
id=backgroundcolorset
+  object class=svxcorelo-SvxColorValueSet 
id=backgroundcolorset
 property name=width_request150/property
 property name=height_request150/property
 property name=visibleTrue/property
diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui
index 0146da1..e190e4d 100644
--- a/cui/uiconfig/ui/colorpage.ui
+++ b/cui/uiconfig/ui/colorpage.ui
@@ -129,7 +129,7 @@
   /packing
 /child
 child
-  object class=svxlo-SvxColorValueSet id=colorset
+  object class=svxcorelo-SvxColorValueSet 
id=colorset
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=hexpandTrue/property
diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 91a087d..ecad897 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -78,7 +78,7 @@
 glade-widget-class title=ValueSet name=svtlo-ValueSet
 generic-name=Set of Value Options 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
-glade-widget-class title=ValueSet name=svxlo-SvxColorValueSet
+glade-widget-class title=ValueSet name=svxcorelo-SvxColorValueSet
 generic-name=Set of Value Options 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
 glade-widget-class title=ValueSet name=swuilo-ColumnValueSet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source sc/uiconfig sd/source sd/uiconfig sw/source sw/uiconfig

2013-05-22 Thread Andre Fischer

 sc/source/ui/view/tabvwsh.cxx|1 -
 sc/uiconfig/scalc/menubar/menubar.xml|1 -
 sd/source/ui/view/drvwshrg.cxx   |1 -
 sd/uiconfig/simpress/menubar/menubar.xml |1 -
 sw/source/ui/uiview/view0.cxx|1 -
 sw/uiconfig/sglobal/menubar/menubar.xml  |1 -
 sw/uiconfig/sweb/menubar/menubar.xml |1 -
 sw/uiconfig/swform/menubar/menubar.xml   |1 -
 sw/uiconfig/swreport/menubar/menubar.xml |1 -
 sw/uiconfig/swriter/menubar/menubar.xml  |1 -
 sw/uiconfig/swxform/menubar/menubar.xml  |1 -
 11 files changed, 11 deletions(-)

New commits:
commit 94b868141e5ad43f8e2affb77563ec0f999a2d60
Author: Andre Fischer a...@apache.org
Date:   Wed May 22 11:32:13 2013 +

Resolves: #ii122335# Disabling the old task pane

(cherry picked from commit f19d927b19ec6263ffedc9a20585d0fa2e74fc54)

Change-Id: I084b132f3a2f2a103c16edab1de6196d3219b468

diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 537499b..7949e17 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -54,7 +54,6 @@ 
SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
 SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
 SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId());
 SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
-SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
 
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
 SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId());
 SFX_CHILDWINDOW_REGISTRATION(ScNameDefDlgWrapper::GetChildWindowId());
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index ca8d8ba..777c324 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -139,7 +139,6 @@
 menu:menuseparator/
 menu:menuitem menu:id=.uno:ViewDataSourceBrowser/
 menu:menuitem menu:id=.uno:Navigator/
-  menu:menuitem menu:id=.uno:TaskPane/
   menu:menuitem menu:id=.uno:Sidebar/
   menu:menuseparator/
 menu:menuitem menu:id=.uno:FullScreen/
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index c71959c..bb20370 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -94,7 +94,6 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, 
SdResId(STR_DRAWVIEWSHELL)) //SOH
 {
 SFX_POPUPMENU_REGISTRATION( SdResId(RID_DRAW_TEXTOBJ_INSIDE_POPUP) );
 SFX_CHILDWINDOW_CONTEXT_REGISTRATION( SID_NAVIGATOR );
-SFX_CHILDWINDOW_REGISTRATION( SID_TASKPANE );
 SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() 
);
 SFX_CHILDWINDOW_REGISTRATION( SvxFontWorkChildWindow::GetChildWindowId() );
 SFX_CHILDWINDOW_REGISTRATION( SvxColorChildWindow::GetChildWindowId() );
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 9a5b874..9ad2019 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -113,7 +113,6 @@
 /menu:menupopup
 /menu:menu
 menu:menuseparator/
-  menu:menuitem menu:id=.uno:TaskPane/
   menu:menuitem menu:id=.uno:Sidebar/
   menu:menuitem menu:id=.uno:LeftPaneImpress/
 menu:menuitem menu:id=.uno:AvailableToolbars/
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index e5f7b3b..73555a8 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -90,7 +90,6 @@ SFX_IMPL_NAMED_VIEWFACTORY(SwView, Default)
 SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) )
 {
 SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
-SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
 
SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
 SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
 SFX_CHILDWINDOW_REGISTRATION(SfxInfoBarContainerChild::GetChildWindowId());
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index f79d0ec..3c310f2 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -137,7 +137,6 @@
   menu:menuseparator/
   menu:menuitem menu:id=.uno:ViewDataSourceBrowser/
   menu:menuitem menu:id=.uno:Navigator/
-  menu:menuitem menu:id=.uno:TaskPane/
   menu:menuitem menu:id=.uno:Sidebar/
   menu:menuseparator/
   menu:menuitem menu:id=.uno:FullScreen/
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index 3cb3b76..30229a7 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -108,7 +108,6 @@
   menu:menuseparator/
   menu:menuitem

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f1/9d927b19ec6263ffedc9a20585d0fa2e74fc54

2013-05-22 Thread Caolán McNamara

 f1/9d927b19ec6263ffedc9a20585d0fa2e74fc54 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e3e117c47b689386417d58408073431b935b66db
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 19:19:55 2013 +0100

Notes added by 'git notes add'

diff --git a/f1/9d927b19ec6263ffedc9a20585d0fa2e74fc54 
b/f1/9d927b19ec6263ffedc9a20585d0fa2e74fc54
new file mode 100644
index 000..d9474a9
--- /dev/null
+++ b/f1/9d927b19ec6263ffedc9a20585d0fa2e74fc54
@@ -0,0 +1 @@
+merged as: 94b868141e5ad43f8e2affb77563ec0f999a2d60
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ABANDONED] fdo#60924: autoinstall onlineupdate libraries

2013-05-22 Thread Marcos Souza (via Code Review)

Marcos Souza has abandoned this change.

Change subject: fdo#60924: autoinstall onlineupdate libraries
..


Patch Set 1: Abandoned

This change is merged with other commit related to onlineupdate

-- 
To view, visit https://gerrit.libreoffice.org/3878
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I9e06d165351161ff144b7605094a3e490d13d5f2
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Marcos Souza marcos.souza@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com
Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sfx2/source

2013-05-22 Thread Andre Fischer

 sfx2/source/sidebar/MenuButton.cxx |   12 
 sfx2/source/sidebar/TabBar.cxx |4 
 sfx2/source/sidebar/TabBar.hxx |3 ++-
 3 files changed, 6 insertions(+), 13 deletions(-)

New commits:
commit ff7bbe528aebedd41229e8d351a8c595e3627905
Author: Andre Fischer a...@apache.org
Date:   Wed May 22 11:48:44 2013 +

Resolves: #i122366# Uncheck sidebar menu button after menu is closed

(cherry picked from commit ac41d4c3e1972e3968ce9cf6949adc13e2b198e6)

Change-Id: I4eef19a3b4ad9ea3ff7fd40b22c2854f569b69b6

diff --git a/sfx2/source/sidebar/MenuButton.cxx 
b/sfx2/source/sidebar/MenuButton.cxx
index 0a5180e..fc573ce 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -102,18 +102,12 @@ void MenuButton::MouseMove (const MouseEvent rEvent)
 
 void MenuButton::MouseButtonDown (const MouseEvent rMouseEvent)
 {
-#if 0
-Hide();
-CheckBox::MouseButtonDown(rMouseEvent);
-Show();
-#else
 if (rMouseEvent.IsLeft())
 {
 mbIsLeftButtonDown = true;
 CaptureMouse();
 Invalidate();
 }
-#endif
 }
 
 
@@ -121,11 +115,6 @@ void MenuButton::MouseButtonDown (const MouseEvent 
rMouseEvent)
 
 void MenuButton::MouseButtonUp (const MouseEvent rMouseEvent)
 {
-#if 0
-Hide();
-CheckBox::MouseButtonUp(rMouseEvent);
-Show();
-#else
 if (IsMouseCaptured())
 ReleaseMouse();
 
@@ -143,7 +132,6 @@ void MenuButton::MouseButtonUp (const MouseEvent 
rMouseEvent)
 mbIsLeftButtonDown = false;
 Invalidate();
 }
-#endif
 }
 
 
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 21beb0f..1cbd18b 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -363,6 +363,9 @@ void TabBar::UpdateFocusManager (FocusManager 
rFocusManager)
 
 IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
 {
+if ( ! mpMenuButton)
+return 0;
+
 ::std::vectorDeckMenuData aMenuData;
 
 for(ItemContainer::const_iterator 
iItem(maItems.begin()),iEnd(maItems.end());
@@ -388,6 +391,7 @@ IMPL_LINK(TabBar, OnToolboxClicked, void*, EMPTYARG)
 mpMenuButton-GetPosPixel(),
 mpMenuButton-GetSizePixel()),
 aMenuData);
+mpMenuButton-Check(sal_False);
 
 return 0;
 }
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index 7cecc42..cafd3e8 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -30,6 +30,7 @@
 #include boost/scoped_ptr.hpp
 
 class Button;
+class CheckBox;
 class RadioButton;
 
 namespace css = ::com::sun::star;
@@ -94,7 +95,7 @@ public:
 
 private:
 cssu::Referencecss::frame::XFrame mxFrame;
-::boost::scoped_ptrButton mpMenuButton;
+::boost::scoped_ptrCheckBox mpMenuButton;
 class Item
 {
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ac/41d4c3e1972e3968ce9cf6949adc13e2b198e6

2013-05-22 Thread Caolán McNamara

 ac/41d4c3e1972e3968ce9cf6949adc13e2b198e6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3eb3964f4bd6b09478692ec3c74fb998cca68f4c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed May 22 20:02:55 2013 +0100

Notes added by 'git notes add'

diff --git a/ac/41d4c3e1972e3968ce9cf6949adc13e2b198e6 
b/ac/41d4c3e1972e3968ce9cf6949adc13e2b198e6
new file mode 100644
index 000..436e396
--- /dev/null
+++ b/ac/41d4c3e1972e3968ce9cf6949adc13e2b198e6
@@ -0,0 +1 @@
+merged as: ff7bbe528aebedd41229e8d351a8c595e3627905
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 3 >

1 - 100 of 295 matches

Mail list logo