Re: libreofficeaustralia.org

[Jonathan Aquilina]

Glad i could help :).

I have to say that looks like just a replica of the site just with a different 
looking landing page.

Regards

Jonathan Aquilina



On 7 Jun 2012, at 08:39, Tor Lillqvist wrote:

>> http://www.websitelooker.com/www/libreofficeaustralia.org
> 
> Thanks. Must be too early in the morning for me when I didn't think
> that of course there must be services that provide contact information
> for web sites... Will contact that guy, making it clear that I am
> speaking just for myself, not as a representative for any community...
> 
> --tml

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

Re: libreofficeaustralia.org

[Tor Lillqvist]

> http://www.websitelooker.com/www/libreofficeaustralia.org

Thanks. Must be too early in the morning for me when I didn't think
that of course there must be services that provide contact information
for web sites... Will contact that guy, making it clear that I am
speaking just for myself, not as a representative for any community...

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

Re: libreofficeaustralia.org

[Jonathan Aquilina]

Hey Tor

Might have found you another email address you can try for the site and domain 
owner 

http://www.websitelooker.com/www/libreofficeaustralia.org

Regards

Jonathan Aquilina



On 7 Jun 2012, at 08:30, Tor Lillqvist wrote:

>> Cc:ing to hostmas...@libreofficeaustralia.org in the (vain?) hope it
>> will reach somebody there...
> 
> I meant postmaster of course, but that didn't work either;) (Yeah, I
> guess my age shows in imagining email addressed to
> postmaster@random.domain would actually reach somebody...)
> 
> So please remove the bogus hostmas...@libreofficeaustralia.org from
> CC: if following-up to avoid bounces.
> 
> --tml
> ___
> 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

Re: libreofficeaustralia.org

[Jonathan Aquilina]

Wouldn't a whois on the domain return you a working email address you can try 
in regards to contact details?

Regards

Jonathan Aquilina



On 7 Jun 2012, at 08:30, Tor Lillqvist wrote:

>> Cc:ing to hostmas...@libreofficeaustralia.org in the (vain?) hope it
>> will reach somebody there...
> 
> I meant postmaster of course, but that didn't work either;) (Yeah, I
> guess my age shows in imagining email addressed to
> postmaster@random.domain would actually reach somebody...)
> 
> So please remove the bogus hostmas...@libreofficeaustralia.org from
> CC: if following-up to avoid bounces.
> 
> --tml
> ___
> 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

Re: libreofficeaustralia.org

[Tor Lillqvist]

> Cc:ing to hostmas...@libreofficeaustralia.org in the (vain?) hope it
> will reach somebody there...

I meant postmaster of course, but that didn't work either;) (Yeah, I
guess my age shows in imagining email addressed to
postmaster@random.domain would actually reach somebody...)

So please remove the bogus hostmas...@libreofficeaustralia.org from
CC: if following-up to avoid bounces.

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

libreofficeaustralia.org

[Tor Lillqvist]

Cc:ing to hostmas...@libreofficeaustralia.org in the (vain?) hope it
will reach somebody there...

What's the point with libreofficeaustralia.org ? Is it a copy of
libreoffice.org from some point in history?

Should we try to persuade its maintainers to turn it off and/or
redirect to libreoffice.org, and work on that, our real site, instead?
(We are as friendly towards volunteer web developers as we are towards
volunteer code developers, I hope?)

That site seems to be friendly towards us, so I don't see what its
owner/maintainer would win by insisting on keeping it up and confusing
users. I mean, if it actually was somehow Australia-specific and
contained info about Australian events, user group activites and
whatnot, the situation would be different of course, nothing wrong
with such sites.

I am asking because for some reason apparently my LibreOffice-related
blog posts turn up in searches first as mirrored on that site. (I have
at least twice seen people link to my blog posts through that site.)
And even in weird mock localised trees, like
http://www.libreofficeaustralia.org/lt/community/blog/planet/20110328/porting-libreoffice-x64-windows
("lt" = Lithuanian, huh?). Surely this is pointless and
counter-productive.

So yeah, sigh, including that link in this email which is publicly
archived will increase its apparent significance even more... The real
location of that blog post is
http://tml-blog.blogspot.com/2011/03/porting-libreoffice-to-x64-windows.html
.

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

[Libreoffice-commits] .: boost/boost_1_44_0-clang-warnings.patch boost/makefile.mk

[Stephan Bergmann]

 boost/boost_1_44_0-clang-warnings.patch |   61 
 boost/makefile.mk   |3 +
 2 files changed, 64 insertions(+)

New commits:
commit 48d6c11c6fc6276c45bed56318fc4ac0dc033fdf
Author: Stephan Bergmann 
Date:   Thu Jun 7 08:03:22 2012 +0200

Some boost warnings with Clang

...on Mac OS X, in what looks like only newly used boost headers.

Change-Id: I86612a419311fe5a2dfda9eec520889707f9e5db

diff --git a/boost/boost_1_44_0-clang-warnings.patch 
b/boost/boost_1_44_0-clang-warnings.patch
new file mode 100644
index 000..c0c2206
--- /dev/null
+++ b/boost/boost_1_44_0-clang-warnings.patch
@@ -0,0 +1,61 @@
+--- misc/boost_1_44_0/boost/algorithm/string/detail/find_format_store.hpp  
2010-07-10 22:29:03.0 +0200
 
misc/build/boost_1_44_0/boost/algorithm/string/detail/find_format_store.hpp 
   2012-06-06 23:13:26.0 +0200
+@@ -71,7 +71,7 @@
+ };
+ 
+ template
+-bool check_find_result(InputT& Input, FindResultT& FindResult)
++bool check_find_result(InputT&, FindResultT& FindResult)
+ {
+ typedef BOOST_STRING_TYPENAME 
+ range_const_iterator::type input_iterator_type; 
+--- misc/boost_1_44_0/boost/date_time/dst_rules.hpp2008-02-27 
21:00:24.0 +0100
 misc/build/boost_1_44_0/boost/date_time/dst_rules.hpp  2012-06-06 
23:11:03.0 +0200
+@@ -371,7 +371,7 @@
+ return is_not_in_dst;
+   }
+ 
+-  static bool is_dst_boundary_day(date_type d)
++  static bool is_dst_boundary_day(date_type)
+   {
+ return false;
+   }
+--- misc/boost_1_44_0/boost/date_time/gregorian_calendar.ipp   2010-01-10 
20:17:23.0 +0100
 misc/build/boost_1_44_0/boost/date_time/gregorian_calendar.ipp 
2012-06-06 22:27:07.0 +0200
+@@ -47,7 +47,7 @@
+   return week;
+ }
+ 
+-if ((week == 53)) {
++if (week == 53) {
+   if((day==6) ||(day == 5 && is_leap_year(ymd.year))) {
+ return week; //under these circumstances week == 53.
+   } else {
+--- misc/boost_1_44_0/boost/date_time/period_formatter.hpp 2008-02-27 
21:00:24.0 +0100
 misc/build/boost_1_44_0/boost/date_time/period_formatter.hpp   
2012-06-06 23:12:48.0 +0200
+@@ -114,10 +114,10 @@
+ {
+   m_range_option = option;
+ }
+-void delimiter_strings(const string_type& separator,
+-   const string_type& start_delim,
+-   const string_type& open_end_delim,
+-   const string_type& closed_end_delim)
++void delimiter_strings(const string_type&,
++   const string_type&,
++   const string_type&,
++   const string_type&)
+ {
+   m_period_separator;
+   m_period_start_delimeter;
+--- misc/boost_1_44_0/boost/token_functions.hpp2010-06-12 
14:06:28.0 +0200
 misc/build/boost_1_44_0/boost/token_functions.hpp  2012-06-06 
23:12:27.0 +0200
+@@ -285,7 +285,7 @@
+   template <>
+   struct assign_or_plus_equal {
+ template
+-static void assign(Iterator b, Iterator e, Token &t) { }
++static void assign(Iterator, Iterator, Token &) { }
+ template 
+ static void plus_equal(Token &t, const Value &v) {
+   t += v;
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 6c9db56..5b8957f 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -75,6 +75,9 @@ PATCH_FILES += boost_1_44_0-logical-op-parentheses.patch
 # Backporting fixes for the GCC 4.7 -std=c++11 mode from Boost 1.48.0:
 PATCH_FILES += boost_1_44_0-gcc4.7.patch
 
+# Clang warnings:
+PATCH_FILES += boost_1_44_0-clang-warnings.patch
+
 ADDITIONAL_FILES= \
 libs/thread/src/win32/makefile.mk \
libs/date_time/src/gregorian/makefile.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

RE: [PATCH]fdo 50488 added calc formula XOR as defined in ODFF1.2

[Winfried Donkers]

Hi Eike, 

> Argh, I missed to reply to you in the bug that XOR is also in the said CWS we
> still hope to be able to integrate back from OOo times. So you duplicated
> some work, my bad. Anyway, if it's ready we'll integrate it, adding some
> pieces for Excel import/export. However, you attached a patch for DATEDIF
> instead of XOR ;-)

How stupid of me to attach the wrong patch! I will (re)submit the proper patch 
file later this afternoon (It is on my computer at home).
Should my work not be as good as the code you are hoping to integrate, just 
disregard my patch. High quality Libreoffice goes first.

> I'll browse through the list you provided, maybe there are some things to
> remark.

Yes, please do. I will wait for your remarks.

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

[PATCH] GTK theming: implement FixedLine rendering

[Ruslan Kabatsayev]

Hello,

This patch implements support for native rendering of FixedLine, and
makes use of it in GTK theming plugin.
This makes vertical and horizontal lines look native in e.g. grouping
widgets (like Tools->Options->User data->Address) and statusbar
separators.

Change might be not as visible with usual themes like Clearlooks or
Glossy, but is greately changed with oxygen-gtk and QtCurve.

Regards,
Ruslan


0002-Implement-native-FixedLine-render-add-GTK-support-fo.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] Re: [PATCH] Bug 50386 - Page count field makes scrolling impossible

[Muhammad Haggag]

On 06/06/2012 12:49 PM, Michael Meeks wrote:
Right ! :-) also, any chance of a screenshot of the updated count in 
the status bar we can add to your nice entry (thanks for adding that) 
here: https://wiki.documentfoundation.org/ReleaseNotes/3.6 Thanks ! 
Michael. 

Done! :)

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

[Libreoffice-commits] .: nss/README

[Philipp Weissenbacher]

 nss/README |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit f50f1dafffb36d1407e3ebcb2347bf24e8f2095a
Author: Philipp Weissenbacher 
Date:   Thu Jun 7 00:18:46 2012 +0200

Convert links to makedocs tool, update one and correct spelling

Change-Id: I4070ffa70690278dbd6575b8bfed3524d4c09ed7

diff --git a/nss/README b/nss/README
index cd56dbe..f11d257 100644
--- a/nss/README
+++ b/nss/README
@@ -1,8 +1,8 @@
-Containes the security libraries which are also part of [[moz]]. However nss 
is meant to be more current.
+Contains the security libraries which are also part of [[moz]]. However nss is 
meant to be more current.
 
 == Relation between nss, moz, moz_prebuilt ==
 
-nss containes the security libraries which are also part of moz. However nss is
+nss contains the security libraries which are also part of moz. However nss is
 meant to be more current, that is it to be updated more often. This should be
 easier than doing this with moz.
 
@@ -45,7 +45,7 @@ ooo/moz/zipped/makefile.mk
 sun/moz_prebuilt/zipped/makefile.mk
 
 See also
-http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+[http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html]
 
 
 == Windows builds of nss ==
@@ -53,11 +53,10 @@ 
http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
 To build mozilla on windows you'll need the mozilla build tools
 
 Build requirements containing the link to the build tools:
-https://developer.mozilla.org/en/Windows_Build_Prerequisites#ss2.2
+[https://developer.mozilla.org/en/Windows_Build_Prerequisites#ss2.2]
 
 The direct link:
-
-http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-1.3.exe
+[http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/MozillaBuildSetup-1.3.exe]
 
 
 == libsqlite3 ==
@@ -75,5 +74,5 @@ used by tools of the build environment. Using the sqlite from 
NSS breaks the
 tools if they use system libraries which are linked with the system
 sqlite. Therefore we deliver it into lib/sqlite on unix systems.
 
-See also issue
-http://qa.openoffice.org/issues/show_bug.cgi?id=106132
+See also issue:
+[https://issues.apache.org/ooo/show_bug.cgi?id=106132]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: calc: function WEEKNUM seems not to conform to ODFF1.2

[Eike Rathke]

Hi Winfried,

On Friday, 2012-06-01 10:07:00 +0200, Winfried Donkers wrote:

> I would like to change the behaviour of function WEEKNUM to conform to
> ODFF1.2 (core/tools/source/datetime/tdate.cxx, Date::GetWeekOfYear(..)
> allows this), but before enter a bug and start working on it, I would
> like to hear if there are reasons to keep WEEKNUM as it is (and change
> the documentation to state that the function differs from ODFF1.2).

The reason would be exsiting documents that already use a Mode value !=1
and assume that Monday would be used. I think some may pass 0 instead of
2 as argument for this case, as the result of a boolean evaluation. We
might get away with strictly complying with ODFF and generate an error
for constraint cases if prominently mentioned in release notes that
WEEKNUM changed. Users will have to change formulas then and we get
angry mails and bug reports ;-)

The other possibility would be to introduce an additional ISOWEEKNUM
function and map the existing WEEKNUM to ISOWEEKNUM upon reading if and
only if the Mode argument is literal and matches the constraints.
Writing WEEKNUM then would have to be done as ORG.LIBREOFFICE.WEEKNUM,
that couldn't be read by older versions so before actually writing that
name at least 2 minor releases must be able to read it already. And of
course other ODF consumers would not be able to read it. So quite more
complicated than the first solution and introducing interoperability
problems.

Therefor I'd go with strict ODFF implementation.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgpIsGxsaPToS.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [HELP] fdo#44721 (nearly) infinite loop & memory consumption

[Lionel Elie Mamane]

On Wed, Jun 06, 2012 at 07:35:58PM +0200, Thorsten Behrens wrote:
> Michael Meeks wrote:
>>  A basegfx memory leak / crasher :-) Thorsten is prolly a good guy to
>> have a look I guess.

> Nah, more likely underflow / insufficient range checking, with the
> large negatives coming in. Will have a look - a nice, ready-made
> .odb with a single big button to press appreciated of course :)

Err... Sorry for the noise, the bug seems to have disappeared.

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

Re: Draft document-rendering tiling API to be called from viewer apps

[Luc Verhaegen]

On Wed, Jun 06, 2012 at 06:42:44PM +0100, Michael Meeks wrote:
> Hi guys,
> 
> On Wed, 2012-06-06 at 16:33 +0100, Iain Billett wrote:
> > I haven't experimented but I've heard that not using power-of-two
> > lengths is seriously detrimental to performance.
> 
>   Must make a mental note to ask a GPU hacker; in fact - lets do that :-)
> Luc - sorry to bother you with a quick question. For all these Android /
> portable 3D chipsets that you deal with - is it really true that we need
> to allocate power-of-two sized, preferably square textures ? [ we're
> working on rendering documents to bitmaps to manipulate them for a
> LibreOffice android viewer ].
> 
> >  Considering we'll be using lots of resources to begin I think we
> > should make every reasonable optimisation
> 
>   Sure; but say we have a Tablet, mine has 1280x800 resolution, are you
> seriously suggesting rounding 1280 up to 2048 ? and 800 up to 1024 ?
> giving a 2Mpixel texture instead of a 1Mpixel texture ;-) is that really
> going to be more fast/efficient. Presumably having a sane rowstride (eg.
> 1280) makes a ton of sense, but a power of two in each dimension ?
> Anyhow - Luc can give an authoritative answer :-)
> 
> > Also, in this arrangement, It would be nice to have the dimensions of
> > the "document" area of the texture. Then if the rest of the bitmap is
> > fully transparent and the plane is too we can render a "page" alone
> > and keep track of dimensions. 
> 
>   I guess.
> 
> > My main concern with all this is in fact dealing with user interaction
> > i.e. mapping measurements in pixels to OpenGL coordinates. This is
> > more of a problem for editing, though. 
> 
>   Yep.
> 
> > Also, are we intending to have continuous scroll documents ( with all
> > the pages available via scroll - like most desktop applications ) or
> > would we be happy to have users flick (or otherwise) through pages. I
> > think the latter would make it easier to manage resources for large
> > documents.
> 
>   I think we'll want to flick through pages when we have them :-) For
> spreadsheets of course we don't really have that (hence liking doubles
> for positioning the view-pane incidentally).
> 
>   Thanks !
> 
>   Michael.

Not sure whether it is so detrimental for performance, I guess it 
depends on the hw and driver implementation. And yes, it depends on the 
GL version whether non-power-of-two textures are accepted.

For the record, i am not such a big 3D/GPU buff, most of my experience 
is with display stuff, some 2d accel/video/mpeg, and tons of lowlevel 
things. My actual GPU knowledge is mostly limited to what was shown at 
linuxtag a few weeks ago, where i was, once again, filling in the bottom 
end bits. My knowledge of openGL* is extremely limited, and this 
question is more for someone who has used GL on a variety of drivers and 
hardware, than for someone who fills in the bottom bits :)

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

[Bug 37361] LibreOffice 3.5 most annoying bugs

[bugzilla-daemon]

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

Bug 37361 depends on bug 44721, which changed state.

Bug 44721 Summary: Report builder: upon mouse-resize control, (nearly) infinite 
loop and memory consumption
https://bugs.freedesktop.org/show_bug.cgi?id=44721

   What|Old Value   |New Value

 Resolution||WORKSFORME
 Status|NEW |RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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

[REVIEW-3-5] fdo#50144 Additional information in the Selection field of Insert cross-reference dialog

[Andras Timar]

Hi,

This is a follow-up of my patch from yesterday, for Fields ->
Cross-references dialog. I learned about fdo#50144 and I agreed to the
proposal.

"It would be great if the Insert cross-reference dialogue Selection field would
contain also content of reference text following to the caption number (caption
of table or chart or other object) like in case of numbered paragraphs. It
would make much easier editing of large documents with tens of tables with
references in different pages."

With the patch below, we no longer have "Illustration 1",
"Illustration 2", etc. in the selection box, but we have the full
reference text, e.g. "Illustration 1: This is a dog, please don't be
offended" etc. Otherwise the behaviour of the dialog is the same. It
is even better when Caption order is Numbering first. Before there
were only the numbers in the Selection box, now there are full
reference text.

Please review it for libreoffice-3-5
http://cgit.freedesktop.org/libreoffice/core/commit/?id=10837b669c9fe3f6b1e1905bfbb855ca02497eb7

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

Re: [PUSHED] Re: [PUSHED] Re: [PATCH] fdo#46378: Poor Resampling Image quality

[Tomaž Vajngerl]

Hi,

On Tue, Jun 5, 2012 at 11:33 AM, Jan Holesovsky  wrote:
> Great stuff - I have pushed your patch, and also my patches to default
> to Lanczos filter.  Can you please add an example of "before" and
> "after" where the advantages of the Lanzcos filter are nicely visible to
> the Release Notes (http://wiki.documentfoundation.org/ReleaseNotes/3.6)?
Done.

> Adding the QA list to the CC: - thanks to Tomaz, we have changed the
> default of the image resize operations to a new scaling operation.
> Please be careful about bugs that involve scaling of images, quality of
> eg. PDF output, or speed of such operations.
Regarding bugs.. I have found a problem with creation of Bitmaps in
ImplScaleLanczos. I have fixed so the Bitmaps are created in the same
way as in ImplScaleInterpolate - the patch is attached. This problem
is visible if you go into impress and set the background of a slide to
a bitmap which is tiled. I have not found any reports in bugzilla
about this yet.

> Tomaz - what interests you next? :-)  You've already outlined some ideas
> regarding the filters, correct?
I am working now to on blur/soften filter which uses
ImplHorizontalConvolution and ImplVerticalConvolution - which are also
used in Lanczos resampling. I have this already working with a
parameterized blur radius. Currently the soften filter only uses a
fixed 3x3 convolution matrix with 2D convolution algorithm. My
solution should be faster and more flexible than the current one. I
still need to add a dialog to select the blur radius which I will do
in step 2.

Other ideas I have is to add "reduce image resolution" function
directly to bitmap so a user could change the image resolution not
only in PDF export but in general. When a user applies a filter, the
image is changed and saved as a new PNG image into the document. So to
create something like this should not be hard.

In a long run I want to improve the quality of images in export but I
think this is a problem of whole page rendering and not so simple to
solve.

Regards, Tomaž


0001-Fix-new-Bitmap-creation-in-Lanczos-resampling.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Andras Timar]

 sw/source/core/fields/expfld.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d56ad449084272e5ccc36444d5ce16e0b5e368a4
Author: Andras Timar 
Date:   Wed Jun 6 23:15:19 2012 +0200

fdo#50144 put full reference text to selection field

Change-Id: I99a4a2a3fc6e20f9c8d35213609075f2269eab2f

diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 53a90d3..9afe607 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -607,7 +607,7 @@ sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList& 
rList )
 pNd->GetNodes().IsDocNodes() )
 {
 _SeqFldLstElem* pNew = new _SeqFldLstElem(
-pNd->GetExpandTxt( 0, (*pF->GetTxtFld()->GetStart()) + 1 ),
+pNd->GetExpandTxt( 0, USHRT_MAX ),
 ((SwSetExpField*)pF->GetFld())->GetSeqNumber() );
 rList.InsertSort( pNew );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

[Andras Timar]

 sw/source/core/fields/expfld.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10837b669c9fe3f6b1e1905bfbb855ca02497eb7
Author: Andras Timar 
Date:   Wed Jun 6 23:15:19 2012 +0200

fdo#50144 put full reference text to selection field

Change-Id: I99a4a2a3fc6e20f9c8d35213609075f2269eab2f

diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 53a90d3..9afe607 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -607,7 +607,7 @@ sal_uInt16 SwSetExpFieldType::GetSeqFldList( SwSeqFldList& 
rList )
 pNd->GetNodes().IsDocNodes() )
 {
 _SeqFldLstElem* pNew = new _SeqFldLstElem(
-pNd->GetExpandTxt( 0, (*pF->GetTxtFld()->GetStart()) + 1 ),
+pNd->GetExpandTxt( 0, USHRT_MAX ),
 ((SwSetExpField*)pF->GetFld())->GetSeqNumber() );
 rList.InsertSort( pNew );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/queryparam.hxx  |   10 +-
 sc/source/core/data/table3.cxx |8 
 sc/source/core/tool/queryparam.cxx |   10 ++
 3 files changed, 23 insertions(+), 5 deletions(-)

New commits:
commit 95626fddef8a9ca5987b49c410f7f1374250a4a1
Author: Kohei Yoshida 
Date:   Wed Jun 6 16:46:03 2012 -0400

Use iterators over index access.

This makes ValidQuery *slightly* faster.

Change-Id: I9fff6099b597d7a8d4d5a4358099348baa657802

diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 77108ab..27d121c 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -60,10 +60,18 @@ struct ScQueryParamBase
 void FillInExcelSyntax(const rtl::OUString& aCellStr, SCSIZE nIndex);
 
 protected:
+typedef boost::ptr_vector EntriesType;
+
+public:
+typedef EntriesType::const_iterator const_iterator;
+
+const_iterator begin() const;
+const_iterator end() const;
+
+protected:
 ScQueryParamBase();
 ScQueryParamBase(const ScQueryParamBase& r);
 
-typedef boost::ptr_vector EntriesType;
 EntriesType maEntries;
 };
 
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 4e7e874..85354f3 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1530,14 +1530,14 @@ bool ScTable::ValidQuery(
 
 longnPos = -1;
 QueryEvaluator aEval(*pDocument, *this, rParam, pbTestEqualCondition);
-
-for (size_t i = 0; i < nEntryCount && rParam.GetEntry(i).bDoQuery; ++i)
+ScQueryParam::const_iterator it, itBeg = rParam.begin(), itEnd = 
rParam.end();
+for (it = itBeg; it != itEnd && it->bDoQuery; ++it)
 {
-const ScQueryEntry& rEntry = rParam.GetEntry(i);
+const ScQueryEntry& rEntry = *it;
 SCCOL nCol = static_cast(rEntry.nField);
 
 // we can only handle one single direct query
-if ( !pCell || i > 0 )
+if (!pCell || it != itBeg)
 pCell = GetCell(nCol, nRow);
 
 std::pair aRes(false, false);
diff --git a/sc/source/core/tool/queryparam.cxx 
b/sc/source/core/tool/queryparam.cxx
index b814b27..e6059ab 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -57,6 +57,16 @@ struct FindUnused : public std::unary_function
 
 }
 
+ScQueryParamBase::const_iterator ScQueryParamBase::begin() const
+{
+return maEntries.begin();
+}
+
+ScQueryParamBase::const_iterator ScQueryParamBase::end() const
+{
+return maEntries.end();
+}
+
 ScQueryParamBase::ScQueryParamBase() :
 bHasHeader(true),
 bByRow(true),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/queryparam.hxx  |   10 +-
 sc/source/core/data/table3.cxx |8 
 sc/source/core/tool/queryparam.cxx |   10 ++
 3 files changed, 23 insertions(+), 5 deletions(-)

New commits:
commit 237e4f52abefc3714accef79deae976f634e04ec
Author: Kohei Yoshida 
Date:   Wed Jun 6 16:46:03 2012 -0400

Use iterators over index access.

This makes ValidQuery *slightly* faster.

Change-Id: I9fff6099b597d7a8d4d5a4358099348baa657802

diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 77108ab..27d121c 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -60,10 +60,18 @@ struct ScQueryParamBase
 void FillInExcelSyntax(const rtl::OUString& aCellStr, SCSIZE nIndex);
 
 protected:
+typedef boost::ptr_vector EntriesType;
+
+public:
+typedef EntriesType::const_iterator const_iterator;
+
+const_iterator begin() const;
+const_iterator end() const;
+
+protected:
 ScQueryParamBase();
 ScQueryParamBase(const ScQueryParamBase& r);
 
-typedef boost::ptr_vector EntriesType;
 EntriesType maEntries;
 };
 
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 4e7e874..85354f3 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1530,14 +1530,14 @@ bool ScTable::ValidQuery(
 
 longnPos = -1;
 QueryEvaluator aEval(*pDocument, *this, rParam, pbTestEqualCondition);
-
-for (size_t i = 0; i < nEntryCount && rParam.GetEntry(i).bDoQuery; ++i)
+ScQueryParam::const_iterator it, itBeg = rParam.begin(), itEnd = 
rParam.end();
+for (it = itBeg; it != itEnd && it->bDoQuery; ++it)
 {
-const ScQueryEntry& rEntry = rParam.GetEntry(i);
+const ScQueryEntry& rEntry = *it;
 SCCOL nCol = static_cast(rEntry.nField);
 
 // we can only handle one single direct query
-if ( !pCell || i > 0 )
+if (!pCell || it != itBeg)
 pCell = GetCell(nCol, nRow);
 
 std::pair aRes(false, false);
diff --git a/sc/source/core/tool/queryparam.cxx 
b/sc/source/core/tool/queryparam.cxx
index b814b27..e6059ab 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -57,6 +57,16 @@ struct FindUnused : public std::unary_function
 
 }
 
+ScQueryParamBase::const_iterator ScQueryParamBase::begin() const
+{
+return maEntries.begin();
+}
+
+ScQueryParamBase::const_iterator ScQueryParamBase::end() const
+{
+return maEntries.end();
+}
+
 ScQueryParamBase::ScQueryParamBase() :
 bHasHeader(true),
 bByRow(true),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basegfx/source

[Julien Nabet]

 basegfx/source/polygon/b2dlinegeometry.cxx   |2 +-
 basegfx/source/polygon/b2dpolygoncutandtouch.cxx |4 ++--
 basegfx/source/polygon/b2dpolygontools.cxx   |2 +-
 basegfx/source/polygon/b2dpolypolygoncutter.cxx  |4 ++--
 basegfx/source/range/b2drangeclipper.cxx |5 ++---
 basegfx/source/workbench/bezierclip.cxx  |3 ++-
 6 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit c9e4cc279371a87495bfbc7c52f56686f9ab42c9
Author: Julien Nabet 
Date:   Wed Jun 6 22:40:37 2012 +0200

Some cppcheck cleaning

Change-Id: I7a5f34715faecd689900b5d41eae9c782e99b47b

diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx 
b/basegfx/source/polygon/b2dlinegeometry.cxx
index cf28c90..b68cd6f 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -619,7 +619,6 @@ namespace basegfx
 if(nPointCount)
 {
 B2DPolyPolygon aRetval;
-const bool bEventuallyCreateLineJoin(B2DLINEJOIN_NONE != 
eJoin);
 const bool bIsClosed(aCandidate.isClosed());
 const sal_uInt32 nEdgeCount(bIsClosed ? nPointCount : 
nPointCount - 1);
 
@@ -628,6 +627,7 @@ namespace basegfx
 B2DCubicBezier aEdge;
 B2DCubicBezier aPrev;
 
+const bool bEventuallyCreateLineJoin(B2DLINEJOIN_NONE != 
eJoin);
 // prepare edge
 aEdge.setStartPoint(aCandidate.getB2DPoint(0));
 
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx 
b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index 73a01be..ca3f7c6 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -563,7 +563,6 @@ namespace basegfx
 {
 rCandidate.getBezierSegment(b, aCubicB);
 aCubicB.testAndSolveTrivialBezier();
-const bool bEdgeBIsCurve(aCubicB.isBezier());
 const B2DRange aRangeB(aCubicB.getRange());
 
 // only overlapping segments need to be tested
@@ -575,6 +574,7 @@ namespace basegfx
 bOverlap = aRangeA.overlapsMore(aRangeB);
 if( bOverlap)
 {
+const bool 
bEdgeBIsCurve(aCubicB.isBezier());
 if(bEdgeAIsCurve && bEdgeBIsCurve)
 {
 // test for bezier-bezier cuts
@@ -816,7 +816,6 @@ namespace basegfx
 {
 rCandidateB.getBezierSegment(b, aCubicB);
 aCubicB.testAndSolveTrivialBezier();
-const bool bEdgeBIsCurve(aCubicB.isBezier());
 const B2DRange aRangeB(aCubicB.getRange());
 
 // consecutive segments touch of course
@@ -827,6 +826,7 @@ namespace basegfx
 bOverlap = aRangeA.overlapsMore(aRangeB);
 if( bOverlap)
 {
+const bool 
bEdgeBIsCurve(aCubicB.isBezier());
 if(bEdgeAIsCurve && bEdgeBIsCurve)
 {
 // test for bezier-bezier cuts
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx 
b/basegfx/source/polygon/b2dpolygontools.cxx
index babc779..baae69a 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -3066,10 +3066,10 @@ namespace basegfx
 }
 
 const bool bHasWidth(!fTools::equalZero(fWaveWidth));
-const bool bHasHeight(!fTools::equalZero(fWaveHeight));
 
 if(bHasWidth)
 {
+const bool bHasHeight(!fTools::equalZero(fWaveHeight));
 if(bHasHeight)
 {
 // width and height, create waveline. First subdivide to 
reduce input to line segments
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx 
b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index b5a0868..522bc37 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -903,7 +903,7 @@ namespace basegfx
 
 // first step: prepareForPolygonOperation and simple merge of 
non-overlapping
 // PolyPolygons for speedup; this is possible for the wanted 
OR-operation
-if(aInput.size())
+if(!aInput.empty())
 {
 std::vector< basegfx::B2DPolyPolygon > aResult;
 aResult.reserve(aInput.size());
@@ -912,

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

[Kohei Yoshida]

 sc/source/core/data/table3.cxx |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 8bb328c1d77cebf7fbd27e00467d1f722d130778
Author: Kohei Yoshida 
Date:   Wed Jun 6 14:49:22 2012 -0400

Avoid expensive allocation & deallocation of local vector on every call.

This alone reduces the ValidQuery() call by 70%.

Change-Id: Ic9f8adbd0cb63297be7e173c39e4bcf886d1e2d2

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 7e766a3..4e7e874 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1521,11 +1521,12 @@ bool ScTable::ValidQuery(
 if (!rParam.GetEntry(0).bDoQuery)
 return true;
 
-//---
-
 SCSIZE nEntryCount = rParam.GetEntryCount();
-std::vector aPassed(nEntryCount, false);
-std::vector aTestEqual(nEntryCount, false);
+
+typedef std::pair ResultType;
+static std::vector aResults;
+if (aResults.size() < nEntryCount)
+aResults.resize(nEntryCount);
 
 longnPos = -1;
 QueryEvaluator aEval(*pDocument, *this, rParam, pbTestEqualCondition);
@@ -1581,34 +1582,32 @@ bool ScTable::ValidQuery(
 if (nPos == -1)
 {
 nPos++;
-aPassed[nPos] = aRes.first;
-aTestEqual[nPos] = aRes.second;
+aResults[nPos] = aRes;
 }
 else
 {
 if (rEntry.eConnect == SC_AND)
 {
-aPassed[nPos] = aPassed[nPos] && aRes.first;
-aTestEqual[nPos] = aTestEqual[nPos] && aRes.second;
+aResults[nPos].first = aResults[nPos].first && aRes.first;
+aResults[nPos].second = aResults[nPos].second && aRes.second;
 }
 else
 {
 nPos++;
-aPassed[nPos] = aRes.first;
-aTestEqual[nPos] = aRes.second;
+aResults[nPos] = aRes;
 }
 }
 }
 
 for ( long j=1; j <= nPos; j++ )
 {
-aPassed[0] = aPassed[0] || aPassed[j];
-aTestEqual[0] = aTestEqual[0] || aTestEqual[j];
+aResults[0].first = aResults[0].first || aResults[j].first;
+aResults[0].second = aResults[0].second || aResults[j].second;
 }
 
-bool bRet = aPassed[0];
+bool bRet = aResults[0].first;
 if ( pbTestEqualCondition )
-*pbTestEqualCondition = aTestEqual[0];
+*pbTestEqualCondition = aResults[0].second;
 
 return bRet;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Kohei Yoshida]

 sc/source/core/data/table3.cxx |   27 +--
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 633178bffaf23ae322060e2c304c9c2cf12b46cc
Author: Kohei Yoshida 
Date:   Wed Jun 6 14:49:22 2012 -0400

Avoid expensive allocation & deallocation of local vector on every call.

This alone reduces the ValidQuery() call by 70%.

Change-Id: Ic9f8adbd0cb63297be7e173c39e4bcf886d1e2d2

diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 7e766a3..4e7e874 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1521,11 +1521,12 @@ bool ScTable::ValidQuery(
 if (!rParam.GetEntry(0).bDoQuery)
 return true;
 
-//---
-
 SCSIZE nEntryCount = rParam.GetEntryCount();
-std::vector aPassed(nEntryCount, false);
-std::vector aTestEqual(nEntryCount, false);
+
+typedef std::pair ResultType;
+static std::vector aResults;
+if (aResults.size() < nEntryCount)
+aResults.resize(nEntryCount);
 
 longnPos = -1;
 QueryEvaluator aEval(*pDocument, *this, rParam, pbTestEqualCondition);
@@ -1581,34 +1582,32 @@ bool ScTable::ValidQuery(
 if (nPos == -1)
 {
 nPos++;
-aPassed[nPos] = aRes.first;
-aTestEqual[nPos] = aRes.second;
+aResults[nPos] = aRes;
 }
 else
 {
 if (rEntry.eConnect == SC_AND)
 {
-aPassed[nPos] = aPassed[nPos] && aRes.first;
-aTestEqual[nPos] = aTestEqual[nPos] && aRes.second;
+aResults[nPos].first = aResults[nPos].first && aRes.first;
+aResults[nPos].second = aResults[nPos].second && aRes.second;
 }
 else
 {
 nPos++;
-aPassed[nPos] = aRes.first;
-aTestEqual[nPos] = aRes.second;
+aResults[nPos] = aRes;
 }
 }
 }
 
 for ( long j=1; j <= nPos; j++ )
 {
-aPassed[0] = aPassed[0] || aPassed[j];
-aTestEqual[0] = aTestEqual[0] || aTestEqual[j];
+aResults[0].first = aResults[0].first || aResults[j].first;
+aResults[0].second = aResults[0].second || aResults[j].second;
 }
 
-bool bRet = aPassed[0];
+bool bRet = aResults[0].first;
 if ( pbTestEqualCondition )
-*pbTestEqualCondition = aTestEqual[0];
+*pbTestEqualCondition = aResults[0].second;
 
 return bRet;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

compile error in neon

[Cor Nouws]

Hi,

after fresh ./g pull -r
error in neon

did make.neon clean and make again
same error:

Making:libneon.so
../../../../../unxlngi6.pro/slo/ne_openssl.o: In function 
`ne_ssl_context_create':
/home/cono/src/git/libo_core/neon/unxlngi6.pro/misc/build/neon-0.29.5/src/ne_openssl.c:572: 
undefined reference to `SSLv2_server_method'

collect2: ld returned 1 exit status
dmake:  Error code 1, while making 
'../../../../../unxlngi6.pro/lib/libneon.so'
dmake:  Error code 255, while making 
'./unxlngi6.pro/misc/build/so_built_so_neon'


Help appreciated,

--
 - Cor
 - http://nl.libreoffice.org

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

Re: [PATCH] [WIP] fdo#45747 - [EasyHack] remove the limitation to 3 sort entries in calc, part 2

[Markus Mohrhard]

Hey Albert,

>
>> Thanks a lot for this amazing work. I added it to the 3.6 release notes page.
>
> I added a reference to the bug and a screenshot to the release notes.

Great. The screenshot looks really good.

> I have a few things lined up which I want to do next. For instance, do
> you mind if I take a stab at this one:
> https://bugs.freedesktop.org/show_bug.cgi?id=43937
> I guess to fix this bug the best would be to implement the same
> UI-magic here, as what I just did for the sort dialog.
>

Oh this one is already implemented just not yet pushed. If you're
interested in this area there are many more dialogs that would benefit
from a rework. Please let me know if this is something you want to do.
Then we could discuss with the UX guys which dialog they would prefer
to convert.

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

Re: [PATCH] [WIP] fdo#45747 - [EasyHack] remove the limitation to 3 sort entries in calc, part 2

[Albert Thuswaldner]

HI Marcus,
Sorry for not replying until now. Forgot to CC the list again...

On Tue, Jun 5, 2012 at 3:13 AM, Markus Mohrhard
 wrote:
> Hey Albert,
>
>>
>> I already had a quick look at the closing problem and it seems it is
>> not a crash. It looks more like a missing close handler which results
>> in the parent window being closed which is in this case the LibO
>> window but I need to spend some more time on it. I will spend next
>> week on your patch and make sure that it is ready for 3-6.
>
> I finally had time to fix the issue with your patch and pushed it to master.
>
> The problem has been that vcl's window class destructor checks that
> all child windows are destroyed in dbgutil builds and your design did
> not ensure this. The changes that I did to your patch are in
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=57e35b0ed54a2e74c107493869e72ab7eb86222a.
>
> I also fixed a crash that I noticed when using more than 3 sort
> entries. I checked and the dialog looks good now.

Thanks for fixing this and getting it into 3.6! Also thanks for your
support during this work, I could not have done this without your
help. I'm very happy to see this being finished, although not so happy
about how long it took me to do this, but at least I learned a lot
along the way.

> Thanks a lot for this amazing work. I added it to the 3.6 release notes page.

I added a reference to the bug and a screenshot to the release notes.

> Regards,
> Markus

I have a few things lined up which I want to do next. For instance, do
you mind if I take a stab at this one:
https://bugs.freedesktop.org/show_bug.cgi?id=43937
I guess to fix this bug the best would be to implement the same
UI-magic here, as what I just did for the sort dialog.


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

[PATCH] GTK theming: render background correctly for widgets without GTK parent

[Ruslan Kabatsayev]

Hello,

This patch allows the GTK theme to render background pattern correctly
for LO widgets which pass GdkPixmap instead of true GdkWindow for
rendering.
Without this patch these widgets have no theme-visible position on the
window, thus making the theme unable to properly render their
background.

Regards,
Ruslan


0001-Render-bg-correctly-for-widgets-without-theme-visibl.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Draft document-rendering tiling API to be called from viewer apps

[Tor Lillqvist]

http://stackoverflow.com/questions/4593951/can-we-use-non-power-of-2-textures-on-opengl-es-on-android

So apparently if one uses OpenGL ES 2.0, there is NPOT support. Not
necessarily in OpenGL ES 1.0 (might be present on some devices as an
extension). But do we want to use OpenGL ES 2.0, I can't really see
programmable shaders being of much use to an app like this?

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

[Libreoffice-commits] .: sw/source

[Michael Meeks]

 sw/source/filter/ww8/docxexport.cxx   |   37 +
 sw/source/filter/ww8/docxexport.hxx   |   37 +
 sw/source/filter/ww8/docxexportfilter.cxx |   37 +
 sw/source/filter/ww8/docxexportfilter.hxx |   43 +++---
 sw/source/filter/ww8/docxfootnotes.hxx|   37 +
 5 files changed, 73 insertions(+), 118 deletions(-)

New commits:
commit 3be5d6bfe2c4934fffb93e3b2b81256fc62e2138
Author: Michael Meeks 
Date:   Wed Jun 6 18:50:55 2012 +0100

re-base on ALv2 code.

Change-Id: I14e3dff2e29ce32a7e62f71defe50d5ddc6cde9f

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index de50add..059c46f 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * 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.
- *
- /
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include "docxexport.hxx"
 #include "docxexportfilter.hxx"
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index 8963cd3..01ce29f 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * 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.
- *
- /
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information

Re: Draft document-rendering tiling API to be called from viewer apps

[Michael Meeks]

Hi guys,

On Wed, 2012-06-06 at 16:33 +0100, Iain Billett wrote:
> I haven't experimented but I've heard that not using power-of-two
> lengths is seriously detrimental to performance.

Must make a mental note to ask a GPU hacker; in fact - lets do that :-)
Luc - sorry to bother you with a quick question. For all these Android /
portable 3D chipsets that you deal with - is it really true that we need
to allocate power-of-two sized, preferably square textures ? [ we're
working on rendering documents to bitmaps to manipulate them for a
LibreOffice android viewer ].

>  Considering we'll be using lots of resources to begin I think we
> should make every reasonable optimisation

Sure; but say we have a Tablet, mine has 1280x800 resolution, are you
seriously suggesting rounding 1280 up to 2048 ? and 800 up to 1024 ?
giving a 2Mpixel texture instead of a 1Mpixel texture ;-) is that really
going to be more fast/efficient. Presumably having a sane rowstride (eg.
1280) makes a ton of sense, but a power of two in each dimension ?
Anyhow - Luc can give an authoritative answer :-)

> Also, in this arrangement, It would be nice to have the dimensions of
> the "document" area of the texture. Then if the rest of the bitmap is
> fully transparent and the plane is too we can render a "page" alone
> and keep track of dimensions. 

I guess.

> My main concern with all this is in fact dealing with user interaction
> i.e. mapping measurements in pixels to OpenGL coordinates. This is
> more of a problem for editing, though. 

Yep.

> Also, are we intending to have continuous scroll documents ( with all
> the pages available via scroll - like most desktop applications ) or
> would we be happy to have users flick (or otherwise) through pages. I
> think the latter would make it easier to manage resources for large
> documents.

I think we'll want to flick through pages when we have them :-) For
spreadsheets of course we don't really have that (hence liking doubles
for positioning the view-pane incidentally).

Thanks !

Michael.

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

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

Re: [HELP] fdo#44721 (nearly) infinite loop & memory consumption

[Thorsten Behrens]

Michael Meeks wrote:
>   A basegfx memory leak / crasher :-) Thorsten is prolly a good guy to
> have a look I guess.
> 
Nah, more likely underflow / insufficient range checking, with the
large negatives coming in. Will have a look - a nice, ready-made
.odb with a single big button to press appreciated of course :)

Cheers,

-- Thorsten


pgpXmyxFZeqi1.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Draft document-rendering tiling API to be called from viewer apps

[Tor Lillqvist]

>> Sure, but on the other hand it makes it simpler in that we don't need
>> to figure out the aspect ratio of each page (they can be different)
>> beforehand.
>
>        Surely we have to do that in order to present it to the user ?

Yes, but no. There is something of a chicken-and-egg problem here. In
order to call even the getRendererCount() of XRenderable (which gives
the number of pages), you have to pass it set of properties that
include "RenderDevice" whose value is an XDevice for a virtual device
created with XToolkit's createScreenCompatibleDevice(), which takes
bitmap size parameters;) The same property set is passed also to
render().

I.e., in order to know what size (well, aspect ratio) a particular
page is, you need to render it, and to render it, you need a device,
and a bitmap-backed virtual device is created with a specific size.

But I might be missing something...

BTW, noticed a hilarious thing today: The documentation for XDevice
says "If the specified area does not lie entirely in the device, the
bits outside are not specified". Oh good. But does it "specify", or
even hint, what the bits *inside* are then? Nope.

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

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

[Michael Meeks]

 connectivity/source/drivers/evoab2/EApi.h|1 
 sw/source/filter/ww8/docxattributeoutput.cxx |   37 ++-
 sw/source/filter/ww8/docxattributeoutput.hxx |   37 ++-
 3 files changed, 29 insertions(+), 46 deletions(-)

New commits:
commit 5572bdb944ccf5ba7915388b7920c88084f6dd37
Author: Michael Meeks 
Date:   Wed Jun 6 18:28:58 2012 +0100

re-base on ALv2 code.

Change-Id: I06da546daa2efb23362cdc61c14add3ea761638c

diff --git a/connectivity/source/drivers/evoab2/EApi.h 
b/connectivity/source/drivers/evoab2/EApi.h
index 97afaf1..bf3a901 100644
--- a/connectivity/source/drivers/evoab2/EApi.h
+++ b/connectivity/source/drivers/evoab2/EApi.h
@@ -16,6 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_
 #define _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_
 #include 
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0d94c30..db118a8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * 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.
- *
- /
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
 
 #include "docxattributeoutput.hxx"
 #include "docxexport.hxx"
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx 
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 11b8cee..9fc093e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -1,30 +1,21 @@
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
+/*
+ * This file is part of the LibreOffice project.
  *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 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/.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * This file incorporates work covered by the following license notice:
  *
- * 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
- * vers

[Libreoffice-commits] .: solenv/gbuild

[Norbert Thiebaud]

 solenv/gbuild/platform/com_GCC_class.mk |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 3212b694eebb260495bee1fa46c2e20b3f8c630c
Author: Norbert Thiebaud 
Date:   Wed Jun 6 12:31:17 2012 -0500

fix typo that prevented the proper management of .d files

Change-Id: I2e958fde37bc2cf13d4b37d8e8ae9e7bd64061d2

diff --git a/solenv/gbuild/platform/com_GCC_class.mk 
b/solenv/gbuild/platform/com_GCC_class.mk
index 478d5fd..b098c99 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -21,10 +21,10 @@
 # instead of those above.
 
 ifeq ($(gb_FULLDEPS),$(true))
-gb_ccx_dep_generation_options=-MMD -MT $(1) -MP -MF $(4)_
-gb_cxx_dep_copy=&& mv $(4)_ $(4)
+gb_cxx_dep_generation_options=-MMD -MT $(1) -MP -MF $(4)_
+gb_cxx_dep_copy=&& mv $(4)_ $(4)
 else
-gb_ccx_dep_generation_options=
+gb_cxx_dep_generation_options=
 gb_cxx_dep_copy=
 endif
 
@@ -62,10 +62,10 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CFLAGS) \
-c $(3) \
-o $(1) \
-   $(gb_ccx_dep_generation_options) \
+   $(gb_cxx_dep_generation_options) \
-I$(dir $(3)) \
$(INCLUDE) \
-   $(gb_ccx_dep_copy) \
+   $(gb_cxx_dep_copy) \
)
 endef
 
@@ -83,10 +83,10 @@ $(call gb_Helper_abbreviate_dirs,\
$(T_CXXFLAGS) \
-c $(3) \
-o $(1) \
-   $(gb_ccx_dep_generation_options) \
+   $(gb_cxx_dep_generation_options) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE) \
-   $(gb_ccx_dep_copy) \
+   $(gb_cxx_dep_copy) \
)
 endef
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-ux-advise] [PUSHED] Make new About dialogue a little nicer

[Stefan Knorr (Astron)]

Hi Jean-Baptiste, Riccardo

>> On Tue, 2012-06-05 at 12:06 +0200, Riccardo Magliocchetti wrote:
>>> It looks way cleaner, also what do you think about to align all the text
>>> above buttons to left instead of center ?

Hm, don't think that would look very good, to be honest. If the
dialogue were as slim as before it might look good, but now it is a
lot wider. Left-aligning the text and images would now look as if the
dialogue was "tilting" to the left.


>> Feel free to commit more improvements into master and even 3-6 branch
>> during the beta phase.

Okay, might do.

> Nicer about dialog, indeed, but in some cases the close button does not
> fit in the window. The code should check if the sum of the lengths of
> the four buttons is not greater than the window width.

Ah, thanks, Jean-Baptiste ... working on that. Btw, any idea why the
Website buttons still reads libreoffice.org for you?

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

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

[Noel Power]

 oox/inc/oox/vml/vmlshape.hxx   |1 +
 oox/source/vml/vmlshape.cxx|   11 +--
 oox/source/vml/vmlshapecontext.cxx |2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 80a31e00c5276602f27aa410b2fe6dece1f3fcce
Author: Noel Power 
Date:   Wed Jun 6 16:45:54 2012 +0100

import vmlshape 'hidden' style attribute and apply to controls bnc#757609

ensure 'hidden' controls are imported as such.

diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index b60e251..d8e7209 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -84,6 +84,7 @@ struct ShapeTypeModel
 ::rtl::OUString maRotation; ///< Rotation of the shape, in 
degrees.
 ::rtl::OUString maFlip; ///< Flip type of the shape 
(can be "x" or "y").
 sal_BoolmbAutoHeight;   ///< If true, the height value 
is a minimum value (mostly used for textboxes)
+sal_BoolmbVisible;  /// Visible or Hidden
 
 StrokeModel maStrokeModel;  ///< Border line formatting.
 FillModel   maFillModel;///< Shape fill formatting.
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 4e5e4ac..aa39fcc 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -34,6 +34,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -115,7 +116,8 @@ Rectangle lclGetAbsRect( const Rectangle& rRelRect, const 
Rectangle& rShapeRect,
 // 
 
 ShapeTypeModel::ShapeTypeModel():
-mbAutoHeight( sal_False )
+mbAutoHeight( sal_False ),
+mbVisible( sal_True )
 {
 }
 
@@ -305,7 +307,12 @@ Reference< XShape > ShapeBase::convertAndInsert( const 
Reference< XShapes >& rxS
 PropertySet aShapeProp( xShape );
 if( aShapeProp.hasProperty( PROP_Name ) )
 aShapeProp.setProperty( PROP_Name, getShapeName() );
-
+Reference< XControlShape > xControlShape( xShape, 
uno::UNO_QUERY );
+if ( xControlShape.is() && !getTypeModel().mbVisible )
+{
+PropertySet aControlShapeProp( xControlShape->getControl() 
);
+aControlShapeProp.setProperty( PROP_EnableVisible, 
uno::makeAny( sal_False ) );
+}
 /*  Notify the drawing that a new shape has been inserted. For
 convenience, pass the rectangle that contains position and
 size of the shape. */
diff --git a/oox/source/vml/vmlshapecontext.cxx 
b/oox/source/vml/vmlshapecontext.cxx
index 3134282..68793c9 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -361,6 +361,8 @@ void ShapeTypeContext::setStyle( const OUString& rStyle )
 else if( aName == "mso-fit-shape-to-text" )   
mrTypeModel.mbAutoHeight = sal_True;
 else if( aName == "rotation" )   mrTypeModel.maRotation = 
aValue;
 else if( aName == "flip" )   mrTypeModel.maFlip = aValue;
+else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( 
"visibility" ) ) )
+mrTypeModel.mbVisible = !aValue.equalsAsciiL( 
RTL_CONSTASCII_STRINGPARAM("hidden") );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] newdev review request: sc/.../vbarange.cxx

[Kevin Hunter]

Hullo List,

Having been too excited last time (7+ months) and committed to master 
way too early, I'm back to basics as I try (once again) to get back into 
LO dev.  Here's a minor cppcheck-found unused variable patch.  Please 
review at your convenience.


Cheers,

Kevin
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 99a2308..a1190bd 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -5530,15 +5530,10 @@ ScVbaRange::AutoFill(  const uno::Reference< excel::XRange >& Destination, const
 }
 }
 }
