date:20130417


On 04/18/2013 08:42 AM, Stephan Bergmann wrote:

On 04/15/2013 03:34 PM, Michael Stahl wrote:

--enable-dgbutil just got better on non-mainstream platforms:

[...]

with commit a5a5104cae175f6b9a8cb4bbaccb69f0276783e3 MacOSX build define
_GLIBCXX_DEBUG (like Linux/BSD/Android builds have done for years(,
which enables debug STL.


So this unfortunately had to be reverted again with

"Revert _GLIBCXX_DEBUG on Mac OS X again."  See the other mails in this
thread for details.


(So this unfortunately means you need to do a clean build for Mac OS X 
--enable-dbgutil once again.)


Stephan

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

[PUSHED] fdo#63197, convert some accessories

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3449

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b406734603ad61d7a00ea2f6114103e10f265ed
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

[Libreoffice-commits] core.git: extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk extras/ExternalPackage_accessoriesgallerynonfree.mk extras/ExternalPackage_accessoriesgalleryphotosbuilding

 extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk  |  191 +
 extras/ExternalPackage_accessoriesgallerynonfree.mk   |   29 +
 extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk   |   37 +
 extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk |   19 
 extras/ExternalPackage_accessoriesgalleryphotoscities.mk  |   25 +
 extras/Module_extras.mk   |   10 
 extras/Zip_accessoriesgalleryelementsbullets2.mk  |  193 --
 extras/Zip_accessoriesgallerynonfree.mk   |   31 -
 extras/Zip_accessoriesgalleryphotosbuildings.mk   |   39 --
 extras/Zip_accessoriesgalleryphotoscelebration.mk |   21 -
 extras/Zip_accessoriesgalleryphotoscities.mk  |   27 -
 scp2/source/accessories/file_gallery_accessories.scp  |   35 +
 12 files changed, 326 insertions(+), 331 deletions(-)

New commits:
commit 3677823cea29f6d0b054827a8df1ae3aa84c4523
Author: Julien Nabet 
Date:   Thu Apr 18 08:26:59 2013 +0200

fdo#63197, convert some accessories

Change-Id: I0b406734603ad61d7a00ea2f6114103e10f265ed
Reviewed-on: https://gerrit.libreoffice.org/3449
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk 
b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
new file mode 100644
index 000..9fcdea1
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
@@ -0,0 +1,191 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call 
gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelementsbullets2,gallery-pack))
+
+$(eval $(call 
gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(INSTDIR)))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,share/gallery/Elements/Bullets2,\
+   accessories/Elements/Bullets2/amethyst.arrow.png \
+   accessories/Elements/Bullets2/amethyst.asterisk.png \
+   accessories/Elements/Bullets2/amethyst.circle-light.png \
+   accessories/Elements/Bullets2/amethyst.circle.png \
+   accessories/Elements/Bullets2/amethyst.cross1.png \
+   accessories/Elements/Bullets2/amethyst.cross2.png \
+   accessories/Elements/Bullets2/amethyst.dash.png \
+   accessories/Elements/Bullets2/amethyst.diamond-light.png \
+   accessories/Elements/Bullets2/amethyst.diamond.png \
+   accessories/Elements/Bullets2/amethyst.minus.png \
+   accessories/Elements/Bullets2/amethyst.plus.png \
+   accessories/Elements/Bullets2/amethyst.smiley.png \
+   accessories/Elements/Bullets2/amethyst.square-light.png \
+   accessories/Elements/Bullets2/amethyst.square.png \
+   accessories/Elements/Bullets2/amethyst.star.png \
+   accessories/Elements/Bullets2/amethyst.tick.png \
+   accessories/Elements/Bullets2/amethyst.triangle1-light.png \
+   accessories/Elements/Bullets2/amethyst.triangle1.png \
+   accessories/Elements/Bullets2/amethyst.triangle2-light.png \
+   accessories/Elements/Bullets2/amethyst.triangle2.png \
+   accessories/Elements/Bullets2/citrine.arrow.png \
+   accessories/Elements/Bullets2/citrine.asterisk.png \
+   accessories/Elements/Bullets2/citrine.circle-light.png \
+   accessories/Elements/Bullets2/citrine.circle.png \
+   accessories/Elements/Bullets2/citrine.cross1.png \
+   accessories/Elements/Bullets2/citrine.cross2.png \
+   accessories/Elements/Bullets2/citrine.dash.png \
+   accessories/Elements/Bullets2/citrine.diamond-light.png \
+   accessories/Elements/Bullets2/citrine.diamond.png \
+   accessories/Elements/Bullets2/citrine.minus.png \
+   accessories/Elements/Bullets2/citrine.plus.png \
+   accessories/Elements/Bullets2/citrine.smiley.png \
+   accessories/Elements/Bullets2/citrine.square-light.png \
+   accessories/Elements/Bullets2/citrine.square.png \
+   accessories/Elements/Bullets2/citrine.star.png \
+   accessories/Elements/Bullets2/citrine.tick.png \
+   accessories/Elements/Bullets2/citrine.triangle1-light.png \
+   accessories/Elements/Bullets2/citrine.triangle1.png \
+   accessories/Elements/Bullets2/citrine.triangle2-light.png \
+   accessories/Elements/Bullets2/citrine.triangle2.png \
+   accessories/Elements/Bullets2/emerald.arrow.png \
+   accessories/Elements/Bullets2/emerald.asterisk.png \
+   accessories/Elements/Bullets2/emerald.circle-light.png \
+   accessories/Elements/Bullets2/emerald.circle.png \
+   accessories/Elements/Bullets2/emerald.cross1.png \
+   accessori

Re: [ANN] --enable-dbgutil: everyone gets a Debug STL!


On 04/15/2013 03:34 PM, Michael Stahl wrote:

--enable-dgbutil just got better on non-mainstream platforms:

[...]

with commit a5a5104cae175f6b9a8cb4bbaccb69f0276783e3 MacOSX build define
_GLIBCXX_DEBUG (like Linux/BSD/Android builds have done for years(,
which enables debug STL.


So this unfortunately had to be reverted again with 
 
"Revert _GLIBCXX_DEBUG on Mac OS X again."  See the other mails in this 
thread for details.


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

[Libreoffice-commits] core.git: cppunit/ExternalProject_cppunit.mk liborcus/ExternalProject_liborcus.mk solenv/gbuild

 cppunit/ExternalProject_cppunit.mk   |8 +---
 liborcus/ExternalProject_liborcus.mk |8 +---
 solenv/gbuild/platform/macosx.mk |   12 
 3 files changed, 2 insertions(+), 26 deletions(-)

New commits:
commit dfebe3fc512939395e8ece9cab85eb1c2cb04783
Author: Stephan Bergmann 
Date:   Thu Apr 18 08:38:06 2013 +0200

Revert _GLIBCXX_DEBUG on Mac OS X again

It does not work, see
 
"Re:
[ANN] --enable-dbgutil: everyone gets a Debug STL!"

Change-Id: I0b0c0faa03a1a03095b70454d38a1a193b42d56a

diff --git a/cppunit/ExternalProject_cppunit.mk 
b/cppunit/ExternalProject_cppunit.mk
index 7aba4f0..bb63996 100644
--- a/cppunit/ExternalProject_cppunit.mk
+++ b/cppunit/ExternalProject_cppunit.mk
@@ -38,18 +38,12 @@ else
 
 cppunit_CXXFLAGS=$(CXXFLAGS)
 
-ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX MACOSX NETBSD 
OPENBSD,$(OS)))
+ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
 ifneq (,$(gb_ENABLE_DBGUTIL))
 cppunit_CXXFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-ifeq ($(OS),MACOSX)
-ifneq (,$(gb_ENABLE_DBGUTIL))
-cppunit_CXXFLAGS+=-D_GLIBCXX_FULLY_DYNAMIC_STRING
-endif
-endif
-
 ifeq ($(OS)-$(COM),WNT-GCC)
 cppunit_CXXFLAGS+=-mthreads
 endif
diff --git a/liborcus/ExternalProject_liborcus.mk 
b/liborcus/ExternalProject_liborcus.mk
index ce9644c..75099fa 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -57,18 +57,12 @@ endif
 # library (glibc), the NDK does offer the GNU C++ library as one of
 # the C++ libraries available, and we use it.
 #
-ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX MACOSX NETBSD 
OPENBSD,$(OS)))
+ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
 ifneq (,$(gb_ENABLE_DBGUTIL))
 liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
 endif
 endif
 
-ifeq ($(OS),MACOSX)
-ifneq (,$(gb_ENABLE_DBGUTIL))
-liborcus_CPPFLAGS+=-D_GLIBCXX_FULLY_DYNAMIC_STRING
-endif
-endif
-
 liborcus_CXXFLAGS=$(CXXFLAGS)
 ifeq ($(COM),MSC)
 liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index efb0f05..011aaae 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -77,18 +77,6 @@ gb_COMPILERDEFS += \
 
 endif
 
-# Enable debug libstdc++
-ifeq ($(gb_ENABLE_DBGUTIL),$(true))
-gb_COMPILERDEFS += \
-   -D_GLIBCXX_DEBUG \
-
-# See http://lists.apple.com/archives/cocoa-dev/2009/Sep/msg01199.html ,
-# 
http://stackoverflow.com/questions/2234557/c-using-getline-prints-pointer-being-freed-was-not-allocated-in-xcode
-gb_COMPILERDEFS += \
-   -D_GLIBCXX_FULLY_DYNAMIC_STRING \
-
-endif
-
 ifeq ($(HAVE_GCC_NO_LONG_DOUBLE),TRUE)
 gb_CXXFLAGS += -Wno-long-double
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [ANN] --enable-dbgutil: everyone gets a Debug STL!


On 04/17/2013 08:43 AM, Stephan Bergmann wrote:

On 04/15/2013 03:34 PM, Michael Stahl wrote:

with commit f14f7a2e4568e3e85a0c8860beebd0376c5a8b51 MSVC builds will
link everything against the debug runtimes (MSVCRTD etc.), which enables
debug STL and other things.

[...]

since we have this enabled on other GCC platforms for years i'm not much
concerned about breakage on MacOSX; it would be helpful though if
somebody could try what happens when you run the "subsequentcheck" tests
which apparently isn't possible over SSH.


Another fallout is that, at least in
my Mac OS X 10.7.5, Xcode 4.6.1, --enable-dbgutil --with-macosx-sdk=10.7
master builds, writing numbers to std streams now suppresses all output
to those streams, so that e.g., SAL_WARN("foo","bar") only writes
"warn:foo:" to stderr (not even followed by a newline) and stops as soon
as it would write the numeric pid.

This is caused by basic_ostream::_M_insert
(/usr/include/c++/4.2.1/bits/ostream.tcc) catching an exception from
__check_facet(this->_M_num_put) and setting ios_base::badbit, which in
turn results from this->_M_num_put unexpectedly being null.  Similar
problems on (non-debug) Linux had been addressed with long ago with
consistently exporting _ZGVNSt7num_put* and _ZNSt7num_put* symbols from
all libraries.

Why _GLIBCXX_DEBUG causes this problem on Mac OS X now, and how to solve
it, is still unclear to me.


For the record, here is what happens:  At least on Mac OS X 10.7.5 with 
Xcode 4.6.2 (with Command Line Tools installed), building the C++ 
program test.cc



#include 
#include 
int main() {
  std::ostringstream s;
  s << "a" << 1 << "b\n";
  std::cout << s.str();
}


with


c++ -D_GLIBCXX_DEBUG test.cc


and running it (./a.out) prints only


a


(not followed by a newline) to stdout, not


a1b


(followed by a newline).

The reason is that in basic_ostream::_M_insert 
(/usr/include/c++/4.2.1/bits/ostream.tcc) the 
__check_facet(this->_M_num_put) call throws an exception, leading to 
this->_M_setstate(ios_base::badbit).


This is because _M_num_put is null, because in 
basic_ios::_M_cache_locale (/usr/include/c++/4.2.1/bits/basic_ios.tcc) 
the call to has_facet<__num_put_type>(__loc) returns false.


This is because in has_facet 
(/usr/include/c++/4.2.1/bits/locale_facets.tcc), the call to 
_Facet::id._M_id() (with _Facet being __num_put_type aka 
num_put<_CharT,ostreambuf_iterator<_CharT,_Traits>>, see 
/usr/include/c++/4.2.1/bits/basic_ios.h) returns a fresh __i >= 
__loc._M_impl->_M_facets_size.


This is because the static


template 
  locale::id num_put<_CharT, _OutIter>::id;


(/usr/include/c++/4.2.1/bits/locale_facets.h) is emitted into test.s as


  .section __DATA,__datacoal_nt,coalesced
  .globl __ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE ## 
@_ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE
  .weak_definition 
__ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE
  .align 3
__ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE:
  .space 8


so that a.out binds to this instance while libstdc++.6.dylib previously 
has used a binding to its own instance (in calls via 
std::ios_base::Init::Init -> ... -> 
std::has_facet>>>, 
as can be observed in gdb).


Interestingly, while a.out contains its own weak definition of 
__ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE2idE, it 
has __ZNSt5ctypeIcE2idE -- i.e.,



template
  locale::id ctype<_CharT>::id;


(/usr/include/c++/4.2.1/bits/locale_facets.h) as an undefined reference 
(so binds to the definition in libstdc++.6.dylib).  Both are eventually 
needed from _M_cache_locale; the two mainly differ in the number of 
template parameters.


This all becomes irrelevant when compiling without -D_GLIBCXX_DEBUG, as 
then (/usr/include/c++/4.2.1/bits/c++config.h) 
_GLIBCXX_NAMESPACE_ASSOCIATION_DEBUG is 0 so that 
_GLIBCXX_EXTERN_TEMPLATE is 1, so that



extern template class basic_ostringstream;


(/usr/include/c++/4.2.1/bits/sstream.tcc) becomes visible and the call 
to 
std::basic_ostringstream,std::allocator>::basic_ostringstream(std::_Ios_Openmode) 
(aka 
__ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC1ESt13_Ios_Openmode) 
in a.out calls directly into libstdc++.6.dylib, instead of carrying weak 
definitions of all the code involved above in a.out.


(It makes no difference whether to build with c++, clang++, or g++.  It 
also makes no difference whether to also specify 
-D_GLIBCXX_FULLY_DYNAMIC_STRING, which is known to be required in other 
circumstances like 
 "Re: 
getline 'free' problem."  Also, results are the same at least with Xcode 
4.6.1 and Xcode 4.6.2.)


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

[PATCH] fdo#63197, convert some accessories

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3449

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/3449/1

fdo#63197, convert some accessories

Change-Id: I0b406734603ad61d7a00ea2f6114103e10f265ed
---
A extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
A extras/ExternalPackage_accessoriesgallerynonfree.mk
A extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
A extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
A extras/ExternalPackage_accessoriesgalleryphotoscities.mk
M extras/Module_extras.mk
D extras/Zip_accessoriesgalleryelementsbullets2.mk
D extras/Zip_accessoriesgallerynonfree.mk
D extras/Zip_accessoriesgalleryphotosbuildings.mk
D extras/Zip_accessoriesgalleryphotoscelebration.mk
D extras/Zip_accessoriesgalleryphotoscities.mk
M scp2/source/accessories/file_gallery_accessories.scp
12 files changed, 326 insertions(+), 331 deletions(-)



diff --git a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk 
b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
new file mode 100644
index 000..9fcdea1
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
@@ -0,0 +1,191 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call 
gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelementsbullets2,gallery-pack))
+
+$(eval $(call 
gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(INSTDIR)))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,share/gallery/Elements/Bullets2,\
+   accessories/Elements/Bullets2/amethyst.arrow.png \
+   accessories/Elements/Bullets2/amethyst.asterisk.png \
+   accessories/Elements/Bullets2/amethyst.circle-light.png \
+   accessories/Elements/Bullets2/amethyst.circle.png \
+   accessories/Elements/Bullets2/amethyst.cross1.png \
+   accessories/Elements/Bullets2/amethyst.cross2.png \
+   accessories/Elements/Bullets2/amethyst.dash.png \
+   accessories/Elements/Bullets2/amethyst.diamond-light.png \
+   accessories/Elements/Bullets2/amethyst.diamond.png \
+   accessories/Elements/Bullets2/amethyst.minus.png \
+   accessories/Elements/Bullets2/amethyst.plus.png \
+   accessories/Elements/Bullets2/amethyst.smiley.png \
+   accessories/Elements/Bullets2/amethyst.square-light.png \
+   accessories/Elements/Bullets2/amethyst.square.png \
+   accessories/Elements/Bullets2/amethyst.star.png \
+   accessories/Elements/Bullets2/amethyst.tick.png \
+   accessories/Elements/Bullets2/amethyst.triangle1-light.png \
+   accessories/Elements/Bullets2/amethyst.triangle1.png \
+   accessories/Elements/Bullets2/amethyst.triangle2-light.png \
+   accessories/Elements/Bullets2/amethyst.triangle2.png \
+   accessories/Elements/Bullets2/citrine.arrow.png \
+   accessories/Elements/Bullets2/citrine.asterisk.png \
+   accessories/Elements/Bullets2/citrine.circle-light.png \
+   accessories/Elements/Bullets2/citrine.circle.png \
+   accessories/Elements/Bullets2/citrine.cross1.png \
+   accessories/Elements/Bullets2/citrine.cross2.png \
+   accessories/Elements/Bullets2/citrine.dash.png \
+   accessories/Elements/Bullets2/citrine.diamond-light.png \
+   accessories/Elements/Bullets2/citrine.diamond.png \
+   accessories/Elements/Bullets2/citrine.minus.png \
+   accessories/Elements/Bullets2/citrine.plus.png \
+   accessories/Elements/Bullets2/citrine.smiley.png \
+   accessories/Elements/Bullets2/citrine.square-light.png \
+   accessories/Elements/Bullets2/citrine.square.png \
+   accessories/Elements/Bullets2/citrine.star.png \
+   accessories/Elements/Bullets2/citrine.tick.png \
+   accessories/Elements/Bullets2/citrine.triangle1-light.png \
+   accessories/Elements/Bullets2/citrine.triangle1.png \
+   accessories/Elements/Bullets2/citrine.triangle2-light.png \
+   accessories/Elements/Bullets2/citrine.triangle2.png \
+   accessories/Elements/Bullets2/emerald.arrow.png \
+   accessories/Elements/Bullets2/emerald.asterisk.png \
+   accessories/Elements/Bullets2/emerald.circle-light.png \
+   accessories/Elements/Bullets2/emerald.circle.png \
+   accessories/Elements/Bullets2/emerald.cross1.png \
+   accessories/Elements/Bullets2/emerald.cross2.png \
+   accessories/Elements/Bullets2/emerald.dash.png \
+   accessories/Elements/Bullets2/emerald.diamond-light.png \
+   accessories/Elements/Bullets2/emerald.diamond.png \
+   accessories/Elements/Bullets2/emerald.minus.png \
+   accessories/Elements/B

[Bug 41883] MinGW port Most Annoying Bugs

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

Rainer Bielefeld  changed:

   What|Removed |Added

 Depends on||63669

--- Comment #15 from Rainer Bielefeld  ---
I add "Bug 63669 - MinGW: Tinderbox @7 does not deliver 4.1 Master builds",
delivery broken again!

-- 
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

GSoC ,2013

2013-04-17 Thread mohit bhura

 I am a second year student at The Indian Institute of Technology,
Kharagpur, in the department of Computer Science.

I am interested in working on your project and would like some help on
where i should get started.

Thanking You,
Mohit Bhura
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Value of a ListBox, FMC paradigm for Form elements (controls)

2013-04-17 Thread Lionel Elie Mamane

Context: (Data)Forms and their elements (controls). I'm most
interested in Base, but these things are also used in other
LibreOffice apps I presume? (At least when we import an excel document
that has some... Plus I presume our Calc has the same feature
"natively".)

A ListBox is a form element (or "form control") that takes:

1) a list of values (hardcoded in its properties or from a
   table/query...) to be displayed

2) lets the user choose one (or several) of them

3) *usually* / often, a *second* list of values, same length as
   display list, that gives the *value* corresponding to the choices
   made by the user.

   (one can have the degenerate case where the two lists are the same)

To me, this is like:

 The value of a FormattedDate control is not the string "June 3rd,
 2005", but the "abstract" date (Year=2005, Month=6, Day=3). "June
 3rd, 2005" is merely the *display* format.

The same applies to ListBox: it makes a correspondence between "actual
values" (or "storage value") and "display values". It shows the
display values to the user, but (when bound to a database field)
stores / reads the *actual* value.


PROBLEM 1: value of a ListBox
=

Currently, the "CurrentValue" pseudo-property (getCurrentValue()
method) of a ListBox returns the current *display* value, not the
*storage* value. To me, this is a bug or (serious) misdesign. More
generally, the *storage* values are *not* exposed at all by the UNO
API. IMO this needs to change.

I have a patch ready to change it, but... incompatible behaviour
change... Basically, my question to you is: what should I do? Just
change it, or introduce a new getCurrentBoundValue() to disambiguate,
and leave getCurrentValue() alone?


Even if I change getCurrentValue(), I'd still like to add access to an
*arbitrary* storage value (that is not necessarily to currently
selected one), like the UNO API already exposes access to an arbitrary
display value. Which leads me to:


PROBLEM 2: Frame-Controller-Model paradigm as applied to Form elements
==

Frame elements seem to have a b0rken implementation of the
Frame-Controller-Model paradigm.

When I bind a macro to an event of a ListBox, Event.Source is a
frm::OListBoxControl (see forms/source/component/ListBox.hxx). So far,
so good.

It has a getView() that returns... itself. Hu?

It has a getModel() that returns a frm::OListBoxModel. That in itself
makes sense, *but*:

1) frm::OListBoxModel has no method/API to get back the corresponding
   frm::OListBoxControl

2) The interface com::sun::star::awt::XListBox is exposed by the
   OListBoxControl, not the OListBoxModel.

Now, imagine instead of binding a macro to an event of the ListBox, I
bind to an event of a Button of the same form. Makes sense, when the
user pushes the "OK" button, my macro goes read the ListBox value and
does some processing or when the user types the "refresh listbox"
button the macro goes and adds/removes values from the lists.

So, Event.source is a frm::OButtonControl. I call
getModel().getParent().getParent() (enough getParent() calls to get
the ODatabaseForm), then I do getByName("name_of_listbox_element"),
and I get... a frm::OListBoxModel. With no way to get the
OListBoxControl. This fact is even documented (see
http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Form_Elements_in_the_Document_Model;
it says "Controls are not accessible in the document model. ").

Now, the problem is: the com::sun::star::awt::XListBox interface is
exposed by the frm::OListBoxControl, not the frm::OListBoxModel. So
no way to get at it!

What to do about that? Add a "getCurrentControl(ler)" to the form
element model (com.sun.star.form.FormControlModel)? Duplicate all APIs
in the model (and keep them in the control for backwards
compatibility)?