-ScDocShell* pDocSh= excel::GetDocShellFromRange( mxRange );
 
 FillCmd eCmd = FILL_AUTO;
 FillDateCmd eDateCmd = FILL_DAY;
 
-#ifdef VBA_OOBUILD_HACK
-double fEndValue =  MAXDOUBLE;
-#endif
-
 if ( Type.hasValue() )
 {
 sal_Int16 nFillType = excel::XlAutoFillType::xlFillDefault;
@@ -5581,6 +5576,8 @@ ScVbaRange::AutoFill(  const uno::Reference< excel::XRange >& Destination, const
 }
 }
 #ifdef VBA_OOBUILD_HACK
+double fEndValue =  MAXDOUBLE;
+ScDocShell* pDocSh = excel::GetDocShellFromRange( mxRange );
 pDocSh->GetDocFunc().FillAuto( aSourceRange, NULL, eDir, eCmd, eDateCmd,
nCount, fStep, fEndValue, sal_True, sal_True );
 #endif
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Incorrect OSL_ENSURE -> SAL_WARN_IF conversions (Re: [Libreoffice-commits] .: sw/source)

[Lubos Lunak]

 Hello,

 please note that when convering from the obsolete OSL_ENSURE or similar 
macros to SAL_WARN_IF, the condition needs to be inverted. OSL_ENSURE is a 
(broken) assert-like macro and so it requires the condition to be true or it 
warns. SAL_WARN_IF, as the name says, requires the condition to be false and 
warns on true.

On Wednesday 06 of June 2012, Lubos Lunak wrote:
>  sw/source/core/unocore/unodraw.cxx |   18 +-
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> New commits:
> commit dfc4832049c140b7442c085062599aef1953e8fd
> Author: Luboš Luňák 
> Date:   Wed Jun 6 18:17:50 2012 +0200
>
> fix incorrect OSL_ENSURE -> SAL_WARN_IF conversion (condition not
> inverted)
>
> Change-Id: I57dfa64c55e046ed51797b2abeb7ba3242e637da
>
> diff --git a/sw/source/core/unocore/unodraw.cxx
> b/sw/source/core/unocore/unodraw.cxx index 662a8ff..329bed9 100644
> --- a/sw/source/core/unocore/unodraw.cxx
> +++ b/sw/source/core/unocore/unodraw.cxx
> @@ -1174,7 +1174,7 @@ void SwXShape::setPropertyValue(const rtl::OUString&
> rPropertyName, const uno::A else if(RES_OPAQUE == pEntry->nWID)
>  {
>  SvxShape* pSvxShape = GetSvxShape();
> -SAL_WARN_IF(pSvxShape, "sw.uno", "No SvxShape
> found!"); +SAL_WARN_IF(!pSvxShape, "sw.uno", "No
> SvxShape found!"); if(pSvxShape)
>  {
>  SdrObject* pObj = pSvxShape->GetSdrObject();
> @@ -1220,14 +1220,14 @@ void SwXShape::setPropertyValue(const
> rtl::OUString& rPropertyName, const uno::A //To prevent this the connection
> between format and attribute has to be broken before. const SwPosition
> *pPos = aAnchor.GetCntntAnchor(); SwTxtNode *pTxtNode =
> pPos->nNode.GetNode().GetTxtNode(); -   
> SAL_WARN_IF( pTxtNode->HasHints(), "sw.uno", "Missing FlyInCnt-Hint." ); + 
>   SAL_WARN_IF( !pTxtNode->HasHints(), "sw.uno",
> "Missing FlyInCnt-Hint." ); const xub_StrLen nIdx =
> pPos->nContent.GetIndex(); SwTxtAttr * const pHnt =
>  pTxtNode->GetTxtAttrForCharAt(
>  nIdx, RES_TXTATR_FLYCNT );
> -SAL_WARN_IF( pHnt && pHnt->Which() ==
> RES_TXTATR_FLYCNT, +SAL_WARN_IF( !pHnt ||
> pHnt->Which() != RES_TXTATR_FLYCNT, "sw.uno", "Missing FlyInCnt-Hint." ); -
>SAL_WARN_IF( pHnt &&
> pHnt->GetFlyCnt().GetFrmFmt() == pFmt, +   
> SAL_WARN_IF( !pHnt || pHnt->GetFlyCnt().GetFrmFmt() != pFmt, "sw.uno",
> "Wrong TxtFlyCnt-Hint." ); const_cast(pHnt->GetFlyCnt())
> .SetFlyFmt();
> @@ -1237,7 +1237,7 @@ void SwXShape::setPropertyValue(const rtl::OUString&
> rPropertyName, const uno::A RES_TXTATR_FLYCNT, nIdx );
>  //create a new one
>  SwTxtNode *pNd =
> pInternalPam->GetNode()->GetTxtNode(); -   
> SAL_WARN_IF( pNd, "sw.uno", "Cursor not at TxtNode." ); +  
>  SAL_WARN_IF( !pNd, "sw.uno", "Cursor not at TxtNode." );
> SwFmtFlyCnt aFmt( pFmt );
>  pNd->InsertItem(aFmt,
> pInternalPam->GetPoint() ->nContent.GetIndex(), 0 ); @@ -1306,14 +1306,14
> @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName,
> const uno::A //To prevent this the connection between format and attribute
> has to be broken before. const SwPosition *pPos =
> rOldAnchor.GetCntntAnchor(); SwTxtNode *pTxtNode =
> pPos->nNode.GetNode().GetTxtNode(); -   
> SAL_WARN_IF( pTxtNode->HasHints(), "sw.uno", "Missing FlyInCnt-Hint." ); + 
>   SAL_WARN_IF( !pTxtNode->HasHints(), "sw.uno",
> "Missing FlyInCnt-Hint." ); const xub_StrLen nIdx =
> pPos->nContent.GetIndex(); SwTxtAttr * const pHnt =
>  pTxtNode->GetTxtAttrForCharAt(
>  nIdx, RES_TXTATR_FLYCNT );
> -SAL_WARN_IF( pHnt && pHnt->Which() ==
> RES_TXTATR_FLYCNT, +SAL_WARN_IF( !pHnt ||
> pHnt->Which() != RES_TXTATR_FLYCNT, "sw.uno", "Missing FlyInCnt-Hint." ); -
>SAL_WARN_IF( pHnt &&
> pHnt->GetFlyCnt().GetFrmFmt() == pFlyFmt, +   
> SAL_WARN_IF( !pHnt || pHnt->GetFlyCnt().GetFrmFmt() != pFlyFmt, "sw.uno",
> "Wrong TxtFlyCnt-Hint." ); const_cast(pHnt->GetFlyCnt())
> .SetFlyFmt();
> @@ -1349,7 +1349,7 @@ void SwXShape::setPropertyValue(const rtl::OUString&
> rPropertyName, const uno::A {
>  //the RES_TXTATR_FLYCNT needs to be added
> now SwTxtNode *pNd = aPam.GetNode()->GetTxtNode(); -   
> SAL_WARN_IF( pNd, "sw.uno", "Crsr is not in a TxtNode." ); +   
> SAL_WARN_IF( !pNd, "sw.uno", "Crsr is not in a
> TxtNode." ); SwFmtFlyCn

Developer interviews -- please read

[Marc Paré]

No need to answer this, its not meant to create noise on this list. This 
is an FYI for you to read if you could.


A few months ago, we started a series of LibreOffice developer 
interviews that appeared on the TDF blog. We have gotten so busy that 
the interviews were put aside for a while until one of us could get back 
to the series.


I have offered to help out with the interviews and I will be sending the 
odd email out to a few of you every week or so with a Question/Answer 
interview sheet.


You do not have to agree to the interview if you do not wish to take 
part in it; nor do you have to answer all of the questions and you are 
free to add some parts if you wish.


Its just a casual way of letting our blog readers find out what kind of 
person commits to the TDF/LibreOffice team. People are a little curious 
as to what makes you "tick" and, well, its pretty cool to find out a bit 
about people on the project, especially the dev team.


There are now over 400 contributors, so, if we published an  interview a 
week on the TDF blog, it would take well over a year to complete. I 
imagine that there are probably more devs on the project by now, AND, 
depending on the time it takes to get the completed interviews back, we 
may be able to post only one interview every two weeks ... who knows.


So, when you get an email for an interview, there is no pressure to 
participate if you do not want to, but it would be nice if you did. BTW 
... there is no real order to the interviews, so whether you have 
contributed loads of code or just a few lines, this is all that matters 
... we would like to get to know you.


If there is a photo that you could supply with the interview, that would 
be great but it's not a big problem if there is no photo.


Thanks a lot to all the people who will accept. I've left you a link to 
our past interviews[1] for you to see/read if you wish.


BTW ... thanks to the dev team for all of the work that you put and have 
put into LibreOffice; it is really appreciated and you have given us a 
great product to work with. Thanks!


Cheers,

Marc



http://blog.documentfoundation.org/category/interviews/

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

[Libreoffice-commits] .: sw/source

[Lubos Lunak]

 sw/source/core/unocore/unodraw.cxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit dfc4832049c140b7442c085062599aef1953e8fd
Author: Luboš Luňák 
Date:   Wed Jun 6 18:17:50 2012 +0200

fix incorrect OSL_ENSURE -> SAL_WARN_IF conversion (condition not inverted)

Change-Id: I57dfa64c55e046ed51797b2abeb7ba3242e637da

diff --git a/sw/source/core/unocore/unodraw.cxx 
b/sw/source/core/unocore/unodraw.cxx
index 662a8ff..329bed9 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1174,7 +1174,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& 
rPropertyName, const uno::A
 else if(RES_OPAQUE == pEntry->nWID)
 {
 SvxShape* pSvxShape = GetSvxShape();
-SAL_WARN_IF(pSvxShape, "sw.uno", "No SvxShape found!");
+SAL_WARN_IF(!pSvxShape, "sw.uno", "No SvxShape found!");
 if(pSvxShape)
 {
 SdrObject* pObj = pSvxShape->GetSdrObject();
@@ -1220,14 +1220,14 @@ void SwXShape::setPropertyValue(const rtl::OUString& 
rPropertyName, const uno::A
 //To prevent this the connection between 
format and attribute has to be broken before.
 const SwPosition *pPos = 
aAnchor.GetCntntAnchor();
 SwTxtNode *pTxtNode = 
pPos->nNode.GetNode().GetTxtNode();
-SAL_WARN_IF( pTxtNode->HasHints(), "sw.uno", 
"Missing FlyInCnt-Hint." );
+SAL_WARN_IF( !pTxtNode->HasHints(), "sw.uno", 
"Missing FlyInCnt-Hint." );
 const xub_StrLen nIdx = 
pPos->nContent.GetIndex();
 SwTxtAttr * const pHnt =
 pTxtNode->GetTxtAttrForCharAt(
 nIdx, RES_TXTATR_FLYCNT );
-SAL_WARN_IF( pHnt && pHnt->Which() == 
RES_TXTATR_FLYCNT,
+SAL_WARN_IF( !pHnt || pHnt->Which() != 
RES_TXTATR_FLYCNT,
 "sw.uno", "Missing FlyInCnt-Hint." 
);
-SAL_WARN_IF( pHnt && 
pHnt->GetFlyCnt().GetFrmFmt() == pFmt,
+SAL_WARN_IF( !pHnt || 
pHnt->GetFlyCnt().GetFrmFmt() != pFmt,
 "sw.uno", "Wrong TxtFlyCnt-Hint." 
);
 const_cast(pHnt->GetFlyCnt())
 .SetFlyFmt();
@@ -1237,7 +1237,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& 
rPropertyName, const uno::A
 RES_TXTATR_FLYCNT, nIdx );
 //create a new one
 SwTxtNode *pNd = 
pInternalPam->GetNode()->GetTxtNode();
-SAL_WARN_IF( pNd, "sw.uno", "Cursor not at 
TxtNode." );
+SAL_WARN_IF( !pNd, "sw.uno", "Cursor not at 
TxtNode." );
 SwFmtFlyCnt aFmt( pFmt );
 pNd->InsertItem(aFmt, pInternalPam->GetPoint()
 ->nContent.GetIndex(), 0 );
@@ -1306,14 +1306,14 @@ void SwXShape::setPropertyValue(const rtl::OUString& 
rPropertyName, const uno::A
 //To prevent this the connection between format 
and attribute has to be broken before.
 const SwPosition *pPos = 
rOldAnchor.GetCntntAnchor();
 SwTxtNode *pTxtNode = 
pPos->nNode.GetNode().GetTxtNode();
-SAL_WARN_IF( pTxtNode->HasHints(), "sw.uno", 
"Missing FlyInCnt-Hint." );
+SAL_WARN_IF( !pTxtNode->HasHints(), "sw.uno", 
"Missing FlyInCnt-Hint." );
 const xub_StrLen nIdx = pPos->nContent.GetIndex();
 SwTxtAttr * const pHnt =
 pTxtNode->GetTxtAttrForCharAt(
 nIdx, RES_TXTATR_FLYCNT );
-SAL_WARN_IF( pHnt && pHnt->Which() == 
RES_TXTATR_FLYCNT,
+SAL_WARN_IF( !pHnt || pHnt->Which() != 
RES_TXTATR_FLYCNT,
 "sw.uno", "Missing FlyInCnt-Hint." );
-SAL_WARN_IF( pHnt && pHnt->GetFlyCnt().GetFrmFmt() 
== pFlyFmt,
+SAL_WARN_IF( !pHnt || 
pHnt->GetFlyCnt().GetFrmFmt() != pFlyFmt,
 "sw.uno", "Wrong TxtFlyCnt-Hint." );
 const_cast(pHnt->GetFlyCnt())
 .SetFlyFmt();
@@ -1349,7 +1349,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& 
rPropertyName, const uno::A
 {
   

Re: Draft document-rendering tiling API to be called from viewer apps

[Tor Lillqvist]

> IMHO the use of the term 'tiles' here is prolly just a misleading
> nonsense ;-) my main concern is the ability to render an arbitrary
> sub-set of a page to an arbitrarily sized texture.

That is exactly what I have in mind, too;)

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

[Libreoffice-commits] .: unodevtools/source

[Tor Lillqvist]

 unodevtools/source/skeletonmaker/skeletonmaker.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2faadd0b4e1a7971c55e1e0a16890e7194b04544
Author: Tor Lillqvist 
Date:   Wed Jun 6 19:00:03 2012 +0300

Update also the help message

Change-Id: I3b84d1905d13c9418985d1ebe5feac13a0025efe

diff --git a/unodevtools/source/skeletonmaker/skeletonmaker.cxx 
b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
index 3609798..12fd04f 100644
--- a/unodevtools/source/skeletonmaker/skeletonmaker.cxx
+++ b/unodevtools/source/skeletonmaker/skeletonmaker.cxx
@@ -79,7 +79,7 @@ static const char usageText[] =
 "--propertysetmixin the generated skeleton implements the 
cppu::PropertySetMixin\n"
 "   helper if a referenced new style service specifies 
an\n"
 "   interface which provides attributes (directly or 
inherited).\n"
-"-lh --licenseheadergenerates a default OpenOffice.org LGPL license\n"
+"-lh --licenseheadergenerates a default LibreOffice MPL license\n"
 "   header at the beginning of a component source 
file.\n"
 "   This option is taken into account in 'component' 
mode\n"
 "   only and if -o is unequal 'stdout'.\n"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - Module_cross_tail_build.mk unodevtools/source

[Tor Lillqvist]

 Module_cross_tail_build.mk  |1 
 unodevtools/source/skeletonmaker/skeletoncommon.cxx |   34 
 2 files changed, 8 insertions(+), 27 deletions(-)

New commits:
commit 9369f5abd785a9df174c5d583d55e3fd6918b542
Author: Tor Lillqvist 
Date:   Wed Jun 6 18:58:11 2012 +0300

unodevtools is not needed for the build platform in a cross-compilation

Change-Id: If77a879178a260590be64253435b6c8adde31878

diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk
index cc27ed1..86f87fd 100644
--- a/Module_cross_tail_build.mk
+++ b/Module_cross_tail_build.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\
sax \
shell \
tools \
-   unodevtools \
unoil \
unotest \
unotools \
commit d28f2135f12b6ea9e62027ccdb713c4758a41a13
Author: Tor Lillqvist 
Date:   Wed Jun 6 18:55:56 2012 +0300

Nobody uses this tool, but still, update the license blurb it outputs

Change-Id: Id9d767c2738d8052f2716086fb40a1b01c68d76e

diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx 
b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
index d9b9731..d6ce0f9 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
@@ -54,32 +54,14 @@ void printLicenseHeader(std::ostream& o, rtl::OString const 
& filename)
 if ( index != -1 )
 shortfilename = filename.copy(index+1);
 
-o << 
"/*\n"
-" *\n"
-" * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n"
-" * \n"
-" * Copyright 2000, 2010 Oracle and/or its affiliates.\n"
-" *\n"
-" * OpenOffice.org - a multi-platform office productivity suite\n"
-" *\n"
-" * This file is part of OpenOffice.org.\n"
-" *\n"
-" * OpenOffice.org is free software: you can redistribute it and/or 
modify\n"
-" * it under the terms of the GNU Lesser General Public License 
version 3\n"
-" * only, as published by the Free Software Foundation.\n"
-" *\n"
-" * OpenOffice.org is distributed in the hope that it will be 
useful,\n"
-" * but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-" * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-" * GNU Lesser General Public License version 3 for more details\n"
-" * (a copy is included in the LICENSE file that accompanied this 
code).\n"
-" *\n"
-" * You should have received a copy of the GNU Lesser General Public 
License\n"
-" * version 3 along with OpenOffice.org.  If not, see\n"
-" * \n"
-" * for a copy of the LGPLv3 License.\n"
-" *\n"
-" 
/\n\n";
+o << "/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; 
c-basic-offset: 4 -*- */\n"
+ "/*\n"
+ " * Copyright 2012 LibreOffice contributors.\n"
+ " *\n"
+ " * This Source Code Form is subject to the terms of the Mozilla 
Public\n"
+ " * License, v. 2.0. If a copy of the MPL was not distributed with 
this\n"
+ " * file, You can obtain one at http://mozilla.org/MPL/2.0/.\n";
+ " */\n\n";
 }
 
 bool getOutputStream(ProgramOptions const & options,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Draft document-rendering tiling API to be called from viewer apps

[Michael Meeks]

On Wed, 2012-06-06 at 17:48 +0300, Tor Lillqvist wrote:
> >IMHO the decision to render just squares prolly complicates the
> > situation un-necessarily.
> 
> Sure, but on the other hand it makes it simpler in that we don't need
> to figure out the aspect ratio of each page (they can be different)
> beforehand.

Surely we have to do that in order to present it to the user ? at
least, I assume we would want to end up with a texture that is the
size/shape of the page - it sounds like you have something different in
mind though (?).

> BTW, I didn't mention in the IDL, but I did think that the not only
> would it be a square, but also the side of the square would be a
> power-of-two. Presumably you also want power-of-two for each side?

Not really; my main concer was to ensure that we could render a region
of the document into a full-screen window ;-) such that we could get
that middle bit of the page (or worse spreadsheet) rendered so we didn't
have to create an humungeous texture of the whole page at a high
resolution and throw most of it away :-) Prolly 'tiling' is the wrong
word to use for that ;-) my bad; the whole thing brings back hideous
memories of the libart_lgpl work / optimisation that turned out to all
be worse than useless on even legacy hardware.

> > Consider an A4 document - 2 x sqrt(2) in
> > dimensions - almost certainly we end up with some 21x17 type ratio and
> > then have to work hard to try to pack squares into it.
> 
> Hmm, but isn't this then an argument *in favour* of keeping the
> rendered area square (and with a power-of-two side)? (Note that this
> would mean that when zoomed in at some level and beyond, some tiles
> will be completely outside of the page area.)

IMHO the use of the term 'tiles' here is prolly just a misleading
nonsense ;-) my main concern is the ability to render an arbitrary
sub-set of a page to an arbitrarily sized texture.

HTH,

Michael.

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

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

[Libreoffice-commits] .: Branch 'feature/gsoc_test_improvements' - 6 commits - drawinglayer/inc drawinglayer/source

[Artur Dorda]

 drawinglayer/inc/drawinglayer/XShapeDumper.hxx |9 +
 drawinglayer/source/dumper/XShapeDumper.cxx|  116 +
 2 files changed, 125 insertions(+)

New commits:
commit 244dd966d07884b8f2511e2c85456b08f42dab47
Author: Artur Dorda 
Date:   Wed Jun 6 17:45:30 2012 +0200

Added dumping [property] FillHatch

Change-Id: I883c056bcda79bcf8e0275d2a1bb7145553de483

diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx 
b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index b211a72..2644106 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -32,6 +32,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #ifndef ChartViewDumper_hxx
 #define ChartViewDumper_hxx
@@ -53,6 +54,7 @@ private:
 void dumpFillGradientNameAsAttribute(rtl::OUString aGradName, 
xmlTextWriterPtr xmlWriter);
 void dumpFillGradientAsElement(com::sun::star::awt::Gradient aGradient, 
xmlTextWriterPtr xmlWriter);
 void dumpFillHatchNameAsAttribute(rtl::OUString aHatchName, 
xmlTextWriterPtr xmlWriter);
+void dumpFillHatchAsElement(com::sun::star::drawing::Hatch aHatch, 
xmlTextWriterPtr xmlWriter);
 
 void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint, 
xmlTextWriterPtr xmlWriter);
 void dumpSizeAsAttribute(const com::sun::star::awt::Size& rSize, 
xmlTextWriterPtr xmlWriter);
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx 
b/drawinglayer/source/dumper/XShapeDumper.cxx
index 508ad75..400440f 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -165,6 +165,29 @@ namespace {
 rtl::OUStringToOString(aHatchName, 
RTL_TEXTENCODING_UTF8).getStr());
 }
 
+void XShapeDumper::dumpFillHatchAsElement(drawing::Hatch aHatch, 
xmlTextWriterPtr xmlWriter)
+{
+xmlTextWriterStartElement(xmlWriter, BAD_CAST( "FillHatch" ));
+switch(aHatch.Style)
+{
+case drawing::HatchStyle_SINGLE:
+xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("style"), "%s", "SINGLE");
+break;
+case drawing::HatchStyle_DOUBLE:
+xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("style"), "%s", "DOUBLE");
+break;
+case drawing::HatchStyle_TRIPLE:
+xmlTextWriterWriteFormatAttribute( xmlWriter, 
BAD_CAST("style"), "%s", "TRIPLE");
+break;
+default:
+break;
+}
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("color"), "%" 
SAL_PRIdINT32, (sal_Int32) aHatch.Color);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("distance"), "%" 
SAL_PRIdINT32, (sal_Int32) aHatch.Distance);
+xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("angle"), "%" 
SAL_PRIdINT32, (sal_Int32) aHatch.Angle);
+xmlTextWriterEndElement( xmlWriter );
+}
+
 void XShapeDumper::dumpPositionAsAttribute(const awt::Point& rPoint, 
xmlTextWriterPtr xmlWriter)
 {
 xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("positionX"), 
"%" SAL_PRIdINT32, rPoint.X);
@@ -267,6 +290,12 @@ namespace {
 if(anotherAny >>= aHatchName)
 dumpFillGradientNameAsAttribute(aHatchName, xmlWriter);
 }
+{
+uno::Any anotherAny = xPropSet->getPropertyValue("FillHatch");
+drawing::Hatch aHatch;
+if(anotherAny >>= aHatch)
+dumpFillHatchAsElement(aHatch, xmlWriter);
+}
 }
 
 #if DEBUG_DUMPER
commit 374c023d29249194b511fe23560ee3d886c044d2
Author: Artur Dorda 
Date:   Wed Jun 6 17:12:32 2012 +0200

Added dumping [property] FillHatchName

Change-Id: I85e15ca28edaaf2d3c2ac26b7dd152291ff6966e

diff --git a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx 
b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
index 61176d0..b211a72 100644
--- a/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
+++ b/drawinglayer/inc/drawinglayer/XShapeDumper.hxx
@@ -52,6 +52,7 @@ private:
 void dumpFillTransparenceGradientAsElement(com::sun::star::awt::Gradient 
aTranspGrad, xmlTextWriterPtr xmlWriter);
 void dumpFillGradientNameAsAttribute(rtl::OUString aGradName, 
xmlTextWriterPtr xmlWriter);
 void dumpFillGradientAsElement(com::sun::star::awt::Gradient aGradient, 
xmlTextWriterPtr xmlWriter);
+void dumpFillHatchNameAsAttribute(rtl::OUString aHatchName, 
xmlTextWriterPtr xmlWriter);
 
 void dumpPositionAsAttribute(const com::sun::star::awt::Point& rPoint, 
xmlTextWriterPtr xmlWriter);
 void dumpSizeAsAttribute(const com::sun::star::awt::Size& rSize, 
xmlTextWriterPtr xmlWriter);
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx 
b/drawinglayer/source/dumper/XShapeDumper.cxx
index 6ae6ef1..508ad75 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper

Re: Draft document-rendering tiling API to be called from viewer apps

[Iain Billett]

>
> >IMHO the decision to render just squares prolly complicates the
> > situation un-necessarily.
>
> Sure, but on the other hand it makes it simpler in that we don't need
> to figure out the aspect ratio of each page (they can be different)
> beforehand.
>
> BTW, I didn't mention in the IDL, but I did think that the not only
> would it be a square, but also the side of the square would be a
> power-of-two. Presumably you also want power-of-two for each side?
>

I haven't experimented but I've heard that not using power-of-two lengths
is seriously detrimental to performance. Considering we'll be using lots of
resources to begin I think we should make every reasonable optimisation .
Also, in this arrangement, It would be nice to have the dimensions of the
"document" area of the texture. Then if the rest of the bitmap is fully
transparent and the plane is too we can render a "page" alone and keep
track of dimensions.

My main concern with all this is in fact dealing with user interaction i.e.
mapping measurements in pixels to OpenGL coordinates. This is more of a
problem for editing, though.

Also, are we intending to have continuous scroll documents ( with all the
pages available via scroll - like most desktop applications ) or would we
be happy to have users flick (or otherwise) through pages. I think the
latter would make it easier to manage resources for large documents.

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

Re: [PATCH]fdo 50488 added calc formula XOR as defined in ODFF1.2

[Eike Rathke]

Hi Winfried,

On Wednesday, 2012-06-06 16:35:52 +0200, Winfried Donkers wrote:

> Attached patch adds formula XOR to calc.
> Possibly the function ought to be included in one or more arrays of functions 
> that are or are not known in Excel, Lotus, Qpro.

Argh, I missed to reply to you in the bug that XOR is also in the said
CWS we still hope to be able to integrate back from OOo times. So you
duplicated some work, my bad. Anyway, if it's ready we'll integrate it,
adding some pieces for Excel import/export. However, you attached
a patch for DATEDIF instead of XOR ;-)

> In the mean time I will pick another ODFF1.2 function still missing in calc.

I'll browse through the list you provided, maybe there are some things
to remark.

Thanks
  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3  9E96 2F1A D073 293C 05FD


pgp5YSgXx4SWI.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 50783, which changed state.

Bug 50783 Summary: Can't create database or access table in Base
https://bugs.freedesktop.org/show_bug.cgi?id=50783

   What|Old Value   |New Value

 Resolution||FIXED
 Status|UNCONFIRMED |RESOLVED

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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] .: Branch 'libreoffice-3-6' - connectivity/Jar_sdbc_hsqldb.mk

[Petr Mladek]

 connectivity/Jar_sdbc_hsqldb.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit 203707c0591021d827b1de855f977cdb4c8cfd47
Author: Petr Mladek 
Date:   Wed Jun 6 16:40:21 2012 +0200

make hsql database working again (fdo#50783)

+ set Class-Path in sdbc_hsqldb.jar/MANIFEST.MF

+ pack the missing org/hsqldb/lib/FileSystemRuntimeException.class

  heh, it is a crazy hack; the source file is under another path
  com/sun/star/sdbcx/comp/hsqldb

Change-Id: I53078269f2298175fee52912d55e8defe01b259b

diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk
index ea6df7b..34fcb7c 100644
--- a/connectivity/Jar_sdbc_hsqldb.mk
+++ b/connectivity/Jar_sdbc_hsqldb.mk
@@ -37,8 +37,16 @@ $(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
 ))
 endif
 
+$(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
+   hsqldb.jar \
+   $(HSQLDB_JAR) \
+   .. \
+))
+
 $(eval $(call gb_Jar_set_packageroot,sdbc_hsqldb,com))
 
+$(eval $(call gb_Jar_add_packagedir,sdbc_hsqldb,org))
+
 $(eval $(call gb_Jar_add_sourcefiles,sdbc_hsqldb,\
connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException \
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: connectivity/Jar_sdbc_hsqldb.mk

[Petr Mladek]

 connectivity/Jar_sdbc_hsqldb.mk |8 
 1 file changed, 8 insertions(+)

New commits:
commit 7a86071a9cb2c3ceb8f3efc6345889ae4638a91f
Author: Petr Mladek 
Date:   Wed Jun 6 16:40:21 2012 +0200

make hsql database working again (fdo#50783)

+ set Class-Path in sdbc_hsqldb.jar/MANIFEST.MF

+ pack the missing org/hsqldb/lib/FileSystemRuntimeException.class

  heh, it is a crazy hack; the source file is under another path
  com/sun/star/sdbcx/comp/hsqldb

Change-Id: I53078269f2298175fee52912d55e8defe01b259b

diff --git a/connectivity/Jar_sdbc_hsqldb.mk b/connectivity/Jar_sdbc_hsqldb.mk
index ea6df7b..34fcb7c 100644
--- a/connectivity/Jar_sdbc_hsqldb.mk
+++ b/connectivity/Jar_sdbc_hsqldb.mk
@@ -37,8 +37,16 @@ $(eval $(call gb_Jar_use_jars,sdbc_hsqldb,\
 ))
 endif
 
+$(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
+   hsqldb.jar \
+   $(HSQLDB_JAR) \
+   .. \
+))
+
 $(eval $(call gb_Jar_set_packageroot,sdbc_hsqldb,com))
 
+$(eval $(call gb_Jar_add_packagedir,sdbc_hsqldb,org))
+
 $(eval $(call gb_Jar_add_sourcefiles,sdbc_hsqldb,\
connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException \
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: editeng/source

[Caolán McNamara]

 editeng/source/editeng/impedit2.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7093b2418d036b47ed706464956f330cfb89707a
Author: Caolán McNamara 
Date:   Wed Jun 6 16:23:36 2012 +0100

valgrind: uninitialized value

Change-Id: I405733a77a721f3d5562782e654a1942fe3b073e

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 246ad29..be1e766 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -99,6 +99,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* 
pItemPool ) :
 bAddExtLeading(false),
 bIsFormatting(false),
 bFormatted(false),
+bInSelection(false),
 bIsInUndo(false),
 bUpdate(true),
 bUndoEnabled(true),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Reverted check for boost_date_time

[David Tardon]

On Wed, Jun 06, 2012 at 03:45:50PM +0200, Jan Holesovsky wrote:
> Hi David,
> 
> I am sorry, I had to revert
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=4c2e9fc655b6480ffc7f0feb5d07b8106b6b8e22
> 
> I was unable to get it right in a reasonable amount of time :-( -
> BOOST_LDFLAGS seem not to get set when building on MinGW.

Hi,

yeah, it fails right during configure here. I suppose I should have
tried it with MinGW too... This would need the same treatment as the
other dlls: test for the dll, export a variable for it, copy it into
solver and finally pack it into installation. I will try to rework that
tomorrow.

I suppose I should also document somewhere what needs to be done when
adding a new system dll. I wrote the checklist down in a commit message
once, but that is not very visible...

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

Re: Is it ok to remove visual navigator comments?

[Michael Meeks]

Hi Philipp,

On Wed, 2012-06-06 at 16:46 +0200, Philipp Weissenbacher wrote:
> Is it ok to remove visual navigator comments (starting and ending with
> ** and only containing the function's name)?

Yes :-)

> In my experience this greatly reduces visual noise to the cost of
> visual separation. Or am I missing something?

It's a nice cleanup; I'd prefer if you could hold-fire temporarily at
least until the re-basing on the ALv2 code-base is done - since there is
a degree of merging / auditing necessary there.

As we go, I'll try to build a list of files which are great to do
further aggressive cleanups in :-) will let you know when that's
in-place.

Thanks !

Michael.

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

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

Re: Is it ok to remove visual navigator comments?

[Michael Stahl]

On 06/06/12 16:46, Philipp Weissenbacher wrote:
> Hi all,
> Is it ok to remove visual navigator comments (starting and ending with
> ** and only containing the function's name)?
> E.g. what I did in fe436d.
> 
> In my experience this greatly reduces visual noise to the cost of visual
> separation. Or am I missing something?

yes if they only contain the name of the method, or empty lines that
start with "Description: " :)  then they're just useless clutter.

it is more useful if it separates a chunk of related stuff from another
chunk of related stuff, e.g. if there are multiple classes implemented
in one file it can be nice to have a separator between the methods of
different classes, but this should usually result in a number of
separators in a file that can be counted on one hand.

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

Re: Draft document-rendering tiling API to be called from viewer apps

[Michael Stahl]

On 06/06/12 15:31, Stephan Bergmann wrote:
> On 06/06/2012 03:11 PM, Tor Lillqvist wrote:
>>> I would go the UNO approach nevertheless.
>>
>> It's a hard decision to make...
> 
> With the current state of touch/idl, what you would want to do in C++ is 
> an implementation of the Document service, plus potentially an 
> implementation of an XDocumentRenderCallback object (if you want to call 
> the service's XDocument.render from C++ code).
> 
> The boilerplate for the former boils down to a derivation of 
> cppu::WeakImplHelper1, plus a component_getFactory function 
> (just calling cppu::component_getFactoryHelper) if this is the first 
> service implementation in a given library.  The boilerplate for the 
> latter boils down to a derivation of 
> cppu::WeakImplHelper1.  Let me know if you need 
> skeleton code (or any other form of help) for that.

by the way, there is a "skeletonmaker" tool that can write a lot of the
boilerplate for you, something like this:

uno-skeletonmaker
-env:UNO_TYPES="file:///so/ws/DEV300/unxsoli4.pro/bin.4/types.rdb"
component --cpp --all -n "CBlankNode" -t com.sun.star.rdf.BlankNode -lh

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

Re: Draft document-rendering tiling API to be called from viewer apps

[Tor Lillqvist]

>        IMHO the decision to render just squares prolly complicates the
> situation un-necessarily.

Sure, but on the other hand it makes it simpler in that we don't need
to figure out the aspect ratio of each page (they can be different)
beforehand.

BTW, I didn't mention in the IDL, but I did think that the not only
would it be a square, but also the side of the square would be a
power-of-two. Presumably you also want power-of-two for each side?

> Consider an A4 document - 2 x sqrt(2) in
> dimensions - almost certainly we end up with some 21x17 type ratio and
> then have to work hard to try to pack squares into it.

Hmm, but isn't this then an argument *in favour* of keeping the
rendered area square (and with a power-of-two side)? (Note that this
would mean that when zoomed in at some level and beyond, some tiles
will be completely outside of the page area.)

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

Is it ok to remove visual navigator comments?

[Philipp Weissenbacher]

Hi all,
Is it ok to remove visual navigator comments (starting and ending with
** and only containing the function's name)?
E.g. what I did in fe436d.

In my experience this greatly reduces visual noise to the cost of visual
separation. Or am I missing something?

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

[PATCH]fdo 50488 added calc formula XOR as defined in ODFF1.2

[Winfried Donkers]

Attached patch adds formula XOR to calc.
Possibly the function ought to be included in one or more arrays of functions 
that are or are not known in Excel, Lotus, Qpro.

In the mean time I will pick another ODFF1.2 function still missing in calc.

WinfriedFrom 61d133beff3ce513dbeb0df82453f3b9a780518b Mon Sep 17 00:00:00 2001
From: Winfried Donkers 
Date: Wed, 9 May 2012 16:47:13 +0200
Subject: [PATCH] fdo#44456 added calc function DATEDIF as in ODF1.2

Change-Id: I082ea20d02bf37d515fc33d627281696fc48fcb6
---
 formula/inc/formula/compiler.hrc   |7 +-
 formula/inc/formula/opcode.hxx |1 +
 formula/source/core/resource/core_resource.src |6 ++
 sc/inc/helpids.h   |1 +
 sc/qa/unit/ucalc.cxx   |1 +
 sc/source/core/inc/interpre.hxx|1 +
 sc/source/core/tool/interpr2.cxx   |   91 
 sc/source/core/tool/interpr4.cxx   |1 +
 sc/source/filter/excel/xlformula.cxx   |1 +
 sc/source/filter/oox/formulabase.cxx   |2 +-
 sc/source/ui/src/scfuncs.src   |   46 
 sc/util/hidother.src   |1 +
 12 files changed, 155 insertions(+), 4 deletions(-)

diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc
index 15d8aab..a2d4bb5 100644
--- a/formula/inc/formula/compiler.hrc
+++ b/formula/inc/formula/compiler.hrc
@@ -399,10 +399,11 @@
 #define SC_OPCODE_BITXOR397
 #define SC_OPCODE_BITRSHIFT 398
 #define SC_OPCODE_BITLSHIFT 399
-#define SC_OPCODE_STOP_2_PAR400
-#define SC_OPCODE_LAST_OPCODE_ID399 /* last OpCode */
+#define SC_OPCODE_GET_DATEDIF   400
+#define SC_OPCODE_STOP_2_PAR401
+#define SC_OPCODE_LAST_OPCODE_ID401 /* last OpCode */
 
-/*** Interna ***/
+/*** Internal ***/
 #define SC_OPCODE_INTERNAL_BEGIN   
 #define SC_OPCODE_TTT  
 #define SC_OPCODE_INTERNAL_END 
diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx
index b1e585c..a1543dd 100644
--- a/formula/inc/formula/opcode.hxx
+++ b/formula/inc/formula/opcode.hxx
@@ -212,6 +212,7 @@ enum OpCodeEnum
 ocGetTime   = SC_OPCODE_GET_TIME,
 ocGetDiffDate   = SC_OPCODE_GET_DIFF_DATE,
 ocGetDiffDate360= SC_OPCODE_GET_DIFF_DATE_360,
+ocGetDateDif= SC_OPCODE_GET_DATEDIF,
 ocMin   = SC_OPCODE_MIN,
 ocMax   = SC_OPCODE_MAX,
 ocSum   = SC_OPCODE_SUM,
diff --git a/formula/source/core/resource/core_resource.src b/formula/source/core/resource/core_resource.src
index 12cb57d..1259231 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -170,6 +170,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
 String SC_OPCODE_GET_TIME { Text = "TIME" ; };
 String SC_OPCODE_GET_DIFF_DATE { Text = "DAYS" ; };
 String SC_OPCODE_GET_DIFF_DATE_360 { Text = "DAYS360" ; };
+String SC_OPCODE_GET_DATEDIF { Text = "DATEDIF" ; };
 String SC_OPCODE_MIN { Text = "MIN" ; };
 String SC_OPCODE_MIN_A { Text = "MINA" ; };
 String SC_OPCODE_MAX { Text = "MAX" ; };
@@ -502,6 +503,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
 String SC_OPCODE_GET_TIME { Text = "TIME" ; };
 String SC_OPCODE_GET_DIFF_DATE { Text = "DAYS" ; };
 String SC_OPCODE_GET_DIFF_DATE_360 { Text = "DAYS360" ; };
+String SC_OPCODE_GET_DATEDIF { Text = "DATEDIF" ; };
 String SC_OPCODE_MIN { Text = "MIN" ; };
 String SC_OPCODE_MIN_A { Text = "MINA" ; };
 String SC_OPCODE_MAX { Text = "MAX" ; };
@@ -1175,6 +1177,10 @@ Resource RID_STRLIST_FUNCTION_NAMES
 {
 Text [ en-US ] = "DAYS360" ;
 };
+String SC_OPCODE_GET_DATEDIF
+{
+Text [ en-US ] = "DATEDIF" ;
+};
 String SC_OPCODE_MIN
 {
 Text [ en-US ] = "MIN" ;
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 5eec0d1..8d41ab7 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -434,6 +434,7 @@
 #define HID_FUNC_WOCHENTAG  "SC_HID_FUNC_WOCHENTAG"
 #define HID_FUNC_JAHR   "SC_HID_FUNC_JAHR"
 #define HID_FUNC_TAGE   "SC_HID_FUNC_TAGE"
+#define HID_FUNC_DATEDIF"SC_HID_FUNC_DATEDIF"
 #define HID_FUNC_KALENDERWOCHE  "SC_HID_FUNC_KALENDERWOCHE"
 #define HID_FUNC_OSTERSONNTAG   "SC_HID_FUNC_OSTERSONNTAG"
 
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index d875e42..ef33e64 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3076,6 +3076,7 @@ void Test::testFunctionLists()
 
 const char* aDateTime[] = {
 "DATE",
+"DATEDIF",
 "DATEVALUE",
 "DAY",
 "DAYS",
di

Re: [HELP] fdo#44721 (nearly) infinite loop & memory consumption

[Michael Meeks]

On Wed, 2012-06-06 at 16:04 +0200, Lionel Elie Mamane wrote:
> I'd appreciate some help on fdo#44721; it is not directly in my area
> of expertise, but is very crippling for Base / Report Builder users:
> one cannot resize a control with the mouse: LibreOffice freezes and
> takes up all memory.

A basegfx memory leak / crasher :-) Thorsten is prolly a good guy to
have a look I guess.

Thanks !

Michael.

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

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

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - wizards/com

[Caolán McNamara]

 wizards/com/sun/star/wizards/ui/SortingComponent.java |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit b8b7e7ea20397fa9e0d0470a19667e88c7c049cb
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 15:10:00 2012 +0100

fdo#48018 legacy reports do not sort by group columns

Legacy report means done with the "old" report system, as opposed to
with report builder.

This was caused by a misguided attempt to sort-of work around i#110536
instead of fixing it cleanly. Revert that.

Apparently the idea was to not explicitly set grouping columns as
sorting columns, but that the report execution would automagically add
grouping columns at begin of sorting list at report execution
time. That's a bad idea for at least two reasons:
 * This does not allow the user to chose ASC/DESC for grouping columns
 * In rare / advanced cases, sorting on another column *before*
   grouping is desirable.
Plus, the "automagic adding" part apparently wasn't implemented
anyway.

Change-Id: Ia7f3836bb1ecfbdf3575040bb1f3998d09a1c257

diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java 
b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index 48ac44b..a6de255 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -258,13 +258,10 @@ public class SortingComponent
 ArrayList SortDescriptions = new ArrayList();
 for (int i = 0; i <= MaxSortIndex; i++)
 {
-if (!((Boolean) CurUnoDialog.getControlProperty("lstSort" + (i 
+ 1), PropertyNames.READ_ONLY)))
-{
-CurFieldName = xSortListBox[i].getSelectedItem();
-SortDescriptions.add(CurFieldName);
-iCurState = ((Short) 
CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), 
PropertyNames.PROPERTY_STATE)).shortValue();
-SortFieldNames.add(new String[]{CurFieldName,iCurState == 
1 ? PropertyNames.ASC :"DESC" });
-}
+   CurFieldName = xSortListBox[i].getSelectedItem();
+   SortDescriptions.add(CurFieldName);
+   iCurState = ((Short) 
CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), 
PropertyNames.PROPERTY_STATE)).shortValue();
+   SortFieldNames.add(new String[]{CurFieldName,iCurState == 1 ? 
PropertyNames.ASC :"DESC" });
 }
 // When searching for a duplicate entry we can neglect wether the 
entries are to be sorted ascending or descending
 // TODO for the future we should deliver a messagebox when two 
different sorting modes have been applied to one field
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Draft document-rendering tiling API to be called from viewer apps

[Michael Meeks]

On Wed, 2012-06-06 at 16:16 +0300, Tor Lillqvist wrote:
> >It'd be rather nice to have some parameter names rather than just
> > 'long' 'int' etc. etc ;-)
> 
> Of course. Those are specified in the IDL. No Java source code is

Ah - sorry pardon; I read the IDL in the directory:

+void render( [in] hyper buffer,
+ [in] long bufferSize,

IMHO the decision to render just squares prolly complicates the
situation un-necessarily. Consider an A4 document - 2 x sqrt(2) in
dimensions - almost certainly we end up with some 21x17 type ratio and
then have to work hard to try to pack squares into it. The rendering
code can cope with an arbitrary render area so ... I'd suggest we allow
that.

Otherwise it looks very reasonable to me :-) thanks for the review,
[ the assumption being that in a nutshell we entirely fill the texture
with content so we don't need any 'dest_offset' pair ].

HTH,

Michael.

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

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

Re: [PATCH][PUSHED 3-5][REVIEW:3-5] fdo#48018 legacy reports don't sort on grouping columns

[Caolán McNamara]

On Wed, 2012-06-06 at 15:07 +0200, Lionel Elie Mamane wrote:
> Please apply to libreoffice-3-5 branch.

Pushed to 3-5

C.

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

[Libreoffice-commits] .: connectivity/source cppuhelper/inc embedserv/source extensions/source filter/source

[Takeshi Abe]

 connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx |   14 --
 connectivity/source/drivers/mysql/YCatalog.cxx  |   16 ---
 cppuhelper/inc/cppuhelper/compbase1.hxx |3 
 cppuhelper/inc/cppuhelper/compbase10.hxx|3 
 cppuhelper/inc/cppuhelper/compbase11.hxx|3 
 cppuhelper/inc/cppuhelper/compbase12.hxx|3 
 cppuhelper/inc/cppuhelper/compbase2.hxx |3 
 cppuhelper/inc/cppuhelper/compbase3.hxx |3 
 cppuhelper/inc/cppuhelper/compbase4.hxx |3 
 cppuhelper/inc/cppuhelper/compbase5.hxx |3 
 cppuhelper/inc/cppuhelper/compbase6.hxx |3 
 cppuhelper/inc/cppuhelper/compbase7.hxx |3 
 cppuhelper/inc/cppuhelper/compbase8.hxx |3 
 cppuhelper/inc/cppuhelper/compbase9.hxx |3 
 cppuhelper/inc/cppuhelper/implbase_ex_post.hxx  |   57 
 embedserv/source/embed/guid.cxx |   33 ---
 extensions/source/activex/so_activex.cxx|   12 --
 extensions/source/plugin/unx/nppapi.cxx |6 -
 extensions/source/update/check/updateprotocol.cxx   |5 -
 filter/source/config/cache/cacheitem.cxx|   20 
 filter/source/config/cache/cacheupdatelistener.cxx  |   18 ---
 filter/source/graphicfilter/epict/epict.cxx |   19 
 filter/source/graphicfilter/idxf/dxf2mtf.cxx|   75 
 filter/source/graphicfilter/ios2met/ios2met.cxx |8 -
 filter/source/graphicfilter/ipcd/ipcd.cxx   |   11 --
 filter/source/graphicfilter/ipcx/ipcx.cxx   |8 -
 filter/source/graphicfilter/ipict/ipict.cxx |8 -
 filter/source/graphicfilter/itiff/itiff.cxx |   11 --
 filter/source/placeware/zip.cxx |4 
 filter/source/xsltdialog/xmlfilterjar.cxx   |8 -
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx|   18 ---
 31 files changed, 387 deletions(-)

New commits:
commit f0c7544df93e3847c4f96934d1d76be3e8d3af85
Author: Takeshi Abe 
Date:   Wed Jun 6 18:46:01 2012 +0900

nuke dead code

Change-Id: I0ea47ee535ba0e903bae0de227acd311ca96aa03

diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx 
b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 9433e26..77a3c16 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -74,20 +74,6 @@ namespace connectivity {
 }
 
 // -
-/*
-MQuery::MQuery()
-{
-OSL_TRACE( "IN MQuery::MQuery()" );
-
-   construct();
-#if OSL_DEBUG_LEVEL > 0
-m_oThreadID = osl_getThreadIdentifier(NULL);
-#endif
-
-OSL_TRACE( "\tOUT MQuery::MQuery()" );
-}
-*/
-// -
 MQuery::MQuery( const OColumnAlias& _ca )
 :m_rColumnAlias( _ca )
 {
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx 
b/connectivity/source/drivers/mysql/YCatalog.cxx
index 37e818a..7c5f86f 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -85,22 +85,6 @@ void OMySQLCatalog::refreshViews()
 Sequence< ::rtl::OUString > aTypes(1);
 aTypes[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"));
 
-/*
-sal_Bool bSupportsViews = sal_False;
-try
-{
-Reference xRes = m_xMetaData->getTableTypes();
-Reference xRow(xRes,UNO_QUERY);
-while ( !bSupportsViews && xRow.is() && xRes->next() )
-{
-::rtl::OUString sTableType( xRow->getString( 1 ) );
-bSupportsViews = sTableType.equalsIgnoreAsciiCase( aTypes[0] );
-}
-}
-catch(const SQLException&)
-{
-}
-*/
 // let's simply assume the server is new enough to support views. Current 
drivers
 // as of this writing might not return the proper information in 
getTableTypes, so
 // don't rely on it.
diff --git a/cppuhelper/inc/cppuhelper/compbase1.hxx 
b/cppuhelper/inc/cppuhelper/compbase1.hxx
index c18210d..32d2954 100644
--- a/cppuhelper/inc/cppuhelper/compbase1.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase1.hxx
@@ -30,9 +30,6 @@
 
 #include 
 #include 
-/*
-__DEF_COMPIMPLHELPER_EX( 1 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase10.hxx 
b/cppuhelper/inc/cppuhelper/compbase10.hxx
index 9c0a1c1..f059a95 100644
--- a/cppuhelper/inc/cppuhelper/compbase10.hxx
+++ b/cppuhelper/inc/cppuhelper/compbase10.hxx
@@ -30,9 +30,6 @@
 
 #include 
 #include 
-/*
-__DEF_COMPIMPLHELPER_EX( 10 )
-*/
 
 namespace cppu
 {
diff --git a/cppuhelper/inc/cppuhelper/compbase11.hxx 
b/cppuhelper/inc/cppuhelper/compbase11.hxx
index 33d8a2f..0eab9c5 100644
--- a/cppuhelper/inc/cppuhelper/compbase11.hxx
+++ b/cppuhelp

Re: [HELP] fdo#44721 (nearly) infinite loop & memory consumption

[Lionel Elie Mamane]

The attached patch is unrelated, forgot to remove it; sorry.

On Wed, Jun 06, 2012 at 04:04:16PM +0200, Lionel Elie Mamane wrote:
> I'd appreciate some help on fdo#44721; it is not directly in my area
> of expertise, but is very crippling for Base / Report Builder users:
> one cannot resize a control with the mouse: LibreOffice freezes and
> takes up all memory.

> Someone more familiar with the UI parts of LibreOffice would be *much*
> more efficient than me on this bug.

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

[HELP] fdo#44721 (nearly) infinite loop & memory consumption

[Lionel Elie Mamane]

I'd appreciate some help on fdo#44721; it is not directly in my area
of expertise, but is very crippling for Base / Report Builder users:
one cannot resize a control with the mouse: LibreOffice freezes and
takes up all memory.

Someone more familiar with the UI parts of LibreOffice would be *much*
more efficient than me on this bug.

Thanks in advance.

-- 
Lionel
>From 9fd39a5047a7735c2532787de8f98423eae9da06 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane 
Date: Wed, 6 Jun 2012 14:22:45 +0200
Subject: [PATCH] fdo#48018 legacy reports do not sort by group columns

Legacy report means done with the "old" report system, as opposed to
with report builder.

This was caused by a misguided attempt to sort-of work around i#110536
instead of fixing it cleanly. Revert that.

Apparently the idea was to not explicitly set grouping columns as
sorting columns, but that the report execution would automagically add
grouping columns at begin of sorting list at report execution
time. That's a bad idea for at least two reasons:
 * This does not allow the user to chose ASC/DESC for grouping columns
 * In rare / advanced cases, sorting on another column *before*
   grouping is desirable.
Plus, the "automagic adding" part apparently wasn't implemented
anyway.

Change-Id: I81e76eb4b6a0e543571a4df97d0ead77f6a2d7c8
---
 .../com/sun/star/wizards/ui/SortingComponent.java  |   11 ---
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index e24ef33..6c50c9b 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -258,13 +258,10 @@ public class SortingComponent
 ArrayList SortDescriptions = new ArrayList();
 for (int i = 0; i <= MaxSortIndex; i++)
 {
-if (!((Boolean) CurUnoDialog.getControlProperty("lstSort" + (i + 1), PropertyNames.READ_ONLY)))
-{
-CurFieldName = xSortListBox[i].getSelectedItem();
-SortDescriptions.add(CurFieldName);
-iCurState = ((Short) CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), PropertyNames.PROPERTY_STATE)).shortValue();
-SortFieldNames.add(new String[]{CurFieldName,iCurState == 1 ? PropertyNames.ASC :"DESC" });
-}
+		CurFieldName = xSortListBox[i].getSelectedItem();
+		SortDescriptions.add(CurFieldName);
+		iCurState = ((Short) CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), PropertyNames.PROPERTY_STATE)).shortValue();
+		SortFieldNames.add(new String[]{CurFieldName,iCurState == 1 ? PropertyNames.ASC :"DESC" });
 }
 // When searching for a duplicate entry we can neglect whether the entries are to be sorted ascending or descending
 // TODO for the future we should deliver a messagebox when two different sorting modes have been applied to one field
-- 
1.7.7.3

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

Reverted check for boost_date_time

[Jan Holesovsky]

Hi David,

I am sorry, I had to revert

http://cgit.freedesktop.org/libreoffice/core/commit/?id=4c2e9fc655b6480ffc7f0feb5d07b8106b6b8e22

I was unable to get it right in a reasonable amount of time :-( -
BOOST_LDFLAGS seem not to get set when building on MinGW.

Regards,
Kendy

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

[Libreoffice-commits] .: config_host.mk.in configure.in m4/ax_boost_base.m4 m4/ax_boost_date_time.m4 RepositoryExternal.mk

[Jan Holesovsky]

 RepositoryExternal.mk|   14 --
 config_host.mk.in|3 
 configure.in |3 
 m4/ax_boost_base.m4  |  258 ---
 m4/ax_boost_date_time.m4 |  113 
 5 files changed, 1 insertion(+), 390 deletions(-)

New commits:
commit 4c2e9fc655b6480ffc7f0feb5d07b8106b6b8e22
Author: Jan Holesovsky 
Date:   Wed Jun 6 15:41:53 2012 +0200

Revert "add configure check for date_time lib"

This commit breaks MinGW builds; the m4 macros probably need some
improvements there.

This reverts commit 5ed17233908c7f87b08b0964b55e4504d964ed71.

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 613cf39..7f91d77 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -273,19 +273,7 @@ endif # SYSTEM_HUNSPELL
 ifeq ($(SYSTEM_BOOST),YES)
 
 define gb_LinkTarget__use_boostdatetime
-$(call gb_LinkTarget_set_include,$(1),\
-   $$(INCLUDE) \
-   $(BOOST_CPPFLAGS) \
-)
-
-$(call gb_LinkTarget_add_ldflags,$(1),\
-   $(BOOST_LDFLAGS) \
-)
-
-$(call gb_LinkTarget_add_libs,$(1),\
-   $(BOOST_DATE_TIME_LIB) \
-)
-
+$(call gb_LinkTarget_add_libs,$(1),-lboost_date_time)
 endef
 
 else # !SYSTEM_BOOST
diff --git a/config_host.mk.in b/config_host.mk.in
index 116c4f9..2dbc020 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -22,9 +22,6 @@ export ATL_INCLUDE=@ATL_INCLUDE@
 export ATL_LIB=@ATL_LIB@
 export AWTLIB=@AWTLIB@
 export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
-export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
-export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
-export BOOST_LDFLAGS=@BOOST_LDFLAGS@
 export BSH_JAR=@BSH_JAR@
 export BUILD_DMAKE=@BUILD_DMAKE@
 export BUILD_EPM=@BUILD_EPM@
diff --git a/configure.in b/configure.in
index 8f74557..bd93fc2 100644
--- a/configure.in
+++ b/configure.in
@@ -7318,9 +7318,6 @@ if test "$with_system_boost" = "yes"; then
 fi
 CXXFLAGS=$save_CXXFLAGS
 AC_LANG_POP([C++])
-
-AX_BOOST_BASE
-AX_BOOST_DATE_TIME
 else
 AC_MSG_RESULT([internal])
 BUILD_TYPE="$BUILD_TYPE BOOST"
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
deleted file mode 100644
index 54a2a1b..000
--- a/m4/ax_boost_base.m4
+++ /dev/null
@@ -1,258 +0,0 @@
-# ===
-#   http://www.gnu.org/software/autoconf-archive/ax_boost_base.html
-# ===
-#
-# SYNOPSIS
-#
-#   AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# DESCRIPTION
-#
-#   Test for the Boost C++ libraries of a particular version (or newer)
-#
-#   If no path to the installed boost library is given the macro searchs
-#   under /usr, /usr/local, /opt and /opt/local and evaluates the
-#   $BOOST_ROOT environment variable. Further documentation is available at
-#   .
-#
-#   This macro calls:
-#
-# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS)
-#
-#   And sets:
-#
-# HAVE_BOOST
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Thomas Porschberg 
-#   Copyright (c) 2009 Peter Adolphs
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 20
-
-AC_DEFUN([AX_BOOST_BASE],
-[
-AC_ARG_WITH([boost],
-  [AS_HELP_STRING([--with-boost@<:@=ARG@:>@],
-[use Boost library from a standard location (ARG=yes),
- from the specified location (ARG=),
- or disable it (ARG=no)
- @<:@ARG=yes@:>@ ])],
-[
-if test "$withval" = "no"; then
-want_boost="no"
-elif test "$withval" = "yes"; then
-want_boost="yes"
-ac_boost_path=""
-else
-want_boost="yes"
-ac_boost_path="$withval"
-fi
-],
-[want_boost="yes"])
-
-
-AC_ARG_WITH([boost-libdir],
-AS_HELP_STRING([--with-boost-libdir=LIB_DIR],
-[Force given directory for boost libraries. Note that this will 
override library path detection, so use this parameter only if default library 
detection fails and you know exactly where your boost libraries are located.]),
-[
-if test -d "$withval"
-then
-ac_boost_lib_path="$withval"
-else
-AC_MSG_ERROR(--with-boost-libdir expected directory name)
-fi
-],
-[ac_boost_lib_path=""]
-)
-
-if test "x$want_boost" = "xyes"; then
-boost_lib_version_req=ifelse([$1], ,1.20.0,$1)
-boost_lib_version_req_shorten=`expr $boost_lib_version_req : 
'\([[0-9]]*\.[[0-9]]*\)'`
-boost_lib_version_req_major=`expr $boost_lib_version_req : '\([[0-9]]*\)'`
-boost_lib_version_req_minor=`expr $boost_lib_version_req : 
'[[0-9]]*\.\([[0-9]]*\)'`
-boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : 
'[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-if te

[Libreoffice-commits] .: basic/source comphelper/inc comphelper/qa comphelper/source fpicker/source sc/source svx/source tools/inc tools/source

[Caolán McNamara]

 basic/source/runtime/methods1.cxx|4 ++--
 comphelper/inc/comphelper/string.hxx |   15 +++
 comphelper/qa/string/test_string.cxx |   11 ++-
 comphelper/source/misc/string.cxx|   26 ++
 fpicker/source/office/iodlg.cxx  |7 +++
 sc/source/core/tool/address.cxx  |4 ++--
 svx/source/table/cell.cxx|5 +++--
 tools/inc/tools/string.hxx   |1 -
 tools/source/string/tustring.cxx |   24 
 9 files changed, 61 insertions(+), 36 deletions(-)

New commits:
commit e2cd6a77ea0e8a1abd8f4d3570ba4f5fdefff3e1
Author: Caolán McNamara 
Date:   Wed Jun 6 14:35:49 2012 +0100

drop String::Reverse

Change-Id: Ie06635dc1f242241d48f9d6de4f592898e605bf2

diff --git a/basic/source/runtime/methods1.cxx 
b/basic/source/runtime/methods1.cxx
index 4e5788a..2195a17 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -52,6 +52,7 @@
 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -3122,8 +3123,7 @@ RTLFUNC(StrReverse)
 return;
 }
 
-String aStr = pSbxVariable->GetString();
-aStr.Reverse();
+rtl::OUString aStr = 
comphelper::string::reverseString(pSbxVariable->GetString());
 rPar.Get(0)->PutString( aStr );
 }
 
diff --git a/comphelper/inc/comphelper/string.hxx 
b/comphelper/inc/comphelper/string.hxx
index dc3620d..499e850 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.hxx
@@ -226,6 +226,21 @@ COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const 
rtl::OString &rIn, sal_Char c
 */
 COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const rtl::OUString &rIn, 
sal_Unicode cTok);
 
+/** Reverse an OUString
+
+  @paramrIn the input OUString
+  @return   the reversed input
+*/
+COMPHELPER_DLLPUBLIC rtl::OUString reverseString(const rtl::OUString &rStr);
+
+/** Reverse an OString
+
+  @paramrIn the input OString
+  @return   the reversed input
+*/
+COMPHELPER_DLLPUBLIC rtl::OString reverseString(const rtl::OString &rStr);
+
+
 namespace detail
 {
 template B& truncateToLength(B& rBuffer, sal_Int32 nLen)
diff --git a/comphelper/qa/string/test_string.cxx 
b/comphelper/qa/string/test_string.cxx
index b775e01..96706ac 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@ -53,7 +53,7 @@ public:
 void testTokenCount();
 void testDecimalStringToNumber();
 void testIsdigitAsciiString();
-void testIndexOfL();
+void testReverseString();
 
 CPPUNIT_TEST_SUITE(TestString);
 CPPUNIT_TEST(testNatural);
@@ -65,6 +65,7 @@ public:
 CPPUNIT_TEST(testTokenCount);
 CPPUNIT_TEST(testDecimalStringToNumber);
 CPPUNIT_TEST(testIsdigitAsciiString);
+CPPUNIT_TEST(testReverseString);
 CPPUNIT_TEST_SUITE_END();
 };
 
@@ -396,6 +397,14 @@ void TestString::testTokenCount()
 CPPUNIT_ASSERT(nOut == 0);
 }
 
+void TestString::testReverseString()
+{
+::rtl::OString aIn("ABC");
+::rtl::OString aOut = ::comphelper::string::reverseString(aIn);
+
+CPPUNIT_ASSERT(aOut == "CBA");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(TestString);
 
 }
diff --git a/comphelper/source/misc/string.cxx 
b/comphelper/source/misc/string.cxx
index 6eb744f..08aa392 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -438,6 +438,32 @@ rtl_String * SAL_CALL rtl_string_alloc(sal_Int32 nLen)
 return string_alloc(nLen);
 }
 
+namespace
+{
+template  T tmpl_reverseString(const T &rIn)
+{
+if (rIn.isEmpty())
+return rIn;
+
+sal_Int32 i = rIn.getLength();
+O sBuf(i);
+while (i)
+sBuf.append(rIn[--i]);
+return sBuf.makeStringAndClear();
+}
+}
+
+rtl::OUString reverseString(const rtl::OUString &rStr)
+{
+return tmpl_reverseString(rStr);
+}
+
+rtl::OString reverseString(const rtl::OString &rStr)
+{
+return tmpl_reverseString(rStr);
+}
+
+
 } }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index cc57c5b..006f8e8 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2557,8 +2557,7 @@ void SvtFileDialog::implArrangeControls()
 sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( String& rPath, String& 
rFilter )
 {
 String aEmpty;
-String aReversePath( rPath );
-aReversePath.Reverse();
+String aReversePath = comphelper::string::reverseString(rPath);
 sal_uInt16 nQuestionMarkPos = rPath.Search( '?' );
 
 if ( nQuestionMarkPos != STRING_NOTFOUND )
@@ -2607,12 +2606,12 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( 
String& rPath, String& rFilt
 // cut off filter
 rFilter = aReversePath;
 rFilter.Erase( nPathTokenPos );
-rFilter.Reverse();
+rFilter = comphelper::string::reverseString(rFilter);
 
 // determine folder
 

Re: Draft document-rendering tiling API to be called from viewer apps

[Stephan Bergmann]

On 06/06/2012 03:11 PM, Tor Lillqvist wrote:

I would go the UNO approach nevertheless.


It's a hard decision to make...


With the current state of touch/idl, what you would want to do in C++ is 
an implementation of the Document service, plus potentially an 
implementation of an XDocumentRenderCallback object (if you want to call 
the service's XDocument.render from C++ code).


The boilerplate for the former boils down to a derivation of 
cppu::WeakImplHelper1, plus a component_getFactory function 
(just calling cppu::component_getFactoryHelper) if this is the first 
service implementation in a given library.  The boilerplate for the 
latter boils down to a derivation of 
cppu::WeakImplHelper1.  Let me know if you need 
skeleton code (or any other form of help) for that.


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

Re: Clean build of master fails on ERROR: Could not find parfile in includes paths

[Tomáš Chvátal]

As discussed with dtaron on irc more info about the machine with the crash:

configure line:
./configure --prefix=/usr --build=x86_64-pc-linux-gnu
--host=x86_64-pc-linux-gnu --mandir=/usr/share/man
--infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc
--localstatedir=/var/lib --libdir=/usr/lib64
--disable-dependency-tracking
--docdir=/usr/share/doc/libreoffice-3.6./ --with-system-headers
--with-system-libs --with-system-jars --with-system-dicts
--enable-cairo-canvas --enable-largefile --enable-mergelibs
--enable-python=system --enable-randr --enable-randr-link
--enable-release-build --enable-unix-qstart-libpng --disable-ccache
--disable-crashdump --disable-dependency-tracking --disable-epm
--disable-fetch-external --disable-gnome-vfs
--disable-ext-report-builder --disable-kdeab --disable-kde
--disable-ldap --disable-mozilla --disable-online-update --disable-pch
--disable-rpath --disable-systray --disable-zenity --with-alloc=system
--with-build-version=Gentoo official package
--enable-extension-integration
--with-external-dict-dir=/usr/share/myspell
--with-external-hyph-dir=/usr/share/myspell
--with-external-thes-dir=/usr/share/myspell
--with-external-tar=/var/tmp/portage/app-office/libreoffice-3.6./distdir
--with-lang= --with-max-jobs=12 --with-num-cpus=12
--with-unix-wrapper=libreoffice --with-vendor=Gentoo Foundation
--with-x --without-afms --without-fonts --without-myspell-dicts
--without-stlport --without-system-mozilla --without-help
--with-helppack-integration --without-sun-templates
--disable-binfilter --enable-cups --enable-dbus --disable-evolution2
--disable-gconf --disable-gio --disable-lockdown --enable-graphite
--enable-gstreamer --enable-gtk --disable-gtk3 --enable-kde4
--disable-ext-mysql-connector --enable-nsplugin --disable-odk
--enable-opengl --disable-postgresql-sdbc --enable-librsvg=system
--disable-linkoo --disable-vba --enable-neon --enable-xmlsec
--with-java --without-system-mysql-cppconn --without-system-sane
--without-system-vigra
--with-intro-bitmap=/var/tmp/portage/app-office/libreoffice-3.6./work/branding-intro.png
--without-system-hsqldb --without-system-saxon
--with-ant-home=/usr/share/ant
--with-jdk-home=/opt/icedtea-bin-6.1.11.1
--with-java-target-version=1.6 --with-jvm-path=/usr/lib64/
--without-junit --enable-ext-nlpsolver --disable-ext-pdfimport
--enable-ext-presenter-console --enable-ext-presenter-minimizer
--disable-ext-scripting-beanshell --disable-ext-scripting-javascript
--disable-ext-wiki-publisher

System info:
Portage 2.2.0_alpha110 (hardened/linux/amd64/desktop, gcc-4.6.3,
glibc-2.14.1-r3, 3.2.11-hardened x86_64)
=
System uname: 
Linux-3.2.11-hardened-x86_64-Intel-R-_Core-TM-_i7-2600K_CPU_@_3.40GHz-with-gentoo-2.1
Timestamp of tree: Wed, 06 Jun 2012 07:30:01 +
distcc 3.1 x86_64-pc-linux-gnu [disabled]
ccache version 3.1.7 [enabled]
app-shells/bash:  4.2_p20
dev-java/java-config: 2.1.11-r3
dev-lang/python:  2.7.3-r1
dev-util/ccache:  3.1.7
dev-util/cmake:   2.8.7-r5
dev-util/pkgconfig:   0.26
sys-apps/baselayout:  2.1-r1
sys-apps/openrc:  0.9.8.4
sys-apps/sandbox: 2.5
sys-devel/autoconf:   2.13, 2.68
sys-devel/automake:   1.11.1
sys-devel/binutils:   2.21.1-r1
sys-devel/gcc:4.6.3
sys-devel/gcc-config: 1.6
sys-devel/libtool:2.4-r1
sys-devel/make:   3.82-r1
sys-kernel/linux-headers: 3.1 (virtual/os-headers)
sys-libs/glibc:   2.14.1-r3
Repositories: gentoo
Installed sets:
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=corei7-avx -O2 -pipe -ggdb -floop-interchange
-ftree-loop-distribution -floop-strip-mine -floop-block
-ftree-vectorize -fforce-addr"
CHOST="x86_64-pc-linux-gnu"
CXXFLAGS="-march=corei7-avx -O2 -pipe -ggdb -floop-interchange
-ftree-loop-distribution -floop-strip-mine -floop-block
-ftree-vectorize -fforce-addr"
LANG="cs_CZ.utf8"
LC_ALL="cs_CZ.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu,--sort-common -Wl,-z,now"
LINGUAS="cs en"
MAKEOPTS="-j12 -s"

2012/6/1 Tomáš Chvátal :
>
> ERROR: Could not find parfile  in includes paths: /var/tmp/portage/app-
> office/libreoffice--r2/work/libreoffice-
> core-/workdir/unxlngx6.pro/InstallModuleTarget/scp2/sdkoo,/var/tmp/portage/app-
> office/libreoffice--r2/work/libreoffice-core-/solver/unxlngx6.pro/par 
> !
> make[2]: *** 
> [/var/tmp/portage/app-office/libreoffice--r2/work/libreoffice-
> core-/workdir/unxlngx6.pro/InstallScriptTarget/sdkoo.ins] Error 255
> make[2]: *** Waiting for unfinished jobs
> ERROR: Could not find parfile  in includes paths: /var/tmp/portage/app-
> office/libreoffice--r2/work/libreoffice-
> core-/workdir/unxlngx6.pro/InstallModuleTarget/scp2/smoketest,/var/tmp/portage/app-
> office/libreoffice--r2/work/libreoffice-core-/solver/unxlngx6.pro/par 
> !
> make[2]: *** 
> [/var/tmp/portage/app-office/libreoffice--r2/work/libreoffice-
> core-99

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source

[Jan Holesovsky]

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

New commits:
commit add88d69738f61eb28935d50229781f9bf514b43
Author: Jan Holesovsky 
Date:   Wed Jun 6 15:17:43 2012 +0200

calc input line: Fix crash on MacOSX.

Change-Id: Iff50dfc1b4730ff584e3015486da4acf8fd5cb47

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 601a614..9139f5c 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1098,7 +1098,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, 
long nWidth, long nHei
 {
 // FIXME: this is currently only on aqua, check with other
 // platforms
-if( ImplGetSVData()->maNWFData.mbNoFocusRects )
+if( ImplGetSVData()->maNWFData.mbNoFocusRects && !( nBorderStyle & 
WINDOW_BORDER_NWF ) )
 {
 // for native widget drawing we must find out what
 // control this border belongs to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

[Jan Holesovsky]

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

New commits:
commit 5662854bc29acb45c1c449c05d1e92f96a4b335a
Author: Jan Holesovsky 
Date:   Wed Jun 6 15:17:43 2012 +0200

calc input line: Fix crash on MacOSX.

Change-Id: Iff50dfc1b4730ff584e3015486da4acf8fd5cb47

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 601a614..9139f5c 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1098,7 +1098,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, 
long nWidth, long nHei
 {
 // FIXME: this is currently only on aqua, check with other
 // platforms
-if( ImplGetSVData()->maNWFData.mbNoFocusRects )
+if( ImplGetSVData()->maNWFData.mbNoFocusRects && !( nBorderStyle & 
WINDOW_BORDER_NWF ) )
 {
 // for native widget drawing we must find out what
 // control this border belongs to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Draft document-rendering tiling API to be called from viewer apps

[Tor Lillqvist]

>        It'd be rather nice to have some parameter names rather than just
> 'long' 'int' etc. etc ;-)

Of course. Those are specified in the IDL. No Java source code is
generated from IDL, it generates class files directly (well, through
.rdb), and there are no parameter names in class files. The Java bit
in my message was just a dump of the class files as produced by javap,
it is just a debugging aid, not intended to be "human readable" and
not even compilable.

Of course, if I would have bothered to write the comments in the .idl
files in proper meta-syntax, those would have propagated into
generated documentation as descriptions of parameters etc.

> I assume that the last four are pixel co-ordinates to render ?

Read the IDL, that's where I have the documentation.

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

Re: Draft document-rendering tiling API to be called from viewer apps

[Tor Lillqvist]

> I see no need for a DocumentRenderCallback service.

OK, I didn't realize that you can have an interface without wrapping
it in a service.

> I would go the UNO approach nevertheless.

It's a hard decision to make...

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

[PATCH] [REVIEW:3-5] fdo#48018 legacy reports don't sort on grouping columns

[Lionel Elie Mamane]

Legacy reports (not Sun/Oracle Report Builder ones) don't sort by the
grouping columns.

Commit message is explanatory; shout if you have other question.

Please apply to libreoffice-3-5 branch.

-- 
Lionel
>From 9fd39a5047a7735c2532787de8f98423eae9da06 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane 
Date: Wed, 6 Jun 2012 14:22:45 +0200
Subject: [PATCH] fdo#48018 legacy reports do not sort by group columns

Legacy report means done with the "old" report system, as opposed to
with report builder.

This was caused by a misguided attempt to sort-of work around i#110536
instead of fixing it cleanly. Revert that.

Apparently the idea was to not explicitly set grouping columns as
sorting columns, but that the report execution would automagically add
grouping columns at begin of sorting list at report execution
time. That's a bad idea for at least two reasons:
 * This does not allow the user to chose ASC/DESC for grouping columns
 * In rare / advanced cases, sorting on another column *before*
   grouping is desirable.
Plus, the "automagic adding" part apparently wasn't implemented
anyway.

Change-Id: I81e76eb4b6a0e543571a4df97d0ead77f6a2d7c8
---
 .../com/sun/star/wizards/ui/SortingComponent.java  |   11 ---
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index e24ef33..6c50c9b 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -258,13 +258,10 @@ public class SortingComponent
 ArrayList SortDescriptions = new ArrayList();
 for (int i = 0; i <= MaxSortIndex; i++)
 {
-if (!((Boolean) CurUnoDialog.getControlProperty("lstSort" + (i + 1), PropertyNames.READ_ONLY)))
-{
-CurFieldName = xSortListBox[i].getSelectedItem();
-SortDescriptions.add(CurFieldName);
-iCurState = ((Short) CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), PropertyNames.PROPERTY_STATE)).shortValue();
-SortFieldNames.add(new String[]{CurFieldName,iCurState == 1 ? PropertyNames.ASC :"DESC" });
-}
+		CurFieldName = xSortListBox[i].getSelectedItem();
+		SortDescriptions.add(CurFieldName);
+		iCurState = ((Short) CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), PropertyNames.PROPERTY_STATE)).shortValue();
+		SortFieldNames.add(new String[]{CurFieldName,iCurState == 1 ? PropertyNames.ASC :"DESC" });
 }
 // When searching for a duplicate entry we can neglect whether the entries are to be sorted ascending or descending
 // TODO for the future we should deliver a messagebox when two different sorting modes have been applied to one field
-- 
1.7.7.3

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/ui/SortingComponent.java |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 9fd39a5047a7735c2532787de8f98423eae9da06
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:22:45 2012 +0200

fdo#48018 legacy reports do not sort by group columns

Legacy report means done with the "old" report system, as opposed to
with report builder.

This was caused by a misguided attempt to sort-of work around i#110536
instead of fixing it cleanly. Revert that.

Apparently the idea was to not explicitly set grouping columns as
sorting columns, but that the report execution would automagically add
grouping columns at begin of sorting list at report execution
time. That's a bad idea for at least two reasons:
 * This does not allow the user to chose ASC/DESC for grouping columns
 * In rare / advanced cases, sorting on another column *before*
   grouping is desirable.
Plus, the "automagic adding" part apparently wasn't implemented
anyway.

Change-Id: I81e76eb4b6a0e543571a4df97d0ead77f6a2d7c8

diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java 
b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index e24ef33..6c50c9b 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -258,13 +258,10 @@ public class SortingComponent
 ArrayList SortDescriptions = new ArrayList();
 for (int i = 0; i <= MaxSortIndex; i++)
 {
-if (!((Boolean) CurUnoDialog.getControlProperty("lstSort" + (i 
+ 1), PropertyNames.READ_ONLY)))
-{
-CurFieldName = xSortListBox[i].getSelectedItem();
-SortDescriptions.add(CurFieldName);
-iCurState = ((Short) 
CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), 
PropertyNames.PROPERTY_STATE)).shortValue();
-SortFieldNames.add(new String[]{CurFieldName,iCurState == 
1 ? PropertyNames.ASC :"DESC" });
-}
+   CurFieldName = xSortListBox[i].getSelectedItem();
+   SortDescriptions.add(CurFieldName);
+   iCurState = ((Short) 
CurUnoDialog.getControlProperty("optAscend" + Integer.toString(i + 1), 
PropertyNames.PROPERTY_STATE)).shortValue();
+   SortFieldNames.add(new String[]{CurFieldName,iCurState == 1 ? 
PropertyNames.ASC :"DESC" });
 }
 // When searching for a duplicate entry we can neglect whether the 
entries are to be sorted ascending or descending
 // TODO for the future we should deliver a messagebox when two 
different sorting modes have been applied to one field
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 6 commits - wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/db/SQLQueryComposer.java |   22 
+++-
 wizards/com/sun/star/wizards/report/ReportTextDocument.java   |3 -
 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |   25 
++
 wizards/com/sun/star/wizards/ui/SortingComponent.java |   11 +---
 4 files changed, 41 insertions(+), 20 deletions(-)

New commits:
commit b679dd69c0ebc1e8f4a3e85a2ef39c6a68a814f5
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:28:50 2012 +0200

legacy reports: unify treatment of query and table

In *both* cases, the value of hidden control "Sorting" (if non-empty)
decides the columns being sorted on.

Change-Id: I7f4b50c3af8c12e48e5dedd36b5877ad7a9e1b66

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 6be5b36..937d9f2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -264,7 +264,8 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 }
 getRecordParser().setRecordFieldNames(sNewList);
 getRecordParser().GroupFieldNames = 