(see 
http://wiki.openoffice.org/wiki/Documentation/DevGuide/Forms/Form_Control_Models)

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

[Libreoffice-commits] help.git: 2 commits - AllLangHelp_schart.mk source/text

 AllLangHelp_schart.mk |1 
 source/text/schart/00/0004.xhp|4 +
 source/text/schart/01/smooth_line_properties.xhp  |2 
 source/text/schart/01/stepped_line_properties.xhp |   53 ++
 source/text/schart/01/type_line.xhp   |4 -
 source/text/schart/01/type_xy.xhp |   24 +
 source/text/schart/01/wiz_chart_type.xhp  |6 +-
 7 files changed, 86 insertions(+), 8 deletions(-)

New commits:
commit c000c3e3811701f55229bdc0231ceaf8f1e2517a
Author: Markus Mohrhard 
Date:   Thu Apr 18 05:58:04 2013 +0200

add missing help ids

Change-Id: I4e3c1d9eada018c16f3657b93d0f95e0f0b1aa7a

diff --git a/source/text/schart/01/stepped_line_properties.xhp 
b/source/text/schart/01/stepped_line_properties.xhp
index efec875..d1b2118 100644
--- a/source/text/schart/01/stepped_line_properties.xhp
+++ b/source/text/schart/01/stepped_line_properties.xhp
@@ -34,19 +34,19 @@
 
 
 Start step 
icon
-Start with horizontal line and step up vertically at the 
end.
+Start 
with horizontal line and step up vertically at the end.
 
 
 End step 
icon
-Start to step up vertically and end with horizontal line.
+Start to step up 
vertically and end with horizontal line.
 
 
 Center X 
icon
-Start with horizontal line, step up vertically in the middle of the 
X values and end with horizontal line.
+Start 
with horizontal line, step up vertically in the middle of the X values and end 
with horizontal line.
 
 
 Center Y 
icon
-Start to step up vertically to the middle of the Y values, draw a 
horizonal line and finish by stepping vertically to the end.
+Start to step up 
vertically to the middle of the Y values, draw a horizonal line and finish by 
stepping vertically to the end.
 
 
 
diff --git a/source/text/schart/01/type_xy.xhp 
b/source/text/schart/01/type_xy.xhp
index 5516f55..a5d41a3 100644
--- a/source/text/schart/01/type_xy.xhp
+++ b/source/text/schart/01/type_xy.xhp
@@ -86,7 +86,7 @@
 B-Spline uses a parametric, interpolating B-spline curve. Those 
curves are built piecewise from polynomials. The Degree of 
polynomials sets the degree of these polynomials.
 Stepped Lines
 Choose Stepped from the Line type dropdown 
to draw lines which step from point to point instead of straight line 
segments.
-Click Properties to set details for the 
curves.
+Click Properties to set details for the 
curves.
 There are 4 different step types:
 
 
commit 41837c920a92e84ad8bf989f407e60898aa99209
Author: Eric Seynaeve 
Date:   Thu Apr 18 00:21:11 2013 +0200

fdo#61135 Adding stepped lines: changes to help system.

Change-Id: I9b285d4043ab412105d607a8daa6a6b250ba59c2

diff --git a/AllLangHelp_schart.mk b/AllLangHelp_schart.mk
index 0ddceff..dcf2984 100644
--- a/AllLangHelp_schart.mk
+++ b/AllLangHelp_schart.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,schart,\
 helpcontent2/source/text/schart/01/0512 \
 helpcontent2/source/text/schart/01/choose_chart_type \
 helpcontent2/source/text/schart/01/smooth_line_properties \
+helpcontent2/source/text/schart/01/stepped_line_properties \
 helpcontent2/source/text/schart/01/three_d_view \
 helpcontent2/source/text/schart/01/type_area \
 helpcontent2/source/text/schart/01/type_bubble \
diff --git a/source/text/schart/00/0004.xhp 
b/source/text/schart/00/0004.xhp
index d89f7e1..c6d9c0e 100644
--- a/source/text/schart/00/0004.xhp
+++ b/source/text/schart/00/0004.xhp
@@ -242,7 +242,9 @@
  Chart 
 Double-click a chart, then choose Format - Data Ranges
 
-In the Chart Type dialog of a Line chart or XY 
chart that displays lines, mark Smooth lines checkbox, then click the 
Properties button.
+In the Chart Type dialog of a Line chart or XY 
chart that displays lines, choose Smooth in the Lines type dropdown, then click 
the Properties button.
+
+In the Chart Type dialog of a Line chart or XY 
chart that displays lines, choose Stepped in the Lines type dropdown, then 
click the Properties button.
 
 
 
diff --git a/source/text/schart/01/smooth_line_properties.xhp 
b/source/text/schart/01/smooth_line_properties.xhp
index f614391..dfd8701 100644
--- a/source/text/schart/01/smooth_line_properties.xhp
+++ b/source/text/schart/01/smooth_line_properties.xhp
@@ -38,7 +38,7 @@
 Smooth Line Properties
 In 
a chart that displays lines (Line type or XY type), you can choose to show 
curves instead of straight lines. Some options control the properties of those 
curves.most possibly these curves are not Bezier 
curves.
 
-  
+  
 
 
 To change line properties
diff --git a/source/text/schart/01/stepped_line_properties.xhp 
b/source/text/schart/01/stepped_line_properties.xhp
new file mode 100644
index 000..efec875
--- /dev/null
+++ b/source/text/schart/01/stepped_line_properties.xhp
@@ -0,0 +1,53 @@
+
+
+
+
+
+
+
+
+Smooth Line Properties
+/text/schart/01/stepped_line_properties.xhp
+
+
+Eric Seynaeve
+First version
+
+
+
+
+curv

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit 4ea761868c5cb79acd6c994d2f9d66799a3728a6
Author: Markus Mohrhard 
Date:   Thu Apr 18 05:58:04 2013 +0200

Updated core
Project: help  c000c3e3811701f55229bdc0231ceaf8f1e2517a

diff --git a/helpcontent2 b/helpcontent2
index 0483b91..c000c3e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0483b91db6d66dbe320ce8a129988a6ed8940832
+Subproject commit c000c3e3811701f55229bdc0231ceaf8f1e2517a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#61135: adding help button to stepped lines dialog.

2013-04-17 Thread Markus Mohrhard (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/3445


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ab4882e6c1e98ffa5a297a49e6968b629051be0
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eric Seynaeve 
Gerrit-Reviewer: Markus Mohrhard 

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

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

2013-04-17 Thread Eric Seynaeve

 chart2/uiconfig/ui/steppedlinesdlg.ui |   15 +++
 1 file changed, 15 insertions(+)

New commits:
commit ff547f4646c88c739118bf3058823b8642a275ae
Author: Eric Seynaeve 
Date:   Thu Apr 18 00:24:05 2013 +0200

fdo#61135: adding help button to stepped lines dialog.

Change-Id: I2ab4882e6c1e98ffa5a297a49e6968b629051be0

diff --git a/chart2/uiconfig/ui/steppedlinesdlg.ui 
b/chart2/uiconfig/ui/steppedlinesdlg.ui
index 4cc351f..ff1b5c0 100644
--- a/chart2/uiconfig/ui/steppedlinesdlg.ui
+++ b/chart2/uiconfig/ui/steppedlinesdlg.ui
@@ -209,6 +209,20 @@
 1
   
 
+
+  
+gtk-help
+True
+True
+True
+True
+  
+  
+False
+True
+2
+  
+
   
   
 False
@@ -222,6 +236,7 @@
 
   ok
   cancel
+  help
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#63197, convert accessoriesgallerydrawspeople

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3444

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9743fd98691695f831fa282a64482b23178f0026
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 
Gerrit-Reviewer: Julien Nabet 

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

[PUSHED] fdo#63197: convert psprint_config files

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3443

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I99660704931c7341a72fe303fae47f984f968ecb
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

[Libreoffice-commits] core.git: extras/ExternalPackage_accessoriesgallerydrawspeople.mk extras/Module_extras.mk extras/Zip_accessoriesgallerydrawspeople.mk scp2/source

 extras/ExternalPackage_accessoriesgallerydrawspeople.mk |   38 +++
 extras/Module_extras.mk |2 
 extras/Zip_accessoriesgallerydrawspeople.mk |   39 
 scp2/source/accessories/file_gallery_accessories.scp|7 +-
 4 files changed, 43 insertions(+), 43 deletions(-)

New commits:
commit b1ba3e03078d1d69e482aaae497a068600fa68fd
Author: Julien Nabet 
Date:   Wed Apr 17 23:10:48 2013 +0200

fdo#63197, convert accessoriesgallerydrawspeople

Change-Id: I9743fd98691695f831fa282a64482b23178f0026
Reviewed-on: https://gerrit.libreoffice.org/3444
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk 
b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
new file mode 100644
index 000..df6ffbe
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+#$(eval $(call gb_Package_Package,extras_accessoriesgallerydrawspeople,$(call 
gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People))
+$(eval $(call 
gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerydrawspeople,gallery-pack))
+
+$(eval $(call 
gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(INSTDIR)))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,share/gallery/Draws/People,\
+   accessories/Draws/People/Baboo1.png \
+   accessories/Draws/People/Jac1.png \
+   accessories/Draws/People/Jac2.png \
+   accessories/Draws/People/Jac3.png \
+   accessories/Draws/People/Jac4.png \
+   accessories/Draws/People/Paul-1.png \
+   accessories/Draws/People/Paul-2.png \
+   accessories/Draws/People/Paul-3.jpg \
+   accessories/Draws/People/Paul-3.png \
+   accessories/Draws/People/Paul-4.png \
+   accessories/Draws/People/Paul-5.png \
+   accessories/Draws/People/Paul-6.png \
+   accessories/Draws/People/Paul-7.png \
+   accessories/Draws/People/Paul-8.png \
+   accessories/Draws/People/Ruty1.png \
+   accessories/Draws/People/tof-1.png \
+   accessories/Draws/People/tof-2.png \
+   accessories/Draws/People/tof-3.png \
+   accessories/Draws/People/Zoa1.png \
+   accessories/Draws/People/Zoa2.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 7b494e4..08351c1 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -61,7 +61,7 @@ ifeq ($(WITH_EXTRA_GALLERY),YES)
 $(eval $(call gb_Module_add_targets,extras,\
UnpackedTarball_gallery_pack \
ExternalPackage_accessoriesgallery \
-   Zip_accessoriesgallerydrawspeople \
+   ExternalPackage_accessoriesgallerydrawspeople \
Zip_accessoriesgalleryelementsbullets2 \
Zip_accessoriesgallerynonfree \
Zip_accessoriesgalleryphotosbuildings \
diff --git a/extras/Zip_accessoriesgallerydrawspeople.mk 
b/extras/Zip_accessoriesgallerydrawspeople.mk
deleted file mode 100644
index 064ce84..000
--- a/extras/Zip_accessoriesgallerydrawspeople.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Zip_Zip,accessoriesgallerydrawspeople,$(call 
gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgallerydrawspeople,\
-   $(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgallerydrawspeople,\
-   Baboo1.png \
-   Jac1.png \
-   Jac2.png \
-   Jac3.png \
-   Jac4.png \
-   Paul-1.png \
-   Paul-2.png \
-   Paul-3.jpg \
-   Paul-3.png \
-   Paul-4.png \
-   Paul-5.png \
-   Paul-6.png \
-   Paul-7.png \
-   Paul-8.png \
-   Ruty1.png \
-   tof-1.png \
-   tof-2.png \
-   tof-3.png \
-   Zoa1.png \
-   Zoa2.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/accessories/file_gallery_accessories.scp 
b/scp2/source/accessories/file_gallery_accessories.scp
index 11ce2ed..57ec168 100644
--- a/scp2/source/accessories/file_gallery_accessories.scp
+++ b/scp2/source/accessories/file_gallery_accessories.scp
@@ -42,9 +42,10 @@ File gid_File_Extra_Gallery_Accessories
 End
 
 File gid_File_Extra_Gallery_Draws_People_Accessories
-

[Libreoffice-commits] core.git: psprint_config/Module_psprint_config.mk psprint_config/Package_fontunxppds.mk psprint_config/Package_fontunxpsprint.mk psprint_config/Zip_fontunxppds.mk psprint_config/

 psprint_config/Module_psprint_config.mk  |4 +--
 psprint_config/Package_fontunxppds.mk|   37 +++
 psprint_config/Package_fontunxpsprint.mk |   36 ++
 psprint_config/Zip_fontunxppds.mk|   35 -
 psprint_config/Zip_fontunxpsprint.mk |   34 
 scp2/source/ooo/file_extra_ooo.scp   |   12 +-
 6 files changed, 81 insertions(+), 77 deletions(-)

New commits:
commit e725872d49e8b176e2c9be4fde5d5f76256daf45
Author: Julien Nabet 
Date:   Wed Apr 17 22:30:52 2013 +0200

fdo#63197: convert psprint_config files

Change-Id: I99660704931c7341a72fe303fae47f984f968ecb
Reviewed-on: https://gerrit.libreoffice.org/3443
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/psprint_config/Module_psprint_config.mk 
b/psprint_config/Module_psprint_config.mk
index 5c30c9f..0d35eb0 100644
--- a/psprint_config/Module_psprint_config.mk
+++ b/psprint_config/Module_psprint_config.mk
@@ -28,8 +28,8 @@
 $(eval $(call gb_Module_Module,psprint_config))
 
 $(eval $(call gb_Module_add_targets,psprint_config,\
-   Zip_fontunxppds \
-   Zip_fontunxpsprint \
+   Package_fontunxppds \
+   Package_fontunxpsprint \
 ))
 
 # vim: set noet sw=4:
diff --git a/psprint_config/Package_fontunxppds.mk 
b/psprint_config/Package_fontunxppds.mk
new file mode 100644
index 000..65df35d
--- /dev/null
+++ b/psprint_config/Package_fontunxppds.mk
@@ -0,0 +1,37 @@
+#*
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# 
+# for a copy of the LGPLv3 License.
+#
+#*
+
+$(eval $(call 
gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
+
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(INSTDIR)))
+
+$(eval $(call 
gb_Package_add_files,psprint_config_fontunxppds,share/psprint/driver,\
+   SGENPRT.PS \
+   SGENT42.PS \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/psprint_config/Package_fontunxpsprint.mk 
b/psprint_config/Package_fontunxpsprint.mk
new file mode 100644
index 000..f4b8e9e
--- /dev/null
+++ b/psprint_config/Package_fontunxpsprint.mk
@@ -0,0 +1,36 @@
+#*
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# 
+# for a copy of the LGPLv3 License.
+#
+#*
+
+$(eval $(call 
gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
+
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(INSTDIR)))
+
+$(eval $(call 
gb_Package_add_files,psprint_config_fontunxpsprint,share/psprint,\
+   psprint.conf \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/psprint_config/Zip_fontunxppds.mk 
b/psprint_config/Zip_fontunxppds.mk
deleted file mode 100644
index 3714f11..000
--- a/psprint_config/Zip_fontunxppds.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#**

[PUSHED] fdo#63197, convert sysui osxicons

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3440

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iab9cb3704385c115e1d25189a3d8833bd6721e24
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

[Libreoffice-commits] core.git: scp2/source sysui/Module_sysui.mk sysui/Package_osxicons.mk sysui/Zip_osxicons.mk

 scp2/source/ooo/file_ooo.scp |8 
 sysui/Module_sysui.mk|2 +-
 sysui/Package_osxicons.mk|   41 +
 sysui/Zip_osxicons.mk|   39 ---
 4 files changed, 46 insertions(+), 44 deletions(-)

New commits:
commit 0b4315077a6827798e1d2bdae73298365ba9a018
Author: Julien Nabet 
Date:   Wed Apr 17 21:28:40 2013 +0200

fdo#63197, convert sysui osxicons

Change-Id: Iab9cb3704385c115e1d25189a3d8833bd6721e24
Reviewed-on: https://gerrit.libreoffice.org/3440
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index bd5b571..b5fe2a2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1267,10 +1267,10 @@ End
 
 #ifdef MACOSX
 File gid_File_Icns_Bundle
-ARCHIVE_TXT_FILE_BODY;
-Dir = gid_Dir_Bundle_Contents_Resources;
-Name = "osxicons.zip";
-Styles = (ARCHIVE);
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "sysui_osxicons.filelist";
 End
 #endif
 
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk
index 9c5c76a..c668730 100644
--- a/sysui/Module_sysui.mk
+++ b/sysui/Module_sysui.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_Module_add_targets,sysui,\
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,sysui,\
-   Zip_osxicons \
+   Package_osxicons \
CustomTarget_infoplist \
Package_infoplist \
 ))
diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk
new file mode 100644
index 000..ed84e10
--- /dev/null
+++ b/sysui/Package_osxicons.mk
@@ -0,0 +1,41 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop))
+
+$(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\
+icons/text.icns \
+icons/oasis-text.icns \
+icons/spreadsheet.icns \
+icons/oasis-spreadsheet.icns \
+icons/presentation.icns \
+icons/oasis-presentation.icns \
+icons/drawing.icns \
+icons/oasis-drawing.icns \
+icons/master-document.icns \
+icons/oasis-master-document.icns \
+icons/formula.icns \
+icons/oasis-formula.icns \
+icons/text-template.icns \
+icons/oasis-text-template.icns \
+icons/spreadsheet-template.icns \
+icons/oasis-spreadsheet-template.icns \
+icons/presentation-template.icns \
+icons/oasis-presentation-template.icns \
+icons/drawing-template.icns \
+icons/oasis-drawing-template.icns \
+icons/oasis-database.icns \
+icons/extension.icns \
+icons/main.icns \
+   macosx/Info.plist \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/sysui/Zip_osxicons.mk b/sysui/Zip_osxicons.mk
deleted file mode 100644
index d9c1901..000
--- a/sysui/Zip_osxicons.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Zip_Zip,osxicons,$(SRCDIR)/sysui/desktop))
-
-$(eval $(call gb_Zip_add_files,osxicons,\
-icons/text.icns \
-icons/oasis-text.icns \
-icons/spreadsheet.icns \
-icons/oasis-spreadsheet.icns \
-icons/presentation.icns \
-icons/oasis-presentation.icns \
-icons/drawing.icns \
-icons/oasis-drawing.icns \
-icons/master-document.icns \
-icons/oasis-master-document.icns \
-icons/formula.icns \
-icons/oasis-formula.icns \
-icons/text-template.icns \
-icons/oasis-text-template.icns \
-icons/spreadsheet-template.icns \
-icons/oasis-spreadsheet-template.icns \
-icons/presentation-template.icns \
-icons/oasis-presentation-template.icns \
-icons/drawing-template.icns \
-icons/oasis-drawing-template.icns \
-icons/oasis-database.icns \
-icons/extension.icns \
-icons/main.icns \
-   macosx/Info.plist \
-))
-
-# vim: set ts=4 sw=4 et:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: fdo#61135 adding help text for stepped lines dialog

Hey Eric,


2013/4/18 Eric Seynaeve 

> Hello Markus,
>
> here is my patch for the help text changes in the stepped lines dialog. For
> some reason, I can't push it to gerrit. I guess I messed something up in my
> git setup.
>
> There is also a smaller change that is linked to this:
> https://gerrit.libreoffice.org/3445
>
> Can you review it ?
>
>
I had a look at it and it looks quite good. There seem to be a few help ids
being missing in the help text but I'll quickly add them myself and push
the patch.

Thanks a lot for this amazing work. Do you want to add the feature to the
ReleaseNotes page at https://wiki.documentfoundation.org/ReleaseNotes/4.1 ?

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

[Libreoffice-commits] core.git: Branch 'feature/extract-tooltip' - 0 commits -

2013-04-17 Thread Unknown

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

[PATCH] Remove a few unnecessary #includes

2013-04-17 Thread Michael Dunphy (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3448

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/3448/1

Remove a few unnecessary #includes

Change-Id: I47c0f097f91c7cac7af91a15326e73ca201952ad
---
M chart2/source/controller/dialogs/dlg_InsertLegend.cxx
1 file changed, 0 insertions(+), 6 deletions(-)



diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx 
b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 5fdb3dd..de6ad10 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -22,13 +22,7 @@
 #include "res_LegendPosition.hxx"
 #include "ObjectNameProvider.hxx"
 #include "ResId.hxx"
-#include "chartview/ChartSfxItemIds.hxx"
 #include "NoWarningThisInCTOR.hxx"
-
-// header for enum SvxChartLegendPos
-#include 
-// header for class SfxItemPool
-#include 
 
 //.
 namespace chart

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47c0f097f91c7cac7af91a15326e73ca201952ad
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Dunphy 

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

[Libreoffice-commits] core.git: Changes to 'feature/extended-tooltips'

New branch 'feature/extended-tooltips' available with the following commits:
commit e814acbde55608c958b62888d0d2b3b2d68810fe
Author: Markus Mohrhard 
Date:   Thu Apr 18 04:28:54 2013 +0200

replace PRODUCTVERSION and PRODUCTNAME in tooltip strings

Change-Id: Id4b686636b9156c86a9677100ae181182ef16e92

commit 37c815a3685da01bf404fb8ce070766526945823
Author: Markus Mohrhard 
Date:   Wed Apr 17 00:20:32 2013 +0200

implement loading extended tooltips

Change-Id: Ib120e1806e6a84858bafae5991e9851f79a13b88

commit 3c6274f0a593075c5b17a8b1e13aadeddb348c62
Author: Markus Mohrhard 
Date:   Tue Apr 16 23:58:43 2013 +0200

add calc tooltips

Change-Id: I9a62eb4306323531d382105e5dbec6de19caa201

commit 3bd0cfd3464d04ff7f38ba5e3a7c714bcaf9c239
Author: Markus Mohrhard 
Date:   Tue Apr 16 21:26:50 2013 +0200

initial work on the makefile part

Change-Id: Ib980db55d750dd5a62d18a0dc30862e4a10a0b60

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

[PATCH] Remove unused code

2013-04-17 Thread Michael Dunphy (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3447

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/3447/1

Remove unused code

Change-Id: Id4ce1d003db61374ba68f807090860595178b562
---
M chart2/source/controller/dialogs/res_ErrorBar.cxx
1 file changed, 0 insertions(+), 7 deletions(-)



diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx 
b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 713bb08..1a8c2fe 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -80,13 +80,6 @@
 {
 //.
 
-enum StatIndicator
-{
-INDICATE_BOTH,
-INDICATE_UP,
-INDICATE_DOWN
-};
-
 ErrorBarResources::ErrorBarResources( Window* pParent, Dialog * pParentDialog,
   const SfxItemSet& rInAttrs, bool 
bNoneAvailable,
   tErrorBarType eType /* = ERROR_BAR_Y */ 
) :

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4ce1d003db61374ba68f807090860595178b562
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Dunphy 

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

Need OSX Triager without Java Installed

2013-04-17 Thread Joel Madero


Hi All,

Can we get someone to try to confirm this bug, either respond to this 
thread or directly to FDO? Thanks!


*Bug 61183*  
-copying text requires java runtime (editing?)

https://bugs.freedesktop.org/show_bug.cgi?id=61183&list_id=287379

This would be really bad so hopefully we can get confirmation.


Thanks all!



Best,
Joel


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

[PATCH] Delete unused code in one file.

2013-04-17 Thread Golnaz Irannejad (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3446

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/3446/1

Delete unused code in one file.

Change-Id: Ib468dd87e1624bd02b4d190699cd864514664229
---
M chart2/source/controller/dialogs/res_Trendline.cxx
1 file changed, 0 insertions(+), 9 deletions(-)



diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx 
b/chart2/source/controller/dialogs/res_Trendline.cxx
index 1be6e34..e74a84a 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -58,15 +58,6 @@
 namespace chart
 {
 
-enum StatTrendLine
-{
-TRENDLINE_NONE,
-TRENDLINE_LINE,
-TRENDLINE_LOG,
-TRENDLINE_EXP,
-TRENDLINE_POW
-};
-
 TrendlineResources::TrendlineResources( Window * pParent, const SfxItemSet& 
rInAttrs, bool bNoneAvailable ) :
 m_aFLType( pParent, SchResId( FL_TYPE )),
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib468dd87e1624bd02b4d190699cd864514664229
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Golnaz Irannejad 

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

License statement

2013-04-17 Thread Michael Dunphy

Hi all,

All of my past & future contributions to LibreOffice may be licensed under
the MPL/LGPLv3+ dual license.

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

[PATCH] fdo#61135: adding help button to stepped lines dialog.

2013-04-17 Thread Eric Seynaeve (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3445

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/3445/1

fdo#61135: adding help button to stepped lines dialog.

Change-Id: I2ab4882e6c1e98ffa5a297a49e6968b629051be0
---
M chart2/uiconfig/ui/steppedlinesdlg.ui
1 file changed, 15 insertions(+), 0 deletions(-)



diff --git a/chart2/uiconfig/ui/steppedlinesdlg.ui 
b/chart2/uiconfig/ui/steppedlinesdlg.ui
index 4cc351f..ff1b5c0 100644
--- a/chart2/uiconfig/ui/steppedlinesdlg.ui
+++ b/chart2/uiconfig/ui/steppedlinesdlg.ui
@@ -209,6 +209,20 @@
 1
   
 
+
+  
+gtk-help
+True
+True
+True
+True
+  
+  
+False
+True
+2
+  
+
   
   
 False
@@ -222,6 +236,7 @@
 
   ok
   cancel
+  help
 
   
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ab4882e6c1e98ffa5a297a49e6968b629051be0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eric Seynaeve 

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

Trouble creating logerrit account

2013-04-17 Thread Wols Lists

I've just tried to set this up. Looks my my RSA keygen is screwed, but I
don't know why. The trace from ssh - logerrit follows:

anthony@ashdown ~/gitstuff/loffice $ ssh - logerrit
OpenSSH_5.9p1-hpn13v11lpk, OpenSSL 1.0.1c 10 May 2012
debug1: Reading configuration data /home/anthony/.ssh/config
debug1: /home/anthony/.ssh/config line 4: Applying options for logerrit
debug1: Reading configuration data /etc/ssh/ssh_config
debug2: ssh_connect: needpriv 0
debug1: Connecting to gerrit.libreoffice.org [78.46.154.99] port 29418.
debug1: Connection established.
debug3: Incorrect RSA1 identifier
debug3: Could not load "/home/anthony/.ssh/id_rsa" as a RSA1 public key
debug1: identity file /home/anthony/.ssh/id_rsa type 1
debug1: identity file /home/anthony/.ssh/id_rsa-cert type -1
debug1: Remote protocol version 2.0, remote software version
GerritCodeReview_2.5.1 (SSHD-CORE-0.5.1-R1095809)
debug1: no match: GerritCodeReview_2.5.1 (SSHD-CORE-0.5.1-R1095809)
debug1: Enabling compatibility mode for protocol 2.0
debug1: Local version string SSH-2.0-OpenSSH_5.9p1-hpn13v11lpk
debug2: fd 3 setting O_NONBLOCK
debug3: put_host_port: [gerrit.libreoffice.org]:29418
debug3: load_hostkeys: loading entries for host
"[gerrit.libreoffice.org]:29418" from file "/home/anthony/.ssh/known_hosts"
debug3: load_hostkeys: found key type RSA in file
/home/anthony/.ssh/known_hosts:6
debug3: load_hostkeys: found key type DSA in file
/home/anthony/.ssh/known_hosts:7
debug3: load_hostkeys: loaded 2 keys
debug3: order_hostkeyalgs: prefer hostkeyalgs:
ssh-rsa-cert-...@openssh.com,ssh-dss-cert-...@openssh.com,ssh-rsa-cert-...@openssh.com,ssh-dss-cert-...@openssh.com,ssh-rsa,ssh-dss
debug1: SSH2_MSG_KEXINIT sent
debug1: SSH2_MSG_KEXINIT received
debug1: AUTH STATE IS 0
debug2: kex_parse_kexinit:
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1
debug2: kex_parse_kexinit:
ssh-rsa-cert-...@openssh.com,ssh-dss-cert-...@openssh.com,ssh-rsa-cert-...@openssh.com,ssh-dss-cert-...@openssh.com,ssh-rsa,ssh-dss,ecdsa-sha2-nistp256-cert-...@openssh.com,ecdsa-sha2-nistp384-cert-...@openssh.com,ecdsa-sha2-nistp521-cert-...@openssh.com,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521
debug2: kex_parse_kexinit:
aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc,aes256-cbc,arcfour,rijndael-...@lysator.liu.se
debug2: kex_parse_kexinit:
aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc,aes256-cbc,arcfour,rijndael-...@lysator.liu.se
debug2: kex_parse_kexinit:
hmac-md5,hmac-sha1,umac...@openssh.com,hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,hmac-sha2-512-96,hmac-ripemd160,hmac-ripemd...@openssh.com,hmac-sha1-96,hmac-md5-96
debug2: kex_parse_kexinit:
hmac-md5,hmac-sha1,umac...@openssh.com,hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,hmac-sha2-512-96,hmac-ripemd160,hmac-ripemd...@openssh.com,hmac-sha1-96,hmac-md5-96
debug2: kex_parse_kexinit: none,z...@openssh.com,zlib
debug2: kex_parse_kexinit: none,z...@openssh.com,zlib
debug2: kex_parse_kexinit:
debug2: kex_parse_kexinit:
debug2: kex_parse_kexinit: first_kex_follows 0
debug2: kex_parse_kexinit: reserved 0
debug2: kex_parse_kexinit:
diffie-hellman-group14-sha1,diffie-hellman-group1-sha1
debug2: kex_parse_kexinit: ssh-rsa,ssh-dss
debug2: kex_parse_kexinit:
aes128-cbc,3des-cbc,blowfish-cbc,aes192-cbc,aes256-cbc
debug2: kex_parse_kexinit:
aes128-cbc,3des-cbc,blowfish-cbc,aes192-cbc,aes256-cbc
debug2: kex_parse_kexinit: hmac-md5,hmac-sha1,hmac-md5-96,hmac-sha1-96
debug2: kex_parse_kexinit: hmac-md5,hmac-sha1,hmac-md5-96,hmac-sha1-96
debug2: kex_parse_kexinit: none
debug2: kex_parse_kexinit: none
debug2: kex_parse_kexinit:
debug2: kex_parse_kexinit:
debug2: kex_parse_kexinit: first_kex_follows 0
debug2: kex_parse_kexinit: reserved 0
debug2: mac_setup: found hmac-md5
debug1: REQUESTED ENC.NAME is 'aes128-cbc'
debug1: kex: server->client aes128-cbc hmac-md5 none
debug2: mac_setup: found hmac-md5
debug1: REQUESTED ENC.NAME is 'aes128-cbc'
debug1: kex: client->server aes128-cbc hmac-md5 none
debug2: dh_gen_key: priv key bits set: 131/256
debug2: bits set: 1025/2048
debug1: sending SSH2_MSG_KEXDH_INIT
debug1: expecting SSH2_MSG_KEXDH_REPLY
debug1: Server host key: RSA b3:eb:11:2a:7d:f0:65:e4:01:53:d1:59:61:b4:4e:86
debug3: put_host_port: [78.46.154.99]:29418
debug3: put_host_port: [gerrit.libreoffice.org]:29418
debug3: load_hostkeys: loading entries for host
"[gerrit.libreoffice.org]:29418" from file "/home/anthony/.ssh/known_hosts"
debug3: load_hostkeys: found key type RSA in file
/home/anthony/.ssh/known_hosts:6
debug3: load_hostkeys: found key type DSA in file
/home/anthony/.ssh/known_hosts:7
debug3: load_hostkeys: loaded 2 keys
debug3: load_hostkeys: loading entries for host "[78.46.154.99]:29418"
from file "/home/anthony/.ssh/known_hosts"
debug3: load_ho

PyThreadState_Swap fatal error (was Re: [ANN] --enable-dbgutil: everyone gets a Debug STL!)

this could benefit from advice of a CPython hacker :)

On 17/04/13 09:33, Stephan Bergmann wrote:
> On 04/15/2013 03:34 PM, Michael Stahl wrote:
>> with commit f14f7a2e4568e3e85a0c8860beebd0376c5a8b51 MSVC builds will
>> link everything against the debug runtimes (MSVCRTD etc.), which enables
>> debug STL and other things.
> [...]
>> the MSVC one is tested on MSVC 2008 only, where "make check" passes
>> successfully; it's possible that i've overlooked something in the
>> makefiles where different MSVC versions use different rules, so it needs
>> somebody to try it out in an --enable-dbgutil build with 2010 and 2012.
> 
> You probably did that "make check" on a build without any bundled Python 
> extensions, right?  In my heavily --enable-ext-* configured build, 
> starting soffice instantly fails with
> 
>> Fatal Python error: Invalid thread state for this thread
>>
>> Current thread 0x0260:
>>
>> Thread 0x0260:

after enabling some Python extensions (i was actually unaware that my
MSVC build was without dictionaries since they started defaulting to
disabled...), i can reproduce the problem.

[ the Py_FatalError function calls abort() which then causes your other
assertion/dialog from operator delete (somehow). ]

the "invalid thread state" is apparently caused by the
PyThreadAttach / PyThreadDetach classes in PyUno, which are both RAII
style guard classes.

the PyThreadAttach will create a new PyThreadState with
PyThreadState_New and call PyEval_AcquireThread in its ctor, and
PyEval_ReleaseThread and PyThreadState_Delete in its dtor.

PyThreadDetach does the inverse, calling PyEval_ReleaseThread in the
ctor and PyEval_AcquireThread in the dtor.

now it may happen that a single OS thread does multiple independent
calls into PyUno, for example a call into a Python UNO component, which
calls a C++ UNO component, which in turn calls a Python UNO component.

in this case we get multiple PyThreadState for the same OS thread,
because multiple PyThreadAttach objects are on the C stack (with
PyThreadDetach between them).

this is apparently what the assertion in PyThreadState_Swap that is
triggered here complains about: it checks that the value of
PyGILState_GetThisThreadState(), which essentially is a thread-local
variable holding the last PyThreadState that was used on the current OS
thread, is the same as the PyThreadState that is passed in.

now i think we could ensure that this is the case in PyUno, by storing
the PyThreadState in a thread-local variable in PyThreadAttach so that
one OS thread only uses one PyThreadState.

but i have doubts that this actually makes sense - this PyThreadState
apparently contains things like pending exceptions, and i'm concerned
that if the "inner" Python evaluation would use these that they could
confuse the "outer" Python evaluation when control returns to it.

the other alternative that i see is to simply patch out the check in
PyThreadState_Swap; the _other_ checks in PyEval_*Thread functions and
RAII nature of the guard classes should hopefully prevent ~all of the
potential errors.

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

[PATCH] fdo#63197, convert accessoriesgallerydrawspeople

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3444

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/3444/1

fdo#63197, convert accessoriesgallerydrawspeople

Change-Id: I9743fd98691695f831fa282a64482b23178f0026
---
A extras/ExternalPackage_accessoriesgallerydrawspeople.mk
M extras/Module_extras.mk
D extras/Zip_accessoriesgallerydrawspeople.mk
M scp2/source/accessories/file_gallery_accessories.scp
4 files changed, 43 insertions(+), 43 deletions(-)



diff --git a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk 
b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
new file mode 100644
index 000..df6ffbe
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+#$(eval $(call gb_Package_Package,extras_accessoriesgallerydrawspeople,$(call 
gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People))
+$(eval $(call 
gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerydrawspeople,gallery-pack))
+
+$(eval $(call 
gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(INSTDIR)))
+
+$(eval $(call 
gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,share/gallery/Draws/People,\
+   accessories/Draws/People/Baboo1.png \
+   accessories/Draws/People/Jac1.png \
+   accessories/Draws/People/Jac2.png \
+   accessories/Draws/People/Jac3.png \
+   accessories/Draws/People/Jac4.png \
+   accessories/Draws/People/Paul-1.png \
+   accessories/Draws/People/Paul-2.png \
+   accessories/Draws/People/Paul-3.jpg \
+   accessories/Draws/People/Paul-3.png \
+   accessories/Draws/People/Paul-4.png \
+   accessories/Draws/People/Paul-5.png \
+   accessories/Draws/People/Paul-6.png \
+   accessories/Draws/People/Paul-7.png \
+   accessories/Draws/People/Paul-8.png \
+   accessories/Draws/People/Ruty1.png \
+   accessories/Draws/People/tof-1.png \
+   accessories/Draws/People/tof-2.png \
+   accessories/Draws/People/tof-3.png \
+   accessories/Draws/People/Zoa1.png \
+   accessories/Draws/People/Zoa2.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 7b494e4..08351c1 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -61,7 +61,7 @@
 $(eval $(call gb_Module_add_targets,extras,\
UnpackedTarball_gallery_pack \
ExternalPackage_accessoriesgallery \
-   Zip_accessoriesgallerydrawspeople \
+   ExternalPackage_accessoriesgallerydrawspeople \
Zip_accessoriesgalleryelementsbullets2 \
Zip_accessoriesgallerynonfree \
Zip_accessoriesgalleryphotosbuildings \
diff --git a/extras/Zip_accessoriesgallerydrawspeople.mk 
b/extras/Zip_accessoriesgallerydrawspeople.mk
deleted file mode 100644
index 064ce84..000
--- a/extras/Zip_accessoriesgallerydrawspeople.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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/.
-#
-
-$(eval $(call gb_Zip_Zip,accessoriesgallerydrawspeople,$(call 
gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Draws/People))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgallerydrawspeople,\
-   $(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgallerydrawspeople,\
-   Baboo1.png \
-   Jac1.png \
-   Jac2.png \
-   Jac3.png \
-   Jac4.png \
-   Paul-1.png \
-   Paul-2.png \
-   Paul-3.jpg \
-   Paul-3.png \
-   Paul-4.png \
-   Paul-5.png \
-   Paul-6.png \
-   Paul-7.png \
-   Paul-8.png \
-   Ruty1.png \
-   tof-1.png \
-   tof-2.png \
-   tof-3.png \
-   Zoa1.png \
-   Zoa2.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/accessories/file_gallery_accessories.scp 
b/scp2/source/accessories/file_gallery_accessories.scp
index 11ce2ed..57ec168 100644
--- a/scp2/source/accessories/file_gallery_accessories.scp
+++ b/scp2/source/accessories/file_gallery_accessories.scp
@@ -42,9 +42,10 @@
 End
 
 File gid_File_Extra_Gallery_Draws_People_Accessories
-Dir = gid_Dir_Gallery_Draws_People;
-ARCHIVE_TXT_FILE_BODY;
-Name = "accessoriesgallerydrawspeople.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "extras_accessoriesgallerydrawspeople.f

Re: [ANN] --enable-dbgutil: everyone gets a Debug STL!

> I wonder if we should enforce using libc++ instead of GNU libstdc++
> when using Clang on OS X and not targeting 10.6?

Nah, using libc++ leads to the mysterious errors from boost headers...
So let's forget libc++ for now, sigh. At least until we upgrade our
bundled boost.

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

Patch / Crash Fix for libmspub

2013-04-17 Thread Franz Schmid

Hello,

attached is a patch for libmspub that fixes a crash when converting
files with dashed lines to svg.

Greetings,
Franz Schmid
>From 836d91e46d24ddf0ee4616ae5b2ae4cf2325c087 Mon Sep 17 00:00:00 2001
From: Franz Schmid 
Date: Wed, 17 Apr 2013 22:48:01 +0200
Subject: [PATCH] Fixed crash when converting files with dashed lines to svg.

---
 src/lib/MSPUBCollector.cpp|2 +-
 src/lib/MSPUBSVGGenerator.cpp |   35 +++
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 895b736..4af4969 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -743,7 +743,7 @@ boost::function libmspub::MSPUBCollector::paintShape(const ShapeInfo
   graphicsProps.insert("svg:stroke-linecap", "round");
   break;
 case RECT_DOT:
-  graphicsProps.insert("svg:stroke-linecap", "rect");
+  graphicsProps.insert("svg:stroke-linecap", "butt");
   break;
 default:
   break;
diff --git a/src/lib/MSPUBSVGGenerator.cpp b/src/lib/MSPUBSVGGenerator.cpp
index 7546230..4b5482f 100644
--- a/src/lib/MSPUBSVGGenerator.cpp
+++ b/src/lib/MSPUBSVGGenerator.cpp
@@ -546,9 +546,10 @@ void libmspub::MSPUBSVGGenerator::writeStyle(bool /* isClosed */)
 {
   m_outputSink << "style=\"";
 
+  double width = 1.0 / 72.0;
   if (m_style["svg:stroke-width"])
   {
-double width = m_style["svg:stroke-width"]->getDouble();
+width = m_style["svg:stroke-width"]->getDouble();
 if (width == 0.0 && m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() != "none")
   width = 0.2 / 72.0; // reasonable hairline
 m_outputSink << "stroke-width: " << doubleToString(72*width) << "; ";
@@ -562,29 +563,39 @@ void libmspub::MSPUBSVGGenerator::writeStyle(bool /* isClosed */)
   }
 
   if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == "solid")
-m_outputSink << "stroke-dasharray:  solid; ";
-  else if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == "dash")
+m_outputSink << "stroke-dasharray:  none; ";
+  if (m_style["draw:stroke"] && m_style["draw:stroke"]->getStr() == "dash")
   {
-int dots1 = m_style["draw:dots1"]->getInt();
-int dots2 = m_style["draw:dots2"]->getInt();
-double dots1len = m_style["draw:dots1-length"]->getDouble();
-double dots2len = m_style["draw:dots2-length"]->getDouble();
-double gap = m_style["draw:distance"]->getDouble();
+int dots1 = 0;
+if (m_style["draw:dots1"])
+  dots1 = m_style["draw:dots1"]->getInt();
+int dots2 = 0;
+if (m_style["draw:dots2"])
+  dots2 = m_style["draw:dots2"]->getInt();
+double dots1len = width * 72.0;
+double dots2len = width * 72.0;
+double gap = width * 72.0;
+if (m_style["draw:dots1-length"])
+  dots1len = m_style["draw:dots1-length"]->getDouble() * 72.0;
+if (m_style["draw:dots2-length"])
+  dots2len = m_style["draw:dots2-length"]->getDouble() * 72.0;
+if (m_style["draw:distance"])
+  gap = m_style["draw:distance"]->getDouble() * 72.0;
 m_outputSink << "stroke-dasharray: ";
 for (int i = 0; i < dots1; i++)
 {
   if (i)
 m_outputSink << ", ";
-  m_outputSink << (int)dots1len;
+  m_outputSink << dots1len;
   m_outputSink << ", ";
-  m_outputSink << (int)gap;
+  m_outputSink << gap;
 }
 for (int j = 0; j < dots2; j++)
 {
   m_outputSink << ", ";
-  m_outputSink << (int)dots2len;
+  m_outputSink << dots2len;
   m_outputSink << ", ";
-  m_outputSink << (int)gap;
+  m_outputSink << gap;
 }
 m_outputSink << "; ";
   }
-- 
1.7.1

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

[ABANDONED] fdo#63197: convert psprint_config files

Julien Nabet has abandoned this change.

Change subject: fdo#63197: convert psprint_config files
..


Patch Set 1: Abandoned

I tested logerrit resubmit but i must have missed something since it created 
https://gerrit.libreoffice.org/#/c/3443/

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I8e3046a6ed30ac8ee60940844b8ceda6ec1ffd39
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

[PATCH] fdo#63197: convert psprint_config files

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3443

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/43/3443/1

fdo#63197: convert psprint_config files

Change-Id: I99660704931c7341a72fe303fae47f984f968ecb
---
M psprint_config/Module_psprint_config.mk
R psprint_config/Package_fontunxppds.mk
R psprint_config/Package_fontunxpsprint.mk
M scp2/source/ooo/file_extra_ooo.scp
4 files changed, 16 insertions(+), 12 deletions(-)



diff --git a/psprint_config/Module_psprint_config.mk 
b/psprint_config/Module_psprint_config.mk
index 5c30c9f..0d35eb0 100644
--- a/psprint_config/Module_psprint_config.mk
+++ b/psprint_config/Module_psprint_config.mk
@@ -28,8 +28,8 @@
 $(eval $(call gb_Module_Module,psprint_config))
 
 $(eval $(call gb_Module_add_targets,psprint_config,\
-   Zip_fontunxppds \
-   Zip_fontunxpsprint \
+   Package_fontunxppds \
+   Package_fontunxpsprint \
 ))
 
 # vim: set noet sw=4:
diff --git a/psprint_config/Zip_fontunxppds.mk 
b/psprint_config/Package_fontunxppds.mk
similarity index 81%
rename from psprint_config/Zip_fontunxppds.mk
rename to psprint_config/Package_fontunxppds.mk
index 3714f11..65df35d 100644
--- a/psprint_config/Zip_fontunxppds.mk
+++ b/psprint_config/Package_fontunxppds.mk
@@ -25,9 +25,11 @@
 #
 #*
 
-$(eval $(call 
gb_Zip_Zip,fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
+$(eval $(call 
gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
 
-$(eval $(call gb_Zip_add_files,fontunxppds,\
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(INSTDIR)))
+
+$(eval $(call 
gb_Package_add_files,psprint_config_fontunxppds,share/psprint/driver,\
SGENPRT.PS \
SGENT42.PS \
 ))
diff --git a/psprint_config/Zip_fontunxpsprint.mk 
b/psprint_config/Package_fontunxpsprint.mk
similarity index 81%
rename from psprint_config/Zip_fontunxpsprint.mk
rename to psprint_config/Package_fontunxpsprint.mk
index ec0a351..f4b8e9e 100644
--- a/psprint_config/Zip_fontunxpsprint.mk
+++ b/psprint_config/Package_fontunxpsprint.mk
@@ -25,9 +25,11 @@
 #
 #*
 
-$(eval $(call 
gb_Zip_Zip,fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
+$(eval $(call 
gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
 
-$(eval $(call gb_Zip_add_files,fontunxpsprint,\
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(INSTDIR)))
+
+$(eval $(call 
gb_Package_add_files,psprint_config_fontunxpsprint,share/psprint,\
psprint.conf \
 ))
 
diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index c539732..93ebc12 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -221,10 +221,10 @@
 
 #ifndef WITHOUT_PPDS
 File gid_File_Extra_Fontunxppds
-Dir = gid_Dir_Psprint_Driver;
+Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (ARCHIVE);
-Name = "fontunxppds.zip";
+Styles = (FILELIST);
+Name = "psprint_config_fontunxppds.filelist";
 End
 #endif
 
@@ -233,10 +233,10 @@
 #ifdef UNX
 
 File gid_File_Extra_Fontunxpsprint
-Dir = gid_Dir_Psprint;
+Dir = FILELIST_DIR;
 TXT_FILE_BODY;
-Styles = (ARCHIVE, DONT_OVERWRITE, CONFIGFILE);
-Name = "fontunxpsprint.zip";
+Styles = (FILELIST, DONT_OVERWRITE, CONFIGFILE);
+Name = "psprint_config_fontunxpsprint.filelist";
 End
 
 #endif

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I99660704931c7341a72fe303fae47f984f968ecb
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

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

Patch for postgresql driver

2013-04-17 Thread Wols Lists

I've now got the patch done.

Could someone with a postgresql implementation please test and push?

Cheers,
Wol
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index 4bc15e4..f0d9e03 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -482,44 +482,32 @@ static void properties2arrays( const Sequence< PropertyValue > & args,
 // I.e. they are prefiltered to have only relevant ones?
 // Else, at least support all keywords from
 // http://www.postgresql.org/docs/9.0/interactive/libpq-connect.html
+
+static const char* keyword_list[] = {
+"password",
+"user",
+"port",
+"dbname",
+"connect_timeout",
+"options",
+"requiressl"
+};
+
 for( int i = 0; i < args.getLength() ; ++i )
 {
-bool append = true;
-// TODO: rewrite this as a static table of keywords, and a loop over these keywords.
-if( args[i].Name.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "password" ) ) )
-{
-keywords.push_back( "password", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "user" ) ) )
-{
-keywords.push_back( "user", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "port" ) ) )
-{
-keywords.push_back( "port", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "dbname" ) ) )
-{
-keywords.push_back( "dbname", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "connect_timeout" ) ) )
-{
-keywords.push_back( "connect_timeout", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "options" ) ) )
-{
-keywords.push_back( "options", SAL_NO_ACQUIRE );
-}
-else if( args[i].Name.matchIgnoreAsciiCaseAsciiL( RTL_CONSTASCII_STRINGPARAM( "requiressl" ) ) )
-{
-keywords.push_back( "requiressl", SAL_NO_ACQUIRE );
-}
-else
+bool append = false;
+//for( int j = 0; j < (int) ( sizeof( keyword_list ) / sizeof( char * )); j++)
+for( int j = 0; j < (int) SAL_N_ELEMENTS( keyword_list ); j++)
 {
+if( args[i].Name.equalsIgnoreAsciiCaseAscii( keyword_list[j] ))
+{
+keywords.push_back( keyword_list[j], SAL_NO_ACQUIRE );
+append = true;
+break;
+}
-append = false;
-// ignore for now
-OSL_TRACE("sdbc-postgresql: unknown argument '%s'", OUStringToOString( args[i].Name, RTL_TEXTENCODING_UTF8 ).getStr() );
 }
+
 if( append )
 {
 OUString value;
@@ -527,6 +515,11 @@ static void properties2arrays( const Sequence< PropertyValue > & args,
 char *v = strdup(OUStringToOString(value, enc).getStr());
 values.push_back ( v );
 }
+else
+{
+// ignore for now
+OSL_TRACE("sdbc-postgresql: unknown argument '%s'", OUStringToOString( args[i].Name, RTL_TEXTENCODING_UTF8 ).getStr() );
+}
 }
 }
 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] fdo#63197: convert psprint_config files

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3442

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3442/1

fdo#63197: convert psprint_config files

Change-Id: I8e3046a6ed30ac8ee60940844b8ceda6ec1ffd39
---
M psprint_config/Module_psprint_config.mk
R psprint_config/Package_fontunxppds.mk
R psprint_config/Package_fontunxpsprint.mk
3 files changed, 10 insertions(+), 6 deletions(-)



diff --git a/psprint_config/Module_psprint_config.mk 
b/psprint_config/Module_psprint_config.mk
index 5c30c9f..0d35eb0 100644
--- a/psprint_config/Module_psprint_config.mk
+++ b/psprint_config/Module_psprint_config.mk
@@ -28,8 +28,8 @@
 $(eval $(call gb_Module_Module,psprint_config))
 
 $(eval $(call gb_Module_add_targets,psprint_config,\
-   Zip_fontunxppds \
-   Zip_fontunxpsprint \
+   Package_fontunxppds \
+   Package_fontunxpsprint \
 ))
 
 # vim: set noet sw=4:
diff --git a/psprint_config/Zip_fontunxppds.mk 
b/psprint_config/Package_fontunxppds.mk
similarity index 81%
rename from psprint_config/Zip_fontunxppds.mk
rename to psprint_config/Package_fontunxppds.mk
index 3714f11..65df35d 100644
--- a/psprint_config/Zip_fontunxppds.mk
+++ b/psprint_config/Package_fontunxppds.mk
@@ -25,9 +25,11 @@
 #
 #*
 
-$(eval $(call 
gb_Zip_Zip,fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
+$(eval $(call 
gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
 
-$(eval $(call gb_Zip_add_files,fontunxppds,\
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(INSTDIR)))
+
+$(eval $(call 
gb_Package_add_files,psprint_config_fontunxppds,share/psprint/driver,\
SGENPRT.PS \
SGENT42.PS \
 ))
diff --git a/psprint_config/Zip_fontunxpsprint.mk 
b/psprint_config/Package_fontunxpsprint.mk
similarity index 81%
rename from psprint_config/Zip_fontunxpsprint.mk
rename to psprint_config/Package_fontunxpsprint.mk
index ec0a351..f4b8e9e 100644
--- a/psprint_config/Zip_fontunxpsprint.mk
+++ b/psprint_config/Package_fontunxpsprint.mk
@@ -25,9 +25,11 @@
 #
 #*
 
-$(eval $(call 
gb_Zip_Zip,fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
+$(eval $(call 
gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
 
-$(eval $(call gb_Zip_add_files,fontunxpsprint,\
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(INSTDIR)))
+
+$(eval $(call 
gb_Package_add_files,psprint_config_fontunxpsprint,share/psprint,\
psprint.conf \
 ))
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e3046a6ed30ac8ee60940844b8ceda6ec1ffd39
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

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

[PUSHED] fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

2013-04-17 Thread Thomas Arnhold (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/3423

Approvals:
  Thomas Arnhold: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5d3ae7d2c5dbaaed30d0b39740748845c9f1641
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ioan Radu 
Gerrit-Reviewer: Thomas Arnhold 

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

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

2013-04-17 Thread Radu Ioan

 xmloff/source/chart/SchXMLAxisContext.cxx  |   16 +--
 xmloff/source/chart/SchXMLChartContext.cxx |   31 +++--
 xmloff/source/chart/SchXMLExport.cxx   |  151 +
 3 files changed, 71 insertions(+), 127 deletions(-)

New commits:
commit d461088eb4dd3b3bf7c2caaab082890ebcf80fea
Author: Radu Ioan 
Date:   Tue Apr 16 23:28:16 2013 +0300

fdo#43157 - Clean up OSL_ASSERT, DBG_ASSERT

 - replaced osl_trace with sal_info
 - replaced dbg_* with sal_*

Change-Id: Ie5d3ae7d2c5dbaaed30d0b39740748845c9f1641
Reviewed-on: https://gerrit.libreoffice.org/3423
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx 
b/xmloff/source/chart/SchXMLAxisContext.cxx
index b14618f..1a83c20 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -180,7 +180,7 @@ Reference< drawing::XShape > 
SchXMLAxisContext::getTitleShape()
 aPropName = "HasZAxisTitle";
 break;
 case SCH_XML_AXIS_UNDEF:
-OSL_TRACE( "Invalid axis" );
+SAL_INFO("xmloff.chart", "Invalid axis" );
 break;
 }
 xDiaProp->setPropertyValue( aPropName, uno::makeAny(sal_True) );
@@ -217,7 +217,7 @@ void SchXMLAxisContext::CreateGrid( OUString 
sAutoStyleName, bool bIsMajor )
 aPropName = "HasZAxisHelpGrid";
 break;
 case SCH_XML_AXIS_UNDEF:
-OSL_TRACE( "Invalid axis" );
+SAL_INFO("xmloff.chart", "Invalid axis" );
 break;
 }
 xDiaProp->setPropertyValue( aPropName, uno::makeAny(sal_True) );
@@ -364,7 +364,7 @@ Reference< chart2::XAxis > lcl_getAxis( const Reference< 
frame::XModel >& xChart
 }
 catch( uno::Exception & )
 {
-OSL_TRACE( "Couldn't get axis" );
+SAL_INFO("xmloff.chart", "Couldn't get axis" );
 }
 
 return xAxis;
@@ -423,7 +423,7 @@ void SchXMLAxisContext::CreateAxis()
 aPropName = "HasSecondaryXAxis";
 break;
 case SCH_XML_AXIS_UNDEF:
-OSL_TRACE( "Invalid axis" );
+SAL_INFO("xmloff.chart", "Invalid axis" );
 break;
 }
 try
@@ -432,7 +432,7 @@ void SchXMLAxisContext::CreateAxis()
 }
 catch( beans::UnknownPropertyException & )
 {
-OSL_TRACE( "Couldn't turn on axis" );
+SAL_INFO("xmloff.chart", "Couldn't turn on axis" );
 }
 if( m_aCurrentAxis.eDimension==SCH_XML_AXIS_Z )
 {
@@ -443,7 +443,7 @@ void SchXMLAxisContext::CreateAxis()
 }
 catch( beans::UnknownPropertyException & )
 {
-OSL_TRACE( "Couldn't turn on z axis" );
+SAL_INFO("xmloff.chart", "Couldn't turn on z axis" );
 }
 if( !bSettingZAxisSuccedded )
 return;
@@ -460,7 +460,7 @@ void SchXMLAxisContext::CreateAxis()
 }
 catch( beans::UnknownPropertyException & )
 {
-OSL_TRACE( "Couldn't turn on x axis" );
+SAL_INFO("xmloff.chart", "Couldn't turn on x axis" );
 }
 }
 
@@ -602,7 +602,7 @@ void SchXMLAxisContext::SetAxisTitle()
 }
 catch( beans::UnknownPropertyException & )
 {
-OSL_TRACE( "Property String for Title not available" );
+SAL_INFO("xmloff.chart", "Property String for Title not available" 
);
 }
 }
 }
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx 
b/xmloff/source/chart/SchXMLChartContext.cxx
index 034a2f6..5aeb93b 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -57,6 +57,7 @@
 #include 
 #include 
 
+
 using namespace com::sun::star;
 using namespace ::xmloff::token;
 using com::sun::star::uno::Reference;
@@ -104,7 +105,7 @@ void lcl_MoveDataToCandleStickSeries(
 }
 catch(const uno::Exception&)
 {
-OSL_FAIL( "Exception caught while moving data to candlestick series" );
+SAL_WARN("xmloff.chart", "Exception caught while moving data to 
candlestick series" );
 }
 }
 
@@ -163,7 +164,7 @@ void lcl_removeEmptyChartTypeGroups( const uno::Reference< 
chart2::XChartDocumen
 catch(const uno::Exception& ex)
 {
 OString aBStr(OUStringToOString(ex.Message, 
RTL_TEXTENCODING_ASCII_US));
-OSL_TRACE( "Exception caught while removing empty chart types: %s", 
aBStr.getStr());
+SAL_INFO("xmloff.chart", "Exception caught while removing empty chart 
types: " << aBStr);
 }
 }
 
@@ -246,7 +247,7 @@ void SchXMLChartContext::StartElement( const 
uno::Reference< xml::sax::XAttribut
 const SvXMLTokenMap& rAttrTokenMap = mrImportHelper.GetChartAttrTokenMap();
 
 uno::Reference< embed::XVisualObject > xVisualObject( 
mrImportHelper.GetChartDocument(), uno::UNO_QUERY);
-DBG_ASSERT(xVisualObject.is(),"need xVisualObject for page size");
+SAL_WARN_IF(!xVisualObject.is(), "xmloff.chart", "need xVisualObject for 
page

[Bug 54157] LibreOffice 4.0 most annoying bugs

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

Jorendc  changed:

   What|Removed |Added

 Depends on|63652   |

-- 
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: officecfg: reformat using xmllint

2013-04-17 Thread Thomas Arnhold


Hi Stephan,

thanks for the hint. So I load the dtd and now the whitespaces inside 
the value tag like in your example are preserved.


xmllint --loaddtd officecfg/registry/data.dtd --format 
officecfg/registry/schema/org/openoffice/Office/Recovery.xcs


Looks quite sane. Or am I too naive? :)

Thomas

On 17.04.2013 13:13, Stephan Bergmann wrote:

On 04/17/2013 03:20 AM, Thomas Arnhold wrote:

does anyone have objections against running xmllint on officecfg like
fe4260c53e7df91a4d2dad06104d7979a212de29 did?


Isn't xmllint --fromat, without access to a DTD, fundamentally flawed,
in that it cannot decide whether an element has mixed content and all
whitespace would need to be left unchanged?  In principle, this could
affect .xcu file content like



Stephan


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

[Bug 54157] LibreOffice 4.0 most annoying bugs

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

crazyske...@gmail.com changed:

   What|Removed |Added

 Depends on||63652

-- 
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 54157] LibreOffice 4.0 most annoying bugs

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

Jorendc  changed:

   What|Removed |Added

 Depends on|63652   |

--- Comment #137 from Jorendc  ---
(In reply to comment #136)
> Bug 63652 - The Amazing Moving Tab Stops
> 
> This is an MAB because the user cannot open a file he saved without having
> to change the formatting.

Sorry, I remove it for now, because it is still UNCONFIRMED.

-- 
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 54157] LibreOffice 4.0 most annoying bugs

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

crazyske...@gmail.com changed:

   What|Removed |Added

 Depends on||63652

--- Comment #136 from crazyske...@gmail.com ---
Bug 63652 - The Amazing Moving Tab Stops

This is an MAB because the user cannot open a file he saved without having to
change the formatting.

-- 
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] fdo#60641, localise strings

2013-04-17 Thread via Code Review

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3441

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/3441/1

fdo#60641, localise strings

Uses resource from numberingtypelistbox.src, to localise
"Native Numbering" and the Cyrillic and Greek strings.

Change-Id: I3dfafc90686bea9ddee67262044afa2619b882f8
---
M sw/source/ui/fldui/fldmgr.cxx
1 file changed, 14 insertions(+), 1 deletion(-)



diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 2dbee73..2750a09 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -75,6 +75,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::container;
@@ -679,6 +681,9 @@
 {
 if(xNumberingInfo.is())
 {
+SwOLENames aNames(SW_RES(STRRES_NUMTYPES));
+ResStringArray& rNames = aNames.GetNames();
+
 Sequence aTypes = 
xNumberingInfo->getSupportedNumberingTypes();
 const sal_Int16* pTypes = aTypes.getConstArray();
 sal_Int32 nOffset = aSwFlds[nPos].nFmtEnd - nStart;
@@ -690,7 +695,15 @@
 {
 if(nValidEntry == ((sal_Int32)nFormatId) - nOffset)
 {
-aRet = xNumberingInfo->getNumberingIdentifier( 
pTypes[nType] );
+sal_uInt32 n = rNames.FindIndex(pTypes[nType]);
+if (n != RESARRAY_INDEX_NOTFOUND)
+{
+aRet = rNames.GetString(n);
+}
+else
+{
+aRet = xNumberingInfo->getNumberingIdentifier( 
pTypes[nType] );
+}
 break;
 }
 ++nValidEntry;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3dfafc90686bea9ddee67262044afa2619b882f8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ádám Király 

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

Re: Empty Advanced options page on Windows

2013-04-17 Thread Thomas Arnhold


Hi Kohei,

I tested this on Linux (latest master) and can't reproduce it.

I tried the latest nightly on Windows (4th April I think) were it is 
working correctly:


Version: 4.1.0.0.alpha0+
Build ID: 73cc9fc42cfa524a9965f58092f3a004de3a6b8

Are there any newer binaries for windows? If not I'm compiling it during 
the weekend for myself.


Thomas


On 17.04.2013 15:19, Thomas Arnhold wrote:

Hi Kohei,

seems to be my fault (7c48a2a83f4a92200c7f2b0f259bf1684d253436).

I'll investigate it.

Thomas

On 17.04.2013 14:49, Kohei Yoshida wrote:

Hi there,

I just completed my Windows build of the master branch and noticed that,
the Advanced options page is for some reason totally blank.  If my
attachment goes through, you can see it in the attached screenshot.

Does this ring any bell to anyone?

Kohei


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

Re: [ANN] --enable-dbgutil: everyone gets a Debug STL!

It is known that Apple has stopped following upstream libstdc++ (just
like they have stopped following upstream GCC). Thus I assume this bug
in libstdc++ is not going to be fixed. Can it BTW be reproduced on a
Linux version that still uses libstdc++ version 4.2.1?

I wonder if there is some simple hack we could use to work around the problem?

The C++ library Apple is switching to is libc++,
http://libcxx.llvm.org . It doesn't seem to be the default yet when
running clang++ from the command line. However, when setting up
project in Xcode, it does by default use libc++. The clang++
command-line option to use it is -stdlib=libc++.

This problem indeed does not occur with libc++, but then, libc++ does
not really have something that would work and correspond to
_GLIBCXX_DEBUG anyway, so that is not as such any more fun than not
using _GLIBCXX_DEBUG...

(There is a _LIBCPP_DEBUG, but that is not really supposed to be
useful yet, if ever,
http://clang-developers.42468.n3.nabble.com/questions-about-libc-s-LIBCPP-DEBUG-tp4030016p4030019.html
)

I wonder if we should enforce using libc++ instead of GNU libstdc++
when using Clang on OS X and not targeting 10.6? (Trying to build with
-stdlib=libc++ and -mmacosx-version-min=10.6 results in "clang:
error: invalid deployment target for -stdlib=libc++ (requires OS X
10.7 or later)") Nah, probably not useful as long as our deployment
target is 10.6. Better to just forget about _GLIBCXX_DEBUG on OS X if
the ostringstream problem can't be worked around.

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

[PATCH] fdo#63197, convert sysui osxicons

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3440

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/3440/1

fdo#63197, convert sysui osxicons

Change-Id: Iab9cb3704385c115e1d25189a3d8833bd6721e24
---
M scp2/source/ooo/file_ooo.scp
M sysui/Module_sysui.mk
R sysui/Package_osxicons.mk
3 files changed, 9 insertions(+), 7 deletions(-)



diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index bd5b571..b5fe2a2 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1267,10 +1267,10 @@
 
 #ifdef MACOSX
 File gid_File_Icns_Bundle
-ARCHIVE_TXT_FILE_BODY;
-Dir = gid_Dir_Bundle_Contents_Resources;
-Name = "osxicons.zip";
-Styles = (ARCHIVE);
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "sysui_osxicons.filelist";
 End
 #endif
 
diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk
index 9c5c76a..c668730 100644
--- a/sysui/Module_sysui.mk
+++ b/sysui/Module_sysui.mk
@@ -22,7 +22,7 @@
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,sysui,\
-   Zip_osxicons \
+   Package_osxicons \
CustomTarget_infoplist \
Package_infoplist \
 ))
diff --git a/sysui/Zip_osxicons.mk b/sysui/Package_osxicons.mk
similarity index 84%
rename from sysui/Zip_osxicons.mk
rename to sysui/Package_osxicons.mk
index d9c1901..8a1e8c9 100644
--- a/sysui/Zip_osxicons.mk
+++ b/sysui/Package_osxicons.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,osxicons,$(SRCDIR)/sysui/desktop))
+$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop))
 
-$(eval $(call gb_Zip_add_files,osxicons,\
+$(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,sysui_osxicons,presets,\
 icons/text.icns \
 icons/oasis-text.icns \
 icons/spreadsheet.icns \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab9cb3704385c115e1d25189a3d8833bd6721e24
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 

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

[Libreoffice-qa] Bugzilla administration info - New version 4.0.3.1 rc

2013-04-17 Thread Joel Madero

A new version has been added to FreeDesktop.Org (FDO) as well as Bug
Submission Assistant (BSA) for the release of

4.0.3.1 rc

Regards,
Joel

-- 
*Joel Madero*
LibreOffice QA Volunteer
jmadero@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PUSHED] fdo#63197: convert wizards

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3439

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7fa577fbdb527a75643c4e2919e0527432d5536
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

[Libreoffice-commits] core.git: scp2/source wizards/Module_wizards.mk wizards/Package_depot.mk wizards/Package_euro.mk wizards/Package_form.mk wizards/Package_gimmicks.mk wizards/Package_import.mk wiz

 scp2/source/ooo/file_ooo.scp |   74 +++
 wizards/Module_wizards.mk|   22 ++--
 wizards/Package_depot.mk |   56 
 wizards/Package_euro.mk  |   48 +++
 wizards/Package_form.mk  |   45 ++
 wizards/Package_gimmicks.mk  |   45 ++
 wizards/Package_import.mk|   44 +
 wizards/Package_share.mk |   38 ++
 wizards/Package_standard.mk  |   39 ++
 wizards/Package_template.mk  |   44 +
 wizards/Package_tools.mk |   45 ++
 wizards/Package_tutorials.mk |   47 +++
 wizards/Package_usr.mk   |   38 ++
 wizards/Zip_depot.mk |   54 ---
 wizards/Zip_euro.mk  |   46 --
 wizards/Zip_form.mk  |   43 
 wizards/Zip_gimmicks.mk  |   43 
 wizards/Zip_import.mk|   42 
 wizards/Zip_share.mk |   36 
 wizards/Zip_standard.mk  |   37 -
 wizards/Zip_template.mk  |   42 
 wizards/Zip_tools.mk |   43 
 wizards/Zip_tutorials.mk |   45 --
 wizards/Zip_usr.mk   |   36 
 24 files changed, 541 insertions(+), 511 deletions(-)

New commits:
commit 0191eb95fb39138500426a87569d365ecaaf8e42
Author: Julien Nabet 
Date:   Wed Apr 17 21:06:09 2013 +0200

fdo#63197: convert wizards

Change-Id: Ic7fa577fbdb527a75643c4e2919e0527432d5536
Reviewed-on: https://gerrit.libreoffice.org/3439
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a15e58c..bd5b571 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -28,33 +28,38 @@
 #include "macros.inc"
 
 File gid_File_Basic_Depot
-Dir = gid_Dir_Basic_Depot;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvdepot.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvdepot.filelist";
 End
 
 File gid_File_Basic_Euro
-Dir = gid_Dir_Basic_Euro;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrveuro.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrveuro.filelist";
 End
 
 File gid_File_Basic_Gimmicks
-Dir = gid_Dir_Basic_Gimmicks;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvgimmicks.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvgimmicks.filelist";
 End
 
 File gid_File_Basic_Importwiz
-Dir = gid_Dir_Basic_Importwiz;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvimport.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvimport.filelist";
 End
 
 File gid_File_Basic_Formwiz
-Dir = gid_Dir_Basic_Formwiz;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvform.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvform.filelist";
 End
 
 #ifndef DISABLE_SCRIPTING
@@ -68,42 +73,45 @@ End
 #endif
 
 File gid_File_Basic_Template
-Dir = gid_Dir_Basic_Template;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtemplate.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvtemplate.filelist";
 End
 
 File gid_File_Basic_Tools
-Dir = gid_Dir_Basic_Tools;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtools.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvtools.filelist";
 End
 
 File gid_File_Basic_User
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_User_Basic;
-Name = "basicusr.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicusr.filelist";
 End
 
 File gid_File_Basic_Share
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_Basic;
-Name = "basicshare.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicshare.filelist";
 End
 
 File gid_File_Basic_User_Standard
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_Basic_Standard;
-Name = "basicsrvstandard.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicsrvstandard.filelist";
 End
 
 File gid_File_Basic_Tutorials
-Dir = gid_Dir_Basic_Tutorials;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtutorials.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles =

[PATCH] fdo#63197: convert wizards

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3439

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/3439/1

fdo#63197: convert wizards

Change-Id: Ic7fa577fbdb527a75643c4e2919e0527432d5536
---
M scp2/source/ooo/file_ooo.scp
M wizards/Module_wizards.mk
R wizards/Package_depot.mk
R wizards/Package_euro.mk
R wizards/Package_form.mk
R wizards/Package_gimmicks.mk
R wizards/Package_import.mk
C wizards/Package_share.mk
R wizards/Package_standard.mk
R wizards/Package_template.mk
R wizards/Package_tools.mk
R wizards/Package_tutorials.mk
R wizards/Package_usr.mk
D wizards/Zip_share.mk
14 files changed, 94 insertions(+), 102 deletions(-)



diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index a15e58c..bd5b571 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -28,33 +28,38 @@
 #include "macros.inc"
 
 File gid_File_Basic_Depot
-Dir = gid_Dir_Basic_Depot;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvdepot.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvdepot.filelist";
 End
 
 File gid_File_Basic_Euro
-Dir = gid_Dir_Basic_Euro;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrveuro.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrveuro.filelist";
 End
 
 File gid_File_Basic_Gimmicks
-Dir = gid_Dir_Basic_Gimmicks;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvgimmicks.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvgimmicks.filelist";
 End
 
 File gid_File_Basic_Importwiz
-Dir = gid_Dir_Basic_Importwiz;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvimport.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvimport.filelist";
 End
 
 File gid_File_Basic_Formwiz
-Dir = gid_Dir_Basic_Formwiz;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvform.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvform.filelist";
 End
 
 #ifndef DISABLE_SCRIPTING
@@ -68,42 +73,45 @@
 #endif
 
 File gid_File_Basic_Template
-Dir = gid_Dir_Basic_Template;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtemplate.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvtemplate.filelist";
 End
 
 File gid_File_Basic_Tools
-Dir = gid_Dir_Basic_Tools;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtools.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvtools.filelist";
 End
 
 File gid_File_Basic_User
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_User_Basic;
-Name = "basicusr.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicusr.filelist";
 End
 
 File gid_File_Basic_Share
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_Basic;
-Name = "basicshare.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicshare.filelist";
 End
 
 File gid_File_Basic_User_Standard
+Dir = FILELIST_DIR;
 USER_FILE_BODY;
-Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-Dir = gid_Dir_Basic_Standard;
-Name = "basicsrvstandard.zip";
+Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+Name = "wizards_basicsrvstandard.filelist";
 End
 
 File gid_File_Basic_Tutorials
-Dir = gid_Dir_Basic_Tutorials;
-ARCHIVE_TXT_FILE_BODY;
-Name = "basicsrvtutorials.zip";
+Dir = FILELIST_DIR;
+TXT_FILE_BODY;
+Styles = (FILELIST);
+Name = "wizards_basicsrvtutorials.filelist";
 End
 
 #if defined ENABLE_NPAPI_INTO_BROWSER
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 098433d..2d6e36f 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -34,21 +34,21 @@
AllLangResTarget_imp \
AllLangResTarget_tpl \
AllLangResTarget_wzi \
+   Package_depot \
+   Package_euro \
+   Package_form \
+   Package_gimmicks \
+   Package_import \
+   Package_share \
+   Package_standard \
+   Package_template \
+   Package_tools \
+   Package_tutorials \
+   Package_usr \
Pyuno_fax \
Pyuno_letter \
Pyuno_agenda \
Pyuno_commonwizards \
-   Zip_depot \
-   Zip_euro \
-   Zip_form \
-   Zip_gimmicks \
-   Zip_import \
-   Zip_share \
-   Zip_standard \
-   Zip_template \
-   Zip_tools \
-   Zip_tutorials \
-   Zip_usr \
 ))
 
 ifeq ($(SOLAR_JAVA),TRUE)
diff --git a/wizards/Zip_depot.mk b/wizards/Package_depot.mk
similarity index 86%
rename from wizards/Zip_depot.mk
rename to wizards/Package_depot.mk
index 8dd5fef..229b

Re: [ANN] --enable-dbgutil: everyone gets a Debug STL!

>>writing numbers to std streams now suppresses all output to
>> those streams, so that e.g., SAL_WARN("foo","bar") only writes "warn:foo:"

The problem seems to be an old one,
http://www.runcode.us/q/c-debug-builds-broke-in-snow-leopard-x-code

Looking at the interesting parts of ostream.tcc, I saw a mysterious comment

  // _GLIBCXX_RESOLVE_LIB_DEFECTS
  // 117. basic_ostream uses nonexistent num_put member functions.

and googling a bit I found
http://gcc.gnu.org/onlinedocs/libstdc++/ext/lwg-defects.html#117

hmm... no idea how to fix this yet, but apparently this is a bug in
the oldish version of GNU libstdc++ that Apple ships?

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

[PUSHED] Remove unused web wizard

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3438

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I76ed89c4a46e5a7b6a639e2c2717bc53d9b68bc9
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

[PATCH] Remove unused web wizard

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3438

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/3438/1

Remove unused web wizard

Change-Id: I76ed89c4a46e5a7b6a639e2c2717bc53d9b68bc9
---
M wizards/Module_wizards.mk
D wizards/Zip_web.mk
D wizards/source/webwizard/Bullets.xba
D wizards/source/webwizard/Common.xba
D wizards/source/webwizard/HtmlAutoPilotBasic.xba
D wizards/source/webwizard/Language.xba
D wizards/source/webwizard/WebWzrd.xdl
D wizards/source/webwizard/dialog.xlb
D wizards/source/webwizard/script.xlb
9 files changed, 0 insertions(+), 950 deletions(-)



diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index d979ed0..098433d 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -49,7 +49,6 @@
Zip_tools \
Zip_tutorials \
Zip_usr \
-   Zip_web \
 ))
 
 ifeq ($(SOLAR_JAVA),TRUE)
diff --git a/wizards/Zip_web.mk b/wizards/Zip_web.mk
deleted file mode 100644
index c552440..000
--- a/wizards/Zip_web.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-
-$(eval $(call gb_Zip_Zip,basicsrvweb,$(SRCDIR)/wizards/source/webwizard))
-
-$(eval $(call gb_Zip_add_files,basicsrvweb,\
-   Bullets.xba \
-   Common.xba \
-   dialog.xlb \
-   HtmlAutoPilotBasic.xba \
-   Language.xba \
-   script.xlb \
-   WebWzrd.xdl \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/webwizard/Bullets.xba 
b/wizards/source/webwizard/Bullets.xba
deleted file mode 100644
index 76d825a..000
--- a/wizards/source/webwizard/Bullets.xba
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="Bullets" script:language="StarBasic">REM  *  BASIC  *
-Option Explicit
-
-
-SubSetBulletGraphics(sBulletUrl as String)
-Dim i as Integer
-Dim oBookMarkCursor as Object
-   oBookmarks = oBaseDocument.BookMarks
-   For i = 0 To oBookmarks.Count - 1
-   oBookMark = oBookmarks.GetbyIndex(i)
-   oBookMarkCursor = 
oBookMark.Anchor.Text.CreateTextCursorByRange(oBookMark.Anchor)
-   If 
oBookMarkCursor.PropertySetInfo.HasPropertybyName("NumberingRules") 
Then
-   ChangeBulletURL(sBulletUrl, oBookMarkCursor)
-   End If
-   Next i
-End Sub
-
-
-SubChangeBulletURL(sBulletUrl as String, oBookMarkCursor as Object)
-Dim n, m as Integer
-Dim oLevel()
-Dim oRules
-Dim bDoReplace as Boolean
-Dim oSize as New com.sun.star.awt.Size
-Dim oNumberingBuffer(0) as New com.sun.star.beans.PropertyValue
-Dim oNewBuffer(0) as New com.sun.star.beans.PropertyValue
-   oRules = oBookMarkCursor.NumberingRules
-   If Vartype(oRules()) = 9 Then
-   oNumberingBuffer(0).Name = "NumberingType"
-   oNumberingBuffer(0).Value = 
com.sun.star.style.NumberingType.BITMAP
-   For n = 0 To oRules.Count - 1
-   oLevel() = oRules.GetByIndex(n)
-   bDoReplace = ModifyPropertyValue(oLevel(), 
oNumberingBuffer())
-   If bDoReplace Then
-   oRules.ReplaceByIndex(n, oNumberingBuffer())
-   End If
-   Next n
-   oBookmarkCursor.NumberingRules = oRules
-   oNewBuffer(0).Name = "GraphicURL"
-   oNewBuffer(0).Value = sBulletUrl
-   For n = 0 To oRules.Count - 1
-   oLevel() = oRules.GetByIndex(0)
-   bDoReplace = ModifyPropertyValue(oLevel(), oNewBuffer())
-   If bDoReplace Then
-   oRules.ReplaceByIndex(n, oNewBuffer())
-   End If
-   Next n
-   oBookmarkCursor.NumberingRules

[Libreoffice-commits] core.git: wizards/Module_wizards.mk wizards/source wizards/Zip_web.mk

 wizards/Module_wizards.mk   |1 
 wizards/Zip_web.mk  |   41 --
 wizards/source/webwizard/Bullets.xba|  134 ---
 wizards/source/webwizard/Common.xba |  162 
 wizards/source/webwizard/HtmlAutoPilotBasic.xba |  453 
 wizards/source/webwizard/Language.xba   |  101 -
 wizards/source/webwizard/WebWzrd.xdl|   45 --
 wizards/source/webwizard/dialog.xlb |5 
 wizards/source/webwizard/script.xlb |8 
 9 files changed, 950 deletions(-)

New commits:
commit 718cd9e46e47cc384758f0517d4e5b3b70d2a73d
Author: Julien Nabet 
Date:   Wed Apr 17 20:29:45 2013 +0200

Remove unused web wizard

Change-Id: I76ed89c4a46e5a7b6a639e2c2717bc53d9b68bc9
Reviewed-on: https://gerrit.libreoffice.org/3438
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index d979ed0..098433d 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Module_add_targets,wizards,\
Zip_tools \
Zip_tutorials \
Zip_usr \
-   Zip_web \
 ))
 
 ifeq ($(SOLAR_JAVA),TRUE)
diff --git a/wizards/Zip_web.mk b/wizards/Zip_web.mk
deleted file mode 100644
index c552440..000
--- a/wizards/Zip_web.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-
-$(eval $(call gb_Zip_Zip,basicsrvweb,$(SRCDIR)/wizards/source/webwizard))
-
-$(eval $(call gb_Zip_add_files,basicsrvweb,\
-   Bullets.xba \
-   Common.xba \
-   dialog.xlb \
-   HtmlAutoPilotBasic.xba \
-   Language.xba \
-   script.xlb \
-   WebWzrd.xdl \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/webwizard/Bullets.xba 
b/wizards/source/webwizard/Bullets.xba
deleted file mode 100644
index 76d825a..000
--- a/wizards/source/webwizard/Bullets.xba
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="Bullets" script:language="StarBasic">REM  *  BASIC  *
-Option Explicit
-
-
-SubSetBulletGraphics(sBulletUrl as String)
-Dim i as Integer
-Dim oBookMarkCursor as Object
-   oBookmarks = oBaseDocument.BookMarks
-   For i = 0 To oBookmarks.Count - 1
-   oBookMark = oBookmarks.GetbyIndex(i)
-   oBookMarkCursor = 
oBookMark.Anchor.Text.CreateTextCursorByRange(oBookMark.Anchor)
-   If 
oBookMarkCursor.PropertySetInfo.HasPropertybyName("NumberingRules") 
Then
-   ChangeBulletURL(sBulletUrl, oBookMarkCursor)
-   End If
-   Next i
-End Sub
-
-
-SubChangeBulletURL(sBulletUrl as String, oBookMarkCursor as Object)
-Dim n, m as Integer
-Dim oLevel()
-Dim oRules
-Dim bDoReplace as Boolean
-Dim oSize as New com.sun.star.awt.Size
-Dim oNumberingBuffer(0) as New com.sun.star.beans.PropertyValue
-Dim oNewBuffer(0) as New com.sun.star.beans.PropertyValue
-   oRules = oBookMarkCursor.NumberingRules
-   If Vartype(oRules()) = 9 Then
-   oNumberingBuffer(0).Name = "NumberingType"
-   oNumberingBuffer(0).Value = 
com.sun.star.style.NumberingType.BITMAP
-   For n = 0 To oRules.Count - 1
-   oLevel() = oRules.GetByIndex(n)
-   bDoReplace = ModifyPropertyValue(oLevel(), 
oNumberingBuffer())
-   If bDoReplace Then
-   oRules.ReplaceByIndex(n, oNumberingBuffer())
-   End If
-   Next n
-   oBookmarkCursor.NumberingRules = oRules
-   oNewBuffer(0).Name = "GraphicURL"
-   oNewBuffer(0).Value = sBulletUrl
-   For n = 0 To oRules.Count - 1
-   oLevel() =

[PUSHED] Remove unused launcher wizard

Hi,

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

If you are interested in details, please visit

https://gerrit.libreoffice.org/3437

Approvals:
  David Tardon: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c071f00eef88d3f56e76efddf6f0c71aa56b089
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

[ABANDONED] fdo#63197, Remove Zip_launcher part

David Tardon has abandoned this change.

Change subject: fdo#63197, Remove Zip_launcher part
..


Patch Set 1: Abandoned

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I3d14cf90ec4d745a8fb70db8319a3a3042e93306
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: David Tardon 

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

[PATCH] Remove unused launcher wizard

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3437

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/37/3437/1

Remove unused launcher wizard

Change-Id: I6c071f00eef88d3f56e76efddf6f0c71aa56b089
---
M wizards/Module_wizards.mk
D wizards/Zip_launcher.mk
D wizards/source/launcher/DicOOo.xba
D wizards/source/launcher/dialog.xlb
D wizards/source/launcher/script.xlb
5 files changed, 0 insertions(+), 119 deletions(-)



diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 14d6c05..d979ed0 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -43,7 +43,6 @@
Zip_form \
Zip_gimmicks \
Zip_import \
-   Zip_launcher \
Zip_share \
Zip_standard \
Zip_template \
diff --git a/wizards/Zip_launcher.mk b/wizards/Zip_launcher.mk
deleted file mode 100644
index 1fb18b0..000
--- a/wizards/Zip_launcher.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-$(eval $(call gb_Zip_Zip,basicsrvlauncher,$(SRCDIR)/wizards/source/launcher))
-$(eval $(call gb_Zip_add_files,basicsrvlauncher,\
-   dialog.xlb \
-   DicOOo.xba \
-   script.xlb \
-))
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/launcher/DicOOo.xba 
b/wizards/source/launcher/DicOOo.xba
deleted file mode 100644
index 1e1e85e..000
--- a/wizards/source/launcher/DicOOo.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="DicOOo" script:language="StarBasic">Option Explicit
-
-Sub StartDicOOo
-
-Dim ThePath as string
-Dim DefPath as string
-Dim aService as object
-Dim MyDicOOo as string
-dim TheDoc as object
-dim args(1) as new com.sun.star.beans.PropertyValue
-
-on error resume next
-
-' Find path
-aService = CreateUnoService("com.sun.star.util.PathSubstitution")
-ThePath =ConvertToURL(aService.substituteVariables("$(user)", true))
-ThePath=ThePath & "/wordbook"
-DefPath =ConvertToURL(aService.substituteVariables("$(prog)", true))
-DefPath=DefPath & "/../share/dict/ooo"
-
-MyDicOOo=""
-
-if  fileExists(ThePath & "/DicOOo.lst") then
-   'read DicOOo.lst file in user directory
-Open ThePath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   if fileExists(DefPath & "/DicOOo.lst") then
-   'read DicOOo.lst file in share directory
-   Open DefPath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   'creates default file in user directory
-   Open ThePath & "/DicOOo.lst" for output as #1
-   print #1,convertFromURL(DefPath & "/DicOOo.sxw")
-   close #1
-endif
-endif
-
-'security 
-if Not fileExists(MyDicOOo) then
-MyDicOOo= DefPath & "/DicOOo.sxw"
-endif
-
-MyDicOOo=ConvertToURL(MyDicOOo)
-
-'Opens DicOOo main file
-args(0).name="InteractionHandler"
-args(0).value=""
-args(1).name="MacroExecutionMode"
-args(1).value=com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN 
'4
-TheDoc=StarDesktop.loadComponentFromURL(MyDicOOo,"_blank",0,args())
-
-End Sub
-
diff --git a/wizards/source/launcher/dialog.xlb 
b/wizards/source/launcher/dialog.xlb
deleted file mode 100644
index a4c6d75..000
--- a/wizards/source/launcher/dialog.xlb
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-http://openoffice.org/2000/library"; 
library:name="Launcher" library:readonly="true" 
library:passwordprotected="false"/>
diff --git a/wizards/source/launcher/script.xlb 
b/wizards/source/launcher/script.xlb
deleted file mode 100644
index 55310d9..000
--- a/wizards/source/launcher/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-http://openoffice.org/2000/library"; 
library:name="Launcher" library:readonly="true" 
library:passwordprotected="false">
- 
-

[Libreoffice-commits] core.git: wizards/Module_wizards.mk wizards/source wizards/Zip_launcher.mk

 wizards/Module_wizards.mk  |1 
 wizards/Zip_launcher.mk|   34 
 wizards/source/launcher/DicOOo.xba |   76 -
 wizards/source/launcher/dialog.xlb |3 -
 wizards/source/launcher/script.xlb |5 --
 5 files changed, 119 deletions(-)

New commits:
commit 96adcf4b9f466e2bf26ec5aeb9e4202002376a61
Author: Julien Nabet 
Date:   Wed Apr 17 20:00:18 2013 +0200

Remove unused launcher wizard

Change-Id: I6c071f00eef88d3f56e76efddf6f0c71aa56b089
Reviewed-on: https://gerrit.libreoffice.org/3437
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 14d6c05..d979ed0 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Module_add_targets,wizards,\
Zip_form \
Zip_gimmicks \
Zip_import \
-   Zip_launcher \
Zip_share \
Zip_standard \
Zip_template \
diff --git a/wizards/Zip_launcher.mk b/wizards/Zip_launcher.mk
deleted file mode 100644
index 1fb18b0..000
--- a/wizards/Zip_launcher.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-$(eval $(call gb_Zip_Zip,basicsrvlauncher,$(SRCDIR)/wizards/source/launcher))
-$(eval $(call gb_Zip_add_files,basicsrvlauncher,\
-   dialog.xlb \
-   DicOOo.xba \
-   script.xlb \
-))
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/launcher/DicOOo.xba 
b/wizards/source/launcher/DicOOo.xba
deleted file mode 100644
index 1e1e85e..000
--- a/wizards/source/launcher/DicOOo.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="DicOOo" script:language="StarBasic">Option Explicit
-
-Sub StartDicOOo
-
-Dim ThePath as string
-Dim DefPath as string
-Dim aService as object
-Dim MyDicOOo as string
-dim TheDoc as object
-dim args(1) as new com.sun.star.beans.PropertyValue
-
-on error resume next
-
-' Find path
-aService = CreateUnoService("com.sun.star.util.PathSubstitution")
-ThePath =ConvertToURL(aService.substituteVariables("$(user)", true))
-ThePath=ThePath & "/wordbook"
-DefPath =ConvertToURL(aService.substituteVariables("$(prog)", true))
-DefPath=DefPath & "/../share/dict/ooo"
-
-MyDicOOo=""
-
-if  fileExists(ThePath & "/DicOOo.lst") then
-   'read DicOOo.lst file in user directory
-Open ThePath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   if fileExists(DefPath & "/DicOOo.lst") then
-   'read DicOOo.lst file in share directory
-   Open DefPath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   'creates default file in user directory
-   Open ThePath & "/DicOOo.lst" for output as #1
-   print #1,convertFromURL(DefPath & "/DicOOo.sxw")
-   close #1
-endif
-endif
-
-'security 
-if Not fileExists(MyDicOOo) then
-MyDicOOo= DefPath & "/DicOOo.sxw"
-endif
-
-MyDicOOo=ConvertToURL(MyDicOOo)
-
-'Opens DicOOo main file
-args(0).name="InteractionHandler"
-args(0).value=""
-args(1).name="MacroExecutionMode"
-args(1).value=com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN 
'4
-TheDoc=StarDesktop.loadComponentFromURL(MyDicOOo,"_blank",0,args())
-
-End Sub
-
diff --git a/wizards/source/launcher/dialog.xlb 
b/wizards/source/launcher/dialog.xlb
deleted file mode 100644
index a4c6d75..000
--- a/wizards/source/launcher/dialog.xlb
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-http://openoffice.org/2000/library"; 
library:name="Launcher" library:readonly="true" 
library:passwordprotected="false"/>
diff --git a/wizards/source/launcher/script.xlb 
b/wizards/source/launcher/script.xlb
deleted file mode 100644
index 55310d9..000
--- a/

[PATCH] fdo#63197, Remove Zip_launcher part

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3436

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/36/3436/1

fdo#63197, Remove Zip_launcher part

Change-Id: I3d14cf90ec4d745a8fb70db8319a3a3042e93306
---
M wizards/Module_wizards.mk
D wizards/Zip_launcher.mk
D wizards/source/launcher/DicOOo.xba
D wizards/source/launcher/dialog.xlb
D wizards/source/launcher/script.xlb
5 files changed, 0 insertions(+), 119 deletions(-)



diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 14d6c05..d979ed0 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -43,7 +43,6 @@
Zip_form \
Zip_gimmicks \
Zip_import \
-   Zip_launcher \
Zip_share \
Zip_standard \
Zip_template \
diff --git a/wizards/Zip_launcher.mk b/wizards/Zip_launcher.mk
deleted file mode 100644
index 1fb18b0..000
--- a/wizards/Zip_launcher.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2011 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# 
-# for a copy of the LGPLv3 License.
-#
-#*
-$(eval $(call gb_Zip_Zip,basicsrvlauncher,$(SRCDIR)/wizards/source/launcher))
-$(eval $(call gb_Zip_add_files,basicsrvlauncher,\
-   dialog.xlb \
-   DicOOo.xba \
-   script.xlb \
-))
-# vim: set noet sw=4 ts=4:
diff --git a/wizards/source/launcher/DicOOo.xba 
b/wizards/source/launcher/DicOOo.xba
deleted file mode 100644
index 1e1e85e..000
--- a/wizards/source/launcher/DicOOo.xba
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-http://openoffice.org/2000/script"; 
script:name="DicOOo" script:language="StarBasic">Option Explicit
-
-Sub StartDicOOo
-
-Dim ThePath as string
-Dim DefPath as string
-Dim aService as object
-Dim MyDicOOo as string
-dim TheDoc as object
-dim args(1) as new com.sun.star.beans.PropertyValue
-
-on error resume next
-
-' Find path
-aService = CreateUnoService("com.sun.star.util.PathSubstitution")
-ThePath =ConvertToURL(aService.substituteVariables("$(user)", true))
-ThePath=ThePath & "/wordbook"
-DefPath =ConvertToURL(aService.substituteVariables("$(prog)", true))
-DefPath=DefPath & "/../share/dict/ooo"
-
-MyDicOOo=""
-
-if  fileExists(ThePath & "/DicOOo.lst") then
-   'read DicOOo.lst file in user directory
-Open ThePath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   if fileExists(DefPath & "/DicOOo.lst") then
-   'read DicOOo.lst file in share directory
-   Open DefPath & "/DicOOo.lst" for input as #1
-line input #1, MyDicOOo
-close #1
-else
-   'creates default file in user directory
-   Open ThePath & "/DicOOo.lst" for output as #1
-   print #1,convertFromURL(DefPath & "/DicOOo.sxw")
-   close #1
-endif
-endif
-
-'security 
-if Not fileExists(MyDicOOo) then
-MyDicOOo= DefPath & "/DicOOo.sxw"
-endif
-
-MyDicOOo=ConvertToURL(MyDicOOo)
-
-'Opens DicOOo main file
-args(0).name="InteractionHandler"
-args(0).value=""
-args(1).name="MacroExecutionMode"
-args(1).value=com.sun.star.document.MacroExecMode.ALWAYS_EXECUTE_NO_WARN 
'4
-TheDoc=StarDesktop.loadComponentFromURL(MyDicOOo,"_blank",0,args())
-
-End Sub
-
diff --git a/wizards/source/launcher/dialog.xlb 
b/wizards/source/launcher/dialog.xlb
deleted file mode 100644
index a4c6d75..000
--- a/wizards/source/launcher/dialog.xlb
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-http://openoffice.org/2000/library"; 
library:name="Launcher" library:readonly="true" 
library:passwordprotected="false"/>
diff --git a/wizards/source/launcher/script.xlb 
b/wizards/source/launcher/script.xlb
deleted file mode 100644
index 55310d9..000
--- a/wizards/source/launcher/script.xlb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-http://openoffice.org/2000/library"; 
library:name="Launcher" library:readonly="true" 
library:passwordprotected="false">

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

2013-04-17 Thread Luboš Luňák

 sw/source/core/inc/drawfont.hxx   |   22 ++
 sw/source/core/txtnode/swfont.cxx |   10 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

New commits:
commit f22006dc6ac34a35a060e15466cf6b2d2058617d
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Wed Apr 17 18:52:28 2013 +0200

fix stupid over-optimization

There's so little to be gained by storing pointers to simple
or refcounted types instead of using an instance. At least
SwTxtNode::GetMinMaxSize() and SwTxtNode::GetScalingOfSelectedText()
pass string temporaries to SwDrawTextInfo, so keeping a pointer
is clearly broken, and MSVC manages to optimize the code enough
to crash because of this. As all the pointers point to const references
and are accesses using const references as well, there shouldn't
be any harm in making a copy.
This fixes smoketest crash on Windows.

Change-Id: I7d7cb42e175a2e64fe9c84c98c0d0204a0c25c13

diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 204a1a7..f4a8b3d 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -42,12 +42,12 @@ class SwDrawTextInfo
 OutputDevice* pOut;
 ViewShell* pSh;
 const SwScriptInfo* pScriptInfo;
-const Point* pPos;
-const OUString* pText;
+Point pPos;
+OUString pText;
 const SwWrongList* pWrong;
 const SwWrongList* pGrammarCheck;
 const SwWrongList* pSmartTags;
-const Size* pSize;
+Size pSize;
 SwFont *pFnt;
 SwUnderlineFont* pUnderFnt;
 xub_StrLen* pHyphPos;
@@ -111,7 +111,7 @@ public:
 pSh = pS;
 pOut = &rO;
 pScriptInfo = pSI;
-pText = &rSt;
+pText = rSt;
 nIdx = nI;
 nLen = nL;
 nKern = 0;
@@ -129,11 +129,9 @@ public:
 
 // These values are initialized but have to be set explicitly via their
 // Set-function before they may be accessed by their Get-function:
-pPos = 0;
 pWrong = 0;
 pGrammarCheck = 0;
 pSmartTags = 0;
-pSize = 0;
 pFnt = 0;
 pHyphPos = 0;
 nLeft = 0;
@@ -192,7 +190,7 @@ public:
 #ifdef DBG_UTIL
 OSL_ENSURE( m_bPos, "DrawTextInfo: Undefined Position" );
 #endif
-return *pPos;
+return pPos;
 }
 
 xub_StrLen *GetHyphPos() const
@@ -205,7 +203,7 @@ public:
 
 const OUString &GetText() const
 {
-return *pText;
+return pText;
 }
 
 const SwWrongList* GetWrong() const
@@ -234,7 +232,7 @@ public:
 #ifdef DBG_UTIL
 OSL_ENSURE( m_bSize, "DrawTextInfo: Undefined Size" );
 #endif
-return *pSize;
+return pSize;
 }
 
 SwFont* GetFont() const
@@ -402,7 +400,7 @@ public:
 
 void SetPos( const Point &rNew )
 {
-pPos = &rNew;
+pPos = rNew;
 #ifdef DBG_UTIL
 m_bPos = true;
 #endif
@@ -418,7 +416,7 @@ public:
 
 void SetText( const OUString &rNew )
 {
-pText = &rNew;
+pText = rNew;
 }
 
 void SetWrong( const SwWrongList* pNew )
@@ -444,7 +442,7 @@ public:
 
 void SetSize( const Size &rNew )
 {
-pSize = &rNew;
+pSize = rNew;
 #ifdef DBG_UTIL
 m_bSize = true;
 #endif
diff --git a/sw/source/core/txtnode/swfont.cxx 
b/sw/source/core/txtnode/swfont.cxx
index ea9dd55..aed2079 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -1163,17 +1163,17 @@ void SwDrawTextInfo::Shift( sal_uInt16 nDir )
 switch ( nDir )
 {
 case 0 :
-((Point*)pPos)->X() += GetSize().Width();
+pPos.X() += GetSize().Width();
 break;
 case 900 :
-OSL_ENSURE( ((Point*)pPos)->Y() >= GetSize().Width(), "Going 
underground" );
-((Point*)pPos)->Y() -= GetSize().Width();
+OSL_ENSURE( pPos.Y() >= GetSize().Width(), "Going underground" );
+pPos.Y() -= GetSize().Width();
 break;
 case 1800 :
-((Point*)pPos)->X() -= GetSize().Width();
+pPos.X() -= GetSize().Width();
 break;
 case 2700 :
-((Point*)pPos)->Y() += GetSize().Width();
+pPos.Y() += GetSize().Width();
 break;
 }
 }
___
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-4.0' - 2 commits - basic/source oox/inc oox/source

2013-04-17 Thread Noel Power

 basic/source/runtime/step0.cxx |   43 ++---
 oox/inc/oox/ole/axbinaryreader.hxx |   20 --
 oox/inc/oox/ole/axcontrol.hxx  |   50 ++--
 oox/source/ole/axbinaryreader.cxx  |   11 +++
 oox/source/ole/axcontrol.cxx   |  115 +
 oox/source/ole/vbacontrol.cxx  |   63 ++--
 6 files changed, 274 insertions(+), 28 deletions(-)

New commits:
commit 474362028e13f98e73ea9420834a1aaa3490fd83
Author: Noel Power 
Date:   Wed Apr 17 17:08:59 2013 +0100

implement MultiPage, Page & TabStrip import for oox

Change-Id: I1912c9550c12a971fcc7fdbc8bd623f18ccc40b8
(cherry picked from commit a43cc9ec8dde4f311bcf8ff96e6a26d56b2abdcf)

Change-Id: I9d31017ab149ed8a4c80feefc891dc6c911bad20

diff --git a/oox/inc/oox/ole/axbinaryreader.hxx 
b/oox/inc/oox/ole/axbinaryreader.hxx
index d63ccb1..4a03f8a 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -87,7 +87,7 @@ private:
 typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData;
 
 /** An array of string values as a property. */
-typedef ::std::vector< ::rtl::OUString > AxStringArray;
+typedef ::std::vector< ::rtl::OUString > AxArrayString;
 
 // 
 
@@ -111,7 +111,10 @@ public:
 voidreadPairProperty( AxPairData& orPairData );
 /** Reads the next string property from the stream, if the respective flag
 in the property mask is set. */
-voidreadStringProperty( ::rtl::OUString& orValue );
+voidreadStringProperty( OUString& orValue );
+/** Reads ArrayString, an array of fmString ( compressed or uncompressed )
+is read from the stream and inserted into rStrings */
+voidreadArrayStringProperty( std::vector< OUString >& 
rStrings );
 /** Reads the next GUID property from the stream, if the respective flag
 in the property mask is set. The GUID will be enclosed in braces. */
 voidreadGuidProperty( ::rtl::OUString& orGuid );
@@ -135,6 +138,9 @@ public:
 /** Skips the next string property in the stream, if the respective flag in
 the property mask is set. */
 inline void skipStringProperty() { readStringProperty( 
maDummyString ); }
+/** Skips the next ArrayString property in the stream, if the respective 
flag in
+the property mask is set. */
+inline void skipArrayStringProperty() { readArrayStringProperty( 
maDummyArrayString ); }
 /** Skips the next GUID property in the stream, if the respective flag in
 the property mask is set. */
 inline void skipGuidProperty() { readGuidProperty( maDummyString 
); }
@@ -185,11 +191,11 @@ private:
 };
 
 /** Complex property for an array of strings. */
-struct StringArrayProperty : public ComplexProperty
+struct ArrayStringProperty : public ComplexProperty
 {
-AxStringArray&  mrArray;
+AxArrayString&  mrArray;
 sal_uInt32  mnSize;
-inline explicit StringArrayProperty( AxStringArray& rArray, 
sal_uInt32 nSize ) :
+inline explicit ArrayStringProperty( AxArrayString& rArray, 
sal_uInt32 nSize ) :
 mrArray( rArray ), mnSize( nSize ) {}
 virtual boolreadProperty( AxAlignedInputStream& rInStrm );
 };
@@ -233,8 +239,8 @@ private:
 AxPairData  maDummyPairData;///< Dummy pair for unsupported 
properties.
 AxFontData  maDummyFontData;///< Dummy font for unsupported 
properties.
 StreamDataSequence  maDummyPicData; ///< Dummy picture for unsupported 
properties.
-::rtl::OUString maDummyString;  ///< Dummy string for unsupported 
properties.
-AxStringArray   maDummyStringArray; ///< Dummy string array for 
unsupported properties.
+OUString maDummyString;  ///< Dummy string for unsupported 
properties.
+AxArrayString maDummyArrayString; ///< Dummy strings for unsupported 
ArrayString properties.
 sal_Int64   mnPropFlags;///< Flags specifying existing 
properties.
 sal_Int64   mnNextProp; ///< Next property to read.
 sal_Int64   mnPropsEnd; ///< End position of simple/large 
properties.
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index 9e00278..1f4b640 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -157,13 +157,13 @@ enum ApiControlType
 API_CONTROL_COMBOBOX,
 API_CONTROL_SPINBUTTON,
 API_CONTROL_SCROLLBAR,
-API_CONTROL_TABSTRIP,
+API_CONTROL_TABSTRIP, //11
 API_CONTROL_PROGRESSBAR,
 API_CONTROL_GROUPBOX,
-API_CONTROL_FRAME,
-API_CONTROL_PAGE,
-API_CONTROL_MULTIPAGE,
-API_CONTROL_DIALOG
+API_CONTROL_FRAME, // 14
+API_CONTROL_PAGE,  // 15
+API_C

[PATCH] Fix typos: HEIGTH -> HEIGHT and WEIGTH -> WEIGHT

2013-04-17 Thread Lior Kaplan (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3435

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/3435/1

Fix typos: HEIGTH -> HEIGHT and WEIGTH -> WEIGHT

Change-Id: Ie5dc62bf535360cde8a5ccd6f8be3965ff48739c
---
M xmloff/inc/xmloff/PageMasterStyleMap.hxx
M xmloff/inc/xmloff/xmltoken.hxx
M xmloff/source/chart/PropertyMap.hxx
M xmloff/source/core/xmltoken.cxx
M xmloff/source/style/PageMasterExportPropMapper.cxx
M xmloff/source/style/PageMasterStyleMap.cxx
M xmloff/source/style/PagePropertySetContext.cxx
M xmloff/source/style/XMLFootnoteSeparatorExport.cxx
M xmloff/source/style/XMLFootnoteSeparatorImport.cxx
9 files changed, 11 insertions(+), 11 deletions(-)



diff --git a/xmloff/inc/xmloff/PageMasterStyleMap.hxx 
b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
index c1c6d31..c3a8392 100644
--- a/xmloff/inc/xmloff/PageMasterStyleMap.hxx
+++ b/xmloff/inc/xmloff/PageMasterStyleMap.hxx
@@ -150,8 +150,8 @@
 #define CTF_PM_FOOTERMARGINLEFT (CTF_PM_FOOTERFLAG|CTF_PM_MARGINLEFT)
 #define CTF_PM_FOOTERMARGINRIGHT(CTF_PM_FOOTERFLAG|CTF_PM_MARGINRIGHT)
 
-#define CTF_PM_FTN_HEIGTH   (XML_PM_CTF_START + 0x0060)
-#define CTF_PM_FTN_LINE_WEIGTH  (XML_PM_CTF_START + 0x0061)
+#define CTF_PM_FTN_HEIGHT   (XML_PM_CTF_START + 0x0060)
+#define CTF_PM_FTN_LINE_WEIGHT  (XML_PM_CTF_START + 0x0061)
 #define CTF_PM_FTN_LINE_COLOR   (XML_PM_CTF_START + 0x0062)
 #define CTF_PM_FTN_LINE_WIDTH   (XML_PM_CTF_START + 0x0063)
 #define CTF_PM_FTN_LINE_ADJUST  (XML_PM_CTF_START + 0x0064)
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index e19043a..a40da2c 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -3183,7 +3183,7 @@
 XML_HORIZONTAL_BAR,
 XML_VERTICAL_BAR,
 
-XML_ERROR_STANDARD_WEIGTH, // errorbar standard deviation error weigth
+XML_ERROR_STANDARD_WEIGHT, // errorbar standard deviation error weight
 XML_TOKEN_END
 };
 
diff --git a/xmloff/source/chart/PropertyMap.hxx 
b/xmloff/source/chart/PropertyMap.hxx
index 6363fa2..e924b7f 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -192,7 +192,7 @@
 // errorbars properties (chart2)
 MAP_ENTRY_ODF_EXT( "PositiveError", CHART, XML_ERROR_LOWER_LIMIT, 
XML_TYPE_DOUBLE),
 MAP_ENTRY_ODF_EXT( "NegativeError", CHART, XML_ERROR_UPPER_LIMIT, 
XML_TYPE_DOUBLE),
-MAP_ENTRY_ODF_EXT( "Weigth", CHART, XML_ERROR_STANDARD_WEIGTH, 
XML_TYPE_DOUBLE),
+MAP_ENTRY_ODF_EXT( "Weight", CHART, XML_ERROR_STANDARD_WEIGHT, 
XML_TYPE_DOUBLE),
 
 // series/data-point properties
 MAP_SPECIAL( "DataCaption", CHART, XML_DATA_LABEL_NUMBER, XML_TYPE_NUMBER 
| MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_NUMBER ),   // 
convert one constant
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index da73b16..264770d 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3182,7 +3182,7 @@
 TOKEN( "horizontal-bar",   XML_HORIZONTAL_BAR ),
 TOKEN( "vertical-bar", XML_VERTICAL_BAR ),
 
-TOKEN( "std-weight", XML_ERROR_STANDARD_WEIGTH ),
+TOKEN( "std-weight", XML_ERROR_STANDARD_WEIGHT ),
 
 #if OSL_DEBUG_LEVEL > 0
 { 0, NULL, NULL,   XML_TOKEN_END }
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx 
b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 72fcc67..db50eb6 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -292,7 +292,7 @@
 case CTF_PM_TEXTCOLUMNS:
 pThis->aTextColumnsExport.exportXML( rProperty.maValue );
 break;
-case CTF_PM_FTN_LINE_WEIGTH:
+case CTF_PM_FTN_LINE_WEIGHT:
 pThis->aFootnoteSeparatorExport.exportXML( pProperties, nIdx,
getPropertySetMapper());
 break;
diff --git a/xmloff/source/style/PageMasterStyleMap.cxx 
b/xmloff/source/style/PageMasterStyleMap.cxx
index 815c5e9..8726729 100644
--- a/xmloff/source/style/PageMasterStyleMap.cxx
+++ b/xmloff/source/style/PageMasterStyleMap.cxx
@@ -115,13 +115,13 @@
 PLMAP( "UserDefinedAttributes", XML_NAMESPACE_TEXT, XML_XMLNS, 
 XML_TYPE_ATTRIBUTE_CONTAINER | MID_FLAG_SPECIAL_ITEM, 0 ),
 
 // footnote
-PLMAP( "FootnoteHeight",XML_NAMESPACE_STYLE,
XML_FOOTNOTE_MAX_HEIGHT, XML_TYPE_MEASURE, CTF_PM_FTN_HEIGTH ),
+PLMAP( "FootnoteHeight",XML_NAMESPACE_STYLE,
XML_FOOTNOTE_MAX_HEIGHT, XML_TYPE_MEASURE, CTF_PM_FTN_HEIGHT ),
 PLMAP( "FootnoteLineAdjust",XML_NAMESPACE_STYLE,XML__EMPTY,
 XML_TYPE_TEXT_HORIZONTAL_ADJUST|MID_FLAG_SPECIAL_ITEM,  CTF_PM_FTN_LINE_ADJUST 
),
 PLMAP( "Footno

[PATCH] WaE: g_type_init has been deprecated since GLib 2.36

2013-04-17 Thread Ivan Timofeev (via Code Review)

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3434

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/3434/1

WaE: g_type_init has been deprecated since GLib 2.36

Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
---
M shell/source/backends/gconfbe/gconfaccess.cxx
M shell/source/sessioninstall/SyncDbusSessionHelper.cxx
M tubes/source/manager.cxx
M ucb/source/ucp/gio/gio_provider.cxx
4 files changed, 8 insertions(+), 2 deletions(-)



diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx 
b/shell/source/backends/gconfbe/gconfaccess.cxx
index 1a1131c..d5b864d 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,8 +51,10 @@
 static GConfClient* mClient= 0;
 if (mClient == NULL)
 {
+#if !defined(GLIB_VERSION_2_36)
 /* initialize glib object type library */
 g_type_init();
+#endif
 
 GError* aError = NULL;
 if (!gconf_init(0, NULL, &aError))
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx 
b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index e833784..a39c847 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -62,7 +62,9 @@
 {
 SyncDbusSessionHelper::SyncDbusSessionHelper(Reference 
const&)
 {
+#if !defined(GLIB_VERSION_2_36)
 g_type_init ();
+#endif
 }
 void SAL_CALL SyncDbusSessionHelper::InstallPackageNames( const 
::sal_uInt32 nXid, const Sequence< OUString >& vPackages, const OUString& 
sInteraction ) throw (RuntimeException)
 {
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 70d9e44..a7acc3f 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -885,7 +885,9 @@
 mpFileTransferClient( NULL),
 mpAccountManager( NULL)
 {
+#if !defined(GLIB_VERSION_2_36)
 g_type_init();
+#endif
 }
 
 TeleManagerImpl::~TeleManagerImpl()
diff --git a/ucb/source/ucp/gio/gio_provider.cxx 
b/ucb/source/ucp/gio/gio_provider.cxx
index aad78b3..acd6e14 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,9 +100,9 @@
 uno::Reference< lang::XMultiServiceFactory > xSMgr
 (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
 uno::Reference< lang::XSingleServiceFactory > xFactory;
-
+#if !defined(GLIB_VERSION_2_36)
 g_type_init();
-
+#endif
 if ( 
!::gio::ContentProvider::getImplementationName_Static().compareToAscii( 
pImplName ) )
 xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr );
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Ivan Timofeev 

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

[Bug 54157] LibreOffice 4.0 most annoying bugs

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

vitriol  changed:

   What|Removed |Added

 Depends on||63498

--- Comment #135 from vitriol  ---
Nominating Bug 63498: Personas doesn't work anymore. A new functionality
completely unusable.

-- 
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

[Libreoffice-commits] core.git: oox/inc oox/source

2013-04-17 Thread Noel Power

 oox/inc/oox/ole/axbinaryreader.hxx |   16 +++--
 oox/inc/oox/ole/axcontrol.hxx  |   50 ++--
 oox/source/ole/axbinaryreader.cxx  |   11 +++
 oox/source/ole/axcontrol.cxx   |  115 +
 oox/source/ole/vbacontrol.cxx  |   63 ++--
 5 files changed, 240 insertions(+), 15 deletions(-)

New commits:
commit a43cc9ec8dde4f311bcf8ff96e6a26d56b2abdcf
Author: Noel Power 
Date:   Wed Apr 17 17:08:59 2013 +0100

implement MultiPage, Page & TabStrip import for oox

Change-Id: I1912c9550c12a971fcc7fdbc8bd623f18ccc40b8

diff --git a/oox/inc/oox/ole/axbinaryreader.hxx 
b/oox/inc/oox/ole/axbinaryreader.hxx
index f734a307..b6a937d 100644
--- a/oox/inc/oox/ole/axbinaryreader.hxx
+++ b/oox/inc/oox/ole/axbinaryreader.hxx
@@ -87,7 +87,7 @@ private:
 typedef ::std::pair< sal_Int32, sal_Int32 > AxPairData;
 
 /** An array of string values as a property. */
-typedef ::std::vector< OUString > AxStringArray;
+typedef ::std::vector< OUString > AxArrayString;
 
 // 
 
@@ -112,6 +112,9 @@ public:
 /** Reads the next string property from the stream, if the respective flag
 in the property mask is set. */
 voidreadStringProperty( OUString& orValue );
+/** Reads ArrayString, an array of fmString ( compressed or uncompressed )
+is read from the stream and inserted into rStrings */
+voidreadArrayStringProperty( std::vector< OUString >& 
rStrings );
 /** Reads the next GUID property from the stream, if the respective flag
 in the property mask is set. The GUID will be enclosed in braces. */
 voidreadGuidProperty( OUString& orGuid );
@@ -135,6 +138,9 @@ public:
 /** Skips the next string property in the stream, if the respective flag in
 the property mask is set. */
 inline void skipStringProperty() { readStringProperty( 
maDummyString ); }
+/** Skips the next ArrayString property in the stream, if the respective 
flag in
+the property mask is set. */
+inline void skipArrayStringProperty() { readArrayStringProperty( 
maDummyArrayString ); }
 /** Skips the next GUID property in the stream, if the respective flag in
 the property mask is set. */
 inline void skipGuidProperty() { readGuidProperty( maDummyString 
); }
@@ -185,11 +191,11 @@ private:
 };
 
 /** Complex property for an array of strings. */
-struct StringArrayProperty : public ComplexProperty
+struct ArrayStringProperty : public ComplexProperty
 {
-AxStringArray&  mrArray;
+AxArrayString&  mrArray;
 sal_uInt32  mnSize;
-inline explicit StringArrayProperty( AxStringArray& rArray, 
sal_uInt32 nSize ) :
+inline explicit ArrayStringProperty( AxArrayString& rArray, 
sal_uInt32 nSize ) :
 mrArray( rArray ), mnSize( nSize ) {}
 virtual boolreadProperty( AxAlignedInputStream& rInStrm );
 };
@@ -234,7 +240,7 @@ private:
 AxFontData  maDummyFontData;///< Dummy font for unsupported 
properties.
 StreamDataSequence  maDummyPicData; ///< Dummy picture for unsupported 
properties.
 OUString maDummyString;  ///< Dummy string for unsupported 
properties.
-AxStringArray   maDummyStringArray; ///< Dummy string array for 
unsupported properties.
+AxArrayString maDummyArrayString; ///< Dummy strings for unsupported 
ArrayString properties.
 sal_Int64   mnPropFlags;///< Flags specifying existing 
properties.
 sal_Int64   mnNextProp; ///< Next property to read.
 sal_Int64   mnPropsEnd; ///< End position of simple/large 
properties.
diff --git a/oox/inc/oox/ole/axcontrol.hxx b/oox/inc/oox/ole/axcontrol.hxx
index 6612ef3..84e3a3e 100644
--- a/oox/inc/oox/ole/axcontrol.hxx
+++ b/oox/inc/oox/ole/axcontrol.hxx
@@ -157,13 +157,13 @@ enum ApiControlType
 API_CONTROL_COMBOBOX,
 API_CONTROL_SPINBUTTON,
 API_CONTROL_SCROLLBAR,
-API_CONTROL_TABSTRIP,
+API_CONTROL_TABSTRIP, //11
 API_CONTROL_PROGRESSBAR,
 API_CONTROL_GROUPBOX,
-API_CONTROL_FRAME,
-API_CONTROL_PAGE,
-API_CONTROL_MULTIPAGE,
-API_CONTROL_DIALOG
+API_CONTROL_FRAME, // 14
+API_CONTROL_PAGE,  // 15
+API_CONTROL_MULTIPAGE, // 16
+API_CONTROL_DIALOG // 17
 };
 
 // 
@@ -600,6 +600,24 @@ private:
 boolmbPicTiling;///< True = picture is repeated.
 };
 
+class OOX_DLLPUBLIC AxTabStripModel : public AxFontDataModel
+{
+public:
+explicitAxTabStripModel();
+
+virtual boolimportBinaryModel( BinaryInputStream& rInStrm );
+
+virtual ApiControlType getControlType() const;
+
+public:
+sal_uInt32   mnListIndex;
+

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

 helpers/help_hid.lst   |1 -
 source/text/shared/01/06040300.xhp |4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 0483b91db6d66dbe320ce8a129988a6ed8940832
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 17 17:04:56 2013 +0100

update helpids for autocorrect dialog .ui conversion

Change-Id: I5eec4ec839e83648362b60e2f840e8705bb4d7aa

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 8ef203d..5c72455 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -795,7 +795,6 @@ HID_AUTOCORR_HELP_SENTWORDENEMDASH,34109,
 HID_AUTOCORR_HELP_SETINETATTR,34116,
 HID_AUTOCORR_HELP_WORD,34099,
 HID_AUTOCORR_HELP_WORDENEMDASH,34107,
-HID_AUTOCORR_LANGUAGE,35091,
 HID_AUTOFORMAT_ACCEPT,54854,
 HID_AUTOFORMAT_CLB,52827,
 HID_AUTOFORMAT_CLOSE,52834,
diff --git a/source/text/shared/01/06040300.xhp 
b/source/text/shared/01/06040300.xhp
index b31e810..58e179f 100644
--- a/source/text/shared/01/06040300.xhp
+++ b/source/text/shared/01/06040300.xhp
@@ -37,9 +37,9 @@
 
 
 
-
+
 Replacements and exceptions for language:
-Select the language for which 
you want to create or edit the replacement rules. $[officename] first 
searches for exceptions that are defined for the language at the current cursor 
position in the document, and then searches the remaining languages.
+Select the language for 
which you want to create or edit the replacement rules. $[officename] 
first searches for exceptions that are defined for the language at the current 
cursor position in the document, and then searches the remaining 
languages.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig cui/UIConfig_cui.mk helpcontent2

 cui/UIConfig_cui.mk  |1 
 cui/source/inc/autocdlg.hxx  |   14 -
 cui/source/inc/helpid.hrc|1 
 cui/source/tabpages/autocdlg.cxx |   68 -
 cui/source/tabpages/autocdlg.src |   71 -
 cui/uiconfig/ui/autocorrectdialog.ui |  255 +++
 helpcontent2 |2 
 7 files changed, 296 insertions(+), 116 deletions(-)

New commits:
commit 2bbdf5c72254a70c43894eb907f23f78557f709a
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 17 16:57:31 2013 +0100

convert autocorrect dialog to .ui format

Just the outmost dialog itself, not the individual pages.

We have to go top down in this case to incrementally convert the pages 
because
of the non-standard additional widgets outside the tabcontrol area.

So this dialog is set to non-resizable until its contents are
converted over.

Change-Id: I92014a44b4cab8d345666295b052635d4b57a496

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index d8e94ba..7afa2df 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,cui))
 $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/aboutdialog \
cui/uiconfig/ui/asiantypography \
+   cui/uiconfig/ui/autocorrectdialog \
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/cellalignment \
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 1190ffe..91062f1 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -38,18 +38,18 @@ namespace editeng { class SortedAutoCompleteStrings; }
 
 class OfaAutoCorrDlg : public SfxTabDialog
 {
-FixedText   aLanguageFT;
-SvxLanguageBox  aLanguageLB;
+VclContainer* m_pLanguageBox;
+SvxLanguageBox*  m_pLanguageLB;
+
+sal_uInt16 m_nReplacePageId;
+sal_uInt16 m_nExceptionsPageId;
 
 DECL_LINK(SelectLanguageHdl, ListBox*);
 public:
 
-OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet );
-
-voidEnableLanguage(sal_Bool bEnable)
-{   aLanguageFT.Enable(bEnable);
-aLanguageLB.Enable(bEnable);}
+OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet);
 
+void EnableLanguage(bool bEnable);
 };
 
 #ifdef _OFA_AUTOCDLG_CXX
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 0f4a5a1..5c68192 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -229,7 +229,6 @@
 #define HID_SEARCHSIMILARITY "CUI_HID_SEARCHSIMILARITY"
 #define UID_SEARCH_RECORDSTATUS "CUI_UID_SEARCH_RECORDSTATUS"
 #define HID_OFAPAGE_AUTOCORR_CLB "CUI_HID_OFAPAGE_AUTOCORR_CLB"
-#define HID_AUTOCORR_LANGUAGE "CUI_HID_AUTOCORR_LANGUAGE"
 #define HID_OFAPAGE_AUTOFORMAT_CLB "CUI_HID_OFAPAGE_AUTOFORMAT_CLB"
 #define HID_TPCOLOR_RGB_1 "CUI_HID_TPCOLOR_RGB_1"
 #define HID_TPCOLOR_RGB_2 "CUI_HID_TPCOLOR_RGB_2"
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 2f11b4c..75fa160 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -59,11 +59,12 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star;
 using namespace ::rtl;
 
-OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) :
-SfxTabDialog( pParent,  CUI_RES( RID_OFA_AUTOCORR_DLG ), _pSet ),
-aLanguageFT ( this, CUI_RES( FT_LANG ) ),
-aLanguageLB ( this, CUI_RES( LB_LANG ) )
+OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet )
+: SfxTabDialog(pParent, "AutoCorrectDialog", 
"cui/ui/autocorrectdialog.ui", _pSet)
 {
+get(m_pLanguageBox, "langbox");
+get(m_pLanguageLB, "lang");
+
 sal_Bool bShowSWOptions = sal_False;
 sal_Bool bOpenSmartTagOptions = sal_False;
 
@@ -78,21 +79,16 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const 
SfxItemSet* _pSet ) :
 bOpenSmartTagOptions = sal_True;
 }
 
-aLanguageFT.SetZOrder(0, WINDOW_ZORDER_FIRST);
-aLanguageLB.SetZOrder(&aLanguageFT, WINDOW_ZORDER_BEHIND);
-aLanguageLB.SetHelpId(HID_AUTOCORR_LANGUAGE);
-FreeResource();
-
-AddTabPage(RID_OFAPAGE_AUTOCORR_OPTIONS, OfaAutocorrOptionsPage::Create, 
0);
-AddTabPage(RID_OFAPAGE_AUTOFMT_APPLY, OfaSwAutoFmtOptionsPage::Create, 0);
-AddTabPage(RID_OFAPAGE_AUTOCOMPLETE_OPTIONS, 
OfaAutoCompleteTabPage::Create, 0);
-AddTabPage(RID_OFAPAGE_SMARTTAG_OPTIONS, 
OfaSmartTagOptionsTabPage::Create, 0);
+AddTabPage("options", OfaAutocorrOptionsPage::Create, 0);
+AddTabPage("apply", OfaSwAutoFmtOptionsPage::Create, 0);
+AddTabPage("wordcompletion", OfaAutoCompleteTabPage::Create, 0);
+AddTabPage("smarttags", OfaSmartTagOptionsTabPage::Create, 0);
 
 if (!bShowSWOptions)
 {
-RemoveTabPage(RID_OFAPAGE_AUTOFMT_APPLY);
-RemoveTabPage(RID_OFAPAGE_AUTOCOMPLETE_OPTIONS);
-RemoveTabPage(RID_OFAPAGE_SMARTTAG_OPTIONS);
+

Re: cherry-pick across renames [was: minutes of ESC call ...]

2013-04-17 Thread Miklos Vajna

Hi Michael,

On Wed, Apr 17, 2013 at 11:55:04AM +0200, Michael Meeks 
 wrote:
> 
> On Tue, 2013-04-16 at 10:19 +0200, Miklos Vajna wrote:
> > I tried that on a sample repo, so thanks for bringing this up. It seems
> > the git rename detection is O(N^2), so the default number of renamed
> > files is limited to avoid long merges.
> 
>   Presumably it would be possible to cache rename information trawled
> from the history at great cost, so a second time a cherry-pick is done,
> things are much harder ? (at least locally that is).

If we see that a git cherry-pick indeed takes a lot of time, and if the
majority of the time is spent in rename detection, then I would look
into some kind of caching, sure.

IIRC rename detection works on two trees, though, so practically
whatever you cache may be potentially reused next time you cherry-pick
the same commit to the same branch, which is unlikely. :-)

Miklos

signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 helpers/help_hid.lst|   35 ---
 source/text/scalc/01/solver.xhp |   73 
 2 files changed, 37 insertions(+), 71 deletions(-)

New commits:
commit 0065ae78b41544cda55fb0cf4e776da56e4d
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 17 16:15:03 2013 +0100

update helpids for solver dialog .ui conversion

Change-Id: I9e6ef6fb678dbc1c853fb9b6245b58a2d6b08b30

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 1fd405d..8ef203d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6591,17 +6591,6 @@ sc_Edit_RID_SCDLG_FILLSERIES_ED_START_VALUES,1493518388,
 sc_Edit_RID_SCDLG_FILTER_ED_COPY_AREA,2567079943,
 sc_Edit_RID_SCDLG_HIGHLIGHT_CHANGES_ED_ASSIGN,2568964111,
 sc_Edit_RID_SCDLG_NEWSCENARIO_ED_NAME,1493846027,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT1,2569209860,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT2,2569209861,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT3,2569209862,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_LEFT4,2569209863,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_OBJECTIVECELL,2569209857,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT1,2569209864,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT2,2569209865,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT3,2569209866,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_RIGHT4,2569209867,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_TARGET,2569209858,
-sc_Edit_RID_SCDLG_OPTSOLVER_ED_VARIABLECELLS,2569209859,
 sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_INAREA,2567505962,
 sc_Edit_RID_SCDLG_PIVOT_LAYOUT_ED_OUTAREA,2567505943,
 sc_Edit_RID_SCDLG_RETYPEPASS_INPUT_ED_PASSWORD1,1495681326,
@@ -6640,21 +6629,6 @@ 
sc_ImageButton_RID_SCDLG_CONSOLIDATE_RB_DEST_AREA,2567532076,
 sc_ImageButton_RID_SCDLG_DBNAMES_RB_DBAREA,2567335438,
 sc_ImageButton_RID_SCDLG_FILTER_RB_COPY_AREA,2567089672,
 sc_ImageButton_RID_SCDLG_HIGHLIGHT_CHANGES_RB_ASSIGN,2568973840,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE1,2569219596,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE2,2569219597,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE3,2569219598,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_DELETE4,2569219599,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT1,2569219588,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT2,2569219589,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT3,2569219590,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_LEFT4,2569219591,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_OBJECTIVECELL,2569219585,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT1,2569219592,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT2,2569219593,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT3,2569219594,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_RIGHT4,2569219595,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_TARGET,2569219586,
-sc_ImageButton_RID_SCDLG_OPTSOLVER_IB_VARIABLECELLS,2569219587,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_INAREA,2567515689,
 sc_ImageButton_RID_SCDLG_PIVOT_LAYOUT_RB_OUTAREA,2567515672,
 sc_ImageButton_RID_SCDLG_SIMPLEREF_RB_ASSIGN,2569006604,
@@ -6713,10 +6687,6 @@ sc_ListBox_RID_SCDLG_IMPORTOPT_LB_FONT,1494175242,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
 sc_ListBox_RID_SCDLG_NEWSCENARIO_LB_COLOR,1493847574,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP1,2569211393,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP2,2569211394,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP3,2569211395,
-sc_ListBox_RID_SCDLG_OPTSOLVER_LB_OP4,2569211396,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND1,1493749277,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND2,1493749278,
 sc_ListBox_RID_SCDLG_PIVOTFILTER_LB_COND3,1493749279,
@@ -6796,8 +6766,6 @@ sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_ADD,2567524869,
 sc_PushButton_RID_SCDLG_CONSOLIDATE_BTN_REMOVE,2567524870,
 sc_PushButton_RID_SCDLG_DBNAMES_BTN_ADD,2567328259,
 sc_PushButton_RID_SCDLG_DBNAMES_BTN_REMOVE,2567328260,
-sc_PushButton_RID_SCDLG_OPTSOLVER_BTN_OPTIONS,2569212417,
-sc_PushButton_RID_SCDLG_OPTSOLVER_BTN_SOLVE,2569212420,
 sc_PushButton_RID_SCDLG_PIVOTSUBT_BTN_OPTIONS,1493832197,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_OPTIONS,2567508486,
 sc_PushButton_RID_SCDLG_PIVOT_LAYOUT_BTN_REMOVE,2567508485,
@@ -6852,9 +6820,6 @@ sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_DIV,1493434911,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_MUL,1493434910,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_NOOP,1493434907,
 sc_RadioButton_RID_SCDLG_INSCONT_BTN_OP_SUB,1493434909,
-sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_MAX,2569208321,
-sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_MIN,2569208322,
-sc_RadioButton_RID_SCDLG_OPTSOLVER_RB_VALUE,2569208323,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_AUTO,1493828098,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_NONE,1493828097,
 sc_RadioButton_RID_SCDLG_PIVOTSUBT_RB_USER,1493828099,
diff --git a/source/text/scalc/01/solver.xhp b/source/text/scalc/01/solver.xhp
index a39d077..5c45daf 100644
--- a/source/text/scalc/01/solver.xhp
+++ b/source/text/scalc/01/solver.xhp
@@ -34,7 +34,8 @@
 back-solving
 solver
 
-mw changed "what-if...", "goal seek;" and made 
"back-solving;" a one level entry
+
+
 Solver
 
 Opens the Solver dialog. A solver allows to solve 
equ

[Libreoffice-commits] core.git: 2 commits - helpcontent2 sc/uiconfig

 helpcontent2  |2 +-
 sc/uiconfig/scalc/ui/solverdlg.ui |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9302aec448085b89f73adfc88a5c09180f7d4af8
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 17 16:15:27 2013 +0100

fix solver optionbutton group

Change-Id: I23cf85f5fbd2dcc333094e9003ce8f5ce4f0b68d

diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui 
b/sc/uiconfig/scalc/ui/solverdlg.ui
index e4702b0..3a3ab23 100644
--- a/sc/uiconfig/scalc/ui/solverdlg.ui
+++ b/sc/uiconfig/scalc/ui/solverdlg.ui
@@ -153,6 +153,7 @@
 True
 0
 True
+value
 
   
 
commit f1d22be9c19d6aa0fd904e67767be07b9c1c3a67
Author: CaolÃ¡n McNamara 
Date:   Wed Apr 17 16:15:03 2013 +0100

Updated core
Project: help  0065ae78b41544cda55fb0cf4e776da56e4d

diff --git a/helpcontent2 b/helpcontent2
index 0a2a1d9..0065ae7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0a2a1d9d34779e473405adcae1a96710686c9cec
+Subproject commit 0065ae78b41544cda55fb0cf4e776da56e4d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/unx/gtk3/window/gtk3gtkframe.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 39c6a5cec7471029292de2cf1ebb2a18947be4e2
Author: Stephan Bergmann 
Date:   Wed Apr 17 16:57:56 2013 +0200

Adapt to gtkframe -> gtksalframe rename

Change-Id: I2a464208081b42a577aafbe321d9662007208d77

diff --git a/vcl/unx/gtk3/window/gtk3gtkframe.cxx 
b/vcl/unx/gtk3/window/gtk3gtkframe.cxx
index be4d678..cc93d6e 100644
--- a/vcl/unx/gtk3/window/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/window/gtk3gtkframe.cxx
@@ -27,6 +27,6 @@
  * instead of those above.
  */
 
-#include "../../gtk/window/gtkframe.cxx"
+#include "../../gtk/window/gtksalframe.cxx"
 
 /* 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: libmariadb/StaticLibrary_mariadb.mk

 libmariadb/StaticLibrary_mariadb.mk |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 010dd7a05360a1aebebc3381ba96aa5ff4534543
Author: Michael Stahl 
Date:   Wed Apr 17 16:44:57 2013 +0200

libmariadb: fix unresolved dlopen etc. with MSVC 2008

Change-Id: I8268ac340f62a84bfae774194e8a6a50c8a707f3

diff --git a/libmariadb/StaticLibrary_mariadb.mk 
b/libmariadb/StaticLibrary_mariadb.mk
index 2f70dcb..338701f 100644
--- a/libmariadb/StaticLibrary_mariadb.mk
+++ b/libmariadb/StaticLibrary_mariadb.mk
@@ -22,6 +22,11 @@ $(eval $(call gb_StaticLibrary_set_include,mariadblib,\
-I$(call gb_UnpackedTarball_get_dir,mariadb)/include \
 ))
 
+# This is needed for MSVC 2008: it somehow finds a dlopen somewhere
+# but the static library then contains unreferenced symbols.
+# This macro enables a re-definition to native Win32 APIs in my_global.h.
+$(eval $(call gb_StaticLibrary_add_cflags,mariadblib,-DHAVE_DLOPEN))
+
 $(eval $(call gb_StaticLibrary_add_generated_cobjects,mariadblib,\
 UnpackedTarball/mariadb/libmysql/array \
 UnpackedTarball/mariadb/libmysql/bchange \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: forward RTL_CONTEXT_foo logging to SAL_INFO in default debugging

2013-04-17 Thread Bjoern Michaelsen

On Wed, Apr 17, 2013 at 04:13:15PM +0200, Stephan Bergmann wrote:
> What good is the intermediate move?  That is, was there at least one
> situation in which it would have helped your debugging if an
> existing RTL_LOGFILE_* call had been behaving like SAL_LOG?

Yes, there had been: I was trying to wrap my haed around the
observer-pattern-gone-bad of vcl-callbacks going into
framework/uielement/menubarmanager.cxx to see if there is something going wrong
with the order of execution. RTL_LOGFILE provides some helpful ad-hoc hints
there without manually setting bazillion breakpoints or adding SAL_INFOs there.

Also, Im kinda testing here if someone has a secret love affair with
RTL_LOGFILE and does not want to see it die. ;)

Best,

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

Re: forward RTL_CONTEXT_foo logging to SAL_INFO in default debugging

I am more and more starting to be of the opinion that all debugging
printouts, SAL_INFO() (or RTL_foo)  are mostly useless once the bug or
misfeature you have been chasing (for which you have added the
debugging logging) has been found and fixed;)

If and when later some other bug in the same area needs chasing, you
will have to add more SAL_INFOs, or add more information to existing
ones, anyway... I.e. there is no effective difference between SAL_INFO
and SAL_DEBUG.

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

Re: extracting extended tooltips from the help texts

Hey Andras,


2013/4/17 Andras Timar 

> Hi Markus,
>
> On Wed, Apr 17, 2013 at 12:31 AM, Markus Mohrhard
>  wrote:
> >
> > attached you'll find the initial work on extracting the tooltips from the
> > help texts.
> >
>
> I tried your patch and it works. I don't have strong opinion about the
> actual place of these files in install set. help/tooltips is fine for
> me.
>
> I have some concerns, however.
>
> * This patch and follow-ups will suddenly add ~7 new words to
> translate to UI, effectively doubling the translatable wordcount. Old
> help translations can be migrated, but for those, who don't have help
> translations these strings will be new. Now, without local help,
> extended tips show normal tooltips - which are localized. After the
> patch English strings will appear in localized UI until teams complete
> translation of this huge amount.
>

Ok, I have no idea for that except maybe blocking the extended tooltips if
they are not translated.


>
> * Your work is part of the plan of getting rid of current help system
> (https://wiki.documentfoundation.org/Development/Wikihelp). But
> developments related to this happen on different time scales. You have
> a 80% ready patch, while other related tasks are only in planning
> phase. I don't see the advantage of integrating your patch into master
> (-> 4.1) now.
>

I don't see a big development item there that is in the planning stage. I
worked on this task because Kendy told me that it is the largest blocking
item for moving to the wikihelp.


>
> * Huge properties files will be converted to huge po files. From the
> translators' and translation tools' point of view, it would be better
> to have more, smaller files.
>

Ok. We can surely move the uno commands into own files which should help
with that a bit.


>
> * Originally (very long time ago) these extended tips were next to the
> resource, there was a HelpText field. Later HelpText became deprecated
> and these strings were shared with help, in order to reduce the amount
> of duplication. Now you restore the duplication, but strings are still
> out of context. Ideally the text of a control, its short tooltip
> (QuickHelpText) and its extended tip (HelpText) should be together. It
> would help translators a lot.
>
>
>
We can maybe do that when we transform src files to ui files but I'm unsure
how to do that for uno commands. For the ui files this can easily be done
as Easy Hack.

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

[ANN] LibreOffice 4.0.3 RC1 test builds available

2013-04-17 Thread Fridrich Strba

Hi *,

for the upcoming new version 4.0.3, the RC1 builds now start to be
available on pre-releases. This build is slated to be first release
candidate build on the way towards 4.0.3, please refer to our release
plan timings here:

 http://wiki.documentfoundation.org/ReleasePlan#4.0.3_release

Builds are now being uploaded to a public (but non-mirrored - so don't
spread news too widely!) place, as soon as they're available. Grab
them here:

 http://dev-builds.libreoffice.org/pre-releases/

If you've a bit of time, please give them a try & report *critical*
bugs not yet in bugzilla here, so we can incorporate them into the
release notes. Please note that it takes approximately 24 hours to
populate the mirrors, so that's about the time we have to collect
feedback.

NOTE: This build is in a release configuration and _will_ replace your
existing LibreOffice install on Windows.

The list of fixed bugs relative to 4.0.2 is here:

 
http://dev-builds.libreoffice.org/pre-releases/src/bugs-libreoffice-4-0-3-release-4.0.3.1.log

So playing with the areas touched there also greatly appreciated - and
validation that those bugs are really fixed.


Thanks a lot for your help,
Fridrich
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 solenv/bin/modules/installer/simplepackage.pm |1 -
 1 file changed, 1 deletion(-)

New commits:
commit a029b55d9f8a7b6040fdc27f0b5fde86e71d94a0
Author: Tor Lillqvist 
Date:   Wed Apr 17 17:16:34 2013 +0300

Remove a pointless assignment of a variable to itself

Change-Id: I6c983ec5f0f4597f7f86c1c9ff256881c360bb1d

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index e6e6484..3b8c8a3 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -281,7 +281,6 @@ sub create_package
 my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . 
$allvariables->{'PRODUCTVERSION'};
 my $volume_name_classic_app = $volume_name;  # "app" should not 
contain version number
 $volume_name_classic = $volume_name_classic;
-$volume_name_classic_app = $volume_name_classic_app;
 if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) {
 $volume_name = $volume_name . ' ' . 
$allvariables->{'DMG_VOLUMEEXTENSION'};
 $volume_name_classic = $volume_name_classic . ' ' . 
$allvariables->{'DMG_VOLUMEEXTENSION'};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] fdo#40100 make function YEARFRAC comply with ODFF Version1.2

2013-04-17 Thread Eike Rathke (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/3375

Approvals:
  Eike Rathke: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ief5e5c89b7fb69fb9849cf2d6efe2b4c5b7f5391
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Winfried Donkers 
Gerrit-Reviewer: Eike Rathke 
Gerrit-Reviewer: Winfried Donkers 

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

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

 solenv/bin/modules/installer/simplepackage.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1c25b01fce27c85affee920441b9b09a7bfe0501
Author: Tor Lillqvist 
Date:   Wed Apr 17 17:09:46 2013 +0300

Eek, it is hard to get the right path to the .app that is being built

Temporary directory name upon temporary directory name. Just in
case. When in doubt, add one more temporary directory name layer.


workdir/unxmacxx.pro/installation/LibreOffice_Dev/dmg/install/en-US_inprogress_temp.62979/./LibreOfficeDev_4.1.0.0.alpha0_MacOS_x86-64/LibreOfficeDev.app

Couldn't quickly figure out how to construct the
"LibreOfficeDev_4.1.0.0.alpha0_MacOS_x86-64" part so just use a
wildcard * for that for now;) There won't be any other directories
there anyway, as far as I know.

Change-Id: If950d4cdfe3f7b0663f1b6fbd62185ca8284dd7f

diff --git a/solenv/bin/modules/installer/simplepackage.pm 
b/solenv/bin/modules/installer/simplepackage.pm
index 3445fe3..e6e6484 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -435,7 +435,7 @@ sub create_package
 # participate in the signing and their validity can be
 # guaranteed.
 
-$systemcall = "codesign --sign 
$ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v 
$localtempdir/$folder/$volume_name_classic_app.app";
+$systemcall = "codesign --sign 
$ENV{'MACOSX_CODESIGNING_IDENTITY'} --force -v -v -v 
$localtempdir/$folder/*/$volume_name_classic_app.app";
 print "... $systemcall ...\n";
 my $returnvalue = system($systemcall);
 $infoline = "Systemcall: $systemcall\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-17 Thread Winfried Donkers

 scaddins/source/analysis/analysishelper.cxx |  206 +---
 scaddins/source/analysis/analysishelper.hxx |5 
 2 files changed, 130 insertions(+), 81 deletions(-)

New commits:
commit 275e68d141179272258d03194d799495fa3dec4a
Author: Winfried Donkers 
Date:   Sat Apr 13 19:47:10 2013 +0200

fdo#40100 make function YEARFRAC comply with ODFF Version1.2

Change-Id: Ief5e5c89b7fb69fb9849cf2d6efe2b4c5b7f5391
Reviewed-on: https://gerrit.libreoffice.org/3375
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 278b26f..94e2da8 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -332,78 +332,6 @@ sal_Int32 GetDaysInYears( sal_uInt16 nYear1, sal_uInt16 
nYear2 )
 }
 
 
-void GetDiffParam( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 
nEndDate, sal_Int32 nMode,
-sal_uInt16& rYears, sal_Int32& rDayDiffPart, sal_Int32& rDaysInYear ) 
throw( uno::RuntimeException, lang::IllegalArgumentException )
-{
-if( nStartDate > nEndDate )
-{
-sal_Int32   n = nEndDate;
-nEndDate = nStartDate;
-nStartDate = n;
-}
-
-sal_Int32   nDate1 = nStartDate + nNullDate;
-sal_Int32   nDate2 = nEndDate + nNullDate;
-
-sal_uInt16  nDay1, nDay2;
-sal_uInt16  nMonth1, nMonth2;
-sal_uInt16  nYear1, nYear2;
-
-DaysToDate( nDate1, nDay1, nMonth1, nYear1 );
-DaysToDate( nDate2, nDay2, nMonth2, nYear2 );
-
-sal_uInt16  nYears;
-
-sal_Int32   nDayDiff, nDaysInYear;
-
-switch( nMode )
-{
-case 0: // 0=USA (NASD) 30/360
-case 4: // 4=Europe 30/360
-nDaysInYear = 360;
-nYears = nYear2 - nYear1;
-nDayDiff = GetDiffDate360( nDay1, nMonth1, nYear1, IsLeapYear( 
nYear1 ),
-nDay2, nMonth2, nYear2, nMode == 0 ) - 
nYears * nDaysInYear;
-break;
-case 1: // 1=exact/exact
-nYears = nYear2 - nYear1;
-
-nDaysInYear = IsLeapYear( nYear1 )? 366 : 365;
-
-if( nYears && ( nMonth1 > nMonth2 || ( nMonth1 == nMonth2 && nDay1 
> nDay2 ) ) )
-nYears--;
-
-if( nYears )
-nDayDiff = nDate2 - DateToDays( nDay1, nMonth1, nYear2 );
-else
-nDayDiff = nDate2 - nDate1;
-
-if( nDayDiff < 0 )
-nDayDiff += nDaysInYear;
-
-break;
-case 2: // 2=exact/360
-nDaysInYear = 360;
-nYears = sal_uInt16( ( nDate2 - nDate1 ) / nDaysInYear );
-nDayDiff = nDate2 - nDate1;
-nDayDiff %= nDaysInYear;
-break;
-case 3: //3=exact/365
-nDaysInYear = 365;
-nYears = sal_uInt16( ( nDate2 - nDate1 ) / nDaysInYear );
-nDayDiff = nDate2 - nDate1;
-nDayDiff %= nDaysInYear;
-break;
-default:
-throw lang::IllegalArgumentException();
-}
-
-rYears = nYears;
-rDayDiffPart = nDayDiff;
-rDaysInYear = nDaysInYear;
-}
-
-
 sal_Int32 GetDiffDate( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 
nEndDate, sal_Int32 nMode,
 sal_Int32* pOptDaysIn1stYear ) throw( uno::RuntimeException, 
lang::IllegalArgumentException )
 {
@@ -508,17 +436,143 @@ sal_Int32 GetDaysInYear( sal_Int32 nNullDate, sal_Int32 
nDate, sal_Int32 nMode )
 }
 
 
+//fdo40100 toDo: make function fully compliant with ODFF1.2
+/**
+ * Function GetYearFrac implements YEARFRAC as defined in:
+ *   Open Document Format for Office Applications version 1.2 Part 2, par. 
6.10.24
+ *   The calculations are defined in:
+ *   Open Document Format for Office Applications version 1.2 Part 2, par. 
4.11.7
+ */
 double GetYearFrac( sal_Int32 nNullDate, sal_Int32 nStartDate, sal_Int32 
nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException, 
lang::IllegalArgumentException )
 {
 if( nStartDate == nEndDate )
 return 0.0; // nothing to do...
 
-sal_uInt16  nYears;
-sal_Int32   nDayDiff, nDaysInYear;
+if( nStartDate > nEndDate )
+{
+sal_Int32   n = nEndDate;
+nEndDate = nStartDate;
+nStartDate = n;
+}
+
+sal_Int32 nDate1 = nStartDate + nNullDate;
+sal_Int32 nDate2 = nEndDate + nNullDate;
+
+sal_uInt16  nDay1, nDay2;
+sal_uInt16  nMonth1, nMonth2;
+sal_uInt16  nYear1, nYear2;
+
+DaysToDate( nDate1, nDay1, nMonth1, nYear1 );
+DaysToDate( nDate2, nDay2, nMonth2, nYear2 );
+
+// calculate days between nDate1 and nDate2
+sal_Int32 nDayDiff;
+switch( nMode )
+{
+case 0: // 0=USA (NASD) 30/360
+if ( nDay1 == 31 )
+{
+nDay1--;
+}
+if ( nDay1 == 30 && nDay2 == 31 )
+{
+nDay2--;
+}
+el

Re: forward RTL_CONTEXT_foo logging to SAL_INFO in default debugging


On 04/17/2013 03:39 PM, Bjoern Michaelsen wrote:

please note:

  https://gerrit.libreoffice.org/#/c/3421/

and raise any violent opposition to this move here, if there is no such
opposition on the ESC call, Im going to push it tommorrow.

The rationale (beyond what is in the commit message) is as follows:
- manually replacing RTL_CONTEXT_foo to SAL_INFO might add some additional
   context (I would file that as an EasyHack) and sort the message into a proper
   SAL_LOG area
- this move makes the the messages available at all in SAL_LOG, which is better
   than nothing

So:
- is anyone opposing this change now as an intermediate move?


What good is the intermediate move?  That is, was there at least one 
situation in which it would have helped your debugging if an existing 
RTL_LOGFILE_* call had been behaving like SAL_LOG?


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

[Libreoffice-commits] core.git: libmariadb/mariadb-msvc.patch.1 libmariadb/UnpackedTarball_mariadb.mk

 libmariadb/UnpackedTarball_mariadb.mk |1 +
 libmariadb/mariadb-msvc.patch.1   |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit 81bee24d6b6e12219811813aa1c16892c93e0ba7
Author: Michael Stahl 
Date:   Wed Apr 17 15:48:46 2013 +0200

libmariadb: make it build with MSVC 2008

... although i'm not sure if the stub implementation of
pthread_cond_timedwait makes that much sense.

Change-Id: If1926e760c0e1b84fd2ac48431c06c6f1ba4dd1d

diff --git a/libmariadb/UnpackedTarball_mariadb.mk 
b/libmariadb/UnpackedTarball_mariadb.mk
index f8694ab..ce0bd9f 100644
--- a/libmariadb/UnpackedTarball_mariadb.mk
+++ b/libmariadb/UnpackedTarball_mariadb.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
 libmariadb/mariadb-swap.patch \
 libmariadb/mariadb-trunk-40.patch \
 libmariadb/mariadb-static-inline.patch \
+libmariadb/mariadb-msvc.patch.1 \
 ))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,mariadb,\
diff --git a/libmariadb/mariadb-msvc.patch.1 b/libmariadb/mariadb-msvc.patch.1
new file mode 100644
index 000..60fddae
--- /dev/null
+++ b/libmariadb/mariadb-msvc.patch.1
@@ -0,0 +1,13 @@
+--- mariadb/libmysql/my_pthread.c.orig 2013-04-17 15:45:52.025896770 +0200
 mariadb/libmysql/my_pthread.c  2013-04-17 15:47:32.292895908 +0200
+@@ -28,6 +28,10 @@
+ 
+ #ifdef _WIN32
+ 
++#ifndef ETIMEDOUT  /* does not exist MSVC 2008 but was added in MSVC 2010 */
++#define ETIMEDOUT 145
++#endif
++
+ int 
+ pthread_cond_init (pthread_cond_t *cv, const pthread_condattr_t *attr)
+ {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

forward RTL_CONTEXT_foo logging to SAL_INFO in default debugging

2013-04-17 Thread Bjoern Michaelsen

Hi,

please note:

 https://gerrit.libreoffice.org/#/c/3421/

and raise any violent opposition to this move here, if there is no such
opposition on the ESC call, Im going to push it tommorrow.

The rationale (beyond what is in the commit message) is as follows:
- manually replacing RTL_CONTEXT_foo to SAL_INFO might add some additional
  context (I would file that as an EasyHack) and sort the message into a proper
  SAL_LOG area
- this move makes the the messages available at all in SAL_LOG, which is better
  than nothing 

So:
- is anyone opposing this change now as an intermediate move?
- is anyone opposing killing RTL_CONTEXT_foo in the long term as suggested by
  sberg in the comment?

Best,

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

[PUSHED] Converted Tools -> Solver widget.

2013-04-17 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/3411


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8413f2ee3bcd700409f6bfa3886ba91c2fa2b921
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Abdulelah Alarifi 
Gerrit-Reviewer: Caolán McNamara 

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

Re: Empty Advanced options page on Windows

2013-04-17 Thread Thomas Arnhold


Hi Kohei,

seems to be my fault (7c48a2a83f4a92200c7f2b0f259bf1684d253436).

I'll investigate it.

Thomas

On 17.04.2013 14:49, Kohei Yoshida wrote:

Hi there,

I just completed my Windows build of the master branch and noticed that,
the Advanced options page is for some reason totally blank.  If my
attachment goes through, you can see it in the attached screenshot.

Does this ring any bell to anyone?

Kohei


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



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

[Libreoffice-commits] core.git: 2 commits - libmariadb/mariadb-trunk-40.patch libmariadb/UnpackedTarball_mariadb.mk solenv/gbuild

 libmariadb/UnpackedTarball_mariadb.mk |4 ++
 libmariadb/mariadb-trunk-40.patch |   52 +-
 solenv/gbuild/Dictionary.mk   |2 -
 3 files changed, 31 insertions(+), 27 deletions(-)

New commits:
commit e0e43597c4bf6f92f3d8406341f472be911169db
Author: Michael Stahl 
Date:   Wed Apr 17 15:15:03 2013 +0200

gbuild: fix gb_Dictionary_add_localized_xcu_file for --with-lang

... which has the same stupid mistake.

Change-Id: I128af77f0b75d2b60f5bb4b33e55c2bc0c94ae98

diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 0bb75b4..a7d458f 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -293,7 +293,7 @@ define gb_Dictionary_add_localized_xcu_file
 ifeq ($(gb_WITH_LANG),)
 $(call gb_Dictionary__add_file,$(1),$(1),$(2)/$(notdir $(3)),$(strip $(3)))
 else
-$(call gb_Dictionary__add_file,$(1),$(1)_generated,$(2),$(subst 
$(WORKDIR)/,,$(call gb_XcuFile_for_extension,$(strip $(3)
+$(call gb_Dictionary__add_file,$(1),$(1)_generated,$(2)/$(notdir $(3)),$(subst 
$(WORKDIR)/,,$(call gb_XcuFile_for_extension,$(strip $(3)
 $(call gb_PackageSet_add_package,$(call 
gb_Dictionary_get_packagesetname,$(1)),$(call 
gb_Dictionary_get_packagename,$(1)_generated))
 endif
 
commit 15990d8ccbd4e89770b449444ac430650ca6a381
Author: Michael Stahl 
Date:   Wed Apr 17 14:55:26 2013 +0200

libmariadb: fix wrong line ends in patch

Change-Id: I8fce7d3b3da2a6dad373409f9c9ba3b9cd06aa4f

diff --git a/libmariadb/UnpackedTarball_mariadb.mk 
b/libmariadb/UnpackedTarball_mariadb.mk
index f80bed6..f8694ab 100644
--- a/libmariadb/UnpackedTarball_mariadb.mk
+++ b/libmariadb/UnpackedTarball_mariadb.mk
@@ -33,4 +33,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
 libmariadb/mariadb-static-inline.patch \
 ))
 
+$(eval $(call gb_UnpackedTarball_fix_end_of_line,mariadb,\
+   libmysql/libmysql_exports.def \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libmariadb/mariadb-trunk-40.patch 
b/libmariadb/mariadb-trunk-40.patch
index a0082bc..de8f44c 100644
--- a/libmariadb/mariadb-trunk-40.patch
+++ b/libmariadb/mariadb-trunk-40.patch
@@ -3373,34 +3373,34 @@
 --- mariadb/libmysql/libmysql_exports.def  2012-11-28 13:09:17 +
 +++ mariadb/libmariadb/libmariadb_exports.def  2013-03-14 21:01:43 +
 @@ -1,4 +1,5 @@
- EXPORTS
-+ mysql_ps_fetch_functions DATA
-  get_tty_password
-  load_defaults
-  mysql_thread_end
+ EXPORTS
++ mysql_ps_fetch_functions DATA
+  get_tty_password
+  load_defaults
+  mysql_thread_end
 @@ -53,11 +54,10 @@
-  mysql_num_rows
-  mysql_options
-  mysql_stmt_param_count
-- ;mysql_stmt_param_metadata
-+ mysql_stmt_param_metadata
-  mysql_ping
-  mysql_stmt_result_metadata
-  mysql_query
-- mysql_read_query_result
-  mysql_real_connect
-  mysql_real_escape_string
-  mysql_real_query
+  mysql_num_rows
+  mysql_options
+  mysql_stmt_param_count
+- ;mysql_stmt_param_metadata
++ mysql_stmt_param_metadata
+  mysql_ping
+  mysql_stmt_result_metadata
+  mysql_query
+- mysql_read_query_result
+  mysql_real_connect
+  mysql_real_escape_string
+  mysql_real_query
 @@ -102,6 +102,6 @@
-  mysql_server_end
-  mysql_set_character_set
-  mysql_get_character_set_info
-- ;mysql_stmt_next_result
--
--
-+ mysql_stmt_next_result
-+ mariadb_connection
-+ mysql_get_server_name
+  mysql_server_end
+  mysql_set_character_set
+  mysql_get_character_set_info
+- ;mysql_stmt_next_result
+-
+-
++ mysql_stmt_next_result
++ mariadb_connection
++ mysql_get_server_name
 
 === renamed file 'libmysql/my_secure.c' => 'libmariadb/ma_secure.c'
 --- mariadb/libmysql/my_secure.c   2012-11-26 07:32:41 +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] Java cleanup, use generics in calls to UnoRuntime#queryInter...

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3433

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/3433/1

Java cleanup, use generics in calls to UnoRuntime#queryInterface

A handful of places wrap the call to queryInterface. With a little
generics love, we can reduce the casting required.

Change-Id: I9efca2afb1b23fad2359af24e1c273aea96e45fe
---
M forms/qa/integration/forms/DocumentHelper.java
M forms/qa/integration/forms/DocumentViewHelper.java
M forms/qa/integration/forms/FormComponent.java
M forms/qa/integration/forms/ListSelection.java
M forms/qa/integration/forms/MasterDetailForms.java
M forms/qa/integration/forms/TestCase.java
M odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java
M odk/examples/DevelopersGuide/OfficeDev/OfficeConnect.java
8 files changed, 20 insertions(+), 20 deletions(-)



diff --git a/forms/qa/integration/forms/DocumentHelper.java 
b/forms/qa/integration/forms/DocumentHelper.java
index a26434b..a5a44be 100644
--- a/forms/qa/integration/forms/DocumentHelper.java
+++ b/forms/qa/integration/forms/DocumentHelper.java
@@ -133,12 +133,12 @@
 /* -- */
 public boolean isModified()
 {
-XModifiable modify = (XModifiable)query( XModifiable.class );
+XModifiable modify = query( XModifiable.class );
 return modify.isModified();
 }
 
 /* -- */
-public Object query( Class aInterfaceClass )
+public  T query( Class aInterfaceClass )
 {
 return UnoRuntime.queryInterface( aInterfaceClass, m_documentComponent 
);
 }
diff --git a/forms/qa/integration/forms/DocumentViewHelper.java 
b/forms/qa/integration/forms/DocumentViewHelper.java
index 66d8f0b..76a03d0 100644
--- a/forms/qa/integration/forms/DocumentViewHelper.java
+++ b/forms/qa/integration/forms/DocumentViewHelper.java
@@ -73,7 +73,7 @@
 @param aInterfaceClass
 the class of the interface which shall be returned
 */
-public Object query( Class aInterfaceClass )
+public  T query( Class aInterfaceClass )
 {
 return UnoRuntime.queryInterface( aInterfaceClass, m_controller );
 }
@@ -92,7 +92,7 @@
 XDispatch xReturn = null;
 
 // go get the current view
-XController xController = (XController)query( XController.class );
+XController xController = query( XController.class );
 // go get the dispatch provider of it's frame
 XDispatchProvider xProvider = UnoRuntime.queryInterface(
 XDispatchProvider.class, xController.getFrame() );
@@ -147,7 +147,7 @@
 public XControl getControl( XControlModel xModel ) throws 
com.sun.star.uno.Exception
 {
 // the current view of the document
-XControlAccess xCtrlAcc = (XControlAccess)query( XControlAccess.class 
);
+XControlAccess xCtrlAcc = query( XControlAccess.class );
 // delegate the task of looking for the control
 return xCtrlAcc.getControl( xModel );
 }
@@ -160,7 +160,7 @@
 }
 
 /* -- */
-public Object getControl( Object aModel, Class aInterfaceClass ) throws 
com.sun.star.uno.Exception
+public  T getControl( Object aModel, Class aInterfaceClass ) throws 
com.sun.star.uno.Exception
 {
 XControlModel xModel = UnoRuntime.queryInterface( XControlModel.class, 
aModel );
 return UnoRuntime.queryInterface( aInterfaceClass, getControl( xModel 
) );
@@ -171,7 +171,7 @@
  */
 public XFormController getFormController( XForm _form )
 {
-XFormLayerAccess formLayerAccess = (XFormLayerAccess)query( 
XFormLayerAccess.class );
+XFormLayerAccess formLayerAccess = query( XFormLayerAccess.class );
 return formLayerAccess.getFormController( _form );
 }
 
diff --git a/forms/qa/integration/forms/FormComponent.java 
b/forms/qa/integration/forms/FormComponent.java
index f19ceea..d6ea10d 100644
--- a/forms/qa/integration/forms/FormComponent.java
+++ b/forms/qa/integration/forms/FormComponent.java
@@ -79,7 +79,7 @@
 @param aInterfaceClass
 the class of the interface which shall be returned
 */
-public Object query( Class aInterfaceClass )
+public  T query( Class aInterfaceClass )
 {
 return UnoRuntime.queryInterface( aInterfaceClass, m_component );
 }
diff --git a/forms/qa/integration/forms/ListSelection.java 
b/forms/qa/integration/forms/ListSelection.java
index 5d080cb..64fef48 100644
--- a/forms/qa/integration/forms/ListSelection.java
+++ b/forms/qa/integration/forms/ListSelection.java
@@ -96,7 +96,7 @@
 for ( int i = 0; i < runs; ++i )
 {
 // obtain the active sheet
-XSpreadsheetView view = 
(XSpreadsheetView)m_document.getCurrentView().query( XS

[PATCH] Java cleanup, remove the rest of the unnecessary casts

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3432

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/3432/1

Java cleanup, remove the rest of the unnecessary casts

Change-Id: Ia61d250f6b3711abc29569c5ece38a6f87e38daa
---
M 
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
M odk/examples/DevelopersGuide/Components/JavaComponent/TestJavaComponent.java
M odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java
M odk/examples/DevelopersGuide/Config/ConfigExamples.java
M odk/examples/DevelopersGuide/Database/CodeSamples.java
M odk/examples/DevelopersGuide/Database/OpenQuery.java
M odk/examples/DevelopersGuide/Database/RowSet.java
M odk/examples/DevelopersGuide/Database/Sales.java
M odk/examples/DevelopersGuide/Database/SalesMan.java
M odk/examples/DevelopersGuide/Database/sdbcx.java
M odk/examples/DevelopersGuide/Drawing/ChangeOrderDemo.java
M odk/examples/DevelopersGuide/Drawing/ControlAndSelectDemo.java
M odk/examples/DevelopersGuide/Drawing/CustomShowDemo.java
M odk/examples/DevelopersGuide/Drawing/DrawViewDemo.java
M odk/examples/DevelopersGuide/Drawing/DrawingDemo.java
M odk/examples/DevelopersGuide/Drawing/FillAndLineStyleDemo.java
M odk/examples/DevelopersGuide/Drawing/GluePointDemo.java
M odk/examples/DevelopersGuide/Drawing/GraphicExportDemo.java
M odk/examples/DevelopersGuide/Drawing/Helper.java
M odk/examples/DevelopersGuide/Drawing/LayerDemo.java
M odk/examples/DevelopersGuide/Drawing/ObjectTransformationDemo.java
M odk/examples/DevelopersGuide/Drawing/Organigram.java
M odk/examples/DevelopersGuide/Drawing/PageHelper.java
M odk/examples/DevelopersGuide/Drawing/PresentationDemo.java
M odk/examples/DevelopersGuide/Drawing/ShapeHelper.java
M odk/examples/DevelopersGuide/Drawing/StyleDemo.java
M odk/examples/DevelopersGuide/Drawing/TextDemo.java
M odk/examples/DevelopersGuide/FirstSteps/FirstLoadComponent.java
M odk/examples/DevelopersGuide/FirstSteps/HelloTextTableShape.java
M odk/examples/DevelopersGuide/GUI/DialogDocument.java
M odk/examples/DevelopersGuide/GUI/ImageControlSample.java
M odk/examples/DevelopersGuide/GUI/MessageBox.java
M odk/examples/DevelopersGuide/GUI/RoadmapItemStateChangeListener.java
M odk/examples/DevelopersGuide/GUI/SystemDialog.java
M odk/examples/DevelopersGuide/GUI/UnoDialogSample.java
M odk/examples/DevelopersGuide/GUI/UnoDialogSample2.java
M odk/examples/DevelopersGuide/GUI/UnoMenu.java
M odk/examples/DevelopersGuide/GUI/UnoMenu2.java
M odk/examples/DevelopersGuide/OfficeDev/Clipboard/Clipboard.java
M odk/examples/DevelopersGuide/OfficeDev/ContextMenuInterceptor.java
M 
odk/examples/DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java
M 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
M 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java
M 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java
M odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java
M odk/examples/DevelopersGuide/OfficeDev/MenuElement.java
M odk/examples/DevelopersGuide/OfficeDev/Number_Formats.java
M odk/examples/DevelopersGuide/OfficeDev/PathSettings/PathSettingsTest.java
M 
odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java
M odk/examples/DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java
M 
odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java
M odk/examples/DevelopersGuide/ProfUNO/InterprocessConn/UrlResolver.java
M 
odk/examples/DevelopersGuide/ProfUNO/SimpleBootstrap_java/SimpleBootstrap_java.java
M 
odk/examples/DevelopersGuide/ScriptingFramework/SayHello/SayHello/SayHello.java
M 
odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java
M odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java
M odk/examples/DevelopersGuide/Spreadsheet/GeneralTableSample.java
M odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java
M odk/examples/DevelopersGuide/Spreadsheet/SpreadsheetSample.java
M odk/examples/DevelopersGuide/Spreadsheet/ViewSample.java
M odk/examples/DevelopersGuide/Text/TextDocuments.java
M odk/examples/java/ConverterServlet/ConverterServlet.java
M odk/examples/java/DocumentHandling/DocumentConverter.java
M odk/examples/java/DocumentHandling/DocumentLoader.java
M odk/examples/java/DocumentHandling/DocumentPrinter.java
M odk/examples/java/DocumentHandling/DocumentSaver.java
M odk/examples/java/Drawing/SDraw.

Windows build with --with-lang="en-US ja de fr" broken

2013-04-17 Thread Kohei Yoshida

Another thing I noticed while building master on Windows, the build fails
very early on when I use --with-lang="en-US ja de fr" (which I always do in
my build).  Removing that option and re-building it solves it.  I don't
have a build log handy unfortunately, but it had something to do with not
finding some sort of file for language qtz related to
chart2/uiconfig/ui/smoothlinesdlg ...

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

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

 vcl/win/source/gdi/salgdi_gdiplus.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 7828f4377033f8dcceb8ff9368b6d613a1dd7b2b
Author: Stephan Bergmann 
Date:   Wed Apr 17 14:54:06 2013 +0200

MSC needs those min/max macros after all

...otherwise, it will fail with "c:\program files\microsoft
sdks\windows\v7.1\include\GdiplusTypes.h(470) : error C3861: 'min': 
identifier
not found" errors.

Change-Id: Ib81ab7f5357b1f980202b63b144296fa252b71b1

diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx 
b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index f26ccaa..d1b9d0a 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -27,6 +27,15 @@
 #include 
 
 #if defined _MSC_VER
+#ifndef min
+#define min(a,b)(((a) < (b)) ? (a) : (b))
+#endif
+#ifndef max
+#define max(a,b)(((a) > (b)) ? (a) : (b))
+#endif
+#endif
+
+#if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Empty Advanced options page on Windows

2013-04-17 Thread Kohei Yoshida

Hi there,

I just completed my Windows build of the master branch and noticed that,
the Advanced options page is for some reason totally blank.  If my
attachment goes through, you can see it in the attached screenshot.

Does this ring any bell to anyone?

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

[ABANDONED] Really use 'nCategoriesLength'

Julien Nabet has abandoned this change.

Change subject: Really use 'nCategoriesLength'
..


Patch Set 1: Abandoned

Let's drop it.

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: I455661ccd97be6ea54d00201fda2906cfbd6f819
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet 
Gerrit-Reviewer: Julien Nabet 
Gerrit-Reviewer: Markus Mohrhard 

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

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

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

New commits:
commit ffcdefe83ab043edef943657d5dedef75faaa5b0
Author: Michael Stahl 
Date:   Wed Apr 17 14:25:19 2013 +0200

gbuild: UnpackedTarball: do not query for input on "reversed" patch

This can apparently happen when interrupting a build; reproducible with
"touch workdir/*/UnpackedTarget/*openssl* && make openssl".

The -f parameter would apparently silently ignore some mal-formed
patches but at least it rejects potentially reversed ones,
which causes the "error handler" in gb_UnpackedTarball__command
to touch the "prepare" target so the next make is successful.

Change-Id: I7bbd7d9385d990a69214a3a2d9bb20b5a7173748

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index dd47a35..2342dc9 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -140,7 +140,7 @@ $(call gb_Helper_abbreviate_dirs,\
for p in $(UNPACKED_PATCHES); do \
pl=$(UNPACKED_PATCHLEVEL); \
s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) 
pl="$$s"; ;; esac ; \
-   $(GNUPATCH) -s "-p$$pl" < "$$p"; \
+   $(GNUPATCH) -f -s "-p$$pl" < "$$p"; \
if test "$$?" -ne 0; then echo "Patch FAILED: 
$$p"; exit 1; fi;\
done && \
) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: extracting extended tooltips from the help texts

2013-04-17 Thread Andras Timar

Hi Markus,

On Wed, Apr 17, 2013 at 12:31 AM, Markus Mohrhard
 wrote:
>
> attached you'll find the initial work on extracting the tooltips from the
> help texts.
>

I tried your patch and it works. I don't have strong opinion about the
actual place of these files in install set. help/tooltips is fine for
me.

I have some concerns, however.

* This patch and follow-ups will suddenly add ~7 new words to
translate to UI, effectively doubling the translatable wordcount. Old
help translations can be migrated, but for those, who don't have help
translations these strings will be new. Now, without local help,
extended tips show normal tooltips - which are localized. After the
patch English strings will appear in localized UI until teams complete
translation of this huge amount.

* Your work is part of the plan of getting rid of current help system
(https://wiki.documentfoundation.org/Development/Wikihelp). But
developments related to this happen on different time scales. You have
a 80% ready patch, while other related tasks are only in planning
phase. I don't see the advantage of integrating your patch into master
(-> 4.1) now.

* Huge properties files will be converted to huge po files. From the
translators' and translation tools' point of view, it would be better
to have more, smaller files.

* Originally (very long time ago) these extended tips were next to the
resource, there was a HelpText field. Later HelpText became deprecated
and these strings were shared with help, in order to reduce the amount
of duplication. Now you restore the duplication, but strings are still
out of context. Ideally the text of a control, its short tooltip
(QuickHelpText) and its extended tip (HelpText) should be together. It
would help translators a lot.

Best regards,
Andras
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[PATCH] Java cleanup, remove unnecessary casts

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3431

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/3431/1

Java cleanup, remove unnecessary casts

Change-Id: Id12089bc7df16631737e6acaee0973fb91dd953f
---
M bridges/test/java_uno/acquire/TestAcquire.java
M bridges/test/testclient.java
M chart2/qa/TestCaseOldAPI.java
M connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
M dbaccess/qa/complex/dbaccess/PropertyBag.java
M dbaccess/qa/complex/dbaccess/UISettings.java
M 
desktop/test/deployment/options/handler/com/sun/star/comp/extensionoptions/OptionsEventHandler.java
M extensions/qa/integration/extensions/ConsoleWait.java
M extensions/qa/integration/extensions/Frame.java
M extensions/qa/integration/extensions/MethodHandler.java
M extensions/qa/integration/extensions/ObjectInspector.java
M extensions/qa/integration/extensions/ServicesHandler.java
M extensions/test/pgp/TestPGP.java
M forms/qa/integration/forms/CellBinding.java
M forms/qa/integration/forms/ControlValidation.java
M forms/qa/integration/forms/DocumentHelper.java
M forms/qa/integration/forms/DocumentViewHelper.java
M forms/qa/integration/forms/FormComponent.java
M forms/qa/integration/forms/FormControlTest.java
M forms/qa/integration/forms/FormLayer.java
M forms/qa/integration/forms/ListSelection.java
M forms/qa/integration/forms/RadioButtons.java
M forms/qa/integration/forms/SingleControlValidation.java
M forms/qa/integration/forms/SpreadsheetDocument.java
M forms/qa/integration/forms/SpreadsheetView.java
M forms/qa/integration/forms/TableCellTextBinding.java
M forms/qa/integration/forms/ValueBinding.java
M forms/qa/integration/forms/XMLFormSettings.java
M forms/qa/org/openoffice/complex/forms/tools/ResultSet.java
M forms/qa/org/openoffice/xforms/Model.java
M forms/qa/org/openoffice/xforms/XMLDocument.java
M nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseNLPSolver.java
M nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/ResourceManager.java
M nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/BaseDialog.java
M 
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/EvolutionarySolverStatusUno.java
M 
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/BaseControl.java
M nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/Button.java
M 
nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/dialogs/controls/ProgressBar.java
M odk/examples/DevelopersGuide/Charts/CalcHelper.java
M odk/examples/DevelopersGuide/Charts/ChartHelper.java
M odk/examples/DevelopersGuide/Charts/ChartInCalc.java
M odk/examples/DevelopersGuide/Charts/ChartInDraw.java
M odk/examples/DevelopersGuide/Charts/ChartInWriter.java
M odk/examples/DevelopersGuide/Charts/Helper.java
M odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java
M odk/examples/DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java
M odk/examples/DevelopersGuide/Charts/SelectionChangeListener.java
M odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java
48 files changed, 373 insertions(+), 379 deletions(-)




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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id12089bc7df16631737e6acaee0973fb91dd953f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Noel Grandin 

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

[PATCH] Java cleanup in mediawiki extension