JavaTools.ArrayoutofString(sGroupFieldNames, PropertyNames.SEMI_COLON);
-
getRecordParser().setCommandType(Integer.valueOf(sCommandType).intValue());
+int nOrigCommandType = 
Integer.valueOf(sCommandType).intValue();
+getRecordParser().setCommandType(nOrigCommandType);
 
 sMsgQueryCreationImpossible = 
JavaTools.replaceSubString(sMsgQueryCreationImpossible, 
getRecordParser().Command, "");
 bgetConnection = getRecordParser().getConnection(_properties);
@@ -278,8 +279,6 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 if 
(getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
 {
 getRecordParser().Command = (String) 
oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
-
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
-getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
 }
 else
 {
@@ -291,14 +290,24 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 bexecute = getRecordParser().executeCommand(nCommandType); 
//sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList, 
true);
 if (bexecute)
 {
-DBMetaData.CommandObject oCommand = 
getRecordParser().getQueryByName(sQueryName);
 bexecute = getRecordParser().getFields(sFieldNameList, 
true);
-if (bexecute && 
getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
+
+boolean addSort = true;
+if ( (nOrigCommandType == CommandType.QUERY) && 
!sQueryName.equals(PropertyNames.EMPTY_STRING) )
 {
-
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
-getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
-bexecute = 
getRecordParser().executeCommand(nCommandType);
+DBMetaData.CommandObject oCommand = 
getRecordParser().getQueryByName(sQueryName);
+if 
(!getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
+addSort = false;
 }
+if ( !(addSort && bexecute) )
+{
+return bexecute;
+}
+
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
+
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
+getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
+
+bexecute = 
getRecordParser().executeCommand(nCommandType);
 }
 return bexecute;
 }
commit e08b4b98c35a5e314c35e24174f316950064
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:26:58 2012 +0200

legacy report wizard: when source is table, save name in QueryName

Change-Id: Ie0bdbed9578b95f7fccc3d9ff6d9c8b5b91ac0ab

diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java 
b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 5cddeca..cbb7b9a 100644
--- 

Re: Draft document-rendering tiling API to be called from viewer apps

[Michael Meeks]

Hi Tor,

On Wed, 2012-06-06 at 14:43 +0300, Tor Lillqvist wrote:
> OK, so I did some design of how an API to render (tiles of) pages
> would look like that could be used both on Android and iOS apps.

:-)

> public interface org.libreoffice.touch.XDocument extends
> com.sun.star.uno.XInterface{
> public static final com.sun.star.lib.uno.typeinfo.TypeInfo[] UNOTYPEINFO;
> public abstract int getnumberOfPages();
> public abstract void render(long, int,
> org.libreoffice.touch.XDocumentRenderCallback, int, int, int, int)
>   throws com.sun.star.lang.IllegalArgumentException;
> }

It'd be rather nice to have some parameter names rather than just
'long' 'int' etc. etc ;-) I assume that the last four are pixel
co-ordinates to render ? (perhaps doubles would be better), and the
first long is ? I imagine we want to be able to fetch the size of pages
in the same co-ordinate system (?) or do we use the existing render
interface for that ?

> But, that's the *specification* and *use*. *Implementing* UNO services
> in C++, especially if you don't want to just copy-paste existing code

One of the big missing nasties is a standard signal/slot mechanism that
is part of the language, and maps (where possible) to a native language
construct.

HTH,

Michael.

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

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

[Libreoffice-commits] .: Branch 'features/base-preview' - 7 commits - wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/db/SQLQueryComposer.java |   22 
+++-
 wizards/com/sun/star/wizards/report/ReportTextDocument.java   |3 -
 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |   27 
++
 wizards/com/sun/star/wizards/ui/SortingComponent.java |   11 +---
 4 files changed, 42 insertions(+), 21 deletions(-)

New commits:
commit e5bde62273d3268c5eb0cf34a14fde641f941518
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:28:50 2012 +0200

legacy reports: unify treatment of query and table

In *both* cases, the value of hidden control "Sorting" (if non-empty)
decides the columns being sorted on.

Change-Id: I7f4b50c3af8c12e48e5dedd36b5877ad7a9e1b66

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 6be5b36..937d9f2 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -264,7 +264,8 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 }
 getRecordParser().setRecordFieldNames(sNewList);
 getRecordParser().GroupFieldNames = 
JavaTools.ArrayoutofString(sGroupFieldNames, PropertyNames.SEMI_COLON);
-
getRecordParser().setCommandType(Integer.valueOf(sCommandType).intValue());
+int nOrigCommandType = 
Integer.valueOf(sCommandType).intValue();
+getRecordParser().setCommandType(nOrigCommandType);
 
 sMsgQueryCreationImpossible = 
JavaTools.replaceSubString(sMsgQueryCreationImpossible, 
getRecordParser().Command, "");
 bgetConnection = getRecordParser().getConnection(_properties);
@@ -278,8 +279,6 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 if 
(getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
 {
 getRecordParser().Command = (String) 
oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
-
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
-getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
 }
 else
 {
@@ -291,14 +290,24 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 bexecute = getRecordParser().executeCommand(nCommandType); 
//sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList, 
true);
 if (bexecute)
 {
-DBMetaData.CommandObject oCommand = 
getRecordParser().getQueryByName(sQueryName);
 bexecute = getRecordParser().getFields(sFieldNameList, 
true);
-if (bexecute && 
getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
+
+boolean addSort = true;
+if ( (nOrigCommandType == CommandType.QUERY) && 
!sQueryName.equals(PropertyNames.EMPTY_STRING) )
 {
-
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
-getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
-bexecute = 
getRecordParser().executeCommand(nCommandType);
+DBMetaData.CommandObject oCommand = 
getRecordParser().getQueryByName(sQueryName);
+if 
(!getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
+addSort = false;
 }
+if ( !(addSort && bexecute) )
+{
+return bexecute;
+}
+
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
+
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
+getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
+
+bexecute = 
getRecordParser().executeCommand(nCommandType);
 }
 return bexecute;
 }
commit f293846b762831fd54b132f2e28922809ccff6da
Author: Lionel Elie Mamane 
Date:   Wed Jun 6 14:26:58 2012 +0200

legacy report wizard: when source is table, save name in QueryName

Change-Id: Ie0bdbed9578b95f7fccc3d9ff6d9c8b5b91ac0ab

diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java 
b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 5cddeca..cbb7b9a 100644
--- 

Re: Draft document-rendering tiling API to be called from viewer apps

[Stephan Bergmann]

On 06/06/2012 01:43 PM, Tor Lillqvist wrote:

Now I am having second thoughts, though, but still, a first, in
progress, draft API is in UNOIDL form is in touch/idl.


I see no need for a DocumentRenderCallback service. 
XDocumentRenderCallback will be implemented by UNO objects specific to 
the various callers of XDocument.render; there is no reasonable generic 
implementation that could be offered as a service.  (Also, there is a 
subtle difference between an explicit zero-parameter constructor and an 
implicit default constructor for UNO services, relating to whether the 
constructor internally calls createInstanceWithContext or 
createInstanceWithArgumentsAndContext.)



But, that's the *specification* and *use*. *Implementing* UNO services
in C++, especially if you don't want to just copy-paste existing code
as a start, and then modify,  without understanding what the parts you
don't touch is exactly doing, is still nightmarish with loads of
boilerplate-ish rubbish.


I would go the UNO approach nevertheless.  If you want to be able to 
call this from Java, don't underestimate the work you save by reusing 
UNO here.  Your impression might vary, but I would say this vastly 
compensates for the mild amount of boilerplate you need on the C++ 
implementation side.  (I might of course be routine-blinded, but in my 
eyes the necessary boilerplate boils down to not that much really.)


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

[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_forms binfilter/bf_sc binfilter/bf_sd binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc

[Stephan Bergmann]

 binfilter/bf_basic/source/basmgr/basmgr.cxx|2 
 binfilter/bf_basic/source/classes/sbxmod.cxx   |   18 
---
 binfilter/bf_forms/source/component/Image.hxx  |1 
 binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx |2 
 binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx  |4 
 binfilter/bf_sd/source/core/sd_drawdoc2.cxx|4 
 binfilter/bf_starmath/source/starmath_node.cxx |1 
 binfilter/bf_starmath/source/starmath_smdll.cxx|7 -
 binfilter/bf_svtools/source/config/svt_moduleoptions.cxx   |4 
 binfilter/bf_svtools/source/filter.vcl/ixbm/svt_xbmread.cxx|   60 
+-
 binfilter/bf_svx/source/editeng/svx_impedit3.cxx   |2 
 binfilter/bf_svx/source/engine3d/svx_obj3d.cxx |1 
 binfilter/bf_sw/source/core/doc/sw_docfmt.cxx  |2 
 binfilter/bf_sw/source/core/doc/sw_docftn.cxx  |7 -
 binfilter/bf_sw/source/core/doc/sw_doctxm.cxx  |2 
 binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx   |1 
 binfilter/inc/bf_basic/sbxfac.hxx  |5 
 17 files changed, 42 insertions(+), 81 deletions(-)

New commits:
commit 5fb512c849e4bbe5918465113b095c793c0252f2
Author: Stephan Bergmann 
Date:   Wed Jun 6 10:37:57 2012 +0200

Fixes for various Clang (on Mac OS X) warnings

Change-Id: I06df07f6d4133658fad90d5622762a8d1cdf04af

diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx 
b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index efda967..5e3c517 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -2075,7 +2075,7 @@ Any LibraryContainer_Impl::getByName( const OUString& 
aName )
 Reference< XNameContainer > xModuleContainer =
 (XNameContainer*)new ModuleContainer_Impl( pLib );
 
-Reference< XNameContainer > xDialogContainer;
+Reference< XNameContainer > xDialogContainer =
 (XNameContainer*)new DialogContainer_Impl( pLib );
 
 BasicLibInfo* pLibInfo = mpMgr->FindLibInfo( pLib );
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx 
b/binfilter/bf_basic/source/classes/sbxmod.cxx
index f5b6be5..1ffa8e6 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -356,24 +356,6 @@ SbMethod* SbModule::GetFunctionForLine( USHORT nLine )
 return NULL;
 }
 
-// Ausstrahlen eines Hints an alle Basics
-
-static void _SendHint( SbxObject* pObj, ULONG nId, SbMethod* p )
-{
-// Selbst ein BASIC?
-if( pObj->IsA( TYPE(StarBASIC) ) && pObj->IsBroadcaster() )
-pObj->GetBroadcaster().Broadcast( SbxHint( nId, p ) );
-// Dann die Unterobjekte fragen
-SbxArray* pObjs = pObj->GetObjects();
-for( USHORT i = 0; i < pObjs->Count(); i++ )
-{
-SbxVariable* pVar = pObjs->Get( i );
-if( pVar->IsA( TYPE(SbxObject) ) )
-_SendHint( PTR_CAST(SbxObject,pVar), nId, p );
-}
-}
-
-
 // #57841 Uno-Objekte, die in RTL-Funktionen gehalten werden,
 // beim Programm-Ende freigeben, damit nichts gehalten wird.
 void ClearUnoObjectsInRTL_Impl_Rek( StarBASIC* pBasic )
diff --git a/binfilter/bf_forms/source/component/Image.hxx 
b/binfilter/bf_forms/source/component/Image.hxx
index 8bdda6f..09d86fa 100644
--- a/binfilter/bf_forms/source/component/Image.hxx
+++ b/binfilter/bf_forms/source/component/Image.hxx
@@ -170,6 +170,7 @@ public:
 
 // OComponentHelper
 virtual void SAL_CALL disposing();
+using OImageControl_BASE::disposing;
 
 // ::com::sun::star::form::XApproveActionBroadcaster
 virtual void SAL_CALL addApproveActionListener(const 
::com::sun::star::uno::Reference< 
::com::sun::star::form::XApproveActionListener>& _rxListener)
diff --git 
a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx 
b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
index 74085bb..ddd4695 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLChangeTrackingImportHelper.cxx
@@ -516,7 +516,7 @@ void 
ScXMLChangeTrackingImportHelper::CreateGeneratedActions(ScMyGeneratedList&
 ScMyGeneratedList::iterator aItr = rList.begin();
 while (aItr != rList.end())
 {
-if (((*aItr)->nID == 0))
+if ((*aItr)->nID == 0)
 {
 ScBaseCell* pCell = NULL;
 if ((*aItr)->pCellInfo)
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx 
b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
index 876ce46..cdba6bf 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
@@ -976,9 +976

[Libreoffice-commits] .: 4 commits - dbaccess/source extensions/source moz/makefile.mk moz/patches reportdesign/source

[Stephan Bergmann]

 dbaccess/source/core/api/RowSetBase.cxx  |2 
 extensions/source/plugin/aqua/sysplug.mm |   22 +-
 moz/makefile.mk  |1 
 moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch |   33 +++
 reportdesign/source/core/sdr/UndoEnv.cxx |   18 
 5 files changed, 45 insertions(+), 31 deletions(-)

New commits:
commit 075271062ac719a2790713b7f301a4a4ac7505c0
Author: Stephan Bergmann 
Date:   Wed Jun 6 09:31:30 2012 +0200

-Werror,-Wself-assign (Clang)

Change-Id: Ic541f6539a34ea20b19613edc4fe8670b1a69dee

diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx 
b/reportdesign/source/core/sdr/UndoEnv.cxx
index 487bbaf..46b8986 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -176,20 +176,6 @@ void OXUndoEnvironment::Clear(const Accessor& /*_r*/)
 {
 OUndoEnvLock aLock(*this);
 
-#if OSL_DEBUG_LEVEL > 0
-// TODO: LLA->OJ please describe what you are doing in this code fragment.
-PropertySetInfoCache::iterator aIter = 
m_pImpl->m_aPropertySetCache.begin();
-PropertySetInfoCache::iterator aEnd = m_pImpl->m_aPropertySetCache.end();
-int ndbg_len = m_pImpl->m_aPropertySetCache.size();
-ndbg_len = ndbg_len;
-for (int idbg_ = 0; aIter != aEnd; ++aIter,++idbg_)
-{
-uno::Reference xProp(aIter->first,uno::UNO_QUERY);
-xProp->getPropertySetInfo();
-int nlen = aIter->second.aProperties.size();
-nlen = nlen;
-}
-#endif
 m_pImpl->m_aPropertySetCache.clear();
 
 sal_uInt16 nCount = m_pImpl->m_rModel.GetPageCount();
@@ -267,10 +253,6 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const 
PropertyChangeEvent& _rEv
 
 // no Undo for transient and readonly props.
 // let's see if we know something about the set
-#if OSL_DEBUG_LEVEL > 0
-int nlen = m_pImpl->m_aPropertySetCache.size();
-nlen = nlen;
-#endif
 PropertySetInfoCache::iterator objectPos = 
m_pImpl->m_aPropertySetCache.find(xSet);
 if (objectPos == m_pImpl->m_aPropertySetCache.end())
 {
commit a519cacd61624784eff0646c8a472349373b2993
Author: Stephan Bergmann 
Date:   Tue Jun 5 23:32:45 2012 +0200

-Werror,-Wself-assign (Clang)

Change-Id: I92f1271ad36e4ae1221182a3a446f36cf770e003

diff --git a/dbaccess/source/core/api/RowSetBase.cxx 
b/dbaccess/source/core/api/RowSetBase.cxx
index 728934b..758a715 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -268,8 +268,6 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 
columnIndex)
 aCacheEnd = m_pCache->getEnd();
 aCurrentRow = m_aCurrentRow;
 ORowSetCacheMap::iterator aCacheIter = m_aCurrentRow.getIter();
-sal_Int32 n = aCacheIter->first;
-n = n;
 ORowSetCacheIterator_Helper aHelper = aCacheIter->second;
 ORowSetMatrix::iterator k = aHelper.aIterator;
 for (; k != m_pCache->getEnd(); ++k)
commit 39ec7832d165d81385b340bc6c0ca9cf5f194eb5
Author: Stephan Bergmann 
Date:   Tue Jun 5 23:22:48 2012 +0200

Adapt to --with-macosx-version-min-required=10.6 and Xcode 4

...signature of TransitionWindowWithOptions apparently changed slightly in 
10.6,
and /Developer/Tools/Rez can more reliably be found in /usr/bin.

Change-Id: Iba55478f3b6de1b4695b686095f4aa0bc0af8e7b

diff --git a/moz/makefile.mk b/moz/makefile.mk
index 13db91f..76296ad 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -88,6 +88,7 @@ PATCH_FILES = \
 patches/nss-linux3.patch \
 
patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
 patches/clang_missing_this_pointers.patch \
+patches/seamonkey-1.1.14.source-macosx10.6and7.patch
 
 # This file is needed for the W32 build when BUILD_MOZAB is set
 # (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
diff --git a/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch 
b/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch
new file mode 100644
index 000..e74c4e4
--- /dev/null
+++ b/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch
@@ -0,0 +1,33 @@
+--- misc/mozilla/widget/src/mac/Makefile.in2006-08-04 20:52:25.0 
+0200
 misc/build/mozilla/widget/src/mac/Makefile.in  2012-06-04 
23:26:18.0 +0200
+@@ -130,7 +130,7 @@
+ RES_SRC = $(srcdir)/nsMacWidget.r
+ 
+ $(RES_DEST): $(RES_SRC)
+-  /Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $(RES_SRC) 
-o $(RES_DEST)
++  Rez -i $(MACOS_SDK_DIR)/Developer/Headers/FlatCarbon -useDF $(RES_SRC) 
-o $(RES_DEST)
+ 
+ libs:: $(RES_DEST)
+ 
+--- misc/mozilla/widget/src/mac/nsMacWindow.cpp2007-11-19 
21:40:08.0 +0100
 misc/build/mozilla/widget/src/mac/nsMacWindow.cpp  2012-06-04 
22:26:29.0 +0200
+@@ -1209,7 +1209,7 @@
+   if (!sChecked) {
+ sChecked = PR_TRUE;
+ #if MAC_OS_X_V

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Petr Mladek  changed:

   What|Removed |Added

 Depends on||50783

--- Comment #14 from Petr Mladek  2012-06-06 05:00:58 PDT ---
Add bug 50783: Can't create database or access table in Base. It makes Base
almost unusable.

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
--- 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: udk module fails to compile

[julien2412]

Hi Michael,

Yep it was the wrong track on IRC about make but no problem. (anyway I do
too much errors to complain about this :-))

In fact, first I didn't know how to apply what said David on this thread to
retrieve the bt, then with the details he gave, I wanted to reproduce the
problem but was stuck by Boost date problem (finally solved by Bjoern).

Now I passed this step (see
http://nabble.documentfoundation.org/udk-module-fails-to-compile-tp3987690p3988392.html)
but now it fails to compile sfx2 (a solver dependancy or something, I'm not
at home so can't give details, i can just tell "make sfx2.clean && make
sfx2" doesn't work).

Before that, I had this problem "ZipEnumeration::ZipEnumeration(...
undefined/unsolved ref" or something.
I passed this with just make package.clean && make package.

In brief, I or my laptop must have been cursed 2 or 3 days ago :-) I'll try
another "make clean && make" after day job.

Julien.
PS : Thank you guys for your support and your patience.

--
View this message in context: 
http://nabble.documentfoundation.org/udk-module-fails-to-compile-tp3987690p3988469.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] Re: [PATCH 1/2] Replace SvStringsISortDtor in edtwin.cxx and gloslst.[ch]xx

[Brad Sowden]

Hi Michael,


* I used a pointer to the vector as the move() function previously
copied and cleared all elements whereas a pointer swap would suffice.


ah that's why, i had wondered
would it be possible to use std::swap on the vector itself rather than
the pointer?   i could imagine that being implemented efficiently, and
it would allow the vector to not be a pointer, which is simpler.

also (but that was a pre-existing condition, not really your fault)
member names should start with "m_" so it's easy to grep for member access.


Ah, I can use vector::swap(). Patch attached getting rid of the vector 
pointer. Much nicer.


Thanks,
Brad
>From 7c6b510fdfd2cdc99f8628637296c7fb8622f8d9 Mon Sep 17 00:00:00 2001
From: Brad Sowden 
Date: Wed, 6 Jun 2012 18:34:01 +1200
Subject: [PATCH] Use a vector rather than a pointer to a vector

Change-Id: I437a665ffa225ce69e10f7ee71ff2902c3db505e
---
 sw/source/ui/docvw/edtwin.cxx |   59 ++--
 1 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index fffe6c3..b923ec5 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -272,36 +272,31 @@ public:
 
 struct QuickHelpData
 {
-std::vector *pHelpStrings;
+std::vector m_aHelpStrings;
 sal_uInt16* pAttrs;
 CommandExtTextInputData* pCETID;
 sal_uLong nTipId;
 sal_uInt16 nLen, nCurArrPos;
 sal_Bool bClear : 1, bChkInsBlank : 1, bIsTip : 1, bIsAutoText : 1;
 
-QuickHelpData() : pAttrs( 0 ), pCETID( 0 )
-{
-pHelpStrings = new std::vector;
-ClearCntnt();
-}
-~QuickHelpData() { delete pHelpStrings; }
+QuickHelpData() : pAttrs( 0 ), pCETID( 0 ) { ClearCntnt(); }
 
 void Move( QuickHelpData& rCpy );
 void ClearCntnt();
 void Start( SwWrtShell& rSh, sal_uInt16 nWrdLen );
 void Stop( SwWrtShell& rSh );
 
-sal_Bool HasCntnt() const { return !pHelpStrings->empty() && 0 != nLen; }
+sal_Bool HasCntnt() const { return !m_aHelpStrings.empty() && 0 != nLen; }
 
 void Inc( sal_Bool bEndLess )
 {
-if( ++nCurArrPos >= pHelpStrings->size() )
+if( ++nCurArrPos >= m_aHelpStrings.size() )
 nCurArrPos = (bEndLess && !bIsAutoText ) ? 0 : nCurArrPos-1;
 }
 void Dec( sal_Bool bEndLess )
 {
 if( 0 == nCurArrPos-- )
-nCurArrPos = (bEndLess && !bIsAutoText ) ?  pHelpStrings->size()-1 : 0;
+nCurArrPos = (bEndLess && !bIsAutoText ) ? m_aHelpStrings.size()-1 : 0;
 }
 void FillStrArr( SwWrtShell& rSh, const String& rWord );
 void SortAndFilter();
@@ -2475,7 +2470,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
 // replace the word or abbreviation with the auto text
 rSh.StartUndo( UNDO_START );
 
-String sFnd( (*aTmpQHD.pHelpStrings)[ aTmpQHD.nCurArrPos ] );
+String sFnd( aTmpQHD.m_aHelpStrings[ aTmpQHD.nCurArrPos ] );
 if( aTmpQHD.bIsAutoText )
 {
 SwGlossaryList* pList = ::GetGlossaryList();
@@ -5471,8 +5466,8 @@ uno::Reference< ::com::sun::star::accessibility::XAccessible > SwEditWin::Create
 
 void QuickHelpData::Move( QuickHelpData& rCpy )
 {
-pHelpStrings->clear();
-std::swap( pHelpStrings, rCpy.pHelpStrings );
+m_aHelpStrings.clear();
+m_aHelpStrings.swap( rCpy.m_aHelpStrings );
 
 bClear = rCpy.bClear;
 nLen = rCpy.nLen;
@@ -5495,7 +5490,7 @@ void QuickHelpData::ClearCntnt()
 nLen = nCurArrPos = 0;
 bClear = bChkInsBlank = sal_False;
 nTipId = 0;
-pHelpStrings->clear();
+m_aHelpStrings.clear();
 bIsTip = sal_True;
 bIsAutoText = sal_True;
 delete pCETID, pCETID = 0;
@@ -5524,12 +5519,12 @@ void QuickHelpData::Start( SwWrtShell& rSh, sal_uInt16 nWrdLen )
 rSh.GetCharRect().Pos() )));
 aPt.Y() -= 3;
 nTipId = Help::ShowTip( &rWin, Rectangle( aPt, Size( 1, 1 )),
-(*pHelpStrings)[ nCurArrPos ],
+m_aHelpStrings[ nCurArrPos ],
 QUICKHELP_LEFT | QUICKHELP_BOTTOM );
 }
 else
 {
-String sStr( (*pHelpStrings)[ nCurArrPos ] );
+String sStr( m_aHelpStrings[ nCurArrPos ] );
 sStr.Erase( 0, nLen );
 sal_uInt16 nL = sStr.Len();
 pAttrs = new sal_uInt16[ nL ];
@@ -5609,17 +5604,17 @@ void QuickHelpData::FillStrArr( SwWrtShell& rSh, const String& rWord )
 == sWordLower )
 {
 if ( aWordCase == CASE_LOWER )
-pHelpStrings->push_back( rCC.lowercase( rStr ) );
+m_aHelpStrings.push_back( rCC.lowercase( rStr ) );
 else if ( aWordCase == CASE_SENTENCE )
 {
 String sTmp = rCC.lowercase( rStr );
 sTmp.SetChar( 0, rStr.GetChar(0) );
-pHelpStrings->push_back( sTmp );
+

the pdf export does not work in the the java Uno framework withing Tomcat.

[Bertrand Vuaridel]

The filter "writer_pdf_Export" does not works while another filter "MS 
Word 97" does, using the java Uno  framework within Tomcat.

e.g. the conversion odt > doc or docx > doc works well
Simply changing  the filter name from "MS Word 97" to 
"writer_pdf_Export" and the target file extensions doc to pdf does not 
work!
The conversion to pdf produce a com.sun.star.task.ErrorCodeIOException 
...  as shonw below.


The same code executed has a standalone java application using the 
loader com.sun.star.lib.loader.Loader is working for both filters! We 
have checked all possible write permission and found no possible issue 
since all processes belong to the same user.


Context: MacOS Lion, LibreOffice3.5.4 Java-Tomcat

Note that  the command line with the writer_pdf_Export filter pdf works 
well!:
/Applications/LibreOffice.app/Contents/MacOS/soffice --headless 
--convert-to pdf:writer_pdf_Export *.docx


Libreoffice  is launched with the command line:
/Applications/LibreOffice.app/Contents/MacOS/soffice --norestore 
--nofirststartwizard --nologo --headless 
--accept=socket,host=localhost,port=7396;urp


The code follows after the exception.

The exception:
com.sun.star.task.ErrorCodeIOException:
at 
com.sun.star.lib.uno.environments.remote.Job.remoteUnoRequestRaisedException(Job.java:177)

at com.sun.star.lib.uno.environments.remote.Job.execute(Job.java:143)
at 
com.sun.star.lib.uno.environments.remote.JobQueue.enter(JobQueue.java:338)
at 
com.sun.star.lib.uno.environments.remote.JobQueue.enter(JobQueue.java:307)
at 
com.sun.star.lib.uno.environments.remote.JavaThreadPool.enter(JavaThreadPool.java:91)
at 
com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.sendRequest(java_remote_bridge.java:640)
at 
com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.request(ProxyFactory.java:150)
at 
com.sun.star.lib.uno.bridges.java_remote.ProxyFactory$Handler.invoke(ProxyFactory.java:132)

at $Proxy8.storeAsURL(Unknown Source)
at 
com.artegis.rs.pdf.PdfGenerator.convert2pdfWithDaemon(PdfGenerator.java:622)

at com.artegis.rs.pdf.PdfGenerator.getPdfFile(PdfGenerator.java:299)
at com.artegis.rs.servlet.UploadServlet.doPost(UploadServlet.java:442)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:637)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
at 
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
at 
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at 
org.apache.catalina.core.ApplicationDispatcher.invoke(ApplicationDispatcher.java:646)
at 
org.apache.catalina.core.ApplicationDispatcher.processRequest(ApplicationDispatcher.java:436)
at 
org.apache.catalina.core.ApplicationDispatcher.doForward(ApplicationDispatcher.java:374)
at 
org.apache.catalina.core.ApplicationDispatcher.forward(ApplicationDispatcher.java:302)
at 
com.artegis.infra.classes.PageForwarder.forward(PageForwarder.java:234)
at 
com.artegis.infra.servlet.ControllerServlet.doControl(ControllerServlet.java:1453)
at 
com.artegis.infra.servlet.ControllerServlet.doPost(ControllerServlet.java:775)

at javax.servlet.http.HttpServlet.service(HttpServlet.java:637)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)
at 
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:290)
at 
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:206)
at 
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:233)
at 
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:191)
at 
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127)
at 
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:102)
at 
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:109)
at 
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:298)
at 
org.apache.coyote.http11.Http11Processor.process(Http11Processor.java:857)
at 
org.apache.coyote.http11.Http11Protocol$Http11ConnectionHandler.process(Http11Protocol.java:588)
at 
org.apache.tomcat.util.net.JIoEndpoint$Worker.run(JIoEndpoint.java:489)

at java.lang.Thread.run(Thread.java:680)

The Java code:
/*
 * java 
-Dcom.sun.star.lib.loader.unopath="/Applications/LibreOffice.app/Contents/MacOS/" 
-classpath 
:Users/bv/apache-tomcat-6.0.29/lib/ridl.jar:Users/bv/apache-tomcat-6.0.29/lib/unoil.jar:Users/bv/apache-tomcat-6.0.29/lib/juh.jar:Users/bv/apache-tomcat-6.0.29/lib/jurt.jar:.:/Users/bv/Downloads/ 
com.sun.star.lib.loader.Loader test.Test

 */
package test;
import java.io.File;
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.XPropertySet;
import com.sun.star.bridge.XUnoUrlResolver;
import com.sun.star.comp.helper.Bootstrap;
import com.sun.star.frame.X

Draft document-rendering tiling API to be called from viewer apps

[Tor Lillqvist]

OK, so I did some design of how an API to render (tiles of) pages
would look like that could be used both on Android and iOS apps.

My first idea was to do it based on UNO. On Android the Java code
would then call the implementation in the "normal" nice way one from
Java code calls UNO services. For iOS, the iOS-specific code would
either also use the UNO as from C++ (i.e. from Objective-C++), or one
would write a thing layer in between, perhaps even with ObjC proxy
objects if one would want to get fancy.

Now I am having second thoughts, though, but still, a first, in
progress, draft API is in UNOIDL form is in touch/idl.

See those .idl files for plenty of comments. (Sorry, comments not yet
in the meta-syntax that our documentation-generating tools would
understand.) To see the corresponding Java API that is automatically
generated from that, one needs to run javap on the class files.

The command "javap -classpath
workdir/unxandr.pro/CustomTarget/touch/class
org.libreoffice.touch.Document org.libreoffice.touch.XDocument
org.libreoffice.touch.DocumentRenderCallback
org.libreoffice.touch.XDocumentRenderCallback" outputs:


public final class org.libreoffice.touch.Document extends java.lang.Object{
public static org.libreoffice.touch.XDocument
create(com.sun.star.uno.XComponentContext, java.lang.String);
}

public interface org.libreoffice.touch.XDocument extends
com.sun.star.uno.XInterface{
public static final com.sun.star.lib.uno.typeinfo.TypeInfo[] UNOTYPEINFO;
public abstract int getnumberOfPages();
public abstract void render(long, int,
org.libreoffice.touch.XDocumentRenderCallback, int, int, int, int)
  throws com.sun.star.lang.IllegalArgumentException;
}

public final class org.libreoffice.touch.DocumentRenderCallback
extends java.lang.Object{
public static org.libreoffice.touch.XDocumentRenderCallback
create(com.sun.star.uno.XComponentContext);
}

public interface org.libreoffice.touch.XDocumentRenderCallback extends
com.sun.star.uno.XInterface{
public static final com.sun.star.lib.uno.typeinfo.TypeInfo[] UNOTYPEINFO;
public abstract boolean start(int, int);
public abstract boolean progress(float);
}

But I'll move on to those second thoughts

I already thought I was starting to like UNO! That was after having
seen how nice (relatively speaking) it is to use UNO from Java code
(as in the DocumentLoader test Android app).

Java's garbage collection inter-operates fully with the life-cycles of
underlying UNO objects written in C++, these get destructed when there
are no more references to them on the Java side (or on the C++ side),
when the proxy Java object is finalized prior to being garbage
collected. Or something like that.

Using UNO services is even nicer if the services are of the "new
style" as described by Stephan Bergmann in his "Shiny Happy" OOoCon
talk from 2004 
http://www.openoffice.org/marketing/ooocon2004/presentations/friday/shinyhappyuno.pdf
, which ideas are right now (after 8 years) actually being implemented
more widely in the codebase.

Using UNO APIs from C++ is also (relatively) nice. And specifying APIs
in IDL *is* nice.

But, that's the *specification* and *use*. *Implementing* UNO services
in C++, especially if you don't want to just copy-paste existing code
as a start, and then modify,  without understanding what the parts you
don't touch is exactly doing, is still nightmarish with loads of
boilerplate-ish rubbish.

So now I am not so sure any more. Maybe after all I will just do a
JNI-friendly "C" API. That then internally of course uses UNO to
*call* the existing services in LO, and poke directly into their
implementations as needed. I don't feel like extending existing,
already "published" and thus fixed, APIs like XDevice, XRenderable
etc.

This means the life-cycle of objects accessed though this will
probably not be automated for Java clients, hmm.

Anyway, the end result will be an API for (your) Android Java GUI code
to call that will still be something fairly close to the above. So now
is the time to speak up if you see something obviously stupid, or have
lots of other ideas (which would be *good*, don't be modest!)

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

[Libreoffice-commits] .: embeddedobj/source

[Michael Stahl]

 embeddedobj/source/msole/olepersist.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 38a809d9497006e570847d899c8b7c738bca6136
Author: Michael Stahl 
Date:   Wed Jun 6 13:20:56 2012 +0200

embeddedobj: try to make MSVC happy

Change-Id: I0d3f032309fe5aa1c4a33909cbc0e00a22196aa9

diff --git a/embeddedobj/source/msole/olepersist.cxx 
b/embeddedobj/source/msole/olepersist.cxx
index 7765043..2d74cb8 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -1054,7 +1054,7 @@ void OleEmbeddedObject::StoreObjectToStream( 
uno::Reference< io::XOutputStream >
 throw uno::RuntimeException();
 
 // open temporary file for reading
-uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
+uno::Reference < ucb::XSimpleFileAccess2 > xTempAccess(
 ucb::SimpleFileAccess::create( 
comphelper::ComponentContext(m_xFactory).getUNOContext() ) );
 
 uno::Reference< io::XInputStream > xTempInStream = 
xTempAccess->openFileRead( m_aTempURL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: f70fe6e6 regression: options dialog is a bit broken

[Caolán McNamara]

On Tue, 2012-06-05 at 23:41 +0400, Ivan Timofeev wrote:
> Thanks for the explanations! One question: what is the planned deadline 
> (if any)?

Now that 3-6 is branched I hope to get it into this cycle before 3-7
once I work through a few of the gotchas.

C.

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

Re: [PUSHED 3-5][PUSHED 3-6][PATCH] fdo#50415 and fdo#34638 Fix Shortcut names are not localized on Linux

[Caolán McNamara]

On Tue, 2012-06-05 at 22:30 +0200, Thomas Arnhold wrote:
> Hi,
> 
> I've fixed my introduced regression:
> 
> on master: 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=76dcd76509ec0b2078a95f282e09696a8e91cbb0
> 
> And with these two attachments for 3-5 and 3-6 branch. Would be nice if 
> someone could check and sign it.

Looks alright, back to the way it was except take translations from UI
localization instead of keyboard layout. Which is apparently what GNOME
does anyway.

C.

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

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/inc vcl/Library_vclplug_gen.mk vcl/unx

[Caolán McNamara]

 vcl/Library_vclplug_gen.mk  |1 
 vcl/inc/unx/saldisp.hxx |9 
 vcl/unx/generic/app/keysymnames.cxx |  372 
 vcl/unx/generic/app/saldisp.cxx |   21 +-
 4 files changed, 396 insertions(+), 7 deletions(-)

New commits:
commit 5548b62a3c22cc3338d09e22f1c663a91981deef
Author: Thomas Arnhold 
Date:   Mon Jun 4 18:21:58 2012 +0200

fdo#50415 and fdo#34638 Fix Shortcut names are not localized on Linux

This partially reverts commit 2233aa52da14ec85331aee1163b885fe9a9fb507

Before the keyboard name was used to determine the target language
for translation of UI shortcuts. With this patch the UI locale
is used to determine the language.

Related to:
- 8d9e2d9a211f710e91ac7c607fea25895282d245
- 04b9c2f633f0be1b676933943bdd0b1dc58b5471

Change-Id: I14c6759dc405db490d210a78ce19e1416efb7ac7

Signed-off-by: Caolán McNamara 

diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 3ff257a..c018a9d 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
 vcl/unx/generic/app/i18n_status \
 vcl/unx/generic/app/i18n_wrp \
 vcl/unx/generic/app/i18n_xkb \
+vcl/unx/generic/app/keysymnames \
 vcl/unx/generic/app/randrwrapper \
 vcl/unx/generic/app/saldata \
 vcl/unx/generic/app/saldisp \
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index fce2a68..c83b42b 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -434,6 +434,15 @@ public:
 voidSetupInput( SalI18N_InputMethod *pInputMethod );
 };
 
+
+// get foreign key names
+namespace vcl_sal {
+rtl::OUString getKeysymReplacementName(
+rtl::OUString pLang,
+KeySym nSymbol );
+}
+
+
 #endif // _SV_SALDISP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/app/keysymnames.cxx 
b/vcl/unx/generic/app/keysymnames.cxx
new file mode 100644
index 000..bc1d705
--- /dev/null
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -0,0 +1,372 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * 
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#if !defined(SOLARIS) && !defined(AIX)
+#include 
+#include 
+#include 
+#endif
+
+#include 
+#include 
+#include 
+
+#if !defined (SunXK_Undo)
+#define SunXK_Undo  0xFF65  // XK_Undo
+#define SunXK_Again 0xFF66  // XK_Redo
+#define SunXK_Find  0xFF68  // XK_Find
+#define SunXK_Stop  0xFF69  // XK_Cancel
+#define SunXK_Props 0x1005FF70
+#define SunXK_Front 0x1005FF71
+#define SunXK_Copy  0x1005FF72
+#define SunXK_Open  0x1005FF73
+#define SunXK_Paste 0x1005FF74
+#define SunXK_Cut   0x1005FF75
+#endif
+
+#include 
+#include 
+
+namespace vcl_sal {
+
+struct KeysymNameReplacement
+{
+KeySym  aSymbol;
+const char* pName;
+};
+
+struct KeyboardReplacements
+{
+const char* pLangName;
+const KeysymNameReplacement*pReplacements;
+int nReplacements;
+};
+
+// 
+//
+// CAUTION CAUTION CAUTION
+// every string value in the replacements tables must be in UTF8
+// be careful with your editor !
+//
+// 
+
+static const struct KeysymNameReplacement aImplReplacements_English[] =
+{
+{ XK_Control_L, "Ctrl" },
+{ XK_Control_R, "Ctrl" },
+{ XK_Escape, "Esc" },
+{ XK_space, "Space" },
+};
+
+static const struct KeysymNameReplacement aImplReplacements_Turkish[] =
+{
+{ XK_Con

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

[Caolán McNamara]

 vcl/inc/unx/saldisp.hxx |9 +
 vcl/unx/generic/app/keysymnames.cxx |  248 ++--
 vcl/unx/generic/app/saldisp.cxx |   28 ++--
 3 files changed, 42 insertions(+), 243 deletions(-)

New commits:
commit 309a5aad968f7c12d8317c91d44c3e1122c7fe78
Author: Thomas Arnhold 
Date:   Tue Jun 5 22:26:07 2012 +0200

fdo#50415 and fdo#34638 Fix Shortcut names are not localized on Linux

This partially reverts commit 2233aa52da14ec85331aee1163b885fe9a9fb507
and commit 8d9e2d9a211f710e91ac7c607fea25895282d245

Before the keyboard name was used to determine the target language
for translation of UI shortcuts. With this patch the UI locale
is used to determine the language.

Related to:
- 8d9e2d9a211f710e91ac7c607fea25895282d245
- 04b9c2f633f0be1b676933943bdd0b1dc58b5471

Change-Id: Id7ee05ed4065dd4f0c12d283413e97092e95a15f

Signed-off-by: Caolán McNamara 

diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 83bf9ea..150a100 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -474,6 +474,15 @@ namespace vcl_sal {
 }
 
 
+
+// get foreign key names
+namespace vcl_sal {
+rtl::OUString getKeysymReplacementName(
+rtl::OUString pLang,
+KeySym nSymbol );
+}
+
+
 #endif // _SV_SALDISP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/app/keysymnames.cxx 
b/vcl/unx/generic/app/keysymnames.cxx
index fa1eafd..bc1d705 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -26,7 +26,6 @@
  *
  /
 
-
 #if !defined(SOLARIS) && !defined(AIX)
 #include 
 #include 
@@ -50,19 +49,8 @@
 #define SunXK_Cut   0x1005FF75
 #endif
 
-#ifdef SOLARIS
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#endif
-
 #include 
+#include 
 
 namespace vcl_sal {
 
@@ -74,7 +62,7 @@ namespace vcl_sal {
 
 struct KeyboardReplacements
 {
-const char* pKeyboardName;
+const char* pLangName;
 const KeysymNameReplacement*pReplacements;
 int nReplacements;
 };
@@ -340,243 +328,45 @@ namespace vcl_sal {
 
 static const struct KeyboardReplacements aKeyboards[] =
 {
-#ifdef SOLARIS
-{ "Germany5", aImplReplacements_German, 
SAL_N_ELEMENTS(aImplReplacements_German) },
-{ "Germany4", aImplReplacements_German, 
SAL_N_ELEMENTS(aImplReplacements_German) },
-{ "France5",  aImplReplacements_French, 
SAL_N_ELEMENTS(aImplReplacements_French) },
-{ "France6",  aImplReplacements_French, 
SAL_N_ELEMENTS(aImplReplacements_French) },
-{ "France_x86", aImplReplacements_French, 
SAL_N_ELEMENTS(aImplReplacements_French) },
-{ "Italy5", aImplReplacements_Italian, 
SAL_N_ELEMENTS(aImplReplacements_Italian) },
-{ "Italy5-Hobo", aImplReplacements_Italian, 
SAL_N_ELEMENTS(aImplReplacements_Italian) },
-{ "Italy4", aImplReplacements_Italian, 
SAL_N_ELEMENTS(aImplReplacements_Italian) },
-{ "Italy6", aImplReplacements_Italian, 
SAL_N_ELEMENTS(aImplReplacements_Italian) },
-{ "Italy_x86", aImplReplacements_Italian, 
SAL_N_ELEMENTS(aImplReplacements_Italian) },
-{ "Netherland4", aImplReplacements_Dutch, 
SAL_N_ELEMENTS(aImplReplacements_Dutch) },
-{ "Netherland5", aImplReplacements_Dutch, 
SAL_N_ELEMENTS(aImplReplacements_Dutch) },
-{ "Netherland5-Hobo", aImplReplacements_Dutch, 
SAL_N_ELEMENTS(aImplReplacements_Dutch) },
-{ "Netherland6", aImplReplacements_Dutch, 
SAL_N_ELEMENTS(aImplReplacements_Dutch) },
-{ "Netherland_x86", aImplReplacements_Dutch, 
SAL_N_ELEMENTS(aImplReplacements_Dutch) },
-{ "Norway5", aImplReplacements_Norwegian, 
SAL_N_ELEMENTS(aImplReplacements_Norwegian) },
-{ "Norway5-Hobo", aImplReplacements_Norwegian, 
SAL_N_ELEMENTS(aImplReplacements_Norwegian) },
-{ "Norway4", aImplReplacements_Norwegian, 
SAL_N_ELEMENTS(aImplReplacements_Norwegian) },
-{ "Norway6", aImplReplacements_Norwegian, 
SAL_N_ELEMENTS(aImplReplacements_Norwegian) },
-{ "Norway_x86", aImplReplacements_Norwegian, 
SAL_N_ELEMENTS(aImplReplacements_Norwegian) },
-{ "Portugal5", aImplReplacements_Portuguese, 
SAL_N_ELEMENTS(aImplReplacements_Portuguese) },
-{ "Portugal5-Hobo", aImplReplacements_Portuguese, 
SAL_N_ELEMENTS(aImplReplacements_Portuguese) },
-{ "Portugal4", aImplReplacements_Portuguese, 
SAL_N_ELEMENTS(aImplReplacements_Portuguese) },
-{ "Portugal6", aImplReplacements_Portuguese, 
SAL_N_ELEMENTS(aImplReplacements_Portuguese) },
-{ "Portugal_x86", aImplReplacements_Portuguese, 
SAL_N_ELEMENTS(aImplReplacements_Portuguese) },
-{ "Spain5", aImplReplacements_Spanish, 
SAL_N_ELEMENTS(aImplReplacements_Spanish) },

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtftok/data/fdo50665.rtf  |   16 
 sw/qa/extras/rtftok/rtftok.cxx |   20 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +-
 4 files changed, 42 insertions(+), 3 deletions(-)

New commits:
commit 483c46716f269f5caf904f15676435edd8f1afd4
Author: Miklos Vajna 
Date:   Wed Jun 6 12:58:07 2012 +0200

fdo#50665 rtftok: don't ignore character properties of text fields

The dmapper part was already fixed in commit
9486851baea59d16c449d79bd61a38f6e686cfe0 for DOCX, this fixes the RTF
tokenizer.

Change-Id: Iaca706e50367bb744f5a03e15134bda1646df8fc
(cherry picked from commit b9508dd55f82d35f09a58021dc001cf79b390e08)

diff --git a/sw/qa/extras/rtftok/data/fdo50665.rtf 
b/sw/qa/extras/rtftok/data/fdo50665.rtf
new file mode 100644
index 000..2536eb0
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo50665.rtf
@@ -0,0 +1,16 @@
+{\rtf1\ansi\deff6
+{\fonttbl
+{\f1\fnil\fprq0\fcharset0 Times New Roman;}
+{\f4\fmodern\fprq1\fcharset0 Cumberland
+{\*\falt Courier New}
+;}
+{\f6\froman\fprq2\fcharset1 Book Antiqua
+{\*\falt Times New Roman}
+;}
+}
+\sectd\sbknone\pgwsxn11909\pghsxn16834\marglsxn1080\margrsxn1080\margtsxn2437\margbsxn1080\headery1080
+\pard\plain \s7\cf0\tqr\tx9990\tqr\tx9900
+{\loch\f6\fs24\lang1033\i0\b 
+Page : \chpgn\par
+}
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index a37d02e..2555fb5 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -94,6 +94,7 @@ public:
 void testFdo49692();
 void testFdo45190();
 void testFdo50539();
+void testFdo50665();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -131,6 +132,7 @@ public:
 CPPUNIT_TEST(testFdo49692);
 CPPUNIT_TEST(testFdo45190);
 CPPUNIT_TEST(testFdo50539);
+CPPUNIT_TEST(testFdo50665);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -761,6 +763,24 @@ void Test::testFdo50539()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), nValue);
 }
 
+void Test::testFdo50665()
+{
+load("fdo50665.rtf");
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
+uno::Reference 
xParaEnum(xParaEnumAccess->createEnumeration());
+uno::Reference 
xRunEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY);
+uno::Reference 
xRunEnum(xRunEnumAccess->createEnumeration());
+
+// Access the second run, which is a textfield
+xRunEnum->nextElement();
+uno::Reference xRun(xRunEnum->nextElement(), 
uno::UNO_QUERY);
+OUString aValue;
+xRun->getPropertyValue("CharFontName") >>= aValue;
+// This used to be the default, as character properties were ignored.
+CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"), aValue);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 51e95fd..3acbddc 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -846,12 +846,15 @@ bool RTFFrame::inFrame()
 || nY > 0;
 }
 
-void RTFDocumentImpl::singleChar(sal_uInt8 nValue)
+void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool bRunProps)
 {
 sal_uInt8 sValue[] = { nValue };
 if (!m_pCurrentBuffer)
 {
 Mapper().startCharacterGroup();
+// Should we send run properties?
+if (bRunProps)
+runProps();
 Mapper().text(sValue, 1);
 Mapper().endCharacterGroup();
 }
@@ -1561,7 +1564,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 OUString aStr("PAGE");
 singleChar(0x13);
 text(aStr);
-singleChar(0x14);
+singleChar(0x14, true);
 singleChar(0x15);
 }
 break;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 0f1a4ca..93ed15d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -404,7 +404,7 @@ namespace writerfilter {
 
 void text(rtl::OUString& rString);
 // Sends a single character to dmapper, taking care of 
buffering.
-void singleChar(sal_uInt8 nValue);
+void singleChar(sal_uInt8 nValue, bool bRunProps = false);
 // Sends run properties to dmapper, taking care of buffering.
 void runProps();
 void parBreak();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/qa writerfilter/source

[Miklos Vajna]

 sw/qa/extras/rtftok/data/fdo50665.rtf  |   16 
 sw/qa/extras/rtftok/rtftok.cxx |   20 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |7 +--
 writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +-
 4 files changed, 42 insertions(+), 3 deletions(-)

New commits:
commit b9508dd55f82d35f09a58021dc001cf79b390e08
Author: Miklos Vajna 
Date:   Wed Jun 6 12:58:07 2012 +0200

fdo#50665 rtftok: don't ignore character properties of text fields

The dmapper part was already fixed in commit
9486851baea59d16c449d79bd61a38f6e686cfe0 for DOCX, this fixes the RTF
tokenizer.

Change-Id: Iaca706e50367bb744f5a03e15134bda1646df8fc

diff --git a/sw/qa/extras/rtftok/data/fdo50665.rtf 
b/sw/qa/extras/rtftok/data/fdo50665.rtf
new file mode 100644
index 000..2536eb0
--- /dev/null
+++ b/sw/qa/extras/rtftok/data/fdo50665.rtf
@@ -0,0 +1,16 @@
+{\rtf1\ansi\deff6
+{\fonttbl
+{\f1\fnil\fprq0\fcharset0 Times New Roman;}
+{\f4\fmodern\fprq1\fcharset0 Cumberland
+{\*\falt Courier New}
+;}
+{\f6\froman\fprq2\fcharset1 Book Antiqua
+{\*\falt Times New Roman}
+;}
+}
+\sectd\sbknone\pgwsxn11909\pghsxn16834\marglsxn1080\margrsxn1080\margtsxn2437\margbsxn1080\headery1080
+\pard\plain \s7\cf0\tqr\tx9990\tqr\tx9900
+{\loch\f6\fs24\lang1033\i0\b 
+Page : \chpgn\par
+}
+}
diff --git a/sw/qa/extras/rtftok/rtftok.cxx b/sw/qa/extras/rtftok/rtftok.cxx
index a37d02e..2555fb5 100644
--- a/sw/qa/extras/rtftok/rtftok.cxx
+++ b/sw/qa/extras/rtftok/rtftok.cxx
@@ -94,6 +94,7 @@ public:
 void testFdo49692();
 void testFdo45190();
 void testFdo50539();
+void testFdo50665();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -131,6 +132,7 @@ public:
 CPPUNIT_TEST(testFdo49692);
 CPPUNIT_TEST(testFdo45190);
 CPPUNIT_TEST(testFdo50539);
+CPPUNIT_TEST(testFdo50665);
 #endif
 CPPUNIT_TEST_SUITE_END();
 
@@ -761,6 +763,24 @@ void Test::testFdo50539()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), nValue);
 }
 
+void Test::testFdo50665()
+{
+load("fdo50665.rtf");
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xParaEnumAccess(xTextDocument->getText(), uno::UNO_QUERY);
+uno::Reference 
xParaEnum(xParaEnumAccess->createEnumeration());
+uno::Reference 
xRunEnumAccess(xParaEnum->nextElement(), uno::UNO_QUERY);
+uno::Reference 
xRunEnum(xRunEnumAccess->createEnumeration());
+
+// Access the second run, which is a textfield
+xRunEnum->nextElement();
+uno::Reference xRun(xRunEnum->nextElement(), 
uno::UNO_QUERY);
+OUString aValue;
+xRun->getPropertyValue("CharFontName") >>= aValue;
+// This used to be the default, as character properties were ignored.
+CPPUNIT_ASSERT_EQUAL(OUString("Book Antiqua"), aValue);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 51e95fd..3acbddc 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -846,12 +846,15 @@ bool RTFFrame::inFrame()
 || nY > 0;
 }
 
-void RTFDocumentImpl::singleChar(sal_uInt8 nValue)
+void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool bRunProps)
 {
 sal_uInt8 sValue[] = { nValue };
 if (!m_pCurrentBuffer)
 {
 Mapper().startCharacterGroup();
+// Should we send run properties?
+if (bRunProps)
+runProps();
 Mapper().text(sValue, 1);
 Mapper().endCharacterGroup();
 }
@@ -1561,7 +1564,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
 OUString aStr("PAGE");
 singleChar(0x13);
 text(aStr);
-singleChar(0x14);
+singleChar(0x14, true);
 singleChar(0x15);
 }
 break;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 0f1a4ca..93ed15d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -404,7 +404,7 @@ namespace writerfilter {
 
 void text(rtl::OUString& rString);
 // Sends a single character to dmapper, taking care of 
buffering.
-void singleChar(sal_uInt8 nValue);
+void singleChar(sal_uInt8 nValue, bool bRunProps = false);
 // Sends run properties to dmapper, taking care of buffering.
 void runProps();
 void parBreak();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] GTK theming: implement frame rendering

[Ruslan Kabatsayev]

Hi,

Yes, I'll do, but first I need to logically finalize my series of
patches, namely enable correct bg rendering for several widgets, for
which the theme can't compute their position relative to the window
(which is crucial for bg gradient).
I hope to do this before the release.

Regards,
Ruslan

On Wed, Jun 6, 2012 at 1:53 PM, Michael Meeks  wrote:
> Hi Ruslan,
>
> On Sat, 2012-06-02 at 16:12 +0400, Ruslan Kabatsayev wrote:
>> This patch implements frame rendering via GTK theme.
>> This way we get rid of those ugly square black/gray frames we had all
>> over the place and replace them with native frames.
>
>        Any chance you can put a nice summary of what you've worked on here:
>
>        http://wiki.documentfoundation.org/ReleaseNotes/3.6
>
>        Thanks ! :-)
>
>                Micahel.
>
> --
> michael.me...@suse.com  <><, Pseudo Engineer, itinerant idiot
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [PUSHED] Re: [PATCH] Bug 50386 - Page count field makes scrolling impossible

[Michael Meeks]

On Tue, 2012-06-05 at 20:19 +0200, Michael Stahl wrote:
> thanks a lot for investigating problems caused by your new feature, that
> is much appreciated.

Right ! :-) also, any chance of a screenshot of the updated count in
the status bar we can add to your nice entry (thanks for adding that)
here:

https://wiki.documentfoundation.org/ReleaseNotes/3.6

Thanks !

Michael.

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

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

Re: [PUSHED 3-5] [REVIEW:3-5] fdo#47473 legacy reports created in 3.5 fail to open

[Caolán McNamara]

On Wed, 2012-06-06 at 06:21 +0200, Lionel Elie Mamane wrote:
> Here's the fix by Norbert. Please apply both the original patch and
> the fix. Thanks. (And somebody find me a brown paper bag...)

Pushed to 3-5

C.

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

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - wizards/com

[Caolán McNamara]

 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |8 
+++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit abf647fe0cf4bca8c049d04ba249dcca4b285e33
Author: Norbert Thiebaud 
Date:   Tue Jun 5 18:14:52 2012 -0500

fix bug in commit 32c943e161117e4362ac9246baac2c0fb54e7c79

Change-Id: I684fb4adb68d372914ea42cc4e7bd4459a08b150

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 291e2b7..33f3cf0 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -291,6 +291,7 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 bexecute = getRecordParser().executeCommand(nCommandType); 
//sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList, 
true);
 if (bexecute)
 {
+DBMetaData.CommandObject oCommand = 
getRecordParser().getQueryByName(sQueryName);
 bexecute = getRecordParser().getFields(sFieldNameList, 
true);
 if (bexecute && 
getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
 {
commit 0b2bafa35699240d51270576370c7700eb277289
Author: Lionel Elie Mamane 
Date:   Tue Jun 5 21:30:40 2012 +0200

fdo#47473 try to set new order only after field columns are available

Change-Id: If8ba8f4e12aaebadec86a7f445a6d32bd363106d

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java 
b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9b1e1e2..291e2b7 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -279,7 +279,6 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 {
 getRecordParser().Command = (String) 
oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
 
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
-
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
 getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
 }
 else
@@ -293,6 +292,12 @@ public class ReportTextImplementation extends 
ReportImplementationHelper impleme
 if (bexecute)
 {
 bexecute = getRecordParser().getFields(sFieldNameList, 
true);
+if (bexecute && 
getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
+{
+
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
+getRecordParser().Command = 
getRecordParser().getSQLQueryComposer().getQuery();
+bexecute = 
getRecordParser().executeCommand(nCommandType);
+}
 }
 return bexecute;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: ucb/source

[Stephan Bergmann]

 ucb/source/core/ucb.cxx  |4 +-
 ucb/source/inc/regexpmap.hxx |2 +
 ucb/source/inc/regexpmap.tpt |   59 +--
 3 files changed, 55 insertions(+), 10 deletions(-)

New commits:
commit 9631f96acae6bd179d40ee343ce986296f490741
Author: Stephan Bergmann 
Date:   Wed Jun 6 12:41:41 2012 +0200

Do not copy etc. singular iterator values.

This also reverts previous attempts at fixing this, commits
33839f90e6f8275a584b483827585a6da05aab75 "ucb: try to fix weird STL 
assertion on
tinderbox" and 6506af86b5e20a860c8d2d1dd578a22914df5f53 "ucb: second try to 
fix
weird STL assertion on tinderbox."

Change-Id: I89d0eb87fbd164c0a4cf24d60f225767cb2bfc1a

diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index fec9972..64a412b 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -399,7 +399,7 @@ UniversalContentBroker::registerContentProvider(
 {
 osl::MutexGuard aGuard(m_aMutex);
 
-ProviderMap_Impl::iterator aIt(m_aProviders.end());
+ProviderMap_Impl::iterator aIt;
 try
 {
 aIt = m_aProviders.find(Scheme);
@@ -445,7 +445,7 @@ void SAL_CALL 
UniversalContentBroker::deregisterContentProvider(
 {
 osl::MutexGuard aGuard(m_aMutex);
 
-ProviderMap_Impl::iterator aMapIt(m_aProviders.end());
+ProviderMap_Impl::iterator aMapIt;
 try
 {
 aMapIt = m_aProviders.find(Scheme);
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index e023633..717a077 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -101,6 +101,8 @@ class RegexpMapIter: public RegexpMapConstIter< Val >
 friend class RegexpMap< Val >; // to access ctor
 
 public:
+RegexpMapIter() {}
+
 RegexpMapIter & operator ++();
 
 RegexpMapIter operator ++(int);
diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt
index 64abc37..b4e274a 100644
--- a/ucb/source/inc/regexpmap.tpt
+++ b/ucb/source/inc/regexpmap.tpt
@@ -74,11 +74,19 @@ public:
typedef RegexpMapImpl< Val > MapImpl;
typedef typename List< Val >::iterator ListIterator;
 
+   // Solaris needs these for the ctor...
+
+   inline RegexpMapIterImpl();
+
inline RegexpMapIterImpl(MapImpl * pTheMap, int nTheList,
 ListIterator 
aTheIndex);
 
RegexpMapIterImpl(RegexpMapImpl< Val > * pTheMap, bool bBegin);
 
+   RegexpMapIterImpl(RegexpMapIterImpl const & rOther);
+
+   RegexpMapIterImpl & operator =(RegexpMapIterImpl const & rOther);
+
bool operator ==(RegexpMapIterImpl const & rOther) const;
 
RegexpMapImpl< Val > const * getMap() const { return m_pMap; }
@@ -92,8 +100,6 @@ public:
RegexpMapEntry< Val > & get();
 
 private:
-RegexpMapIterImpl(); // not implemented
-
mutable RegexpMapEntry< Val > m_aEntry;
typename List< Val >::iterator m_aIndex;
RegexpMapImpl< Val > * m_pMap;
@@ -106,6 +112,14 @@ private:
 }
 
 template< typename Val >
+inline RegexpMapIterImpl< Val >::RegexpMapIterImpl():
+   m_aEntry(rtl::OUString(), 0),
+   m_pMap(0),
+   m_nList(-1),
+   m_bEntrySet(false)
+{}
+
+template< typename Val >
 inline RegexpMapIterImpl< Val >::RegexpMapIterImpl(MapImpl * pTheMap,

   int nTheList,

   ListIterator aTheIndex):
@@ -134,11 +148,10 @@ void RegexpMapIterImpl< Val >::setEntry() const
 //
 template< typename Val >
 RegexpMapIterImpl< Val >::RegexpMapIterImpl(RegexpMapImpl< Val > * pTheMap,
-   
bool bBegin)
-: m_aEntry(rtl::OUString(), 0)
-, m_aIndex(pTheMap->m_aList[Regexp::KIND_DOMAIN].end())
-, m_pMap(pTheMap)
-, m_bEntrySet(false)
+   
bool bBegin):
+   m_aEntry(rtl::OUString(), 0),
+   m_pMap(pTheMap),
+   m_bEntrySet(false)
 {
if (bBegin)
{
@@ -149,17 +162,47 @@ RegexpMapIterImpl< Val 
>::RegexpMapIterImpl(RegexpMapImpl< Val > * pTheMap,
else
{
m_nList = Regexp::KIND_DOMAIN;
+   m_aIndex = m_pMap->m_aList[Regexp::KIND_DOMAIN].end();
}
 }
 
 //
 template< typename Val >
+RegexpMapIterImpl< Val >::RegexpMapIterImpl(RegexpMapIterImpl const & rOther):
+m_aEntry(rOther.m_aEntry), m_pMap(rOther.m_pMap), m_nList(rOther.m_nList),
+m_bEntrySet(rOther.m_bEntrySet)
+{
+if (m_nList != -1)
+m_aIndex = rOther.m_aIndex;
+}
+
+//