[Libreoffice-commits] .: Branch 'feature/gsoc-calc-perf2' - sc/qa

2012-06-21 Thread Daniel Bankston
 sc/qa/unit/subsequent_filters-test.cxx |   87 +
 1 file changed, 36 insertions(+), 51 deletions(-)

New commits:
commit a2a99a169f5395f41a9ee7f75dd4856ea42a5ee5
Author: Daniel Bankston daniel.e.banks...@gmail.com
Date:   Thu Jun 21 00:32:19 2012 -0500

Change sc subseq unit tests to use more appropriate cppunit assert macros

-Changed where appropriate to use CPPUNIT_ASSERT_EQUAL_MESSAGE or
CPPUNIT_ASSERT_EQUAL instead of always using CPPUNIT_ASSERT_MESSAGE.

Change-Id: I1855b1b382f39f811905e18a8f24fb34a481031f

diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 739fac8..b9e4a52 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -251,24 +251,24 @@ void testRangeNameImpl(ScDocument* pDoc)
 CPPUNIT_ASSERT_MESSAGE(range name Global1 not found, pRangeData);
 double aValue;
 pDoc-GetValue(1,0,0,aValue);
-CPPUNIT_ASSERT_MESSAGE(range name Global1 should reference Sheet1.A1, 
aValue == 1);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(range name Global1 should reference 
Sheet1.A1, 1.0, aValue);
 pRangeData = 
pDoc-GetRangeName(0)-findByUpperName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(LOCAL1)));
 CPPUNIT_ASSERT_MESSAGE(range name Sheet1.Local1 not found, pRangeData);
 pDoc-GetValue(1,2,0,aValue);
-CPPUNIT_ASSERT_MESSAGE(range name Sheet1.Local1 should reference 
Sheet1.A3, aValue == 3);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(range name Sheet1.Local1 should reference 
Sheet1.A3, 3.0, aValue);
 pRangeData = 
pDoc-GetRangeName(1)-findByUpperName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(LOCAL2)));
 CPPUNIT_ASSERT_MESSAGE(range name Sheet2.Local2 not found, pRangeData);
 pDoc-GetValue(1,1,1,aValue);
-CPPUNIT_ASSERT_MESSAGE(range name Sheet2.Local2 should reference 
Sheet2.A2, aValue == 7);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(range name Sheet2.Local2 should reference 
Sheet2.A2, 7.0, aValue);
 //check for correct results for the remaining formulas
 pDoc-GetValue(1,1,0, aValue);
-CPPUNIT_ASSERT_MESSAGE(=global2 should be 2, aValue == 2);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(=global2 should be 2, 2.0, aValue);
 pDoc-GetValue(1,3,0, aValue);
-CPPUNIT_ASSERT_MESSAGE(=local2 should be 4, aValue == 4);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(=local2 should be 4, 4.0, aValue);
 pDoc-GetValue(2,0,0, aValue);
-CPPUNIT_ASSERT_MESSAGE(=SUM(global3) should be 10, aValue == 10);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(=SUM(global3) should be 10, 10.0, aValue);
 pDoc-GetValue(1,0,1,aValue);
-CPPUNIT_ASSERT_MESSAGE(range name Sheet2.local1 should reference 
Sheet1.A5, aValue == 5);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(range name Sheet2.local1 should reference 
Sheet1.A5, 5.0, aValue);
 }
 
 }
@@ -356,16 +356,16 @@ void testDBRanges_Impl(ScDocument* pDoc, sal_Int32 
nFormat)
 double aValue;
 pDoc-GetValue(0,10,1, aValue);
 rtl::OUString aString;
-CPPUNIT_ASSERT_MESSAGE(Sheet2: A11: formula result is incorrect, 
aValue == 4);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Sheet2: A11: formula result is 
incorrect, 4.0, aValue);
 pDoc-GetValue(1, 10, 1, aValue);
-CPPUNIT_ASSERT_MESSAGE(Sheet2: B11: formula result is incorrect, 
aValue == 2);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Sheet2: B11: formula result is 
incorrect, 2.0, aValue);
 }
 double aValue;
 pDoc-GetValue(3,10,1, aValue);
 rtl::OUString aString;
-CPPUNIT_ASSERT_MESSAGE(Sheet2: D11: formula result is incorrect, aValue 
== 4);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Sheet2: D11: formula result is incorrect, 
4.0, aValue);
 pDoc-GetValue(4, 10, 1, aValue);
-CPPUNIT_ASSERT_MESSAGE(Sheet2: E11: formula result is incorrect, aValue 
== 2);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Sheet2: E11: formula result is incorrect, 
2.0, aValue);
 
 }
 
@@ -424,67 +424,57 @@ void testFormats_Impl(ScFiltersTest* pFiltersTest, 
ScDocument* pDoc, sal_Int32 n
 pPattern = pDoc-GetPattern(0,0,1);
 Font aFont;
 pPattern-GetFont(aFont,SC_AUTOCOL_RAW);
-CPPUNIT_ASSERT_MESSAGE(font size should be 10, 
aFont.GetSize().getHeight() == 200);
-CPPUNIT_ASSERT_MESSAGE(font color should be black, aFont.GetColor() == 
COL_AUTO);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(font size should be 10, 200l, 
aFont.GetSize().getHeight());
+CPPUNIT_ASSERT_EQUAL_MESSAGE(font color should be black, COL_AUTO, 
aFont.GetColor().GetColor());
 pPattern = pDoc-GetPattern(0,1,1);
 pPattern-GetFont(aFont, SC_AUTOCOL_RAW);
-CPPUNIT_ASSERT_MESSAGE(font size should be 12, 
aFont.GetSize().getHeight() == 240);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(font size should be 12, 240l, 
aFont.GetSize().getHeight());
 pPattern = pDoc-GetPattern(0,2,1);
 pPattern-GetFont(aFont, SC_AUTOCOL_RAW);
-CPPUNIT_ASSERT_MESSAGE(font should be italic,aFont.GetItalic() == 
ITALIC_NORMAL);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(font should be italic, ITALIC_NORMAL, 

Re: [libreoffice-projects] [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Lionel Elie Mamane
On Wed, Jun 20, 2012 at 02:34:13PM +0200, Bjoern Michaelsen wrote:
 On Wed, Jun 20, 2012 at 02:11:31PM +0200, Stephan Bergmann wrote:

 Still, this removes the comments from many people's (potential)
 sight. The IMO big advantage of the everything on a single mailing
 list approach is that everybody is forced ;) to see everything
 (modulo information overload)

 I can assure you that I am not forced to see your comments on the mailing
 list. Indeed, unless I am on CC or the subject sounds very thrilling the mail
 body never passes my eye.

Exactly: this is not about *forcing* people to see, but about a push
model rather than a pull model. With publish-to-ML, it is push and
we can easily (for some value of easily) sort out what to look at
from the subject line.

Gerrit seemingly gets us to a pull model; we have to go look for
patches to review, be it on the web interface or by command-line
query. It becomes a separate action from reading the ML.

What I fear the most in that is that I have no way to mark a patch as
I won't review it, not my area / I don't know / don't understand /
 With publish-to-ML, I just mark the post / whole thread as
read. With gerrit, I fear I will see the same patch ever and ever
again in my queries...

And the gerrit daily digest idea floating around is not really,
really helpful there, exactly because we lose the capacity of scanning
for interesting patches by subject and the capacity to individually
mark patches as not to be looked at again.

We already have separate libreoffice-commits and libreoffice-bugs
mailing lists so as not to flood the main development mailing list
with those; maybe we could use a libreoffice-review mailing list to
get *one* mail for each gerrit action? Gerrit action = +1/-1 validate,
+1/+2/-1/-2 codereview, gerrit automatic push, comment added, patch
changed, new patch, ... And all emails concerning one patch/change in
one thread, just like the bugzilla mails for one bug are all in one
thread.

I'd subscribe to such a mailing list (and obviously quickly scan by
subject and not read most threads).

As I review very few patches, keeping me happy in this respect is
probably not high priority, except maybe as a long tail argument (if
we have 100 committers reviewing one patch per two months, that's
still 600 reviews per year... Worth having for the project).

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


Re: [PATCH-3-5][PATCH-3-5-5] fdo#50603: Close fds across a restart of soffice on Mac OS X

2012-06-21 Thread Lionel Elie Mamane
On Mon, Jun 18, 2012 at 01:28:50PM +0200, Stephan Bergmann wrote:

 Via some remote debugging I found out the reason for
 https://bugs.freedesktop.org/show_bug.cgi?id=50603 Unable to
 update LibreOffice without resetting user profile is that an
 soffice restarting itself on Mac OS X (when it finds out that the
 per-user information about shared/bundled extensions is not in sync
 upon startup; or after a crash) has file descriptors from the old
 instance still open.

 http://cgit.freedesktop.org/libreoffice/core/commit/?id=d5e9c2e3e85a2bcdd6a0b2088253fc133e52e831
 fdo#50603: Close fds across a restart of soffice on Mac OS X fixes
 that on master, and I already backported it to libreoffice-3-6.

For my education: why can't we set the O_CLOEXEC/FD_CLOEXEC flag on
these file descriptors? This would - presumably - automatically close
the fds *after* any thread from the old process code could possibly
use them, but *before* any code of the new process (after exec())
executes?

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


Re: [libreoffice-projects] [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Norbert Thiebaud
On Wed, Jun 20, 2012 at 11:57 PM, David Ostrovsky
david.ostrov...@gmx.de wrote:
 While claiming other people's work to be your own may be not a problem in
 other contries,
 here in gemany it is: in fact minister of defence and other politicians
 stepped down for doing exactly that (copy/paste parts of their dissertation
 in that case).

This is software development... not Academic papers.

 And i would really like to see an commit author's face, if reviewer would
 say:
 Hey dude, i just entered some more comments to clarify what you have exactly
 done in your 10.000 changed line patch and
 have promoted it to repo ... with my user as author!
 This is obviously a no go.

Then fix your own patch...
As I explained on IRC: someone that _is_ a Committer can do some
modification and still push the patch with you as author and him as
commiter (git allow that, if we used svn like some other Indians, your
scenario - author does not appear in the log unless he is the commiter
- would be the norm.

a given patch can have only one author... you don't get shared credit
on a single patch...
the alternative is to push a broken patch and then another patch to
correct it... that is pushing breakage that render bisection very
painful only to be pedant about 'authorship'. no thanks

You said: it can not be solved with gerrit: only i can change my gerrit
patch/change.

I illustrated that this assertion was false. I did not suggest that it
was the preferred way to do it, and as a matter of fact 'Committer'
have a way to do it more nicely by preserving the 'author' information
while correcting the patch for them.


 To make the things right and preserve the gerrit patch to be repo-pushable
 all the time,
 you have to conduct even more severe civil crime: to forge other people's
 identity ;-)
We do that all the time with patch we collect from the ML... very
often the commtiter 'polish' the patch and still credit the original
author for the whole thing..
the alternative is to reject the patch and tell the author to come
back with a fixed version... not exactly the kind of dev-friedlyness
we are aiming at.

 but then you would definitelly be put in prison for that ... and you said
 that you wanted visit LO congress this year ...

go ahead, sue me. Me, and every copy-editor of every german newspaper...

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


Re: [PUSHED] Re: [PATCH] more SV_DECL_PTRARR patches (19)

2012-06-21 Thread Noel Grandin



On 2012-06-20 19:51, Michael Stahl wrote:
apparently you don't :) or at least i still had to adapt some Count()s 
in DBG_UTIL

Oh darn, you are correct, sorry about that.
Took it out while I looking for another problem and forgot to put it back.

Disclaimer: http://www.peralex.com/disclaimer.html


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


RE: [libreoffice-projects] [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Winfried Donkers
  Still, this removes the comments from many people's (potential) sight.
  The IMO big advantage of the everything on a single mailing list
  approach is that everybody is forced ;) to see everything (modulo
  information overload)
 
 So, IMHO that advantage not only has its drawbacks (information overload),
 it is also mostly an illusion. Peoples forced _potential_ sight isnt really 
 helping
 us here at all.
 And the drawback (information overload) is hitting those hardest, who have
 not finetuned their procmail for month/years -- read: newcomers and
 volunteers.
 
Not wanting to interfere, just to provide some feedback:
being a volunteer and being on the brink of newcomer and not-quite newcomer, 
the mailing list gives me a lot of information. Comments on submitted patches 
can be very informative for me. And you may know that information overload is 
something that I suffer from more than others.

I also learn a lot about gerrit and change-processes in groups, by the way :)

All the best,

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


Re: [libreoffice-projects] [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Stephan Bergmann

On 06/20/2012 10:27 PM, David Ostrovsky wrote:

On 20.06.2012 14:11, Stephan Bergmann wrote:

On 06/19/2012 09:32 PM, David Ostrovsky wrote:

I got one question with gerrit so far:
how can other people contribute code snippet into foreign gerrit patch
(so called extend it)?
During my work on gbuildi'fication of pyuno module Stefan helped me with
some scp2, Windows and Mac OS X specific stuff.
But he can not put a change set into my gerrit patch.
So he created a couple of patches and sent it to ML, I applied the
patches and pushed the next iteration to gerrit.


To be honest, the main reason I just dumped my changes onto the ML is
that I couldn't get comfortable with the gerrit web UI. But hopefully
the command line (which I haven't started to use yet) will suite me
better...


May be I'm missing something obvious here, but how would it change the
things if you would use command line instead of web UI?


The problem you brought up (contribute code snippet into foreign gerrit 
patch) would likely not change at all with web vs cl.  My remark was 
merely meant as a general rant against yet another idiosyncratic web 
UI.  ;)


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


[REVIEW-3-5][REVIEW-3-5-5] clean uninstall on Windows

2012-06-21 Thread Andras Timar
Hi,

A couple of days ago I fixed the RegisterExtensions custom action,
which runs unopkg.exe during install and pre-registers bundled
extensions. The counterpart of this custom action, the
RemoveExtensions is supposed to remove shared\prereg\bundled directory
during uninstall. Unfortunately RemoveExtensions does not work. It
must be a deferred execution custom action, because it modifies the
system, but the original session handle and property data set during
the installation sequence is not available to a deferred execution
custom action. So it is not possible to get the value of FINDPRODUCT,
not to mention that by that time all registry values are removed, so
it would not work even if we had FINDPRODUCT.

The solution is to pass the install location via CustomActionData
property. Please find attached the patch for 3.5. It is essential to
Intel AppUp build (already applied there), but it is nice to have in
community builds, too, because uninstaller should not left files in
installation directory.

Best regards,
Andras


0001-fix-RemoveExtensions-custom-action.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [libreoffice-projects] [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Stephan Bergmann

On 06/21/2012 08:08 AM, Norbert Thiebaud wrote:

On Wed, Jun 20, 2012 at 11:57 PM, David Ostrovsky
david.ostrov...@gmx.de  wrote:

[...]

As I explained on IRC: someone that _is_ a Committer can do some
modification and still push the patch with you as author and him as
commiter (git allow that, if we used svn like some other Indians, your
scenario - author does not appear in the log unless he is the commiter
- would be the norm.

a given patch can have only one author... you don't get shared credit
on a single patch...
the alternative is to push a broken patch and then another patch to
correct it... that is pushing breakage that render bisection very
painful only to be pedant about 'authorship'. no thanks

You said: it can not be solved with gerrit: only i can change my gerrit
patch/change.


So it's probably more of an it cannot be solved with git (evolving a 
patch in discrete steps and having information about the discrete steps 
recorded in the final git history, yet hiding the steps in a single unit 
for purposes of bisecting; one longs for such a feature occasionally).


As long as the standard gerrit workflow is to automatically preserve the 
initial patch's authorship when pushing it (whereas having to manually 
add comments about additional person's polishing activities into the git 
commit message is acceptable, as with the current patch-on-ML workflow), 
this is IMO OK.


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


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-06-21 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

--- Comment #22 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 
2012-06-21 00:10:23 PDT ---
Add Bug 51278 - Opening Report fails with Error Message, limits usability of
Database very much.

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


[Bug 44446] LibreOffice 3.6 most annoying bugs

2012-06-21 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=6

Rainer Bielefeld libreoff...@bielefeldundbuss.de changed:

   What|Removed |Added

 Depends on||51278

-- 
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] .: instsetoo_native/inc_openoffice setup_native/source

2012-06-21 Thread Andras Timar
 instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt 
|2 
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
|3 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
|3 
 setup_native/source/win32/customactions/shellextensions/registerextensions.cxx 
|   42 +-
 4 files changed, 13 insertions(+), 37 deletions(-)

New commits:
commit c66efa24eb4b12beaaabbddc88f7c5aef4faf6c5
Author: Andras Timar ati...@suse.com
Date:   Wed Jun 20 21:07:29 2012 +0200

fdo#51270 fix RemoveExtensions custom action

FINDPRODUCT property was not available to this deferred custom action.
Not to mention that registry keys are also deleted at his stage of 
uninstallation.
The proper solution is to set the installation directory with a type 51 
custom action,
and pass it to RemoveExtensions custom action via CustomActionData property.

Change-Id: I0ac18b3a0b19ff1a87bcf580fad9c7fdadb26f76

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
index 18b3ca4..2dd9e91 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@@ -11,4 +11,4 @@ InstallFinalize   400
 InstallInitialize  250
 InstallValidate200
 ScheduleReboot ISSCHEDULEREBOOT375
-SetInstalllocation 390
+SetInstallLocation1390
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 41c2de2..5f34a1c 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -6,7 +6,8 @@ setAllUsersProfile2K51  ALLUSERSPROFILE 
[%ALLUSERSPROFILE]
 SetAllUsersProfileNT   51  ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
 setUserProfileNT   51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
-SetInstalllocation 51  RegisterExtensions  [INSTALLLOCATION]
+SetInstallLocation151  RegisterExtensions  [INSTALLLOCATION]
+SetInstallLocation251  RemoveExtensions[INSTALLLOCATION]
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
 SetLanguageSelected51  LANG_SELECTED   1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index bf9367b..cfcd7ca 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -56,7 +56,8 @@ ScheduleRebootISSCHEDULEREBOOT3125
 SelfRegModules 2850
 SelfUnregModules   1100
 SetARPInstallLocation  990
-SetInstalllocation 3140
+SetInstallLocation13140
+SetInstallLocation23141
 SetODBCFolders 550
 StartServices  VersionNT   2800
 StopServices   VersionNT   950
diff --git 
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
 
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index bd5efb7..b1c1810 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -210,42 +210,16 @@ extern C UINT __stdcall RegisterExtensions(MSIHANDLE 
handle)
 
 extern C UINT __stdcall RemoveExtensions(MSIHANDLE handle)
 {
-// Finding the product with the help of the propery FINDPRODUCT,
-// that contains a Windows Registry key, that points to the install 
location.
-
-TCHAR szValue[8192];
-DWORD nValueSize = sizeof(szValue);
-HKEY  hKey;
-std::_tstring sInstDir;
-
-std::_tstring sProductKey = GetMsiProperty( handle, TEXT(FINDPRODUCT) );
-
-if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), 
hKey ) )
-{
-if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT(INSTALLLOCATION), 
NULL, NULL, (LPBYTE)szValue, nValueSize ) )
-{
-sInstDir = szValue;
-}
-RegCloseKey( hKey );
-}
-else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  
sProductKey.c_str(), hKey ) )
-{
-if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT(INSTALLLOCATION), 
NULL, NULL, (LPBYTE)szValue, nValueSize ) )
-{
-sInstDir = szValue;
-}
-RegCloseKey( hKey );
-}
-else
-{
-return ERROR_SUCCESS;
-}
-
-// Removing complete directory Basis\prereg\bundled
+std::_tstring sInstDir = GetMsiProperty( handle, 

[Libreoffice-commits] .: Branch 'libreoffice-3-6' - instsetoo_native/inc_openoffice setup_native/source

2012-06-21 Thread Andras Timar
 instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt 
|2 
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
|3 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
|3 
 setup_native/source/win32/customactions/shellextensions/registerextensions.cxx 
|   42 +-
 4 files changed, 13 insertions(+), 37 deletions(-)

New commits:
commit acdbe9d60e17a128c7c1c5d8994cb04b954cc57e
Author: Andras Timar ati...@suse.com
Date:   Wed Jun 20 21:07:29 2012 +0200

fdo#51270 fix RemoveExtensions custom action

FINDPRODUCT property was not available to this deferred custom action.
Not to mention that registry keys are also deleted at his stage of 
uninstallation.
The proper solution is to set the installation directory with a type 51 
custom action,
and pass it to RemoveExtensions custom action via CustomActionData property.

Change-Id: I0ac18b3a0b19ff1a87bcf580fad9c7fdadb26f76

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
index 18b3ca4..2dd9e91 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@@ -11,4 +11,4 @@ InstallFinalize   400
 InstallInitialize  250
 InstallValidate200
 ScheduleReboot ISSCHEDULEREBOOT375
-SetInstalllocation 390
+SetInstallLocation1390
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 41c2de2..5f34a1c 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -6,7 +6,8 @@ setAllUsersProfile2K51  ALLUSERSPROFILE 
[%ALLUSERSPROFILE]
 SetAllUsersProfileNT   51  ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
 setUserProfileNT   51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
-SetInstalllocation 51  RegisterExtensions  [INSTALLLOCATION]
+SetInstallLocation151  RegisterExtensions  [INSTALLLOCATION]
+SetInstallLocation251  RemoveExtensions[INSTALLLOCATION]
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
 SetLanguageSelected51  LANG_SELECTED   1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index bf9367b..cfcd7ca 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -56,7 +56,8 @@ ScheduleRebootISSCHEDULEREBOOT3125
 SelfRegModules 2850
 SelfUnregModules   1100
 SetARPInstallLocation  990
-SetInstalllocation 3140
+SetInstallLocation13140
+SetInstallLocation23141
 SetODBCFolders 550
 StartServices  VersionNT   2800
 StopServices   VersionNT   950
diff --git 
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
 
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index bd5efb7..b1c1810 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -210,42 +210,16 @@ extern C UINT __stdcall RegisterExtensions(MSIHANDLE 
handle)
 
 extern C UINT __stdcall RemoveExtensions(MSIHANDLE handle)
 {
-// Finding the product with the help of the propery FINDPRODUCT,
-// that contains a Windows Registry key, that points to the install 
location.
-
-TCHAR szValue[8192];
-DWORD nValueSize = sizeof(szValue);
-HKEY  hKey;
-std::_tstring sInstDir;
-
-std::_tstring sProductKey = GetMsiProperty( handle, TEXT(FINDPRODUCT) );
-
-if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), 
hKey ) )
-{
-if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT(INSTALLLOCATION), 
NULL, NULL, (LPBYTE)szValue, nValueSize ) )
-{
-sInstDir = szValue;
-}
-RegCloseKey( hKey );
-}
-else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  
sProductKey.c_str(), hKey ) )
-{
-if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT(INSTALLLOCATION), 
NULL, NULL, (LPBYTE)szValue, nValueSize ) )
-{
-sInstDir = szValue;
-}
-RegCloseKey( hKey );
-}
-else
-{
-return ERROR_SUCCESS;
-}
-
-// Removing complete directory Basis\prereg\bundled
+std::_tstring sInstDir = GetMsiProperty( handle, 

Re: [PATCH-3-5][PATCH-3-5-5] fdo#50603: Close fds across a restart of soffice on Mac OS X

2012-06-21 Thread Stephan Bergmann

On 06/21/2012 08:01 AM, Lionel Elie Mamane wrote:

For my education: why can't we set the O_CLOEXEC/FD_CLOEXEC flag on
these file descriptors? This would - presumably - automatically close
the fds *after* any thread from the old process code could possibly
use them, but *before* any code of the new process (after exec())
executes?


There are two reasons:

1  Availability:  While CLOEXEC is part of at least SUSv4, I'm not sure 
it is indeed available on all relevant platforms.


2  Composability:  To be effective (beyond the concrete bug scenario, 
where it happened to be a file opened by our own code that caused the 
problem), every open(2) call would need to use O_CLOEXEC, even in 
library code we cannot control.


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


Re: [PATCH] Fixed out of bounds memory access

2012-06-21 Thread Stephan Bergmann

On 06/20/2012 10:22 PM, Caolán McNamara wrote:

I wonder if there would be any actual measurable performance benefit to
sticking in some hackery to keep the rtl_str_getLength symbol for
backwards compatibility but alias/define rtl_str_getLength to strlen in
order to get any benefit of those optimized strlens.


My gut assumption is that it wouldn't make too much of a difference in 
practice.  (Do we have large amounts of calls to rtl_str_getLength to 
begin with?)


And it would shoot down the valgrind workaround.  ;)

 Or do they only

kick in if the compiler can determine locally that the argument comes
from malloc ? dunno.


The actual optimization is likely (only) to read in complete words 
rather than individual bytes, which can be applied independently of the 
provenance of the argument.  (In fact, a compiler could even 
automatically optimize the implementation of rtl_str_getLength in that way.)


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


Re: [libreoffice-projects] [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Lionel Elie Mamane
On Thu, Jun 21, 2012 at 02:10:05AM -0500, Norbert Thiebaud wrote:
 On Thu, Jun 21, 2012 at 12:53 AM, Lionel Elie Mamane lio...@mamane.lu wrote:

 What I fear the most in that is that I have no way to mark a patch as
 I won't review it, not my area / I don't know / don't understand /
 

 No but...
 1/ you can 'star' patch
 2/ patch are presented in reverse chronological order

 so you can scan the list of open... (...)

 the next day the top of the pile will be new patche.. you scan until
 you get to stuff you already saw (...)

Ah yes, that's workable.

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


Re: [REVIEW-3-5][REVIEW-3-5-5] clean uninstall on Windows

2012-06-21 Thread Jesús Corrius
On Thu, Jun 21, 2012 at 9:04 AM, Andras Timar tima...@gmail.com wrote:
 Hi,

 A couple of days ago I fixed the RegisterExtensions custom action,
 which runs unopkg.exe during install and pre-registers bundled
 extensions. The counterpart of this custom action, the
 RemoveExtensions is supposed to remove shared\prereg\bundled directory
 during uninstall. Unfortunately RemoveExtensions does not work. It
 must be a deferred execution custom action, because it modifies the
 system, but the original session handle and property data set during
 the installation sequence is not available to a deferred execution
 custom action. So it is not possible to get the value of FINDPRODUCT,
 not to mention that by that time all registry values are removed, so
 it would not work even if we had FINDPRODUCT.

 The solution is to pass the install location via CustomActionData
 property. Please find attached the patch for 3.5. It is essential to
 Intel AppUp build (already applied there), but it is nice to have in
 community builds, too, because uninstaller should not left files in
 installation directory.

Looks good: +1

-- 
Jesús Corrius je...@softcatala.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Bjoern Michaelsen
On Thu, Jun 21, 2012 at 07:09:15AM +0200, Lionel Elie Mamane wrote:
 But frankly, why should Google, AOL, Wordpress or another person be
 able to impersonate me at the TDF systems?

If you created an account at one of those, you are trusting them. The trust
issue is with account creation, not with usage. Once you have a google account
it is automatically OpenID enabled. Even if you never used it yourself, google
is perfectly able to impersonate you. The same is true for an
email/password-login and any external mail provider.

Best,

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


Re: Gerrit FAQ : Why gerrit and other considerations....

2012-06-21 Thread Jan Holesovsky
Hi,

On 2012-06-21 at 06:58 +0200, Jan Holesovsky wrote:

  By experimenting with it, you can help us discover the kinks,
  pain-points or holes in the process. It is much easier to address
  these over some time while we can still make big changes without too
  much impact, rather than try to change on the fly a live production
  system.
 
 Thank you for the great summary!  Please, where is the code of our
 gerrit instance, and what to do if I want to improve something there?

Norbert just answered me on the IRC - the gerrit instance is 100%
vanilla gerrit, in order to patch that, the best is to up-stream your
changes.

Regards,
Kendy

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


Re: [libreoffice-projects] [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Bjoern Michaelsen
On Thu, Jun 21, 2012 at 07:53:42AM +0200, Lionel Elie Mamane wrote:
 What I fear the most in that is that I have no way to mark a patch as
 I won't review it, not my area / I don't know / don't understand /
  With publish-to-ML, I just mark the post / whole thread as
 read. With gerrit, I fear I will see the same patch ever and ever
 again in my queries...

The web UI allows you to star a patch, and that is queryable from the
commandline, but I dont know if it can be set from the commandline.

 As I review very few patches, keeping me happy in this respect is
 probably not high priority, except maybe as a long tail argument (if
 we have 100 committers reviewing one patch per two months, that's
 still 600 reviews per year... Worth having for the project).

For 6 changes per year, wouldnt you already be well served with the watched
projects? You can select in gerrit preferences to watch a project and get
emails for each an every change in it (which is pretty much as good as a
mailing list). But you can already filter there for changes touching certain
files matching a regex e.g. ^connectivity/.*$ in addition(*), which I
personally consider a killer feature. I guess you can find your 6 patches a
year a lot easier with that than with one catch-all list (and if you did not
review a patch after a 2 month, you just have a look at what is open)

That said: registering a bot at gerrit with the mailing list as email and make
it watch all of core should be rather trivial (once the mailing list is set up).

Best,

Bjoern

(*) although there are currently some limitations on the file path filtering --
as gerrit seems to check those only when a change is uploaded, so you cant
interactively tweak them. I hope gerrit will fix this to get so you can tweak
this an get results live.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Bjoern Michaelsen
Hi,

On Thu, Jun 21, 2012 at 07:31:15AM +0200, Lionel Elie Mamane wrote:
 I understand gerrit is not able to understand such policies and we
 will continue to enforce them manually by giving only codereview+1
 unless there are already two other codereview+1.

But a bot using:

 http://gerrit.googlecode.com/svn/documentation/2.2.1/cmd-query.html
 http://gerrit.googlecode.com/svn/documentation/2.2.1/user-search.html
 http://gerrit.googlecode.com/svn/documentation/2.2.1/cmd-stream-events.html
 http://gerrit.googlecode.com/svn/documentation/2.2.1/cmd-gsql.html
 http://gerrit.googlecode.com/svn/documentation/2.2.1/cmd-review.html

is able to understand such policies and can execute the most weirdo custom
workflow we possible can imagine -- all without having to tweaking too much on
gerrit itself.

Best,

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


[Libreoffice-commits] .: 5 commits - svx/source sw/inc sw/source vcl/inc vcl/source

2012-06-21 Thread Ivan Timofeev
 svx/source/gallery2/galbrws2.cxx|1 
 sw/inc/EnhancedPDFExportHelper.hxx  |9 
 sw/source/core/text/EnhancedPDFExportHelper.cxx |   57 ++---
 vcl/inc/vcl/toolbox.hxx |   30 --
 vcl/source/window/toolbox.cxx   |  273 +++-
 vcl/source/window/toolbox2.cxx  |   27 --
 6 files changed, 93 insertions(+), 304 deletions(-)

New commits:
commit db053e48d2ca17e1256eb12500f075488483603b
Author: Ivan Timofeev timofeev@gmail.com
Date:   Wed Jun 20 22:15:46 2012 +0400

fdo#34093: fix error in calculation of page number of SwRect

StringRangeEnumerator (i.e. user's input) contains page numbers in a 
different
page range (it excludes empty pages). So:
- first map page numbers to a common range, then compare
- user's input can't contain empty pages, remove this check

Change-Id: I4fce5215272fc90f39c9e05d3f3604734a8aebe3

diff --git a/sw/inc/EnhancedPDFExportHelper.hxx 
b/sw/inc/EnhancedPDFExportHelper.hxx
index 2020d13..a5a5210 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -216,7 +216,14 @@ class SwEnhancedPDFExportHelper
 OutputDevice mrOut;
 
 StringRangeEnumerator* mpRangeEnum;
-std::vectorbool maIsPageEmpty;
+/** The problem is that numbers in StringRangeEnumerator aren't accordant
+ * to real page numbers if mbSkipEmptyPages is true, because in this case
+ * empty pages are excluded from a page range and numbers in
+ * StringRangeEnumerator are shifted.
+ *
+ * maPageNumberMap[real_page_number] is either a corresponding page number
+ * in a page range without empty pages, or -1 if this page is empty. */
+std::vector sal_Int32  maPageNumberMap;
 
 bool mbSkipEmptyPages;
 bool mbEditEngineOnly;
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 5cbc431..6a4210d 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1523,12 +1523,17 @@ SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( 
SwEditShell rSh,
 
 if ( mbSkipEmptyPages )
 {
-maIsPageEmpty.resize( mrSh.GetPageCount() );
+maPageNumberMap.resize( mrSh.GetPageCount() );
 const SwPageFrm* pCurrPage =
 static_castconst SwPageFrm*( mrSh.GetLayout()-Lower() );
-for ( size_t i = 0, n = maIsPageEmpty.size(); i  n  pCurrPage; ++i )
+sal_Int32 nPageNumber = 0;
+for ( size_t i = 0, n = maPageNumberMap.size(); i  n  pCurrPage; 
++i )
 {
-maIsPageEmpty[i] = pCurrPage-IsEmptyPage();
+if ( pCurrPage-IsEmptyPage() )
+maPageNumberMap[i] = -1;
+else
+maPageNumberMap[i] = nPageNumber++;
+
 pCurrPage = static_castconst SwPageFrm*( pCurrPage-GetNext() );
 }
 }
@@ -2150,7 +2155,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
 sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( const SwRect rRect ) 
const
 {
 // Document page number.
-const sal_Int32 nPageNumOfRect = mrSh.GetPageNumAndSetOffsetForPDF( mrOut, 
rRect );
+sal_Int32 nPageNumOfRect = mrSh.GetPageNumAndSetOffsetForPDF( mrOut, rRect 
);
 if ( nPageNumOfRect  0 )
 return -1;
 
@@ -2158,6 +2163,10 @@ sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( 
const SwRect rRect ) co
 sal_Int32 nRet = -1;
 if ( mpRangeEnum )
 {
+if ( mbSkipEmptyPages )
+// Map the page number to the range without empty pages.
+nPageNumOfRect = maPageNumberMap[ nPageNumOfRect ];
+
 if ( mpRangeEnum-hasValue( nPageNumOfRect ) )
 {
 sal_Int32 nOutputPageNum = 0;
@@ -2165,18 +2174,12 @@ sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( 
const SwRect rRect ) co
 StringRangeEnumerator::Iterator aEnd  = mpRangeEnum-end();
 for ( ; aIter != aEnd; ++aIter )
 {
-bool bSkipThisPage = mbSkipEmptyPages 
-static_castsize_t( *aIter )  maIsPageEmpty.size() 
-maIsPageEmpty[*aIter];
-if ( !bSkipThisPage )
+if ( *aIter == nPageNumOfRect )
 {
-if ( *aIter == nPageNumOfRect )
-{
-nRet = nOutputPageNum;
-break;
-}
-++nOutputPageNum;
+nRet = nOutputPageNum;
+break;
 }
+++nOutputPageNum;
 }
 }
 }
@@ -2185,9 +2188,9 @@ sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( 
const SwRect rRect ) co
 if ( mbSkipEmptyPages )
 {
 sal_Int32 nOutputPageNum = 0;
-for ( size_t i = 0; i  maIsPageEmpty.size(); ++i )
+for ( 

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

2012-06-21 Thread Ivan Timofeev
 sw/inc/EnhancedPDFExportHelper.hxx  |9 +++
 sw/source/core/text/EnhancedPDFExportHelper.cxx |   57 
 2 files changed, 37 insertions(+), 29 deletions(-)

New commits:
commit 9b6cab988b4dd7be88573aab99010aaac657f78f
Author: Ivan Timofeev timofeev@gmail.com
Date:   Wed Jun 20 22:15:46 2012 +0400

fdo#34093: fix error in calculation of page number of SwRect

StringRangeEnumerator (i.e. user's input) contains page numbers in a 
different
page range (it excludes empty pages). So:
- first map page numbers to a common range, then compare
- user's input can't contain empty pages, remove this check

Change-Id: I4fce5215272fc90f39c9e05d3f3604734a8aebe3
(cherry picked from commit db053e48d2ca17e1256eb12500f075488483603b)

diff --git a/sw/inc/EnhancedPDFExportHelper.hxx 
b/sw/inc/EnhancedPDFExportHelper.hxx
index 2020d13..a5a5210 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -216,7 +216,14 @@ class SwEnhancedPDFExportHelper
 OutputDevice mrOut;
 
 StringRangeEnumerator* mpRangeEnum;
-std::vectorbool maIsPageEmpty;
+/** The problem is that numbers in StringRangeEnumerator aren't accordant
+ * to real page numbers if mbSkipEmptyPages is true, because in this case
+ * empty pages are excluded from a page range and numbers in
+ * StringRangeEnumerator are shifted.
+ *
+ * maPageNumberMap[real_page_number] is either a corresponding page number
+ * in a page range without empty pages, or -1 if this page is empty. */
+std::vector sal_Int32  maPageNumberMap;
 
 bool mbSkipEmptyPages;
 bool mbEditEngineOnly;
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index ff70ebc..1427b76 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1523,12 +1523,17 @@ SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( 
SwEditShell rSh,
 
 if ( mbSkipEmptyPages )
 {
-maIsPageEmpty.resize( mrSh.GetPageCount() );
+maPageNumberMap.resize( mrSh.GetPageCount() );
 const SwPageFrm* pCurrPage =
 static_castconst SwPageFrm*( mrSh.GetLayout()-Lower() );
-for ( size_t i = 0, n = maIsPageEmpty.size(); i  n  pCurrPage; ++i )
+sal_Int32 nPageNumber = 0;
+for ( size_t i = 0, n = maPageNumberMap.size(); i  n  pCurrPage; 
++i )
 {
-maIsPageEmpty[i] = pCurrPage-IsEmptyPage();
+if ( pCurrPage-IsEmptyPage() )
+maPageNumberMap[i] = -1;
+else
+maPageNumberMap[i] = nPageNumber++;
+
 pCurrPage = static_castconst SwPageFrm*( pCurrPage-GetNext() );
 }
 }
@@ -2150,7 +2155,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
 sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( const SwRect rRect ) 
const
 {
 // Document page number.
-const sal_Int32 nPageNumOfRect = mrSh.GetPageNumAndSetOffsetForPDF( mrOut, 
rRect );
+sal_Int32 nPageNumOfRect = mrSh.GetPageNumAndSetOffsetForPDF( mrOut, rRect 
);
 if ( nPageNumOfRect  0 )
 return -1;
 
@@ -2158,6 +2163,10 @@ sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( 
const SwRect rRect ) co
 sal_Int32 nRet = -1;
 if ( mpRangeEnum )
 {
+if ( mbSkipEmptyPages )
+// Map the page number to the range without empty pages.
+nPageNumOfRect = maPageNumberMap[ nPageNumOfRect ];
+
 if ( mpRangeEnum-hasValue( nPageNumOfRect ) )
 {
 sal_Int32 nOutputPageNum = 0;
@@ -2165,18 +2174,12 @@ sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( 
const SwRect rRect ) co
 StringRangeEnumerator::Iterator aEnd  = mpRangeEnum-end();
 for ( ; aIter != aEnd; ++aIter )
 {
-bool bSkipThisPage = mbSkipEmptyPages 
-static_castsize_t( *aIter )  maIsPageEmpty.size() 
-maIsPageEmpty[*aIter];
-if ( !bSkipThisPage )
+if ( *aIter == nPageNumOfRect )
 {
-if ( *aIter == nPageNumOfRect )
-{
-nRet = nOutputPageNum;
-break;
-}
-++nOutputPageNum;
+nRet = nOutputPageNum;
+break;
 }
+++nOutputPageNum;
 }
 }
 }
@@ -2185,9 +2188,9 @@ sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( 
const SwRect rRect ) co
 if ( mbSkipEmptyPages )
 {
 sal_Int32 nOutputPageNum = 0;
-for ( size_t i = 0; i  maIsPageEmpty.size(); ++i )
+for ( size_t i = 0; i  maPageNumberMap.size(); ++i )
 {
-if ( !maIsPageEmpty[i] )
+if ( maPageNumberMap[i] = 0 ) // is not 

Re: [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Lionel Elie Mamane
On Thu, Jun 21, 2012 at 09:46:54AM +0200, Bjoern Michaelsen wrote:
 On Thu, Jun 21, 2012 at 07:09:15AM +0200, Lionel Elie Mamane wrote:

 But frankly, why should Google, AOL, Wordpress or another person be
 able to impersonate me at the TDF systems?

 If you created an account at one of those, you are trusting
 them. The trust issue is with account creation, not with usage. Once
 you have a google account it is automatically OpenID enabled. Even
 if you never used it yourself, google is perfectly able to
 impersonate you.

No, if I create a gerrit account with a non-Google OpenID identity,
get it added to the right privileged groups (committer, can review,
can submit patches with different author, ...) and I have an
OpenID-enabled Google account, then Google is able to create a *new*
account at Gerrit with my Google identity with *no* more privileges
than we give any random person. It is *not* able (modulo security
issues in Gerrit or my other OpenID provider) to access my Gerrit
account, as long as I (or my OpenID provider or anybody cracking them)
don't go into my Gerrit account and link my Google-issued OpenID
identity to my Gerrit account.

 The same is true for an email/password-login and any external mail
 provider.

No, my email being hosted at gmail does not mean Google knows, or can
know, my username/password at wiki.documentfoundation.org; yes, they
can request a new password to be mailed and intercept it, but then
I'll notice something is wrong: I cannot login at the wiki anymore!
(For the specific case of google, they could put a spy feature in
Chrome, OK... like the author of about any software I use.)

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


Re: [libreoffice-projects] [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Bjoern Michaelsen
Hi Winfried!

On Thu, Jun 21, 2012 at 08:26:09AM +0200, Winfried Donkers wrote:
 Not wanting to interfere, just to provide some feedback:
 being a volunteer and being on the brink of newcomer and not-quite newcomer,
 the mailing list gives me a lot of information. Comments on submitted patches
 can be very informative for me. And you may know that information overload is
 something that I suffer from more than others.

So, from your point of view, what would be a good balance between information
overflow and keeping the (valuable) comments on submitted patches? So what
should be the 'default forced notification' to the list?

Something like:
- a short dialy digest of changes to keep reviewers in the loop
- _one_ mail once a change goes in with all the comments/revisions and
  back-and-forth for this change in context in it

or something completely different? We might get rid of the first (or only send
it if there are changes untouched for more than a day) later or never do the
second or tweak all of that, but for now we need a sensible start ;)

Best,

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


Re: Breakpoints

2012-06-21 Thread Michael Meeks

On Wed, 2012-06-20 at 12:04 -0700, Joel Madero wrote:
 Thanks I'll look through those links. One thing I noticed on the wiki
 is that it says to do this:
...
 cd /opt/libreoffice/program

:-)

 when I install from source it never installs there so I was confused
 for a second (or two). I think maybe updating the wiki to include a
 couple examples or at least a link to the first site you provided
 could be useful. 

Sure - perhaps better to use a generic install/program path - which
then would match the 'make dev-install' location. Feel free to
edit/improve the wiki :-)

Another thing about gdb is that breakpoints on C++ functions have
traditionally not work out that well for me; there is always some
gotcha: two forms of object constructor, polymorphic methods,
tab-completion not working / and/or taking forages.

So typically I use what (I suspect) IDE's use, and appears to be well
debugged, putting a break-point at a specific module  line number:

break view.cxx:1234

then:

thread apply all backtrace
or  t a a bt

When the breakpoint is hit :-)

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: [REVIEW-3-5][REVIEW-3-5-5] clean uninstall on Windows

2012-06-21 Thread Tor Lillqvist
+1 from me.

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


Re: [libreoffice-projects] [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread d . ostrovsky

Zitat von Bjoern Michaelsen bjoern.michael...@canonical.com:



Something like:
- a short dialy digest of changes to keep reviewers in the loop
- _one_ mail once a change goes in with all the comments/revisions and
  back-and-forth for this change in context in it

or something completely different? We might get rid of the first (or  
only send

it if there are changes untouched for more than a day) later or never do the
second or tweak all of that, but for now we need a sensible start ;)


Sensible start would be:
1. set up a new ML: Libreoffice-gerrit (analogical to LO-COMMIT ML)
2. subscribe dev ML to get a daily digest from the 1. (or generate the  
digest manually).

3. set up IRC Bot to #libreoffice channel to notificate about gerrit events.

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


[REVIEW 3-5] fdo#34093: fix error in calculation of page number of SwRect

2012-06-21 Thread Ivan Timofeev

Hi,

http://cgit.freedesktop.org/libreoffice/core/commit/?id=db053e48d2ca17e1256eb12500f075488483603b
or
https://gerrit.libreoffice.org/230

fixes a MAB:
https://bugs.freedesktop.org/show_bug.cgi?id=34093

that is my fault, but I remember that I tested this code, hmm.. probably 
I used Adobe Reader which recognizes links automatically :(


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


Re: [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Michael Meeks

On Wed, 2012-06-20 at 22:46 +0200, Bjoern Michaelsen wrote:
 we vaguely considered running a TDF OpenID provider in the distant future,
 but so shied away from that for the nontrivial cost (security is hard to
 get right)

I imagine if Lionel wanted to re-open that decision, and has done the
work anyway to get an openID server setup, -and- we labelled it clearly
as some low security, for internal infrastructure only thing - then
the sysadmin guys might be able to help get Lionel plugged into their
world to do that.

I'd poke Thorsten Behrens / Florian Effenberger I guess if you'd be
interested in setting that up  maintaining it (personally).

Failing that a hack-around might be to create an account with some
temporary openID identity, setup the ssh key (so the command-line tools
work), then having some server tweak to disable that user from weblogin.
That'd make you an automatic champion of command-line parity too I
guess ;-)

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: [libreoffice-projects] [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Bjoern Michaelsen
Hi Kendy,

On Thu, Jun 21, 2012 at 11:25:18AM +0200, Jan Holesovsky wrote:
 I believe this way we might keep both camps (everything into ML like
 me, and only discussions on the ML like Bjoern) happy - because the
 people who want to have only discussions on the ML would be able to
 filter out messages based on the X-gerrit-review: header easily.

Not really, as I am not concern for myself here (or anyone a bit more involved
in the project, who thus has some kind of fancy filtering setup), but people
who are newcomer/volunteers and are invested in the project vacational.

Tuning the defaults of the notifications on the mailing list to those who are
heavily involved (and have custom tooling, filtering etc. in place) would be
wrong. These guys will always be able to opt-in or -out of any information
relevant to them anyway . So the list should give a good place for vocational
contributors by default and then be tweakable (by opt-in) to be the
truckload-of-traffic-because-I-know-my-filters-monster only second.

Best,

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


Re: [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Lionel Elie Mamane
On Thu, Jun 21, 2012 at 10:13:38AM +0100, Michael Meeks wrote:
 On Wed, 2012-06-20 at 22:46 +0200, Bjoern Michaelsen wrote:

 we vaguely considered running a TDF OpenID provider in the distant future,
 but so shied away from that for the nontrivial cost (security is hard to
 get right)

   I imagine if Lionel wanted to re-open that decision, and has
 done the work anyway to get an openID server setup,

In short: I've done the work for a small-scale OpenID server (from one
user to a few users, each user being configured manually in a text
file). The implementations I've looked at would most probably not be
adequate for a bigger setup like TDF. Security being one of my core
interests, if there would be interest in a TDF OpenID provider, I
could be interested in participating in its setup, but we'd probably
select a more large scale implementation that the ones I now have
experience with.

In particular, local-openid is intrinsically single-user; but one can
run multiple copies of it :) (that is partially a joke; running it on
a machine that anybody else than you has a shell account on has
security implications I'd need to think about how to resolve). Part of
its appeal is that it is not run system-wide, but that the user that
wants to authenticate runs it hirself from a shell account.

The other implementation I've setup is SimpleID; that's the one where
each user is configured manually in a text file, but we can delegate
that to the user hirself through symlinks. Security-wise, the password
is stored as an *unsalted* hash, but that would be easy enough to
change should we want to.

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


[Libreoffice-commits] .: solenv/bin

2012-06-21 Thread Andras Timar
 solenv/bin/modules/installer/windows/property.pm |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 6af68b494dafcc6822463a0445692929735eb0af
Author: Andras Timar ati...@suse.com
Date:   Thu Jun 21 12:50:39 2012 +0200

fdo#49919 Don't default to desktop pollution

Change-Id: I4b9fda0f81d43cab80a015a2eb7374a94f3da7de

diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 32195e1..9f29195 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -324,9 +324,6 @@ sub set_important_properties
 {
 my $onepropertyline = DESKTOPLINKEXISTS . \t . 1 . \n;
 push(@{$propertyfile}, $onepropertyline);
-
-$onepropertyline = CREATEDESKTOPLINK . \t . 1 . \n; # Setting 
the default
-push(@{$propertyfile}, $onepropertyline);
 }
 
 if ( $installer::globals::patch )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


My experience: Gerrit from a casual contributors view

2012-06-21 Thread Sebastian Spaeth
Hi all, I just pushed my first test patch to gerrit and would like to
share my steps and issues:

1) Registered account using openid: painless. Being able to use your
   gmail/yahoo/launchpad account is a boon. Not another random password :)
   Added ssh key. This was an easy process.

2) Failed to find out if I have to pull from the gerrit git repository
   somehow, no docs on this, so I started with my FDO git repo.

3) Created a patch that I want to push

4) This is the documentation on how to push: essentially it says:
   git push logerrit HEAD:refs/for/master

   So I did :-)

4a) First difficulty: It complained that the capitalization of my email
  address is different from the registered email address and I were not
  allowed to push. ARRG :). I don't want to change my push email
  address, so I tried to change the registered email address, which was
  a bit of a pain, and it required logout/login to actually work (I
  think).

5) Pushed again: Hurray, the patch is at
   https://gerrit.libreoffice.org/#/c/231/ now. Waiting for reviews :-)

That should have been it from a contributors point of view, right? What
happens after reviewer +1'd it? Do I have to do something or who would
push to master?

Lastly, I have a very hard time remembering to push to refs/for/master
and know I would constantly forget this. So I wanted to automated this
that when I do: git push gerrit, the local master branch would be
pushed automatically as ref/for/master. I did this by adding:

push = refs/heads/master:refs/for/master

to .git/config:[remote gerrit]. A git push gerrit on the master
branch will now push the patch into the review queue.

Thanks,
Sebastian

P.S. core is still described as test repo that is going to be
discarded in gerrit. Is it? Can I push patches there or is it going to
be dropped again?
Hi all, I just pushed my first test patch to gerrit and would like to
share my steps and issues:

1) Registered account using openid: painless. Being able to use your
   gmail/yahoo/launchpad account is a boon. Not another random password :)
   Added ssh key. This was an easy process.

2) Failed to find out if I have to pull from the gerrit git repository
   somehow, no docs on this, so I started with my FDO git repo.

3) Created a patch that I want to push

4) This is the documentation on how to push: essentially it says:
   git push logerrit HEAD:refs/for/master

   So I did :-)

4a) First difficulty: It complained that the capitalization of my email
  address is different from the registered email address and I were not
  allowed to push. ARRG :). I don't want to change my push email
  address, so I tried to change the registered email address, which was
  a bit of a pain, and it required logout/login to actually work (I
  think).

5) Pushed again: Hurray, the patch is at
   https://gerrit.libreoffice.org/#/c/231/ now. Waiting for reviews :-)

That should have been it from a contributors point of view, right? What
happens after reviewer +1'd it? Do I have to do something or who would
push to master?

Lastly, I have a very hard time remembering to push to refs/for/master
and know I would constantly forget this. So I wanted to automated this
that when I do: git push gerrit, the local master branch would be
pushed automatically as ref/for/master. I did this by adding:

push = refs/heads/master:refs/for/master

to .git/config:[remote gerrit]. A git push gerrit on the master
branch will now push the patch into the review queue.

Thanks,
Sebastian

P.S. core is still described as test repo that is going to be
discarded in gerrit. Is it? Can I push patches there or is it going to
be dropped again?
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [BUILD] Permission issue with redland

2012-06-21 Thread Michael Stahl
On 11/06/12 17:25, Regina Henschel wrote:
 Hi,
 
 I have build on WinXP with MSVC 20008 from a fresh clone. Build breaks 
 in redland with error:
 
 if [ -f ../wntmsci12/misc/build/redland-1.0.8.exists ] ; then mv 
 .../wntmsci12/misc/build/redland-1.0.8 
 .../wntmsci12/misc/build/redland-1.0.8_removeme ; fi
 mv: cannot move `../wntmsci12/misc/build/redland-1.0.8' to 
 `../wntmsci12/misc/build/redland-1.0.8_removeme': Permission denied
 dmake:  Error code 1, while making 
 '../wntmsci12/misc/build/so_unpacked_so_redland'

hello Regina,

very weird problem, no idea what could cause it, there don't seem to be
many changes to redland module or the solenv/inc/tg_ext.mk thing that
builds these external libraries.

also i don't understand why such a problem would happen only in one module.

 I have set the protection on that folder to no write protect with 
 Microsoft Explorer. I have repeated building then and it works fine then.

permissions on Windows tend to do mysterious things, especially when
cygwin is involved.  if you can reproduce the problem then i guess it's
best to hope it won't happen again :)

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


RE: Difficulties with Flat XML under source control

2012-06-21 Thread Dennis E. Hamilton
I think it is necessary to look at round-trip out-in conversion preservation.

For out-in (which this is, presumably), you want to record a decimal expression 
of the internal value that will convert back to the exact internal value on 
re-input.  (The in-out case is that the input conversion provide whatever 
internal representation that will convert to the read value on re-output.  
Without additional information, it is generally very difficult to have these be 
the same.)

It is also desirable, of course, that any other ODF consumer use the same 
technique so that its in-out conversion satisfies the out-in condition of the 
original source of the decimal expression of the value.  

There are old technical papers on how to have this work.  The name David Matula 
comes to mind.

There might be solutions in the conversions that exist in the basic Java 
classes for float data types.  I think this was addressed in Common Lisp also.  

-Original Message-
From: libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org 
[mailto:libreoffice-bounces+dennis.hamilton=acm@lists.freedesktop.org] On 
Behalf Of Thorsten Behrens
Sent: Wednesday, June 20, 2012 05:49
To: Johannes Sixt
Cc: libreoffice-dev
Subject: Re: Difficulties with Flat XML under source control

Johannes Sixt wrote:
  - Measurements change. E.g. (just to pick one case), in
  style:graphic-properties the draw:visible-area-width changes from
  6.088cm to 6.089cm. Is there a remedy to avoid changes of this kind?
  
  Ah; nasty, some rounding problem / internal representation issue -
  possibly again looking at the code we could do better here to make it
  more predictable; possibly using more precision we could do better
  (doubles instead of floats) ?
 
 Probably. Looking at this again, these changes seem to happen only for
 draw:visible-area-*. Hence, it may also be a matter of conversion
 between screen dimensions (pixels?) and cm/mm/in/etc.
 
Hrm, yeah - and we *really* don't want this slow drift - any chance
you can file a bug with a preferrably small sample doc?

Thanks,

-- Thorsten

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


big Deps ...

2012-06-21 Thread Michael Meeks

On Tue, 2012-06-05 at 11:13 +0200, Bjoern Michaelsen wrote:
 On Mon, Jun 04, 2012 at 11:35:44PM +0200, Bjoern Michaelsen wrote:
  will confirm -- CxxObjects is rather large ... Im beginning to like the 
  idea of
  gzipping those.

:-)

 Finished a master build:
 1.2G  workdir/unxlngx6.pro/Dep/

Modulo compressing the CxxObject deps, I'm still trying to prototype
some more speedups for the concatenated / big-library dependencies with
a few local patches to concat-deps.pl [ the hyper-optimised C version is
not as easy to casually hack ].

Anyhow - doing some more analysis; I see:

4823735 - lines of LinkTarget/ deps
1598180 - lines containing /boost/
1178594 - offapi
 608585 - udkapi

So it seems the next big low-hanging fruit after boost is the IDL
compilation. Having got down to 3.2 million lines - having
another 1.7million (over 50%) of the dependency lines being
compiled IDL files is slightly amazing (at least to me).

I wonder where they all come from and why.

Anyhow - one obvious oddness reading the code is the .hdl and .hpp
duplication; my question is:

$ grep -R 'api/.*\.hpp' * | wc -l
892769
$ grep -R 'api/.*\.hdl' * | wc -l
899179

So a few questions:

if a .idl file is changed is there any circumstance where the .hpp
and .hdl will not both be updated in lock-step.

Also - do all IDL generated .hpp deps ultimately include all the .hdl
files as well ? ie. we could simply elide \.hdl$ from all dependency
files ? - which might knock 25% off our deps at a very trivial stroke.

Then again a small number of files include .hdl files directly; is that
a bug ? :-)

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: big Deps ...

2012-06-21 Thread Stephan Bergmann

On 06/20/2012 05:15 PM, Michael Meeks wrote:

if a .idl file is changed is there any circumstance where the .hpp
and .hdl will not both be updated in lock-step.


IIRC, the logic of cppumaker is to first generate temporary .hpp and 
.hdl files and only copy them over existing ones in solver if they are 
actually different.  That way, it should easily happen that a .hdl file 
is updated while the corresponding .hpp file is not.  (For example, when 
a method is added to an interface and cppumaker is not running in 
comprehensive type information mode; or when a bug in cppumaker is 
fixed affecting .hdl but not .hpp output).



Also - do all IDL generated .hpp deps ultimately include all the .hdl


Each .hpp file includes the corresponding .hdl file (if any), yes.


files as well ? ie. we could simply elide \.hdl$ from all dependency
files ? - which might knock 25% off our deps at a very trivial stroke.


That would be unsound (see above).


Then again a small number of files include .hdl files directly; is that
a bug ? :-)


Looks like a bug, yes.  Care to share the list?

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


Re: [PUSHED] use dash parameters from svg file

2012-06-21 Thread Chr. Rossmanith

Am 20.06.2012 14:41, schrieb Thorsten Behrens:

Fridrich Strba wrote:

As far as I can see now the emulated style id in the internal-style-ref
attribute isn't used anywhere (id following after '$'). Keep it or
remove it?

No idea. Thorsten?


Didn't try it, but: that style should be referenced by the shape
later, otherwise, what's the point writing it anyway
As far as I could see the only place where the emulated style was used 
is emulation of dashes - hence at the moment no shape references any 
emulated style id. I think it doesn't hurt if the unused id is written. 
Maybe I'll add a comment in case someone would like to re-activate 
emulation for some reason.


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


bug 49610 in impress: suspicious commit found, but help needed

2012-06-21 Thread Pierre-André Jacquod

hello,
this bug is a bad regression. Following with debugger, I had as suspect 
the function void Outliner::ProvideNextTextObject (void) line 979 in 
sd/source/ui/view/Outliner.cxx (or something called late from this) as 
main suspect.


After bibisect from QA  the commit

bdfbbb33a491f3ce34375de14ba33436b04
slidesorter1: #i116014# Outliner holds ViewShell as weak_ptr.
* found as LGPLv3-only fix at svn rev 1172131 
(http://svn.apache.org/viewvc?view=revisionrevision=1172131)



touch the suspected function, within the commit frame between last good 
and first bad binaries.


As I just do not understand what it is about here, (neither the goal of 
the change nor the actual content), could you have a look about it? I 
guess it will be the quickest way.


Beware: currently this commit is just a suspect, since I need more than 
4 hours to compile (I am on linux, yeah, but with my hardware...) I am 
still compiling the checkout to try  test.


If / when I get more info (means I have compiled it), I will update to 
confirm (or not) my suspect.


Thanks and regards
Pierre-André
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: big Deps ...

2012-06-21 Thread Michael Meeks

On Wed, 2012-06-20 at 18:28 +0200, Stephan Bergmann wrote:
 IIRC, the logic of cppumaker is to first generate temporary .hpp and 
 .hdl files and only copy them over existing ones in solver if they are 
 actually different.  That way, it should easily happen that a .hdl file 
 is updated while the corresponding .hpp file is not.  (For example, when 

Fair enough; but we could presumably easily tweak that such that a .hdl
and .hpp would be updated in lock-step; after all if the .hpp is not
changed - it necessarily includes the .hdl - so we didn't really gain
anything from not touching the .hpp :-)

[ indeed, I'm sure there is one - but what is the benefit of separating
the .hdl files out, if we are sure that each .hpp will include all of
it's dependent .hpp's ? ].

 a method is added to an interface and cppumaker is not running in 
 comprehensive type information mode; or when a bug in cppumaker is 
 fixed affecting .hdl but not .hpp output).

Sure sure - but we could conceptually tweak cppumaker to do the diff on
the pair and update both timestamps if one changes - and loose 25% of
our dependency rules with a trivial regexp :-)

  Also - do all IDL generated .hpp deps ultimately include all the .hdl
 
 Each .hpp file includes the corresponding .hdl file (if any), yes.

Great.

  Then again a small number of files include .hdl files directly;
 is that a bug ? :-)
 
 Looks like a bug, yes.  Care to share the list?

Nice; it's easier to generate than send:

git grep 'include.*\.hdl'

only 127 instances luckily.

ATB,

Michael.

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

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


Re: big Deps ...

2012-06-21 Thread Stephan Bergmann

On 06/21/2012 10:57 AM, Michael Meeks wrote:

On Wed, 2012-06-20 at 18:28 +0200, Stephan Bergmann wrote:

IIRC, the logic of cppumaker is to first generate temporary .hpp and
.hdl files and only copy them over existing ones in solver if they are
actually different.  That way, it should easily happen that a .hdl file
is updated while the corresponding .hpp file is not.  (For example, when


Fair enough; but we could presumably easily tweak that such that a .hdl
and .hpp would be updated in lock-step; after all if the .hpp is not
changed - it necessarily includes the .hdl - so we didn't really gain
anything from not touching the .hpp :-)


Yeah, could probably be done.


[ indeed, I'm sure there is one - but what is the benefit of separating
the .hdl files out, if we are sure that each .hpp will include all of
it's dependent .hpp's ? ].


Circular dependencies among headers.


Then again a small number of files include .hdl files directly;
is that a bug ? :-)


Looks like a bug, yes.  Care to share the list?


Nice; it's easier to generate than send:

git grep 'include.*\.hdl'

only 127 instances luckily.


Feel free to make that into an EasyHack.

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


Re: Difficulties with Flat XML under source control

2012-06-21 Thread Stephan Bergmann

On 06/20/2012 03:07 PM, Dennis E. Hamilton wrote:

I think it is necessary to look at round-trip out-in conversion preservation.

For out-in (which this is, presumably), you want to record a decimal expression 
of the internal value that will convert back to the exact internal value on 
re-input.  (The in-out case is that the input conversion provide whatever 
internal representation that will convert to the read value on re-output.  
Without additional information, it is generally very difficult to have these be 
the same.)

It is also desirable, of course, that any other ODF consumer use the same 
technique so that its in-out conversion satisfies the out-in condition of the 
original source of the decimal expression of the value.

There are old technical papers on how to have this work.  The name David Matula 
comes to mind.

There might be solutions in the conversions that exist in the basic Java 
classes for float data types.  I think this was addressed in Common Lisp also.


Hasn't there been progress in that field recently?  Wait, yes, 
http://dl.acm.org/citation.cfm?id=1806623 Printing floating-point 
numbers quickly and accurately with integers by Florian Loitsch.


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


[Libreoffice-commits] .: desktop/Executable_oosplash.mk

2012-06-21 Thread Michael Stahl
 desktop/Executable_oosplash.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1266480d38d24e1c5532438223ab33cc25aed08d
Author: Michael Stahl mst...@redhat.com
Date:   Thu Jun 21 14:23:40 2012 +0200

Executable_oosplash.mk: fix typo in Solaris socket lib

Change-Id: Ic9338867a3bf9315f20fa02d7fdb1adda2db285a

diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index b8919d5..a75f11a 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -81,7 +81,7 @@ endif
 ifeq ($(OS),SOLARIS)
 
 $(eval $(call gb_Executable_use_libraries,oosplash,\
--lsocket \
+socket \
 ))
 
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Difficulties with Flat XML under source control

2012-06-21 Thread Thorsten Behrens
Stephan Bergmann wrote:
 Hasn't there been progress in that field recently?  Wait, yes,
 http://dl.acm.org/citation.cfm?id=1806623 Printing floating-point
 numbers quickly and accurately with integers by Florian Loitsch.
 
Nice catch - and some code is here: http://code.google.com/p/double-conversion/

Cheers,

-- Thorsten


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


Re: Building Libreoffice 3.6 on OpenIndiana x86 with GCC

2012-06-21 Thread Michael Stahl
On 15/06/12 23:52, Matúš Kukan wrote:
 On 15 June 2012 17:32, Jonathan Adams t12nsloo...@gmail.com wrote:
 /home/sal/LibreOffice/libo/desktop/Executable_oosplash.mk:83: ***
 Cannot link against library/libraries -lsocket. Libraries must be
 registered in Repository.mk.  Stop.
 
 Just remove the whole ifeq ($(OS),SOLARIS) ... endif part
 from desktop/Executable_oosplash.mk

oh, that looks rather invalid mixture of gb_Executable_use_libraries and
a parameter intended for _add_libs...

 my question is, how do I tell Repository.mk that it should be using
 -lsocket in tail_build ?
 
 It's registered in solenv/gbuild/platform/solaris.mk, see
 gb_Library_PLAINLIBS_NONE.
 It's also in gb_STDLIBS, so we link against it ~all the time.

i've added it there recently when ploum tried to build on Solaris,
because apparently some of the socket and DNS related functions that are
usually found in libc on Linux are in these separate nsl and socket
libraries on Solaris; perhaps it is nicer to explicitly add these in
just the places where they are needed (and there are already various
makefiles that add them), but for getting an initial port working this
should be the easiest way.

by the way it shouldn't be necessary to link against dl on Solaris 10
and later because these functions have been moved into libc.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Re: [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Lionel Elie Mamane
On Thu, Jun 21, 2012 at 08:07:45AM -0400, Terrence Enger wrote:
 On Wed, 2012-06-20 at 22:46 +0200, Bjoern Michaelsen wrote:
 On Wed, Jun 20, 2012 at 09:47:48PM +0200, Lionel Elie Mamane wrote:

 My point is basically that it is too much of an investment for a
 casual contributor... If we could make that easier by allowing
 plain username+password (or exporting bugzilla accounts over
 OpenID? I guess that would be *more* work), I feel it would lower
 the barrier to entry to gerrit.

 I think you are part of a very, very rare demographic there

 By the way ...

 There is a group of people--well, one person anyway--more concerned
 with trusting *myself* to understand the daunting user agreements
 presented by the OpenId providers.  (...) the sub-thread quickly
 moved back to the question of users trusting the providers; that
 proves that my concern is not widespread.

I see your concern as a subset of trusting the provider. You want to
read and understand the user agreement because you don't trust that
the user agreement is reasonable :)

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


Re: libicudata in non-standard directory linking issues.

2012-06-21 Thread Michael Stahl
On 20/06/12 00:15, Jonathan Adams wrote:
 to get icu working on Openindiana/Illumos/Solaris ...
 
 http://bugs.icu-project.org/trac/ticket/9390
 
 I downloaded the very latest icu4c from icu-project and then worked
 through the source till I compiled it ... :)
 
 I put a patch on their bug system to get it to compile on Solaris ...
 although someone would need to check if that actually fixed it for
 other platforms.

can you try to add this patch to the internal ICU build?

i.e. something like

 diff -ur misc/build/icu-unpatched/ misc/build/icu/  solarisgcc.patch

then add that patch in icu/makefile.mk to the PATCH_FILES variable.

that would allow you to use the internal ICU.

 I do set PATH and LD_LIBRARY_PATH before autogen/configure/gmake ...
 this specific batch of commands is especially annoying because it
 overrides the default LD_LIBRARY_PATH, rather than setting
 'LD_LIBRARY_PATH=$O/lib:$LD_LIBRARY_PATH' or similar.

yes that is kind of sub-optimal, but if LO can't use the library on the
system then eventually we'll need to build our bundled one so we can put
it into the installation set anyway...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2012-06-21 Thread Bjoern Michaelsen
 sw/inc/EnhancedPDFExportHelper.hxx  |9 +++
 sw/source/core/text/EnhancedPDFExportHelper.cxx |   57 
 2 files changed, 37 insertions(+), 29 deletions(-)

New commits:
commit a1fd984c7cd4d97c8b039c75e8340e431554ed26
Author: Ivan Timofeev timofeev@gmail.com
Date:   Wed Jun 20 22:15:46 2012 +0400

fdo#34093: fix error in calculation of page number of SwRect

StringRangeEnumerator (i.e. user's input) contains page numbers in a 
different
page range (it excludes empty pages). So:
- first map page numbers to a common range, then compare
- user's input can't contain empty pages, remove this check

Change-Id: I4fce5215272fc90f39c9e05d3f3604734a8aebe3

diff --git a/sw/inc/EnhancedPDFExportHelper.hxx 
b/sw/inc/EnhancedPDFExportHelper.hxx
index 2020d13..a5a5210 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -216,7 +216,14 @@ class SwEnhancedPDFExportHelper
 OutputDevice mrOut;
 
 StringRangeEnumerator* mpRangeEnum;
-std::vectorbool maIsPageEmpty;
+/** The problem is that numbers in StringRangeEnumerator aren't accordant
+ * to real page numbers if mbSkipEmptyPages is true, because in this case
+ * empty pages are excluded from a page range and numbers in
+ * StringRangeEnumerator are shifted.
+ *
+ * maPageNumberMap[real_page_number] is either a corresponding page number
+ * in a page range without empty pages, or -1 if this page is empty. */
+std::vector sal_Int32  maPageNumberMap;
 
 bool mbSkipEmptyPages;
 bool mbEditEngineOnly;
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx 
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 7ed062d..ea19d26 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1521,12 +1521,17 @@ SwEnhancedPDFExportHelper::SwEnhancedPDFExportHelper( 
SwEditShell rSh,
 
 if ( mbSkipEmptyPages )
 {
-maIsPageEmpty.resize( mrSh.GetPageCount() );
+maPageNumberMap.resize( mrSh.GetPageCount() );
 const SwPageFrm* pCurrPage =
 static_castconst SwPageFrm*( mrSh.GetLayout()-Lower() );
-for ( size_t i = 0, n = maIsPageEmpty.size(); i  n  pCurrPage; ++i )
+sal_Int32 nPageNumber = 0;
+for ( size_t i = 0, n = maPageNumberMap.size(); i  n  pCurrPage; 
++i )
 {
-maIsPageEmpty[i] = pCurrPage-IsEmptyPage();
+if ( pCurrPage-IsEmptyPage() )
+maPageNumberMap[i] = -1;
+else
+maPageNumberMap[i] = nPageNumber++;
+
 pCurrPage = static_castconst SwPageFrm*( pCurrPage-GetNext() );
 }
 }
@@ -2148,7 +2153,7 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
 sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( const SwRect rRect ) 
const
 {
 // Document page number.
-const sal_Int32 nPageNumOfRect = mrSh.GetPageNumAndSetOffsetForPDF( mrOut, 
rRect );
+sal_Int32 nPageNumOfRect = mrSh.GetPageNumAndSetOffsetForPDF( mrOut, rRect 
);
 if ( nPageNumOfRect  0 )
 return -1;
 
@@ -2156,6 +2161,10 @@ sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( 
const SwRect rRect ) co
 sal_Int32 nRet = -1;
 if ( mpRangeEnum )
 {
+if ( mbSkipEmptyPages )
+// Map the page number to the range without empty pages.
+nPageNumOfRect = maPageNumberMap[ nPageNumOfRect ];
+
 if ( mpRangeEnum-hasValue( nPageNumOfRect ) )
 {
 sal_Int32 nOutputPageNum = 0;
@@ -2163,18 +2172,12 @@ sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( 
const SwRect rRect ) co
 StringRangeEnumerator::Iterator aEnd  = mpRangeEnum-end();
 for ( ; aIter != aEnd; ++aIter )
 {
-bool bSkipThisPage = mbSkipEmptyPages 
-static_castsize_t( *aIter )  maIsPageEmpty.size() 
-maIsPageEmpty[*aIter];
-if ( !bSkipThisPage )
+if ( *aIter == nPageNumOfRect )
 {
-if ( *aIter == nPageNumOfRect )
-{
-nRet = nOutputPageNum;
-break;
-}
-++nOutputPageNum;
+nRet = nOutputPageNum;
+break;
 }
+++nOutputPageNum;
 }
 }
 }
@@ -2183,9 +2186,9 @@ sal_Int32 SwEnhancedPDFExportHelper::CalcOutputPageNum( 
const SwRect rRect ) co
 if ( mbSkipEmptyPages )
 {
 sal_Int32 nOutputPageNum = 0;
-for ( size_t i = 0; i  maIsPageEmpty.size(); ++i )
+for ( size_t i = 0; i  maPageNumberMap.size(); ++i )
 {
-if ( !maIsPageEmpty[i] )
+if ( maPageNumberMap[i] = 0 ) // is not empty?
 {
 if ( i == static_castsize_t( 

[Libreoffice-commits] .: sw/source

2012-06-21 Thread Bjoern Michaelsen
 sw/source/core/view/vdraw.cxx |  130 ++
 1 file changed, 21 insertions(+), 109 deletions(-)

New commits:
commit e7bbaefa47fa19971151f03531bf1da3658e6d34
Author: Sebastian Spaeth sebast...@sspaeth.de
Date:   Thu Jun 21 12:12:14 2012 +0200

Remove commented out code

Remove old, already commented out code and useless code documentation
(basically restating the function names). Also translate the few Germany
comments in that file.

This file still lacks a good doxygen code documentation or a brief
description of what it actually does.

Change-Id: I339a01dbd4ea894be13293133b8dedbc55c2bbac
Signed-off-by: Sebastian Spaeth sebast...@sspaeth.de

diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 04bf2bc..69eb0a3 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -35,8 +35,6 @@
 #include fmtanchr.hxx
 #include frmfmt.hxx
 
-/// OD 29.08.2002 #102450#
-/// include svx/svdoutl.hxx
 #include svx/svdoutl.hxx
 
 #include fesh.hxx
@@ -54,114 +52,49 @@
 #include IDocumentDrawModelAccess.hxx
 
 
-/*
-|*
-|*  SwSaveHdl
-|*
-|*  Ersterstellung  MA 14. Feb. 95
-|*  Letzte AenderungMA 02. Jun. 98
-|*
-|*/
-//SwSaveHdl::SwSaveHdl( SwViewImp *pI ) :
-//  pImp( pI ),
-//  bXorVis( FALSE )
-//{
-//if ( pImp-HasDrawView() )
-//{
-//  bXorVis = pImp-GetDrawView()-IsShownXorVisible( 
pImp-GetShell()-GetOut());
-//  if ( bXorVis )
-//  pImp-GetDrawView()-HideShownXor( pImp-GetShell()-GetOut() );
-//}
-//}
-
-
-//SwSaveHdl::~SwSaveHdl()
-//{
-//if ( bXorVis )
-//  pImp-GetDrawView()-ShowShownXor( pImp-GetShell()-GetOut() );
-//}
-
-
-/*
-|*
-|*  SwViewImp::StartAction(), EndAction()
-|*
-|*  Ersterstellung  MA 14. Feb. 95
-|*  Letzte AenderungMA 14. Sep. 98
-|*
-|*/
 void SwViewImp::StartAction()
 {
 if ( HasDrawView() )
 {
 SET_CURR_SHELL( GetShell() );
 if ( pSh-ISA(SwFEShell) )
-((SwFEShell*)pSh)-HideChainMarker();   //Kann sich geaendert haben
-//bResetXorVisibility = GetDrawView()-IsShownXorVisible( 
GetShell()-GetOut());
-//GetDrawView()-HideShownXor( GetShell()-GetOut() );
+((SwFEShell*)pSh)-HideChainMarker(); // might have changed
 }
 }
 
+
 void SwViewImp::EndAction()
 {
 if ( HasDrawView() )
 {
 SET_CURR_SHELL( GetShell() );
-//if ( bResetXorVisibility )
-//  GetDrawView()-ShowShownXor( GetShell()-GetOut() );
 if ( pSh-ISA(SwFEShell) )
-((SwFEShell*)pSh)-SetChainMarker();//Kann sich geaendert haben
+((SwFEShell*)pSh)-SetChainMarker(); // might have changed
 }
 }
 
-/*
-|*
-|*  SwViewImp::LockPaint(), UnlockPaint()
-|*
-|*  Ersterstellung  MA 11. Jun. 96
-|*  Letzte AenderungMA 11. Jun. 96
-|*
-|*/
+
 void SwViewImp::LockPaint()
 {
 if ( HasDrawView() )
 {
-//HMHbShowHdlPaint = GetDrawView()-IsMarkHdlShown();
-//HMHif ( bShowHdlPaint )
-//HMH   GetDrawView()-HideMarkHdl();
 bResetHdlHiddenPaint = !GetDrawView()-areMarkHandlesHidden();
 GetDrawView()-hideMarkHandles();
 }
 else
 {
-//HMHbShowHdlPaint = FALSE;
 bResetHdlHiddenPaint = sal_False;
 }
 }
 
+
 void SwViewImp::UnlockPaint()
 {
 if ( bResetHdlHiddenPaint )
 GetDrawView()-showMarkHandles();
-//HMHif ( bShowHdlPaint )
-//HMH   GetDrawView()-ShowMarkHdl();
 }
 
-/*
-|*
-|*  SwViewImp::PaintLayer(), PaintDispatcher()
-|*
-|*  Ersterstellung  MA 20. Dec. 94
-|*  Letzte AenderungAMA 04. Jun. 98
-|*
-|*/
-// OD 29.08.2002 #102450#
-// add 3rd paramter const Color* pPageBackgrdColor for setting this
-// color as the background color at the outliner of the draw view.
-// OD 09.12.2002 #103045# - add 4th parameter for the horizontal text direction
-// of the page in order to set the default horizontal text direction at the
-// outliner of the draw view for painting layers hell and heaven.
-// OD 25.06.2003 #108784# - correct type of 1st parameter
+
 void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
 SwPrintData const*const pPrintData,
 const SwRect ,
@@ -182,13 +115,13 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
 DRAWMODE_SETTINGSTEXT | 

Re: My experience: Gerrit from a casual contributors view

2012-06-21 Thread Bjoern Michaelsen
Hi Sebastian,

On Thu, Jun 21, 2012 at 01:34:23PM +0200, Sebastian Spaeth wrote:
 Hi all, I just pushed my first test patch to gerrit and would like to
 share my steps and issues:
 
 1) Registered account using openid: painless. Being able to use your
gmail/yahoo/launchpad account is a boon. Not another random password :)
Added ssh key. This was an easy process.

Great!

 2) Failed to find out if I have to pull from the gerrit git repository
somehow, no docs on this, so I started with my FDO git repo.

Yes, I understand that this is currently somewhat confusing. It will be a lot
less confusing when fd.o is a read-only mirror and all pushes (even direct ones
bypassing review) go to gerrit.libreoffice.org.

 3) Created a patch that I want to push
 4) This is the documentation on how to push: essentially it says:
git push logerrit HEAD:refs/for/master
So I did :-)
 4a) First difficulty: It complained that the capitalization of my email
   address is different from the registered email address and I were not
   allowed to push. ARRG :). I don't want to change my push email
   address, so I tried to change the registered email address, which was
   a bit of a pain, and it required logout/login to actually work (I
   think).

Yuck. Might be worth a bug report at http://code.google.com/p/gerrit/issues/list
.
 5) Pushed again: Hurray, the patch is at
https://gerrit.libreoffice.org/#/c/231/ now. Waiting for reviews :-)

Looking good, commented, pushed to fd.o

 That should have been it from a contributors point of view, right? 

Right.

 What happens after reviewer +1'd it? Do I have to do something or who would
 push to master?

The submitter doesnt have to do anything (unless there is a negative feedback).
Reviewer have to take it from there.

 Lastly, I have a very hard time remembering to push to refs/for/master
 and know I would constantly forget this.

;) see current work at https://gerrit.libreoffice.org/#/c/229/

 P.S. core is still described as test repo that is going to be
 discarded in gerrit.

updated. ;)

Thanks for the feedback, much appreciated!

Best,

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


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

2012-06-21 Thread Miklos Vajna
 oox/inc/oox/vml/vmlshape.hxx  |2 ++
 oox/source/vml/vmlshape.cxx   |   14 ++
 oox/source/vml/vmlshapecontext.cxx|7 +++
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |7 ++-
 4 files changed, 25 insertions(+), 5 deletions(-)

New commits:
commit f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jun 21 15:02:47 2012 +0200

n#758883 oox: anchor vml shapes without anchor info as at-character

w10:wrap was originally arrived to
writerfilter::dmapper::WrapHandler::lcl_attribute(), but
writerfilter::dmapper::DomainMapper_Impl::PushShapeContext() was called
already and set the anchor type. Fix this, then we can set a a suitable
anchor type in lcl_SetAnchorType() based on the type model.

Change-Id: Ib411450b10f29f814bc13d81eaec434971b2e52a

diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index abd91b6..0400964 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -92,6 +92,8 @@ struct ShapeTypeModel
 
 OptValue ::rtl::OUString  moGraphicPath;  /// Path to a graphic for 
this shape.
 OptValue ::rtl::OUString  moGraphicTitle; /// Title of the graphic.
+OptValue ::rtl::OUString  moWrapAnchorX;  /// The base object from 
which our horizontal positioning should be calculated.
+OptValue ::rtl::OUString  moWrapAnchorY;  /// The base object from 
which our vertical positioning should be calculated.
 
 explicitShapeTypeModel();
 
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 4f0f952..3637385 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -385,10 +385,16 @@ void lcl_SetAnchorType(PropertySet rPropSet, const 
ShapeTypeModel rTypeModel)
 {
 if ( rTypeModel.maPosition == absolute )
 {
-// I'm not sure if AT_PAGE is always correct here (not sure what the 
parent that
-// the spec talks about can be), but with Writer SwXDrawPage::add()
-// always in practice uses this because of pDoc-GetCurrentLayout() 
being NULL at this point.
-rPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_PAGE);
+if (rTypeModel.moWrapAnchorX.get() == page  
rTypeModel.moWrapAnchorY.get() == page)
+{
+// I'm not sure if AT_PAGE is always correct here (not sure what 
the parent that
+// the spec talks about can be), but with Writer SwXDrawPage::add()
+// always in practice uses this because of 
pDoc-GetCurrentLayout() being NULL at this point.
+rPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_PAGE);
+}
+else
+// Map to as-character by default, that fixes vertical position of 
some textframes.
+rPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_CHARACTER);
 }
 else if( rTypeModel.maPosition == relative )
 {   // I'm not very sure this is correct either.
diff --git a/oox/source/vml/vmlshapecontext.cxx 
b/oox/source/vml/vmlshapecontext.cxx
index 290a737..98e759d 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -322,11 +322,18 @@ ContextHandlerRef ShapeTypeContext::onCreateContext( 
sal_Int32 nElement, const A
 mrTypeModel.maFillModel.moRotate = lclDecodeBool( rAttribs, 
XML_rotate );
 break;
 case VML_TOKEN( imagedata ):
+{
 // shapes in docx use r:id for the relationship id
 // in xlsx it they use o:relid
 bool bHasORelId = rAttribs.hasAttribute( O_TOKEN( relid ) );
 mrTypeModel.moGraphicPath = decodeFragmentPath( rAttribs, 
bHasORelId ? O_TOKEN( relid ) : R_TOKEN( id ) );
 mrTypeModel.moGraphicTitle = rAttribs.getString( O_TOKEN( title ) 
);
+}
+break;
+case NMSP_vmlWord | XML_wrap:
+mrTypeModel.moWrapAnchorX = rAttribs.getString(XML_anchorx);
+mrTypeModel.moWrapAnchorY = rAttribs.getString(XML_anchory);
+break;
 break;
 }
 return 0;
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 0724c65..6efa44c 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -2241,7 +2241,12 @@ 
OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
 
 bool bInNamespaces = mMyNamespaces.find(nNameSpace) != mMyNamespaces.end();
 bool bInTokens = mMyTokens.find( Element ) != mMyTokens.end( );
-if ( bInNamespaces )
+
+// We have methods to _add_ individual tokens or whole namespaces to be
+// processed by writerfilter (instead of oox), but we have no method to
+// filter out a single token. Just hardwire the wrap token here till we
+// need a more generic 

Re: [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Terrence Enger
On Wed, 2012-06-20 at 22:46 +0200, Bjoern Michaelsen wrote:
 Hi,
 
 On Wed, Jun 20, 2012 at 09:47:48PM +0200, Lionel Elie Mamane wrote:
 
  My point is basically that it is too much of an investment for a
  casual contributor... If we could make that easier by allowing plain
  username+password (or exporting bugzilla accounts over OpenID? I guess
  that would be *more* work), I feel it would lower the barrier to entry
  to gerrit.
 
 I think you are part of a very, very rare demographic there

By the way ...

There is a group of people--well, one person anyway--more concerned
with trusting *myself* to understand the daunting user agreements
presented by the OpenId providers.  I brought this up on the discuss
list in the sub-thread Re: [tdf-discuss] Re: AskLibO blitzes
http://listarchives.documentfoundation.org/www/discuss/msg08774.html;.
The discussion in the sub-thread quickly moved back to the question of
users trusting the providers; that proves that my concern is not
widespread.

Terry.


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


Re: Building Libreoffice 3.6 on OpenIndiana x86 with GCC

2012-06-21 Thread Jonathan Adams
In case anyone was interested my git diff to date is attached.

On 21 June 2012 13:27, Michael Stahl mst...@redhat.com wrote:
 On 15/06/12 23:52, Matúš Kukan wrote:
 On 15 June 2012 17:32, Jonathan Adams t12nsloo...@gmail.com wrote:
 /home/sal/LibreOffice/libo/desktop/Executable_oosplash.mk:83: ***
 Cannot link against library/libraries -lsocket. Libraries must be
 registered in Repository.mk.  Stop.

 Just remove the whole ifeq ($(OS),SOLARIS) ... endif part
 from desktop/Executable_oosplash.mk

 oh, that looks rather invalid mixture of gb_Executable_use_libraries and
 a parameter intended for _add_libs...

 my question is, how do I tell Repository.mk that it should be using
 -lsocket in tail_build ?

 It's registered in solenv/gbuild/platform/solaris.mk, see
 gb_Library_PLAINLIBS_NONE.
 It's also in gb_STDLIBS, so we link against it ~all the time.

 i've added it there recently when ploum tried to build on Solaris,
 because apparently some of the socket and DNS related functions that are
 usually found in libc on Linux are in these separate nsl and socket
 libraries on Solaris; perhaps it is nicer to explicitly add these in
 just the places where they are needed (and there are already various
 makefiles that add them), but for getting an initial port working this
 should be the easiest way.

 by the way it shouldn't be necessary to link against dl on Solaris 10
 and later because these functions have been moved into libc.
diff --git a/configure.in b/configure.in
index 011aa22..eab462b 100644
--- a/configure.in
+++ b/configure.in
@@ -3401,11 +3401,11 @@ openbsd*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLARINC=$SOLARINC -I/usr/local/include
+SOLARINC=$SOLARINC -I/opt/tools/include
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
-SOLARLIB=$SOLARLIB -L/usr/local/lib
+SOLARLIB=$SOLARLIB -L/opt/tools/lib
 
 ;;
 
@@ -3435,12 +3435,12 @@ solaris*)
 AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
 ;;
 esac
-SOLARINC=$SOLARINC -I/usr/local/include
+SOLARINC=$SOLARINC -I/opt/tools/include
 SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib
 SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
 SOLARLIB=$SOLARLIB -L$COMPATH/lib
-SOLARLIB=$SOLARLIB -L/usr/local/bin -L/usr/dt/lib -L/usr/openwin/lib
+SOLARLIB=$SOLARLIB -L/opt/tools/lib -L/usr/dt/lib -L/usr/openwin/lib
 ;;
 
 *)
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk 
b/connectivity/Library_postgresql-sdbc-impl.mk
index da6fe98..1fb274f 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -69,10 +69,10 @@ ifneq ($(GUI)$(COM),WNTMSC)
 include $(OUTDIR)/inc/postgresql/libpq-flags.mk
 
 $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\
-   $(if $(filter-out MACOSX,$(OS)),-Wl$(COMMA)--as-needed) \
+   $(if $(filter-out MACOSX SOLARIS,$(OS)),-Wl$(COMMA)--as-needed) \
$(LIBPQ_DEP_LIBS) \
$(if $(filter-out MACOSX,$(OS)),-ldl) \
-   $(if $(filter-out MACOSX,$(OS)),-Wl$(COMMA)--no-as-needed) \
+   $(if $(filter-out MACOSX SOLARIS,$(OS)),-Wl$(COMMA)--no-as-needed) \
 ))
 
 endif
diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx 
b/connectivity/source/drivers/odbcbase/ODriver.cxx
index e937363..148b1f5 100644
--- a/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/connectivity/source/drivers/odbcbase/ODriver.cxx
@@ -63,11 +63,11 @@ rtl::OUString ODBCDriver::getImplementationName_Static(  ) 
throw(RuntimeExceptio
 // Please take care when changing it.
 }
 
-typedef Sequence ::rtl::OUString  SS;
+typedef Sequence ::rtl::OUString  JSS;
 
//--
-SS ODBCDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+JSS ODBCDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
-SS aSNS( 1 );
+JSS aSNS( 1 );
 aSNS[0] = ::rtl::OUString(com.sun.star.sdbc.Driver);
 return aSNS;
 }
@@ -81,7 +81,7 @@ SS ODBCDriver::getSupportedServiceNames_Static(  ) throw 
(RuntimeException)
 //--
 sal_Bool SAL_CALL ODBCDriver::supportsService( const ::rtl::OUString 
_rServiceName ) throw(RuntimeException)
 {
-SS aSupported(getSupportedServiceNames());
+JSS aSupported(getSupportedServiceNames());
 const ::rtl::OUString* pSupported = aSupported.getConstArray();
 const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
 for (;pSupported != pEnd  !pSupported-equals(_rServiceName); 
++pSupported)
@@ -91,7 +91,7 @@ sal_Bool SAL_CALL ODBCDriver::supportsService( const 
::rtl::OUString _rServiceN
 }
 
 

Re: big Deps ...

2012-06-21 Thread Michael Stahl
On 21/06/12 13:47, Stephan Bergmann wrote:
 On 06/21/2012 10:57 AM, Michael Meeks wrote:
 On Wed, 2012-06-20 at 18:28 +0200, Stephan Bergmann wrote:
 IIRC, the logic of cppumaker is to first generate temporary .hpp and
 .hdl files and only copy them over existing ones in solver if they are
 actually different.  That way, it should easily happen that a .hdl file
 is updated while the corresponding .hpp file is not.  (For example, when

  Fair enough; but we could presumably easily tweak that such that a .hdl
 and .hpp would be updated in lock-step; after all if the .hpp is not
 changed - it necessarily includes the .hdl - so we didn't really gain
 anything from not touching the .hpp :-)
 
 Yeah, could probably be done.

that sounds easy enough.

  [ indeed, I'm sure there is one - but what is the benefit of separating
 the .hdl files out, if we are sure that each .hpp will include all of
 it's dependent .hpp's ? ].
 
 Circular dependencies among headers.

i wonder: is that the case for all generated headers, or just for some
small subset that is necessary for bootstrapping (i.e. probably
css.uno/css.lang)?

if the latter, would it be possible to add some option or something to
only generate 2 headers when really necessary?

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


Re: [Libreoffice] [GSoC 2012][svg export filter] support of 'dur' attribute for time containers

2012-06-21 Thread Marco Cecchetti
On Thu, 21 Jun 2012 00:21:08 +0200, Thorsten Behrens  
t...@documentfoundation.org wrote:



Marco Cecchetti wrote:

The final jump is due to the fact that the deactivate method of
an animation node invokes the managed activity end method that
in turn calls performEnd which evaluates the animation by passing
the final time value (usually 1.0, or 0.0 if the animation is
reversed).

By commenting out the call to the performEnd method the duration
attribute on the par time container is handled correctly and
I can't see any side effect for usual animations.


Hi Marco,

the bug along which this got added is
https://issues.apache.org/ooo/show_bug.cgi?id=45197 - please try
that scenario. Then again, the comments in those performEnd methods
suggest it might not be the final solution. ;)


I read it. After some test I can add another example where performEnd
makes a difference:

1) create one shape
2) add a custom effect to the shape (e.g. fade in)
3) add a second custom effect to the shape (e.g. change fill color)
   which is played together with the previous one but it is longer
4) start the animation
5) after one second skip to the next animation (left click)

The final state is the following one:
the shape is wrongly shown with only the first effect applied



However I'm wondering if it is worth to perform such a modification
in order to be more conforming to SMIL when such a feature is never
used. Moreover even if I can see no side effect by removing the call
to the performEnd method, I'm also sure that has been placed there
for some good reason (can anyone help me here ?)


Would love to have it (properly) fixed - see above. :)


I have a problem: I can't hear any sound effect at all.
I got the following message on the standard error:

Message: don't know how to handle audio/x-wav

So I'm not able to perform any test.

Any hint ?

-- Marco


--
Using Opera's revolutionary e-mail client: http://www.opera.com/mail/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-06-21 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=37361

Roman Eisele b...@eikota.de changed:

   What|Removed |Added

 Depends on||51023

--- Comment #336 from Roman Eisele b...@eikota.de 2012-06-21 07:48:42 PDT ---
Added bug 51023 - EDITING: Drag-and-drop slide sorting broken on Mac OS X,
leading to data corruption and crashes.

This bug seems to be limited to MacOS X for now, but is still really annoying
and urgent:
* it makes sorting slides in Impress completely impossible,
* it leads to data corruption of a serious kind
* and even to crashes.
* Additionally, it is an regression introduced in LibreOffice 3.5.x.

There are some reports about Drag-and-drop slide sorting not working on Linux,
which could be related, so looking into this issue may also help to fix these
Linux issues (and the other way around).

-- 
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: libicudata in non-standard directory linking issues.

2012-06-21 Thread Jonathan Adams
umm ... it's 14Mb worth of patch ... oh, I've compiled 4.0.1 (i wonder
how I got to that version ...) ... downloading and working through
49.1.2 ...

compiled ...

running a check ...

[All tests passed successfully...]
Elapsed Time: 00:00:24.619

Ok, applying to the in-tree icu ... not quite the same icu ... ok

copying the intree, making the changes, makefile.mk modified to use
the solaris patch ...

compiled successfully ... apart from these errors:
gmake[2]: Leaving directory
`/home/sal/LibreOffice/libo/icu/unxsogi/misc/build/icu/source'
cp: cannot stat
`./unxsogi/misc/build/icu/source/lib/libicudata.so.4.0.1': No such
file or directory
cp: cannot stat `./unxsogi/misc/build/icu/source/lib/libicudata.so.4':
No such file or directory
cp: cannot stat
`./unxsogi/misc/build/icu/source/lib/libicuuc.so.4.0.1': No such file
or directory
cp: cannot stat `./unxsogi/misc/build/icu/source/lib/libicuuc.so.4':
No such file or directory
cp: cannot stat
`./unxsogi/misc/build/icu/source/lib/libicui18n.so.4.0.1': No such
file or directory
cp: cannot stat `./unxsogi/misc/build/icu/source/lib/libicui18n.so.4':
No such file or directory
cp: cannot stat
`./unxsogi/misc/build/icu/source/lib/libicule.so.4.0.1': No such file
or directory
cp: cannot stat `./unxsogi/misc/build/icu/source/lib/libicule.so.4':
No such file or directory
cp: cannot stat
`./unxsogi/misc/build/icu/source/lib/libicutu.so.4.0.1': No such file
or directory
cp: cannot stat `./unxsogi/misc/build/icu/source/lib/libicutu.so.4':
No such file or directory
dmake:  Error code 1, while making './unxsogi/misc/build/so_predeliver_so_icu'

diff attached ...

Jon

On 21 June 2012 13:51, Michael Stahl mst...@redhat.com wrote:
 On 20/06/12 00:15, Jonathan Adams wrote:
 to get icu working on Openindiana/Illumos/Solaris ...

 http://bugs.icu-project.org/trac/ticket/9390

 I downloaded the very latest icu4c from icu-project and then worked
 through the source till I compiled it ... :)

 I put a patch on their bug system to get it to compile on Solaris ...
 although someone would need to check if that actually fixed it for
 other platforms.

 can you try to add this patch to the internal ICU build?

 i.e. something like

  diff -ur misc/build/icu-unpatched/ misc/build/icu/  solarisgcc.patch

 then add that patch in icu/makefile.mk to the PATCH_FILES variable.

 that would allow you to use the internal ICU.

 I do set PATH and LD_LIBRARY_PATH before autogen/configure/gmake ...
 this specific batch of commands is especially annoying because it
 overrides the default LD_LIBRARY_PATH, rather than setting
 'LD_LIBRARY_PATH=$O/lib:$LD_LIBRARY_PATH' or similar.

 yes that is kind of sub-optimal, but if LO can't use the library on the
 system then eventually we'll need to build our bundled one so we can put
 it into the installation set anyway...


icu4c-solarisgcc.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Bug 37361] LibreOffice 3.5 most annoying bugs

2012-06-21 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=37361

Bug 37361 depends on bug 34093, which changed state.

Bug 34093 Summary: Partial PDFEXPORT of particular Master Documents breaks 
hyperlinks
https://bugs.freedesktop.org/show_bug.cgi?id=34093

   What|Old Value   |New Value

 Resolution||FIXED
 Status|ASSIGNED|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


Re: [PUSHED 3-5] fdo#34093: fix error in calculation of page number of SwRect

2012-06-21 Thread Ivan Timofeev

Bjoern pushed it to 3-5
http://cgit.freedesktop.org/libreoffice/core/commit/?id=a1fd984c7cd4d97c8b039c75e8340e431554ed26g=libreoffice-3-5

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


[Libreoffice-commits] .: 4 commits - sw/CppunitTest_sw_subsequent_ooxmlexport.mk sw/CppunitTest_sw_subsequent_ooxmltok.mk sw/CppunitTest_sw_subsequent_rtfexport.mk sw/CppunitTest_sw_subsequent_rtftok.

2012-06-21 Thread Miklos Vajna
 sw/CppunitTest_sw_subsequent_ooxmlexport.mk |   11 +
 sw/CppunitTest_sw_subsequent_ooxmltok.mk|   11 +
 sw/CppunitTest_sw_subsequent_rtfexport.mk   |   11 +
 sw/CppunitTest_sw_subsequent_rtftok.mk  |   11 +
 sw/CppunitTest_sw_subsequent_ww8export.mk   |   10 
 sw/qa/extras/ooxmltok/data/n758883.docx |binary
 sw/qa/extras/ooxmltok/ooxmltok.cxx  |   15 +++
 sw/qa/extras/swmodeltestbase.hxx|   59 
 sw/qa/extras/ww8tok/ww8tok.cxx  |   34 
 sw/source/core/access/accportions.cxx   |2 
 sw/source/core/access/accportions.hxx   |2 
 sw/source/core/inc/SwPortionHandler.hxx |3 -
 sw/source/core/text/porfld.cxx  |5 +-
 sw/source/core/text/xmldump.cxx |8 +++
 14 files changed, 144 insertions(+), 38 deletions(-)

New commits:
commit 8616f227c722affcedff7632ba97644d04427c94
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jun 21 17:03:23 2012 +0200

kill copypaste by introducing SwModelTestBase::parseDump()

Change-Id: I7cc3e05e48fc9850fbe04c6511f5e9f18a680ec7

diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx 
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index a34dd39..59e3aab 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -45,14 +45,6 @@
 
 #include vcl/svapp.hxx
 
-#include unotxdoc.hxx
-#include docsh.hxx
-#include doc.hxx
-#include rootfrm.hxx
-
-#include libxml/xmlwriter.h
-#include libxml/xpath.h
-
 using rtl::OString;
 using rtl::OUString;
 using rtl::OUStringBuffer;
@@ -568,34 +560,10 @@ void Test::testN758883()
  * to the numbering. This is easier to test using a layout dump.
  */
 
-// create xml writer
-xmlBufferPtr pXmlBuffer = xmlBufferCreate();
-xmlTextWriterPtr pXmlWriter = xmlNewTextWriterMemory(pXmlBuffer, 0);
-xmlTextWriterStartDocument(pXmlWriter, NULL, NULL, NULL);
-
-// create dump
 load(n758883.docx);
-SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument 
*(mxComponent.get());
-SwDoc* pDoc = pTxtDoc-GetDocShell()-GetDoc();
-SwRootFrm* pLayout = pDoc-GetCurrentLayout();
-pLayout-dumpAsXml(pXmlWriter);
-
-// delete xml writer
-xmlTextWriterEndDocument(pXmlWriter);
-xmlFreeTextWriter(pXmlWriter);
-
-// parse the dump
-xmlDocPtr pXmlDoc = xmlParseMemory((const 
char*)xmlBufferContent(pXmlBuffer), xmlBufferLength(pXmlBuffer));;
-xmlXPathContextPtr pXmlXpathCtx = xmlXPathNewContext(pXmlDoc);
-xmlXPathObjectPtr pXmlXpathObj = 
xmlXPathEvalExpression(BAD_CAST(/root/page/body/txt/Special), pXmlXpathCtx);
-xmlNodeSetPtr pXmlNodes = pXmlXpathObj-nodesetval;
-xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
-OUString aHeight = OUString::createFromAscii((const 
char*)xmlGetProp(pXmlNode, BAD_CAST(nHeight)));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(220), aHeight.toInt32()); // It was 280
 
-// delete dump
-xmlFreeDoc(pXmlDoc);
-xmlBufferFree(pXmlBuffer);
+OUString aHeight = parseDump(/root/page/body/txt/Special, nHeight);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(220), aHeight.toInt32()); // It was 280
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/sw/qa/extras/swmodeltestbase.hxx b/sw/qa/extras/swmodeltestbase.hxx
index 0ddd226..669e559 100644
--- a/sw/qa/extras/swmodeltestbase.hxx
+++ b/sw/qa/extras/swmodeltestbase.hxx
@@ -32,12 +32,31 @@
 #include unotest/macros_test.hxx
 #include rtl/ustrbuf.hxx
 
+#include unotxdoc.hxx
+#include docsh.hxx
+#include doc.hxx
+#include rootfrm.hxx
+
+#include libxml/xmlwriter.h
+#include libxml/xpath.h
+
 using namespace com::sun::star;
 
 /// Base class for filter tests loading or roundtriping a document, then 
asserting the document model.
 class SwModelTestBase : public test::BootstrapFixture, public 
unotest::MacrosTest
 {
 public:
+SwModelTestBase()
+: mpXmlBuffer(0)
+{
+}
+
+~SwModelTestBase()
+{
+if (mpXmlBuffer)
+xmlBufferFree(mpXmlBuffer);
+}
+
 virtual void setUp()
 {
 test::BootstrapFixture::setUp();
@@ -54,6 +73,26 @@ public:
 test::BootstrapFixture::tearDown();
 }
 
+private:
+void dumpLayout()
+{
+// create the xml writer
+mpXmlBuffer = xmlBufferCreate();
+xmlTextWriterPtr pXmlWriter = xmlNewTextWriterMemory(mpXmlBuffer, 0);
+xmlTextWriterStartDocument(pXmlWriter, NULL, NULL, NULL);
+
+// create the dump
+SwXTextDocument* pTxtDoc = dynamic_castSwXTextDocument 
*(mxComponent.get());
+SwDoc* pDoc = pTxtDoc-GetDocShell()-GetDoc();
+SwRootFrm* pLayout = pDoc-GetCurrentLayout();
+pLayout-dumpAsXml(pXmlWriter);
+
+// delete xml writer
+xmlTextWriterEndDocument(pXmlWriter);
+xmlFreeTextWriter(pXmlWriter);
+}
+
+
 protected:
 /// Get the length of the whole document.
 int getLength()
@@ -84,7 +123,27 @@ protected:
 return xStyleFamily;
 }
 
+/// 

[REVIEW 3-5][REVIEW 3-6] fdo#47636 font fallback performance regression

2012-06-21 Thread Caolán McNamara
So 8c023fd645c8b83637ffcde4055886b2e4f94393 should fix a performance
regression with font fallback under fontconfig using platforms when a
font is missing.

This may be a duplicate of MAB fdo#44719. Fontconfig is fairly slow on
finding a replacement font so proposed solution is to cache the results.

We used to cache the results, but we cached only on missing fontname -
replacement fontname in the past which means we would run into a range
of other problems e.g. fontconfig can suggest as a replacement for an
upright font the *italic* face of an existing font and other
combinations. fdo#41556

So new solution basically restores the cache, but refactors out the font
attributes we know about and use that as the thing to map rather than
just the name.

3.5 and 3.6 patches to fix merge conflicts attached

C.
From fad03eaf8870b7ca2f679e5351cbf451a802cdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com
Date: Tue, 19 Jun 2012 22:23:33 +0100
Subject: [PATCH] Resolves: fdo#47636 cache fontconfig font substitutions

But this time cache on *all* properties, not just the name, which doesn't cut
it, given the things fontconfig can do, e.g. fdo#41556

(cherry picked from commit 8c023fd645c8b83637ffcde4055886b2e4f94393)

Conflicts:
	vcl/inc/outfont.hxx
	vcl/source/gdi/outdev3.cxx

Change-Id: Idfc1dbac67b6912e4985570a0b7c6ccdf47fa4a5
---
 vcl/generic/fontmanager/fontsubst.cxx |   59 ++--
 vcl/inc/outfont.hxx   |   38 ++--
 vcl/source/gdi/outdev3.cxx|  165 +
 3 files changed, 210 insertions(+), 52 deletions(-)

diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index 4f3ec48..3f51fe5 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -42,15 +42,27 @@
 #include salprn.hxx
 #include region.h
 
+#include list
+
 // ===
 // platform specific font substitution hooks
 // ===
 
+struct FontSelectPatternAttributesHash
+{
+size_t operator()(const FontSelectPatternAttributes rAttributes) const
+{ return rAttributes.hashCode(); }
+};
+
 class FcPreMatchSubstititution
 :   public ImplPreMatchFontSubstitution
 {
 public:
 bool FindFontSubstitute( FontSelectPattern ) const;
+typedef ::std::pairFontSelectPatternAttributes, FontSelectPatternAttributes value_type;
+private:
+typedef ::std::listvalue_type CachedFontMapType;
+mutable CachedFontMapType maCachedFontMap;
 };
 
 class FcGlyphFallbackSubstititution
@@ -135,6 +147,19 @@ namespace
 rOrig.meWidthType == rNew.meWidthType
   );
 }
+
+class equal
+{
+private:
+const FontSelectPatternAttributes mrAttributes;
+public:
+equal(const FontSelectPatternAttributes rAttributes)
+: mrAttributes(rAttributes)
+{
+}
+bool operator()(const FcPreMatchSubstititution::value_type rOther) const
+{ return rOther.first == mrAttributes; }
+};
 }
 
 //--
@@ -149,11 +174,26 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern rFontSelDa
 ||  0 == rFontSelData.maSearchName.CompareIgnoreCaseToAscii( opensymbol, 10) )
 return false;
 
-//Note: see fdo#41556 if you feel compelled to cache the results here,
-//remember that fontconfig can return e.g. an italic font for a non-italic
-//input and/or different fonts depending on fontsize, bold, etc settings so
-//don't cache just on the name, cache on all the input and don't just
-//return the original selection data with the fontname updated
+//see fdo#41556 and fdo#47636
+//fontconfig can return e.g. an italic font for a non-italic input and/or
+//different fonts depending on fontsize, bold, etc settings so don't cache
+//just on the name, cache map all the input and all the output not just map
+//from original selection to output fontname
+FontSelectPatternAttributes rPatternAttributes = rFontSelData;
+CachedFontMapType rCachedFontMap = const_castCachedFontMapType (maCachedFontMap);
+CachedFontMapType::iterator itr = std::find_if(rCachedFontMap.begin(), rCachedFontMap.end(), equal(rPatternAttributes));
+if (itr != rCachedFontMap.end())
+{
+// Cached substitution
+rFontSelData.copyAttributes(itr-second);
+if (itr != rCachedFontMap.begin())
+{
+// MRU, move it to the front
+rCachedFontMap.splice(rCachedFontMap.begin(), rCachedFontMap, itr);
+}
+return true;
+}
+
 rtl::OUString aDummy;
 const FontSelectPattern aOut = GetFcSubstitute( rFontSelData, aDummy );
 
@@ -178,7 +218,14 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern rFontSelDa

[Libreoffice-commits] .: sc/source

2012-06-21 Thread Noel Power
 sc/source/filter/oox/formulabuffer.cxx|   14 +-
 sc/source/filter/oox/sheetdatacontext.cxx |1 -
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 75c789691b3ed7a10caa4319cf58144cfaace3a7
Author: Noel Power noel.po...@novell.com
Date:   Thu Jun 21 16:23:09 2012 +0100

fix core dump setting preload value for some cell formula

this patch is a follow up to 6ea4e42eaa28a773ec66fee3b8f764e0dc365297  
7fff98724bc7e3f4d3defb005aa1358d743d08ed

Change-Id: Ia286164c369526acb4dfe733b651e65a79d124d8

diff --git a/sc/source/filter/oox/formulabuffer.cxx 
b/sc/source/filter/oox/formulabuffer.cxx
index f93a517..7d8ec1a 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -20,6 +20,7 @@
 
 #include rangelst.hxx
 #include autonamecache.hxx
+#include tokenuno.hxx
 
 namespace oox {
 namespace xls {
@@ -134,22 +135,25 @@ void FormulaBuffer::finalizeImport()
 
 void FormulaBuffer::applyCellFormulas( std::vector TokenAddressItem  
rVector )
 {
+ScDocument rDoc = getScDocument();
 for ( std::vector TokenAddressItem ::iterator it = rVector.begin(), 
it_end = rVector.end(); it != it_end; ++it )
 {
 ::com::sun::star::table::CellAddress rAddress = it-maCellAddress;
 ApiTokenSequence rTokens = getFormulaParser().importFormula( rAddress, 
it-maTokenStr );
-
-Reference XFormulaTokens  xTokens( getCell( rAddress ), UNO_QUERY );
-OSL_ENSURE( xTokens.is(), WorksheetHelper::putFormulaTokens - missing 
token interface );
-if( xTokens.is() ) xTokens-setTokens( rTokens );
+ScTokenArray aTokenArray;
+ScAddress aCellPos;
+ScUnoConversion::FillScAddress( aCellPos, rAddress );
+ScTokenConversion::ConvertToTokenArray( rDoc, aTokenArray, rTokens );
+ScBaseCell* pNewCell = new ScFormulaCell( rDoc, aCellPos, 
aTokenArray );
+rDoc.PutCell( aCellPos, pNewCell, sal_True );
 }
 }
 
 void FormulaBuffer::applyCellFormulaValues( std::vector ValueAddressPair  
rVector )
 {
+ScDocument rDoc = getScDocument();
 for ( std::vector ValueAddressPair ::iterator it = rVector.begin(), 
it_end = rVector.end(); it != it_end; ++it )
 {
-ScDocument rDoc = getScDocument();
 ScAddress aCellPos;
 ScUnoConversion::FillScAddress( aCellPos, it-first );
 ScBaseCell* pBaseCell = rDoc.GetCell( aCellPos );
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx 
b/sc/source/filter/oox/sheetdatacontext.cxx
index 37f882c..7ca86d7 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -190,7 +190,6 @@ void SheetDataContext::onEndElement()
 {
 if( mbValidRange  maFmlaData.isValidSharedRef( 
maCellData.maCellAddr ) )
 {
-//mrSheetData.createSharedFormula( 
maFmlaData.mnSharedId, mrFormulaParser.importFormula( maCellData.maCellAddr, 
maFormulaStr ) );
 createSharedFormulaMapEntry( maCellData.maCellAddr, 
maFmlaData.mnSharedId, maFormulaStr );
 }
 setCellFormula( maCellData.maCellAddr, 
maFmlaData.mnSharedId );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-6' - filter/source instsetoo_native/inc_openoffice officecfg/registry scp2/source setup_native/source solenv/bin

2012-06-21 Thread Andras Timar
 filter/source/config/fragments/types/draw_Visio_Document.xcu|2 
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf   |8 -
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt   |5 
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt  |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |1 
 officecfg/registry/data/org/openoffice/Office/UI.xcu|2 
 scp2/source/draw/module_draw.scp|9 +
 scp2/source/draw/registryitem_draw.scp  |6 
 scp2/source/draw/registryitem_draw.ulf  |5 
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |   71 
+++---
 solenv/bin/modules/installer/windows/property.pm|2 
 11 files changed, 84 insertions(+), 29 deletions(-)

New commits:
commit 0e6c53a535758ef62110a8744b600633e564af03
Author: Andras Timar ati...@suse.com
Date:   Thu Jun 21 17:28:58 2012 +0200

fdo#51274 optionally associate Visio file types (vsd/vst) to Draw

Change-Id: I0362d758205e7d12484e9e86ff2dce9608730c57

diff --git a/filter/source/config/fragments/types/draw_Visio_Document.xcu 
b/filter/source/config/fragments/types/draw_Visio_Document.xcu
index 17600d0..a271e2a 100644
--- a/filter/source/config/fragments/types/draw_Visio_Document.xcu
+++ b/filter/source/config/fragments/types/draw_Visio_Document.xcu
@@ -1,7 +1,7 @@
 node oor:name=draw_Visio_Document oor:op=replace 
 prop 
oor:name=DetectServicevaluecom.sun.star.comp.Draw.VisioImportFilter/value/prop
 prop oor:name=URLPattern/
-prop oor:name=Extensionsvaluevsd/value/prop
+prop oor:name=Extensionsvaluevsd vst/value/prop
 prop 
oor:name=MediaTypevalueapplication/vnd.visio/value/prop
 prop oor:name=Preferredvaluetrue/value/prop
 prop oor:name=PreferredFiltervalueVisio 
Document/value/prop
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 51f351b..d2a473b 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -614,7 +614,7 @@ en-US = Microsoft Excel Spreadsheets
 en-US = Microsoft PowerPoint Presentations
 
 [OOO_CONTROL_273]
-en-US = [ProductName] Writer/Web
+en-US = Microsoft Visio Documents
 
 [OOO_CONTROL_274]
 en-US = Set [DEFINEDPRODUCT] to be the default application for Microsoft 
Office file types.
@@ -622,12 +622,6 @@ en-US = Set [DEFINEDPRODUCT] to be the default 
application for Microsoft Office
 [OOO_CONTROL_275]
 en-US = [ProductName] can be set as the default application to open Microsoft 
Office file types. This means, for instance, that if you double click on one of 
these files, [ProductName] will open it, not the program that opens it now.
 
-[OOO_CONTROL_276]
-en-US = File types
-
-[OOO_CONTROL_277]
-en-US = Default HTML editor
-
 [OOO_CONTROL_278]
 en-US = {MSSansBold8}File Type
 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 5611333..2fbbad7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -128,11 +128,12 @@ FileTypeDialogBranding2   Text3   228 
88  13  65537   [ProductName]
 FileTypeDialog Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_138 CheckBox1   
 FileTypeDialog CheckBox1   CheckBox41  106 200 10  
3   SELECT_WORD  OOO_CONTROL_270CheckBox2   
 FileTypeDialog CheckBox2   CheckBox41  131 200 10  
3   SELECT_EXCEL OOO_CONTROL_271CheckBox3   
-FileTypeDialog CheckBox3   CheckBox41  156 200 10  
3   SELECT_POWERPOINTOOO_CONTROL_272Back
+FileTypeDialog CheckBox3   CheckBox41  156 200 10  
3   SELECT_POWERPOINTOOO_CONTROL_272CheckBox4   
+FileTypeDialog CheckBox4   CheckBox41  181 200 10  
3   SELECT_VISIO OOO_CONTROL_273Back
 FileTypeDialog DlgDesc Text21  20  272 25  65539   
OOO_CONTROL_274 
 FileTypeDialog DlgLine Line90  234 284 0   1   

 FileTypeDialog DlgText Text21  56  326 40  3   
OOO_CONTROL_275 
-FileTypeDialog DlgText2Text21  190 326 30  3   
OOO_CONTROL_309 
+FileTypeDialog DlgText2Text21  200 326 30  3   
OOO_CONTROL_309 
 

Re: Possible change to the Native Build page?

2012-06-21 Thread Caolán McNamara
On Thu, 2012-06-21 at 07:49 +0800, Phil Hart wrote:
 On 20/06/2012 8:21 PM, Caolán McNamara wrote:
  On Wed, 2012-06-20 at 15:37 +0800, Phil Hart wrote:
  Answers:
 
  phil@linux-012k:~/Downloads/libreoffice-core-3.5.99.1 grep JAVA 
  config_host.mk
  export JAVALIB=-L/usr/lib64/jvm/java-1.5.0-gcj/lib64
  export JAVA_HOME=/usr/lib64/jvm/java-1.5.0-gcj
  export JAVA_SOURCE_VER=1.6
  export JAVA_TARGET_VER=1.6
  odd, I wonder why it ended up as 1.6 here. I'd have expected 1.5. Can I
  get the output of...
 
  java -version
  and
  javac -version
  and
  grep JDK config_host.mk
 
  I mean, gcj should work, and should work out of the box (though from the
  above a hackaround of --with-java-target-version=1.5
 
  C.
 
 Answers:
...
 Question: Might these values have been affected by the install of 
 Java-1_6_0-openjdk-devel
 that I did previously?

Yes, I wanted to see the java + javac output of the configuration that
the config_host.mk from the failed build was generated with :-) Rather
than their current post-openjdk install values.

C.

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


[Libreoffice-commits] .: filter/source instsetoo_native/inc_openoffice officecfg/registry scp2/source setup_native/source solenv/bin

2012-06-21 Thread Andras Timar
 filter/source/config/fragments/types/draw_Visio_Document.xcu|2 
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf   |8 -
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt   |5 
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt  |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt  |1 
 officecfg/registry/data/org/openoffice/Office/UI.xcu|2 
 scp2/source/draw/module_draw.scp|9 +
 scp2/source/draw/registryitem_draw.scp  |6 
 scp2/source/draw/registryitem_draw.ulf  |5 
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |   71 
+++---
 solenv/bin/modules/installer/windows/property.pm|2 
 11 files changed, 84 insertions(+), 29 deletions(-)

New commits:
commit ade85a43e1369cb9e0026f048ed410a964db48d9
Author: Andras Timar ati...@suse.com
Date:   Thu Jun 21 17:28:58 2012 +0200

fdo#51274 optionally associate Visio file types (vsd/vst) to Draw

Change-Id: I0362d758205e7d12484e9e86ff2dce9608730c57

diff --git a/filter/source/config/fragments/types/draw_Visio_Document.xcu 
b/filter/source/config/fragments/types/draw_Visio_Document.xcu
index 17600d0..a271e2a 100644
--- a/filter/source/config/fragments/types/draw_Visio_Document.xcu
+++ b/filter/source/config/fragments/types/draw_Visio_Document.xcu
@@ -1,7 +1,7 @@
 node oor:name=draw_Visio_Document oor:op=replace 
 prop 
oor:name=DetectServicevaluecom.sun.star.comp.Draw.VisioImportFilter/value/prop
 prop oor:name=URLPattern/
-prop oor:name=Extensionsvaluevsd/value/prop
+prop oor:name=Extensionsvaluevsd vst/value/prop
 prop 
oor:name=MediaTypevalueapplication/vnd.visio/value/prop
 prop oor:name=Preferredvaluetrue/value/prop
 prop oor:name=PreferredFiltervalueVisio 
Document/value/prop
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 51f351b..d2a473b 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -614,7 +614,7 @@ en-US = Microsoft Excel Spreadsheets
 en-US = Microsoft PowerPoint Presentations
 
 [OOO_CONTROL_273]
-en-US = [ProductName] Writer/Web
+en-US = Microsoft Visio Documents
 
 [OOO_CONTROL_274]
 en-US = Set [DEFINEDPRODUCT] to be the default application for Microsoft 
Office file types.
@@ -622,12 +622,6 @@ en-US = Set [DEFINEDPRODUCT] to be the default 
application for Microsoft Office
 [OOO_CONTROL_275]
 en-US = [ProductName] can be set as the default application to open Microsoft 
Office file types. This means, for instance, that if you double click on one of 
these files, [ProductName] will open it, not the program that opens it now.
 
-[OOO_CONTROL_276]
-en-US = File types
-
-[OOO_CONTROL_277]
-en-US = Default HTML editor
-
 [OOO_CONTROL_278]
 en-US = {MSSansBold8}File Type
 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 5611333..2fbbad7 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -128,11 +128,12 @@ FileTypeDialogBranding2   Text3   228 
88  13  65537   [ProductName]
 FileTypeDialog Cancel  PushButton  301 243 66  17  3   
OOO_CONTROL_138 CheckBox1   
 FileTypeDialog CheckBox1   CheckBox41  106 200 10  
3   SELECT_WORD  OOO_CONTROL_270CheckBox2   
 FileTypeDialog CheckBox2   CheckBox41  131 200 10  
3   SELECT_EXCEL OOO_CONTROL_271CheckBox3   
-FileTypeDialog CheckBox3   CheckBox41  156 200 10  
3   SELECT_POWERPOINTOOO_CONTROL_272Back
+FileTypeDialog CheckBox3   CheckBox41  156 200 10  
3   SELECT_POWERPOINTOOO_CONTROL_272CheckBox4   
+FileTypeDialog CheckBox4   CheckBox41  181 200 10  
3   SELECT_VISIO OOO_CONTROL_273Back
 FileTypeDialog DlgDesc Text21  20  272 25  65539   
OOO_CONTROL_274 
 FileTypeDialog DlgLine Line90  234 284 0   1   

 FileTypeDialog DlgText Text21  56  326 40  3   
OOO_CONTROL_275 
-FileTypeDialog DlgText2Text21  190 326 30  3   
OOO_CONTROL_309 
+FileTypeDialog DlgText2Text21  200 326 30  3   
OOO_CONTROL_309 
 

[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - instsetoo_native/inc_openoffice setup_native/source

2012-06-21 Thread Caolán McNamara
 instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt 
|2 
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
|3 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
|3 
 setup_native/source/win32/customactions/shellextensions/registerextensions.cxx 
|   44 +-
 4 files changed, 13 insertions(+), 39 deletions(-)

New commits:
commit a13c54699e53e1174d575991ddfb848d6a8a01d9
Author: Andras Timar ati...@suse.com
Date:   Wed Jun 20 21:07:29 2012 +0200

fdo#51270 fix RemoveExtensions custom action

FINDPRODUCT property was not available to this deferred custom action.
Not to mention that registry keys are also deleted at his stage of 
uninstallation.
The proper solution is to set the installation directory with a type 51 
custom action,
and pass it to RemoveExtensions custom action via CustomActionData property.

Change-Id: I0ac18b3a0b19ff1a87bcf580fad9c7fdadb26f76

Signed-off-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 5cfb974d41642d1acbaadb553c16cf8d174f524a)

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

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
index 18b3ca4..2dd9e91 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@@ -11,4 +11,4 @@ InstallFinalize   400
 InstallInitialize  250
 InstallValidate200
 ScheduleReboot ISSCHEDULEREBOOT375
-SetInstalllocation 390
+SetInstallLocation1390
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 913bfe7..938ba05 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -122,7 +122,8 @@ setAllUsersProfile2K51  ALLUSERSPROFILE 
[%ALLUSERSPROFILE]
 SetAllUsersProfileNT   51  ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
 setUserProfileNT   51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
-SetInstalllocation 51  RegisterExtensions  [INSTALLLOCATION]
+SetInstallLocation151  RegisterExtensions  [INSTALLLOCATION]
+SetInstallLocation251  RemoveExtensions[INSTALLLOCATION]
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
 SetLanguageSelected51  LANG_SELECTED   1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 81c1e9a..473b0f8 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -172,7 +172,8 @@ ScheduleReboot  ISSCHEDULEREBOOT3125
 SelfRegModules 2850
 SelfUnregModules   1100
 SetARPInstallLocation  990
-SetInstalllocation 3140
+SetInstallLocation13140
+SetInstallLocation23141
 SetODBCFolders 550
 StartServices  VersionNT   2800
 StopServices   VersionNT   950
diff --git 
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
 
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index 1e30c46..0fbe4e1 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -211,44 +211,16 @@ extern C UINT __stdcall RegisterExtensions(MSIHANDLE 
handle)
 
 extern C UINT __stdcall RemoveExtensions(MSIHANDLE handle)
 {
-std::_tstring mystr;
-
-// Finding the product with the help of the propery FINDPRODUCT,
-// that contains a Windows Registry key, that points to the install 
location.
-
-TCHAR szValue[8192];
-DWORD nValueSize = sizeof(szValue);
-HKEY  hKey;
-std::_tstring sInstDir;
-
-std::_tstring sProductKey = GetMsiProperty( handle, TEXT(FINDPRODUCT) );
-
-if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), 
hKey ) )
-{
-if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT(INSTALLLOCATION), 
NULL, NULL, (LPBYTE)szValue, nValueSize ) )
-{
-sInstDir = szValue;
-}
-RegCloseKey( hKey );
-}
-else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  
sProductKey.c_str(), hKey ) )
-{
-if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT(INSTALLLOCATION), 
NULL, NULL, (LPBYTE)szValue, nValueSize ) )
-{
-sInstDir = szValue;
-

Re: [PATCH] fix some java deprecation warnings in qadevOOo module

2012-06-21 Thread Noel Grandin


On 2012-06-20 22:29, Michael Stahl wrote:

On 19/06/12 16:35, Noel Grandin wrote:

Hi

Since the qadevOOo module seems to require java 1.5, I updated a couple
of places to remove some deprecation warnings.

thanks for fixing the annoying warnings; the Java baseline was raised to
1.5 already some years ago in OOo times, so feel free to use Java 1.5
constructs in all our modules if it helps.




Perhaps you can tell me - there are some deprecated methods like this one:

   package com.sun.star.wizards.common;
   public class NumberFormatter
   {
   public static XNumberFormatter 
createNumberFormatter(XMultiServiceFactory _xMSF, XNumberFormatsSupplier 
_xNumberFormatsSupplier) throws Exception


that are used in various places, but I can't find a replacement - there 
doesn't seem to be a NumberFormatter factory class with a create method 
taking an XComponentContext parameter, like I would expect.

Any ideas?

Thanks, Noel Grandin


Disclaimer: http://www.peralex.com/disclaimer.html


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


Re: [PUSHED-3-5][PUSHED-3-5-5] clean uninstall on Windows

2012-06-21 Thread Caolán McNamara
On Thu, 2012-06-21 at 09:36 +0200, Jesús Corrius wrote:
 Looks good: +1

Not that I've a clue. But it sounds convincing :-) so I'll add an ack
and now pushed to 3-5 and 3-5-5.

C.

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


Re: [Libreoffice] [GSoC 2012][svg export filter] support of 'dur' attribute for time containers

2012-06-21 Thread Thorsten Behrens
Marco Cecchetti wrote:
 I have a problem: I can't hear any sound effect at all.
 I got the following message on the standard error:
 
 Message: don't know how to handle audio/x-wav
 
Looks you're missing some gstreamer plugins - IIRC wav is inside 
gstreamer-0_10-plugins-good or somesuch.

Cheers,

-- Thorsten


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


[Libreoffice-commits] .: logerrit

2012-06-21 Thread Bjoern Michaelsen
 logerrit |  187 +++
 1 file changed, 187 insertions(+)

New commits:
commit fe49f23529a52c33ca3e2f673d242273bcaa7108
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Jun 20 15:42:27 2012 -0500

add helper script for gerrit CLI integration

Change-Id: I5705530ee4d5b93bc66ca23463098ac45f49323d

diff --git a/logerrit b/logerrit
new file mode 100755
index 000..b3d2233
--- /dev/null
+++ b/logerrit
@@ -0,0 +1,187 @@
+#!/bin/sh
+
+#GERRITHOST=gerrit.libreoffice.org
+GERRITHOST=logerrit
+GERRITURL=ssh://$GERRITHOST/core
+
+get_SHA_for_change() {
+   SHA=`ssh ${GERRITHOST?} gerrit query --all-approvals change:$1|grep 
ref|tail -1|cut -d: -f2`
+}
+
+ask_tristate() {
+   case $1 in
+   [yY] | [yY][Ee][Ss] | [+] )
+   ANSWER=y
+   ;;
+   [nN] | [n|N][O|o] | [-] )
+   ANSWER=n
+   ;;
+   [] )
+   ANSWER=
+   ;;
+   * )
+   echo Please answer with either +,-,y,n,yes,no or the 
empty string.
+   exit 1
+   ;;
+   esac
+
+}
+
+case $1 in
+   help)
+   echo Usage: ./logerrit subcommand [options]
+   echo subcommands:
+   echo  test test your gerrit setup
+   echo  submit [BRANCH]  submit your change for 
review to a branch
+   echo  nextchange [BRANCH]   reset branch to the 
remote to start with the next change
+   echo  checkout CHANGEIDcheckout the changes 
for review
+   echo  pull CHANGEIDpull (and merge) the 
changes on current branch
+   echo  cherry-pick CHANGEID cherry-pick the change 
on current branch
+   echo  patch CHANGEID   show the change as a 
patch
+   echo  review [CHANGEID]interactively review a 
change (current one if no changeid given)
+   echo  query    query for changes for 
review on project core
+   echo  any other gerrit command
+   exit
+   ;;
+   test)
+   if test -n `ssh $GERRITHOST 21|grep \Welcome to Gerrit Code 
Review\`
+   then
+   echo Your gerrit setup was succesfull!
+   else
+   echo There seems to be trouble.
+   echo please have the output of: ssh - logerrit
+   echo at hand when looking for help.
+   fi
+   ;;
+   submit)
+   BRANCH=$2
+   if test -z $BRANCH
+   then
+   BRANCH=`git symbolic-ref HEAD 2 /dev/null`
+   BRANCH=${BRANCH##refs/heads/}
+   if test -z $BRANCH
+   then
+   echo no branch specified, and could not guess 
the current branch
+   exit 1
+   fi
+   echo no branch specified, guessing current branch 
$BRANCH
+   fi
+   git push $GERRITURL HEAD:refs/for/$BRANCH
+   ;;
+   nextchange)
+   CHANGEID=`git log --format=format:%b -1 HEAD|grep Change-Id|cut 
-d: -f2|tr -d \ `
+   if test -z $CHANGEID
+   then
+   CHANGEID=NOCHANGEID
+   fi
+   BACKUPBRANCH=backup/$CHANGEID-`date +%F-%H%M%S`
+   git branch $BACKUPBRANCH
+   echo current state backed up as $BACKUPBRANCH
+   BRANCH=$2
+   if test -z $BRANCH
+   then
+   BRANCH=`git symbolic-ref HEAD 2 /dev/null`
+   BRANCH=${BRANCH##refs/heads/}
+   if test -z $BRANCH
+   then
+   echo no branch specified, and could not guess 
the current branch
+   exit 1
+   fi
+   echo no branch specified, guessing current branch 
$BRANCH
+   fi
+   git reset --hard remotes/origin/$BRANCH
+   ;;
+   review)
+   CHANGEID=$2
+   if test -z $CHANGEID
+   then
+   CHANGEID=`git log --format=format:%b -1 HEAD|grep 
Change-Id|cut -d: -f2`
+   if test -z $CHANGEID
+   then
+   echo could not find a Change-Id in your last 
commit, sorry
+   exit 1
+   fi
+   echo no Change-Id given on the command line, reviewing 
change$CHANGEID
+   fi
+   MESSAGEREQ=
+   read -p 'was the 

minutes of ESC call ...

2012-06-21 Thread Michael Meeks
* Present:
+ Bjoern, Eike, Mitch, Stephan, Markus, Michael, Norbert,
  Cedric, Thorsten, Andras, Mirek, Petr, Kendy, Caolan,
  Michael S

* Completed Action Items
+ Late feature reviews (Kendy, Astron, Eike, Markus)
+ icons: send out some mail addresses to poke (Astron)
+ post on-line update numbers for 3.6 testers (Kendy)
+ 600 on-line B1 / updaters registered
+ promote B2 a bit more ...

* Pending Action Items
+ [pending] merge the new pretty templates in place of the old ugly 
ones (Bjoern)
+ new problems shown up with this -
+ Caolan has tool for templates to strip lang tags so it works
AI: + try template lang tag stripping tool (Bjoern)
+ need to fix  merge for Beta3
+ icons: poke Tango authors (Michael)

* Release Engineering update (Petr)
+ problems with scripts  new version numbering scheme
+ hopefully it will survive the test of time
+ 3.6 / Beta 2 status
+ builds went well
+ eager for templates in B3
(last beta + hard string freeze), RC1 in a week
+ pushing to mirrors as we speak
+ misc. download script hackery ongoing
+ 3.5.5 RC2 / deadline next Monday
+ thanks for tripple reviews for RC2

* GSOC update (Cedric)
+ mid-terms in three weeks - July 13th; students
  need to get code included and merged to master
  for then.

* UI / design update (Mirek)
+ windows menubars support / look
+ poll up yesterday - transparent vs. opaque vs. 50%
+ people seem to want it opaque
+ kendy working on it but happy whatever decision
  needed soon; on vacation July onwards
AI: + revert to an opaque background (Kendy)
+ splash screen proposals still pending for one week:
+ submissions welcome:
  
http://wiki.documentfoundation.org/Design/Playground/Splash_screen
+ new templates
AA  + check new templates are using auto-fitting functionality 
(Thorsten)

* re-basing update (Michael)
+ 14k of 45k files complete - ~30%

* gerrit (Bjoern)
+ idiots guide to using it (for Meeks)
+ https://wiki.documentfoundation.org/Development/gerrit
+ need more people to test  accelerate it's deployment
+ some workflows in the wiki are harder than necessarily
+ when gerrit owns git - no problem.
= Major contributors need to log into gerrit so Norbert
   can give you permissions
AI: + https://gerrit.libreoffice.org/ - click 'register' (All 
hackers)
AI: + then poke Norbert by E-mail to get yourself setup a commiter 
/ reviewer
+ the E-mail used for openID registration and 
user-account
  on is needed (cf. core/.git/config)
+ separate group of ACL's for merges / tagging
+ thanks for working on it (Kendy)
+ and for the FAQ:
  
http://lists.freedesktop.org/archives/libreoffice/2012-June/033872.html
+ are we able to continue using git as before ? (Kendy)
+ yes; people not forced to a new workflow.
+ if we get it right, people should never feel
  anything much changed - except the host to
  push/pull to.
+ -modulo- that every committer will need a gerrit
  account in due course before we switch to gerrit
  owning the git repo
+ one-day, not before end of July (Norbert)
- fdo will become a read-only mirror of gerrit
- we already have a special user setup to do this sync.
+ who has used gerrit ? (Michael)
+ 24 accounts setup already, but more may have registered
AI: + notify all committers when we have a nice simple, minimal
  statement of what is required written (Bjoern)
+ concerns about loss of patches (Caolan)
+ see how it plays out
+ how can we integrate it well with mail ? (Bjoern)
+ a daily digest of gerrit commits to dev. list ? (Michael)
+ send everything to the list to start
  with  throttle if needed (Kendy)
+ we have a separate commits list today (Norbert)
+ start not too much traffic as people use it (Bjoern)
+ at the end of the day - people still need to do the reviews (Petr)
+ gerrit has a nice query language:

http://gerrit.googlecode.com/svn/documentation/2.2.1/user-search.html
+ who can help out if you have problems ? Name (IRC nick)
+ Bjoern (Sweetshark), 

[Libreoffice-commits] .: officecfg/registry

2012-06-21 Thread Andras Timar
 officecfg/registry/data/org/openoffice/Office/UI.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f82f0dee986b92e739caf3d8320ff6a6941671b
Author: Andras Timar ati...@suse.com
Date:   Thu Jun 21 17:54:30 2012 +0200

add Publisher Document filter to drawing filters in file selector

Change-Id: Idbe935d4fa1a83f49db28c2dcb74a421ba22b822

diff --git a/officecfg/registry/data/org/openoffice/Office/UI.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI.xcu
index e4e518b..bf1dbed 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI.xcu
@@ -63,7 +63,7 @@
 value xml:lang=en-USDrawings/value
 /prop
 prop oor:name=Filters
-value 
oor:separator=;draw_StarOffice_XML_Draw_Template;SGV - StarDraw 2.0;StarDraw 
3.0;StarDraw 3.0 Vorlage;StarDraw 5.0;StarDraw 5.0 Vorlage;StarOffice XML 
(Draw);draw8;draw8_template;Visio Document;SVG - Scalable Vector Graphics;Corel 
Draw Document/value
+value 
oor:separator=;draw_StarOffice_XML_Draw_Template;SGV - StarDraw 2.0;StarDraw 
3.0;StarDraw 3.0 Vorlage;StarDraw 5.0;StarDraw 5.0 Vorlage;StarOffice XML 
(Draw);draw8;draw8_template;Visio Document;SVG - Scalable Vector Graphics;Corel 
Draw Document;Publisher Document/value
 /prop
 /node
 node oor:name=com.sun.star.text.WebDocument 
oor:op=replace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/inc_openoffice setup_native/source

2012-06-21 Thread Caolán McNamara
 instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt 
|2 
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
|3 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
|3 
 setup_native/source/win32/customactions/shellextensions/registerextensions.cxx 
|   44 +-
 4 files changed, 13 insertions(+), 39 deletions(-)

New commits:
commit 5cfb974d41642d1acbaadb553c16cf8d174f524a
Author: Andras Timar ati...@suse.com
Date:   Wed Jun 20 21:07:29 2012 +0200

fdo#51270 fix RemoveExtensions custom action

FINDPRODUCT property was not available to this deferred custom action.
Not to mention that registry keys are also deleted at his stage of 
uninstallation.
The proper solution is to set the installation directory with a type 51 
custom action,
and pass it to RemoveExtensions custom action via CustomActionData property.

Change-Id: I0ac18b3a0b19ff1a87bcf580fad9c7fdadb26f76

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

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
index 18b3ca4..2dd9e91 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt
@@ -11,4 +11,4 @@ InstallFinalize   400
 InstallInitialize  250
 InstallValidate200
 ScheduleReboot ISSCHEDULEREBOOT375
-SetInstalllocation 390
+SetInstallLocation1390
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 913bfe7..938ba05 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -122,7 +122,8 @@ setAllUsersProfile2K51  ALLUSERSPROFILE 
[%ALLUSERSPROFILE]
 SetAllUsersProfileNT   51  ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
 setUserProfileNT   51  USERPROFILE [%USERPROFILE]
 SetARPInstallLocation  51  ARPINSTALLLOCATION  [INSTALLLOCATION]
-SetInstalllocation 51  RegisterExtensions  [INSTALLLOCATION]
+SetInstallLocation151  RegisterExtensions  [INSTALLLOCATION]
+SetInstallLocation251  RemoveExtensions[INSTALLLOCATION]
 NewProductFound19  OOO_CUSTOMACTION_1
 SameProductFound   19  OOO_CUSTOMACTION_2
 SetLanguageSelected51  LANG_SELECTED   1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 81c1e9a..473b0f8 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -172,7 +172,8 @@ ScheduleReboot  ISSCHEDULEREBOOT3125
 SelfRegModules 2850
 SelfUnregModules   1100
 SetARPInstallLocation  990
-SetInstalllocation 3140
+SetInstallLocation13140
+SetInstallLocation23141
 SetODBCFolders 550
 StartServices  VersionNT   2800
 StopServices   VersionNT   950
diff --git 
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
 
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index 1e30c46..0fbe4e1 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -211,44 +211,16 @@ extern C UINT __stdcall RegisterExtensions(MSIHANDLE 
handle)
 
 extern C UINT __stdcall RemoveExtensions(MSIHANDLE handle)
 {
-std::_tstring mystr;
-
-// Finding the product with the help of the propery FINDPRODUCT,
-// that contains a Windows Registry key, that points to the install 
location.
-
-TCHAR szValue[8192];
-DWORD nValueSize = sizeof(szValue);
-HKEY  hKey;
-std::_tstring sInstDir;
-
-std::_tstring sProductKey = GetMsiProperty( handle, TEXT(FINDPRODUCT) );
-
-if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,  sProductKey.c_str(), 
hKey ) )
-{
-if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT(INSTALLLOCATION), 
NULL, NULL, (LPBYTE)szValue, nValueSize ) )
-{
-sInstDir = szValue;
-}
-RegCloseKey( hKey );
-}
-else if ( ERROR_SUCCESS == RegOpenKey( HKEY_LOCAL_MACHINE,  
sProductKey.c_str(), hKey ) )
-{
-if ( ERROR_SUCCESS == RegQueryValueEx( hKey, TEXT(INSTALLLOCATION), 
NULL, NULL, (LPBYTE)szValue, nValueSize ) )
-{
-sInstDir = szValue;
-}
-RegCloseKey( hKey );
-}
-else
-{
-return ERROR_SUCCESS;
-}
-
-// Removing complete directory 

Re: big Deps ...

2012-06-21 Thread Stephan Bergmann

On 06/21/2012 04:01 PM, Michael Stahl wrote:

On 21/06/12 13:47, Stephan Bergmann wrote:

On 06/21/2012 10:57 AM, Michael Meeks wrote:

[ indeed, I'm sure there is one - but what is the benefit of separating
the .hdl files out, if we are sure that each .hpp will include all of
it's dependent .hpp's ? ].


Circular dependencies among headers.


i wonder: is that the case for all generated headers, or just for some
small subset that is necessary for bootstrapping (i.e. probably
css.uno/css.lang)?


Its not about bootstrapping, its about scenarios like an interface X 
method argument of struct type S, where S in turn has a member of type X 
(IIRC).



if the latter, would it be possible to add some option or something to
only generate 2 headers when really necessary?


Might or might not be possible to do that more or less easily; never 
spent much thought on it.


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


Re: [ANN] LibreOffice 3.6.0.0 beta2 available for testing

2012-06-21 Thread ape
Hi, all

A few notes about LibO-dev_3.6.0.0.beta2 (ID: f010139); OS - Windows.
 
1st note (see - gui_error_win_x86.gif).
 Error GUI. The description is difficult to make because my English is very
bad. But I made an animation (gui_error_win_x86.gif) that will explain
everything without me.
 
http://nabble.documentfoundation.org/file/n3991595/gui_error_win_x86.gif
gui_error_win_x86.gif 

2nd note (see - capt_01.png).
 With a little work, I realized that because of Innovations - the bright
background of the workspace applications:
 - my eyes get tired more quickly;
 - my monitor hooked more intense;
 - sometimes I confused, where is my (left) cursor now - on the edge of the
page, on the working area or on the ruler ...
 
3rd note (see - capt_01.png, on the right - LibreOffice-3.5).
 The right cursor showed a new error GUI LibO-3.5.4rc1 (perhaps only for
me): the button Update is attached to the right edge of the toolbar
Menu, but not separated by X pixels from the right edge of the Help.
The visual effect - the button closes the menu, making it unavailable - is
obvious. I think that I'll see the same error in version 3.6.0 when it will
be possible to upgrade to 3.6.1.

http://nabble.documentfoundation.org/file/n3991595/capt_01.png capt_01.png 
--
ape

--
View this message in context: 
http://nabble.documentfoundation.org/ANN-LibreOffice-3-6-0-0-beta2-available-for-testing-tp3991463p3991595.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: [REVIEW 3-5][REVIEW 3-6] fdo#47636 font fallback performance regression

2012-06-21 Thread Michael Meeks
Hi there,

On Thu, 2012-06-21 at 16:20 +0100, Caolán McNamara wrote:
 So 8c023fd645c8b83637ffcde4055886b2e4f94393 should fix a performance
 regression with font fallback under fontconfig using platforms when a
 font is missing.

 This may be a duplicate of MAB fdo#44719. Fontconfig is fairly slow on
 finding a replacement font so proposed solution is to cache the results.

You have my +1 for both branches (no need for review for -3-6 for this
regression / bug IMHO) ;-) The patch is also a lot simpler when
considering the revert of the original cache logic.

I'll push it in a bit if no-one else has - just building -3-5 currently
to test the performance improvement.

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] .: sc/source

2012-06-21 Thread Eike Rathke
 sc/source/filter/xml/xmlexprt.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d212cbd96e648c10d875161b8ab1fc67ae509bd7
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date:   Wed Jun 20 12:55:24 2012 +0200

fdo#51249 Disable stream copy when saving a file with 'Changes Record' 
active

Change-Id: Id06caa5d0552e4f3695244de4f6096f80885a783

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 9b105d6..1bfe200 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1721,7 +1721,7 @@ void ScXMLExport::_ExportContent()
 {
 sal_Int32 nStartOffset = -1;
 sal_Int32 nEndOffset = -1;
-if (pSheetData  pDoc  pDoc-IsStreamValid((SCTAB)nTable))
+if (pSheetData  pDoc  pDoc-IsStreamValid((SCTAB)nTable)  
!pDoc-GetChangeTrack())
 pSheetData-GetStreamPos( nTable, nStartOffset, nEndOffset );
 
 if ( nStartOffset = 0  nEndOffset = 0  xSourceStream.is() )
@@ -2342,7 +2342,8 @@ void ScXMLExport::_ExportAutoStyles()
 for (sal_Int32 nTable = 0; nTable  nTableCount; ++nTable, 
IncrementProgressBar(false))
 {
 bool bUseStream = pSheetData  pDoc  
pDoc-IsStreamValid((SCTAB)nTable) 
-  pSheetData-HasStreamPos(nTable)  
xSourceStream.is();
+  pSheetData-HasStreamPos(nTable)  
xSourceStream.is() 
+  !pDoc-GetChangeTrack();
 
 Reference sheet::XSpreadsheet xTable(xIndex-getByIndex(nTable), 
uno::UNO_QUERY);
 if (!xTable.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2012-06-21 Thread Eike Rathke
 sc/source/filter/xml/xmlexprt.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit d62646cf5509b45e664b21fd7896ff9dc2f83b82
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date:   Wed Jun 20 12:55:24 2012 +0200

fdo#51249 Disable stream copy when saving a file with 'Changes Record' 
active

Change-Id: Id06caa5d0552e4f3695244de4f6096f80885a783
(cherry picked from commit d212cbd96e648c10d875161b8ab1fc67ae509bd7)

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index c3f0444..ab01286 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1727,7 +1727,7 @@ void ScXMLExport::_ExportContent()
 {
 sal_Int32 nStartOffset = -1;
 sal_Int32 nEndOffset = -1;
-if (pSheetData  pDoc  pDoc-IsStreamValid((SCTAB)nTable))
+if (pSheetData  pDoc  pDoc-IsStreamValid((SCTAB)nTable)  
!pDoc-GetChangeTrack())
 pSheetData-GetStreamPos( nTable, nStartOffset, nEndOffset );
 
 if ( nStartOffset = 0  nEndOffset = 0  xSourceStream.is() )
@@ -2350,7 +2350,8 @@ void ScXMLExport::_ExportAutoStyles()
 for (sal_Int32 nTable = 0; nTable  nTableCount; ++nTable, 
IncrementProgressBar(false))
 {
 bool bUseStream = pSheetData  pDoc  
pDoc-IsStreamValid((SCTAB)nTable) 
-  pSheetData-HasStreamPos(nTable)  
xSourceStream.is();
+  pSheetData-HasStreamPos(nTable)  
xSourceStream.is() 
+  !pDoc-GetChangeTrack();
 
 Reference sheet::XSpreadsheet xTable(xIndex-getByIndex(nTable), 
uno::UNO_QUERY);
 if (!xTable.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Cleaning bug list

2012-06-21 Thread Petr Mladek
Hi bfo,

this are interesting questions. I put back QA mailing list into CC
because there people there are interested.

bfo píše v Út 19. 06. 2012 v 11:24 -0700:
 This is a very nice workflow, but I have some questions:

 - how you define Bug prevent users from making professional quality work?

By professional quality work, I understand that everything works as
expected. It means that all menu entries, buttons, and dialogs does
something reasonable or something that is described in the
documentation ;-)

These bugs are about all functions that are used even by power-users. If
they do not work at all in reasonable scenarios, they should have higher
severity. If they basically works but they do not have ideal results,
they should have lover severity.


 Interoperability issues are a big obstacle. If this package is supposed to
 read/write MSOffice files, then every new bug in this area should have high
 priority by default.

Sure. On the other hand, it would be ugly if the application is able to
perfectly import documents but you could not modify them because of poor
or buggy functionality. We need to ballance it with functional bugs.


  I have reported two annoying:  
 https://bugs.freedesktop.org/show_bug.cgi?id=47138 47138  and 
 https://bugs.freedesktop.org/show_bug.cgi?id=49102 49102 . Are those
 prevent users from making professional quality work enough?

Sure. They are perfect candidates.


 Home users can live with a workaround, but it is impossible to expect
  that xx(x) users will do it xx times a day. Everyday. That is not
  professional (even worse - it is very unprofessional for those
  users migrated from MSO, where it just worked).

No it is not professional. On the other hand, we need to make difference
between broken and non-optimal functionality and also with the level of
annoyance. If would be ugly if most bugs ends here and the minor and
trivial categories are empty ;-)


 I'd change the workflow a little bit by putting the obvious things at the
 top:
 - feature requests aka wishlist

I do not have any strong opinion for this. I think that it is is good to
be able to discuss features, so enhancement bugs in bugzilla might be
usable.


  - add target milestone if a feature is planned already

This must be done by developer, anyway :-)


 - bugs reported against not supported branches - exclude those at reporting
 level by disabling old versions in select fields; but what to do when they
 appear anyway -  mark them as INVALID at triaging? ask the reporter to check
 in new version? Any comments?

We need to be more careful here. The current rule is to do NOT modify
the version picker if you reproduce the problem with newer version. It
is because it is very valuable to know how the bug is old. It helps
developers to locate it. So, maybe, we should do it the other way and
set the field to the oldest version where it was found.


 - is it Most Frequently Reported - then just dupe it 
 and now, if a bug is still there, triage it by the proposed workflow.

What do you mean by Most Frequently Reported?

Note that Joel's flowchart was about prioritizing. It is only one part
of the bugtriage process. Yes, looking for duplicates should be done
before.


 - how you define most and many - I reported those two bugs on behalf of ~xx
 people - is my bug better than other reports? Should this be controlled by
 number of dupes? At what levels? Maybe enabling voting feature of Bugzilla
 would help here...

Good question and hard to answer. The number of dupes is a good helper.
I would personally enable voting as well but some other people thing
that it is not objective. Otherwise, I use a common sense. I try to
guess how each function is hard to use and how many people would do such
action.

Most people do opening documents, do simple editation (elements from
toolbar), saving, printing.

Many people does more professional things, like using styles, adding
footnotes, inserting table of content, do computation in Calc.

Only experienced users use macros, work with databases, send mails using
addressbook...

Another good symptom is how is the function hidden in menu ;-)



 - regressions - this is a major problem and I think it deserves its own
 place in the workflow. It is not a big problem for home users to switch the
 version back and forth. But when we are talking in terms of bigger
 deployment, when you have xx computers (and growing) it becomes a real
 blocker sometimes. What good are new and fixed versions for, where there is
 a regression which disqualifies the software for daily use? That is a big
 problem.

You are right, regression are bad and we need to fix them with high
priority. On the other hand, you still need to compare them with other
reported bugs and decide what is more annoying for the daily work. We
could not blindly set the highest priority for a tiny functional problem
just because it is a regression. As someone said, you could view almost
any bug as regression, so we need to 

Re: [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Pierre-André Jacquod

Hello,
well as free time contributor with commit access to current repository, 
I followed this gerrit story. So not kind of surprise, but yeah, until 
THIS mail and posts, was me very unclear what it would mean.


To say it, first I had a lot of doubt. Reading mails, entry in the wiki, 
looking the web ans thinking, I now have the feeling this could be a 
good move.


Just to say, I basically just really do not like the fact of having to 
use openId, would prefer to have an account at fd.o. I did it really for 
the LibO, a kind of forced to. And NO, I do NOT have any google, flickr, 
facebook or other account. Do not trust them enough to put my data 
there, so to use them as authentication But no choice (!) I kind of 
understood. [+1 for / to Lionel thread]


I - sorry - do not want to read a lot gerrit documentation, I am here 
already in my free time. So I raise some questions that are not clear 
for me, that I did not saw in the wiki, based on my previous 
experiences. Here some points:


[WORKFLOW]
1. I have been beaten back by tinderbox (Mac OS X hurt me well), fixing 
some stupid point of my commits run after run. So would this workflow be 
supported :

some patch done
I push to gerrit and let tinderbox run. In case of success I get ? a +1 
of each tinderbox ? How do I know it passes with success.
Once tinderbox is successful, since my change is small or I am confident 
with, I put a +2 to my patch, which means this will insert automatically 
it to master. So I will be able to positive review my own patch ?


2. If I have several patches, that need to be together, how should I 
proceed with pushing them together to gerrit ? (If I want to have three 
patches in the same review ID from gerrit) ?


[ADMIN]
1. I followed the asked process of setting up an account, etc.. mailed 
to Norbert so he can match my fd.o account to gerrit. Well, how may I 
now see that I actually have / will have commit access to gerrit repo ?


2. When my ssh key expires, it is enough to just change it into my 
gerrit account ?


3. May be a stupid remark, but why do not use this way (opening gerrit 
account ) then to ask for license stuff ? You would have to ack to be 
able to open account, or to load patches. This would ease, ensure the 
process towards this goal ?


Thanks  Regards
Pierre-André

On 06/18/2012 12:09 PM, Bjoern Michaelsen wrote:


Hi all,

with:

  http://sweetshark.livejournal.com/13298.html

gerrit is documented and ready to go. Please use it for code review as much as
possible now as it simplifies things a lot over manual patch fiddling on
mailing lists. I will update the EasyHacks to point to gerrit instead in the
next days.
The last remaining step will be making the repo at gerrit the reference (and
the one at freedesktop a read-only mirror). I assume that to be prepared and
done until mid-July(*).

From that point on, we will have a lot of opportunity to improve our tinderbox

testing and reporting, making life easier and better for everyone working on
the codebase.

Best,

Bjoern

(*) Along with the other repos.
___
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: [Libreoffice] What is bibisect? And what is it doing in my office?

2012-06-21 Thread Pierre-André Jacquod

Hi,
just to say thanks for bibisect
Impressive example with fdo49610 to find the problematic commit.

Regards
Pierre-André

On 12/09/2011 02:59 PM, Bjoern Michaelsen wrote:

Hi all,



So I hope with this, we make regression finding some more fun and allow us --
QA and developers together -- to stabilize this release more quickly that ever
before.

Bjoern

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


Re: bug 49610 in impress: suspicious commit found, but help needed

2012-06-21 Thread Pierre-André Jacquod

Hello,

I locally reverted
bdfbbb33a491f3ce34375de14ba33436b04

 - sadly the change mixes a lot of reformatting with that fix. Hard
 to tell if that is now causing some ripple effects. :/

I can confirm this is the origin of the problem. The generated bug is 
very nasty (creates data loss) and the fix has to / should be in 3.6 as 
well as in 3.5.5


I also have to say honestly that fixing this patch is beyond my 
knowledge of LibO code in this area. So if you say OK, I will push my 
revert to master. This is not the most polite way of fixing it. 
destroying your correction, but the one that fit to my knowledge there.


Or have you time to investigate it and fix it ? Sorry, this sounds not 
very constructive, but in this period I do not have a lot of free time, 
so I can not offer more.


Tack
regards
Pierre-André


On 06/20/2012 11:10 PM, Thorsten Behrens wrote:

Pierre-André Jacquod wrote:

As I just do not understand what it is about here, (neither the goal
of the change nor the actual content), could you have a look about
it? I guess it will be the quickest way.


Hi Pierre-André,

well the goal was to decouple live cycles of Outliner and ViewShell

Cheers,

-- Thorsten



___
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


PATCH: Use hyphen for copyright range in About box

2012-06-21 Thread Robinson Tryon
Per https://bugs.freedesktop.org/show_bug.cgi?id=43180

Hyphens more clearly describe a date range, rather than just a
discrete list of years (e.g. Widget Foo was produced in years 1950,
1961-1963, 1969).

--R


0001-fdo-43180-Use-hyphen-for-copyright-range-in-About-bo.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[patch for 3.5.X] proposal of a patch to solve a crasher when saving a spreadsheet with track-change

2012-06-21 Thread Lionel Dricot
Hello,

The crasher my colleague Pierre-Éric solved as been pushed to master,
thanks Eike, thanks a lot for that :-)
https://bugs.freedesktop.org/show_bug.cgi?id=51249

Because this patch fixes a crasher, I would like to know if it would be
possible to review it for the 3.5.X series.

Thanks a lot,


Lionel


PS: please put me in CC: when replying to this message.

From caa38d397d5ddb1ed422894d0b423adeeae07066 Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Wed, 20 Jun 2012 12:55:24 +0200
Subject: [PATCH] fdo#51249 Disable stream copy when saving a file with
 'Changes Record' active

Change-Id: Id06caa5d0552e4f3695244de4f6096f80885a783
---
 sc/source/filter/xml/xmlexprt.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 9b105d6..1bfe200 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1721,7 +1721,7 @@ void ScXMLExport::_ExportContent()
 {
 sal_Int32 nStartOffset = -1;
 sal_Int32 nEndOffset = -1;
-if (pSheetData  pDoc  pDoc-IsStreamValid((SCTAB)nTable))
+if (pSheetData  pDoc  pDoc-IsStreamValid((SCTAB)nTable)  !pDoc-GetChangeTrack())
 pSheetData-GetStreamPos( nTable, nStartOffset, nEndOffset );
 
 if ( nStartOffset = 0  nEndOffset = 0  xSourceStream.is() )
@@ -2342,7 +2342,8 @@ void ScXMLExport::_ExportAutoStyles()
 for (sal_Int32 nTable = 0; nTable  nTableCount; ++nTable, IncrementProgressBar(false))
 {
 bool bUseStream = pSheetData  pDoc  pDoc-IsStreamValid((SCTAB)nTable) 
-  pSheetData-HasStreamPos(nTable)  xSourceStream.is();
+  pSheetData-HasStreamPos(nTable)  xSourceStream.is() 
+  !pDoc-GetChangeTrack();
 
 Reference sheet::XSpreadsheet xTable(xIndex-getByIndex(nTable), uno::UNO_QUERY);
 if (!xTable.is())
-- 
1.7.10


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


Re: PATCH: Use hyphen for copyright range in About box

2012-06-21 Thread Robinson Tryon
Oh, and you'll be wanting one of these from me as well:

My previous and all future contributions to LibreOffice, unless stated
otherwise, are licensed under LGPLv3+/MPL.


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


Re: [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Bjoern Michaelsen
Hi Pierre-André!

On Thu, Jun 21, 2012 at 07:08:46PM +0200, Pierre-André Jacquod wrote:
 I push to gerrit and let tinderbox run. In case of success I get ? a
 +1 of each tinderbox ? How do I know it passes with success.

a tinderbox would give you a +1verified, which means that it builds (and passes
whatever kind of tests that kind of tinderbox is gracious enough to do).

IMHO for LibreOffice we should use verified as meaning couldnt find anything
evil by blackbox testing.

A tinderbox can never do +1codereview as a tinderbox doesnt understand code,
but it can blackbox test it (does it still compile and pass tests).

Btw, gerrit in theory allows more labels than codereview and verified, so
we could have a codebeauty label or something -- and ignore it. Lets just
start with the default and only make things more complex when we really need
it.


IMHO, we should not use verified as fixes the bug it claims to fix -- thats
what bugzilla is for.

 Once tinderbox is successful, since my change is small or I am
 confident with, I put a +2 to my patch, which means this will insert
 automatically it to master. So I will be able to positive review my
 own patch ?

Yes. I did so already.

 2. If I have several patches, that need to be together, how should I
 proceed with pushing them together to gerrit ? (If I want to have
 three patches in the same review ID from gerrit) ?

Yes. They will depend on each other and gerrit will make sure the second does
not get pushed before the first etc.

 [ADMIN]
 1. I followed the asked process of setting up an account, etc..
 mailed to Norbert so he can match my fd.o account to gerrit. Well,
 how may I now see that I actually have / will have commit access to
 gerrit repo ?

I guess only admins can see that directly from the gerrit UI. But we can
publish the list a week before we make the final switch so everyone can check
himself and will ping those missing directly.

 2. When my ssh key expires, it is enough to just change it into my
 gerrit account ?

I dont know why that wouldnt be sufficient, I have not tested though ;)
 
 3. May be a stupid remark, but why do not use this way (opening
 gerrit account ) then to ask for license stuff ? You would have to
 ack to be able to open account, or to load patches. This would ease,
 ensure the process towards this goal ?

Gerrit has already some git hooks that way of making sure a CLA was signed.
Although we dont need a CLA we indeed can use that to get rid of manual
license statements. That would need some research, setup and tweaking, but
might be well worth it in the end. So yeah, if you want to contribute some
research on how those setups work it would be welcome.

Thanks for the feedback!

Best,

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


Re: [Libreoffice] What is bibisect? And what is it doing in my office?

2012-06-21 Thread Bjoern Michaelsen
Hi,

On Thu, Jun 21, 2012 at 07:11:48PM +0200, Pierre-André Jacquod wrote:
 just to say thanks for bibisect
 Impressive example with fdo49610 to find the problematic commit.

Thanks for the feedback, and also kudos to Florian for actually doing the
bibisect ;)

(An this reminds me that I need to update bibisect again ;) )

Best,

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


Re: [ANN] Please use Gerrit from now on for Patch Review

2012-06-21 Thread Norbert Thiebaud
On Thu, Jun 21, 2012 at 12:08 PM, Pierre-André Jacquod
pjacq...@alumni.ethz.ch wrote:
 I push to gerrit and let tinderbox run. In case of success I get ? a +1 of
 each tinderbox ?
Right now we don;t have tinderbox doing that yet... but when we do,
you'll need to asd a Review +1 to get the auto-build happen

 How do I know it passes with success.
You should get email notification of stuff happening on your patches
(at least you can set that up in your setting)
so you'll get a notification of the activity of the buildbot. depnding
on the sucess/failure, they will but Verify +1 or -1 on your patch

 Once tinderbox is successful, since my change is small or I am confident
 with, I put a +2 to my patch, which means this will insert automatically it
 to master.
No it means that you will  then click 'publish and submit' as you set the +2
(that is once we swtich to gerrit being the main git repo and fdo
being read-only)

 So I will be able to positive review my own patch ?

yes


 2. If I have several patches, that need to be together, how should I proceed
 with pushing them together to gerrit ? (If I want to have three patches in
 the same review ID from gerrit) ?
Yes, gerrit keep track that a patch 'depend on' the one before it.


 [ADMIN]
 1. I followed the asked process of setting up an account, etc.. mailed to
 Norbert so he can match my fd.o account to gerrit. Well, how may I now see
 that I actually have / will have commit access to gerrit repo ?

in your setting/Groups on gerrit you can see the groups you are in


 2. When my ssh key expires, it is enough to just change it into my gerrit
 account ?
yes, although I'm confused with 'expiration' for ssh-key  aren't you
mixing gpg-key and ssh-key concept ?

 3. May be a stupid remark, but why do not use this way (opening gerrit
 account ) then to ask for license stuff ?

There is a hidden/poorly documented feature in gerrit to do just that
(CLA ack) but I haven't experimented with it yet...

 You would have to ack to be able
 to open account, or to load patches. This would ease, ensure the process
 towards this goal ?
apparently there is a hook that get call when CLA is agree upon, which
should allow to automatically promote a user to a different group upon
clearance of the license issue.
This is all doable, but not yet on the top of the to-do list :-)

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


[Libreoffice-commits] .: sc/source

2012-06-21 Thread Noel Power
 sc/source/filter/inc/formulabuffer.hxx |   25 ---
 sc/source/filter/oox/formulabuffer.cxx |   53 -
 2 files changed, 40 insertions(+), 38 deletions(-)

New commits:
commit b326c1d728e65afea4257d1142a02185ae6bc4d0
Author: Noel Power noel.po...@novell.com
Date:   Thu Jun 21 19:05:17 2012 +0100

some const correctness tweaks to various signatures in new formulabuffer

Change-Id: Ic6570608ac98c51438b583b7a75fa940b29b7473

diff --git a/sc/source/filter/inc/formulabuffer.hxx 
b/sc/source/filter/inc/formulabuffer.hxx
index aabd5ff..0097dc7 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -45,14 +45,14 @@ struct TokenAddressItem
 {
 ::rtl::OUString maTokenStr;
 ::com::sun::star::table::CellAddress maCellAddress;
-TokenAddressItem( rtl::OUString rTokenStr, 
::com::sun::star::table::CellAddress rCellAddress ) : maTokenStr( rTokenStr ), 
maCellAddress( rCellAddress ) {}
+TokenAddressItem( const rtl::OUString rTokenStr, const 
::com::sun::star::table::CellAddress rCellAddress ) : maTokenStr( rTokenStr ), 
maCellAddress( rCellAddress ) {}
 };
 
 struct TokenRangeAddressItem
 {
 TokenAddressItem maTokenAndAddress;
 ::com::sun::star::table::CellRangeAddress maCellRangeAddress;
-TokenRangeAddressItem( TokenAddressItem rTokenAndAddress, 
::com::sun::star::table::CellRangeAddress rCellRangeAddress ) : 
maTokenAndAddress( rTokenAndAddress ), maCellRangeAddress( rCellRangeAddress ) 
{}
+TokenRangeAddressItem( const TokenAddressItem rTokenAndAddress, const 
::com::sun::star::table::CellRangeAddress rCellRangeAddress ) : 
maTokenAndAddress( rTokenAndAddress ), maCellRangeAddress( rCellRangeAddress ) 
{}
 };
 
 typedef ::std::map sal_Int32, std::vector TokenAddressItem   
FormulaDataMap;
@@ -69,8 +69,8 @@ typedef ::std::map sal_Int32, SharedIdToTokenIndex  
SheetToSharedIdToTokenInde
 typedef ::std::pair ::com::sun::star::table::CellAddress, double  
ValueAddressPair;
 typedef ::std::map sal_Int32, std::vector ValueAddressPair   
FormulaValueMap;
 
-void createSharedFormula(  ::com::sun::star::table::CellAddress rAddress, 
 sal_Int32 nSharedId, const rtl::OUString rTokens );
-::com::sun::star::uno::Reference com::sun::star::table::XCellRange  
getRange( ::com::sun::star::table::CellRangeAddress rRange);
+void createSharedFormula(  const ::com::sun::star::table::CellAddress 
rAddress,  sal_Int32 nSharedId, const rtl::OUString rTokens );
+::com::sun::star::uno::Reference com::sun::star::table::XCellRange  
getRange( const ::com::sun::star::table::CellRangeAddress rRange);
 ::com::sun::star::uno::Reference com::sun::star::table::XCell  getCell( 
::com::sun::star::table::CellAddress rAddress );
 com::sun::star::uno::Reference com::sun::star::sheet::XSpreadsheet  
mxCurrSheet;
 FormulaDataMap  cellFormulas;
@@ -80,18 +80,19 @@ typedef ::std::map sal_Int32, std::vector 
ValueAddressPair   FormulaValueMap
 SheetToSharedIdToTokenIndex tokenIndexes;
 FormulaValueMapcellFormulaValues;
 
-voidapplyArrayFormulas(  std::vector 
TokenRangeAddressItem  rVector );
-voidapplyCellFormulas(  std::vector TokenAddressItem  
rVector );
-voidapplyCellFormulaValues( std::vector ValueAddressPair 
 rVector );
+voidapplyArrayFormulas(  const std::vector 
TokenRangeAddressItem  rVector );
+voidapplyCellFormula( ScDocument rDoc, const 
ApiTokenSequence rTokens, const ::com::sun::star::table::CellAddress rAddress 
);
+voidapplyCellFormulas(  const std::vector 
TokenAddressItem  rVector );
+voidapplyCellFormulaValues( const std::vector 
ValueAddressPair  rVector );
 
 public:
 explicitFormulaBuffer( const WorkbookHelper rHelper );
 voidfinalizeImport();
-voidsetCellFormula( ::com::sun::star::table::CellAddress 
rAddress, rtl::OUString  );
-voidsetCellFormula( ::com::sun::star::table::CellAddress 
rAddress, sal_Int32 nSharedId );
-voidsetCellFormulaValue( 
::com::sun::star::table::CellAddress rAddress, double fValue  );
-voidsetCellArrayFormula( 
::com::sun::star::table::CellRangeAddress rRangeAddress, 
::com::sun::star::table::CellAddress rTokenAddress, rtl::OUString  );
-void
createSharedFormulaMapEntry(::com::sun::star::table::CellAddress rAddress, 
sal_Int32 nSharedId, const rtl::OUString rTokens );
+voidsetCellFormula( const 
::com::sun::star::table::CellAddress rAddress, const rtl::OUString  );
+voidsetCellFormula( const 
::com::sun::star::table::CellAddress rAddress, sal_Int32 nSharedId );
+voidsetCellFormulaValue( const 
::com::sun::star::table::CellAddress rAddress, double fValue  );
+voidsetCellArrayFormula( const 

Re: [patch for 3.5.X] proposal of a patch to solve a crasher when saving a spreadsheet with track-change

2012-06-21 Thread Markus Mohrhard
Hey,

2012/6/21 Lionel Dricot lio...@lanedo.com:
 Hello,

 The crasher my colleague Pierre-Éric solved as been pushed to master,
 thanks Eike, thanks a lot for that :-)
 https://bugs.freedesktop.org/show_bug.cgi?id=51249

 Because this patch fixes a crasher, I would like to know if it would be
 possible to review it for the 3.5.X series.

Looks like a good workaround for the release branch but personally I'm
not happy with this patch for master. It very much looks like another
bug fix that just hides the problem instead of fixing the underlying
problem. I see no reason why we could not use the old stream if we
able change tracking and the stream is not marked invalid. Every bug
that prevents that very much looks like a problem that should be fixed
and not another ugly workaround added to hide it.

Anyway pushed to 3-5 with my sign-off. If you want it in 3-5-5 you
need to write a new mail with correct subject and 2 more sign-offs.
Please also use REVIEW-3-5 in the future.

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


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

2012-06-21 Thread Markus Mohrhard
 sc/source/filter/xml/xmlexprt.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 17c85c9a5c447f9db6f3b91e6840709df8542345
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date:   Wed Jun 20 12:55:24 2012 +0200

fdo#51249 Disable stream copy when saving a file with 'Changes Record' 
active

Change-Id: Id06caa5d0552e4f3695244de4f6096f80885a783
(cherry picked from commit d212cbd96e648c10d875161b8ab1fc67ae509bd7)

Signed-off-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 2c3e1c1..e62a48f 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -1731,7 +1731,7 @@ void ScXMLExport::_ExportContent()
 {
 sal_Int32 nStartOffset = -1;
 sal_Int32 nEndOffset = -1;
-if (pSheetData  pDoc  pDoc-IsStreamValid((SCTAB)nTable))
+if (pSheetData  pDoc  pDoc-IsStreamValid((SCTAB)nTable)  
!pDoc-GetChangeTrack())
 pSheetData-GetStreamPos( nTable, nStartOffset, nEndOffset );
 
 if ( nStartOffset = 0  nEndOffset = 0  xSourceStream.is() )
@@ -2354,7 +2354,8 @@ void ScXMLExport::_ExportAutoStyles()
 for (sal_Int32 nTable = 0; nTable  nTableCount; ++nTable, 
IncrementProgressBar(false))
 {
 bool bUseStream = pSheetData  pDoc  
pDoc-IsStreamValid((SCTAB)nTable) 
-  pSheetData-HasStreamPos(nTable)  
xSourceStream.is();
+  pSheetData-HasStreamPos(nTable)  
xSourceStream.is() 
+  !pDoc-GetChangeTrack();
 
 Reference sheet::XSpreadsheet xTable(xIndex-getByIndex(nTable), 
uno::UNO_QUERY);
 if (!xTable.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: big Deps ...

2012-06-21 Thread Michael Meeks

On Thu, 2012-06-21 at 13:47 +0200, Stephan Bergmann wrote:
  [ indeed, I'm sure there is one - but what is the benefit of separating
  the .hdl files out, if we are sure that each .hpp will include all of
  it's dependent .hpp's ? ].
 
 Circular dependencies among headers.

Interesting; it'd of course be great to reduce that wherever possible;
presumably for interfaces we could generate forward definitions of them
before the header / includes to avoid generating and including two files
where one would do. For structures clearly it's not possible to have two
in-line structures inside each other ;-) so presumably it works well
enough there already (?) what other cases are there ?

Then again a small number of files include .hdl files directly;
  is that a bug ? :-)
 
  Looks like a bug, yes.  Care to share the list?
...
 Feel free to make that into an EasyHack.

I fixed them all with a simple script; it seems only one was actually
required in cppu/inc/com/sun/star/uno/Type.h

ATB,

Michael.

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

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


Re: fdo 50950 make (ISO)WEEKNUM comply with ODFF1.2, advise asked

2012-06-21 Thread Eike Rathke
Hi Winfried,

On Wednesday, 2012-06-20 11:45:08 +0200, Winfried Donkers wrote:

 I just uploaded a diff file and test document to bug50950.

I'll come back to this tomorrow.

  Eike

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


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


Re: [PUSHED master,3-6][patch] proposal of a patch to solve a crasher when saving a spreadsheet with track-change

2012-06-21 Thread Eike Rathke
Hi Lionel,

On Wednesday, 2012-06-20 14:34:31 +0200, Lionel Dricot wrote:

 At Lanedo, we have been working on a bug described here:
 https://bugs.freedesktop.org/show_bug.cgi?id=51249

Good catch, thanks!

Pushed to master
http://cgit.freedesktop.org/libreoffice/core/commit/?id=d212cbd96e648c10d875161b8ab1fc67ae509bd7
and 3-6
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-6id=d62646cf5509b45e664b21fd7896ff9dc2f83b82

  Eike

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


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


Re: Cleaning bug list

2012-06-21 Thread bfo

Petr Mladek wrote
 
 I'd change the workflow a little bit by putting the obvious things at the
 top:
 - feature requests aka wishlist
 I do not have any strong opinion for this. I think that it is is good to
 be able to discuss features, so enhancement bugs in bugzilla might be
 usable.
  - add target milestone if a feature is planned already
 This must be done by developer, anyway :-)
 
Well, to be clear, I see all this more like how to triage guide, that is why
I started with enhancements.
Target milestone can be set by QA member if feature is available.
https://bugs.freedesktop.org/show_bug.cgi?id=33773#c11 for instance.



 - bugs reported against not supported branches - exclude those at
 reporting
 level by disabling old versions in select fields; but what to do when
 they
 appear anyway -  mark them as INVALID at triaging? ask the reporter to
 check
 in new version? Any comments?
 We need to be more careful here. The current rule is to do NOT modify
 the version picker if you reproduce the problem with newer version. It
 is because it is very valuable to know how the bug is old. It helps
 developers to locate it. So, maybe, we should do it the other way and
 set the field to the oldest version where it was found.
 
I was thinking about New bug reports, which should be reported for supported
branches only (proposed in
https://bugs.freedesktop.org/show_bug.cgi?id=51070). 
Unfortunately it depends on
https://bugs.freedesktop.org/show_bug.cgi?id=50198.



 - is it Most Frequently Reported - then just dupe it 
 What do you mean by Most Frequently Reported?
 
Is it at https://bugs.freedesktop.org/duplicates.cgi for LibreOffice
product. Then it can be handled very quickly, 
but I see that searching for dupes is already listed on
http://wiki.documentfoundation.org/BugTriage



 I would personally enable voting as well but some other people thing
 that it is not objective.
 
Unfortunately I discovered
https://bugs.freedesktop.org/show_bug.cgi?id=39739. WONTFIXed by Mr
Bielefeld who authored
http://wiki.documentfoundation.org/Vote_for_Enhancement, where it begins
with [...] Bugzilla bug tracking system does not support Votes for requests
as it is available for OpenOffice.org. Here you find an experimental Voting
(or better: statistical online survey), currently with only very few rules
and only for Enhancement requests. I am perplexed. How manual wiki voting,
adding special keywords to bugs can be better than automated, build-in, out
of the box, customizable voting within Bugzilla? Strange. 
I know that voting is not a recipe to find best bugs to fix/features to
implement, but I think that giving an ability to vote (even only for QA team
members or LO developers)  would help going forward. I do vote for features
in other Bugzillas myself. 



 You are right, regression are bad and we need to fix them with high
 priority. On the other hand, you still need to compare them with other
 reported bugs and decide what is more annoying for the daily work. We
 could not blindly set the highest priority for a tiny functional problem
 just because it is a regression. As someone said, you could view almost
 any bug as regression, so we need to prioritize them as well.
 I would keep the current approach. Add regression into Whiteboard and
 set one level higher priority that you would set for non-regression.
 
I disagree. Many people just won't upgrade because of them. Fast query shows
180 opened bugs with regression keyword. Very worrying...



 It actually helps to prioritize bugs as well. If reporter is not willing
 to provide more information, the problem is probably not that important
 for him.
 
Disagree, as providing proper bt is complicated. 



 Also note that some crashers are reproducible only in very strange
 circumstances. Also some scenarios are very hard to prepare. We just
 need help from reporters in these cases.
 

Sure, but IMHO only if bug is not reproducible.



 If someone change the priority a wrong way, I would ask them not to do
 it, explain that the level is not that important, and change it back. If
 they change it once again, I would leave it as is. Developers would
 filter it themselves :-)
 

 I found https://bugs.freedesktop.org/show_bug.cgi?id=49168. IMHO instead of
flooding the Bugzilla, one can just disable it. 



 I think that it is not worth spending resources on migrating bugs to a
 single bugzilla. IMHO, it is better to spend time on fixing other bugs,
 improving the functionality, testing, ...
 
Already some bugs are migrated (from Symphony for instance). Some of them
are fixed already. 
I just can't imagine proper bug management in a project, when you have to
follow many bugtrackers.



 The ideal process is described at
 http://wiki.documentfoundation.org/BugReport_Details#Initial_state
 Of course, developers are just humans, sometimes quite overloaded and
 they do not follow the process. [...]
 developers to close bugs by asking about the state. I wonder, how often
 do you see 

[Libreoffice-commits] .: icu/icu4c-solarisgcc.patch icu/makefile.mk

2012-06-21 Thread Michael Stahl
 icu/icu4c-solarisgcc.patch |   58 +
 icu/makefile.mk|1 
 2 files changed, 59 insertions(+)

New commits:
commit 850e9faa2db7002c9eb2797178ae837bff08327f
Author: Jonathan Adams t12nsloo...@gmail.com
Date:   Thu Jun 21 21:58:21 2012 +0200

icu: add patch for Solaris/GCC

Change-Id: I070b878b9275884e1ad0db3bb07483a3451682fb

diff --git a/icu/icu4c-solarisgcc.patch b/icu/icu4c-solarisgcc.patch
new file mode 100644
index 000..d61ad32
--- /dev/null
+++ b/icu/icu4c-solarisgcc.patch
@@ -0,0 +1,58 @@
+diff -uriwb misc/build/icu.old/source/aclocal.m4 
misc/build/icu/source/aclocal.m4
+--- misc/build/icu.old/source/aclocal.m4   2012-04-05 21:49:28.0 
+0100
 misc/build/icu/source/aclocal.m4   2012-06-21 15:44:57.299256932 +0100
+@@ -455,7 +455,7 @@
+ case ${host} in
+ *-*-solaris*)
+ CFLAGS=$CFLAGS -Wall -ansi -pedantic -Wshadow 
-Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long
+-CFLAGS=$CFLAGS -D__STDC__=0;;
++CFLAGS=$CFLAGS -std=c99;;
+ *-*-hpux*)
+ echo # Note: We are not using '-ansi' with HP/UX GCC because 
int64_t broke, see http://bugs.icu-project.org/trac/ticket/8493
+ CFLAGS=$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith 
-Wmissing-prototypes -Wwrite-strings -Wno-long-long;;
+@@ -474,10 +474,6 @@
+ if test $GXX = yes
+ then
+ CXXFLAGS=$CXXFLAGS -W -Wall -ansi -pedantic -Wpointer-arith 
-Wwrite-strings -Wno-long-long
+-case ${host} in
+-*-*-solaris*)
+-CXXFLAGS=$CXXFLAGS -D__STDC__=0;;
+-esac
+ else
+ case ${host} in
+ *-*-cygwin)
+diff -uriwb misc/build/icu.old/source/common/uposixdefs.h 
misc/build/icu/source/common/uposixdefs.h
+--- misc/build/icu.old/source/common/uposixdefs.h  2012-04-05 
21:46:18.0 +0100
 misc/build/icu/source/common/uposixdefs.h  2012-06-21 15:45:17.613369477 
+0100
+@@ -52,7 +52,7 @@
+  *
+  * z/OS needs this definition for timeval and to get usleep.
+  */
+-#if !defined(_XOPEN_SOURCE_EXTENDED)
++#if !defined(_XOPEN_SOURCE_EXTENDED)  (defined(__IBMC__) || 
defined(__IBMCPP__))
+ #   define _XOPEN_SOURCE_EXTENDED 1
+ #endif
+ 
+diff -uriwb misc/build/icu.old/source/configure misc/build/icu/source/configure
+--- misc/build/icu.old/source/configure2012-04-05 21:49:28.0 
+0100
 misc/build/icu/source/configure2012-06-21 15:44:42.817030445 +0100
+@@ -4264,7 +4264,7 @@
+ case ${host} in
+ *-*-solaris*)
+ CFLAGS=$CFLAGS -Wall -ansi -pedantic -Wshadow 
-Wpointer-arith -Wmissing-prototypes -Wwrite-strings -Wno-long-long
+-CFLAGS=$CFLAGS -D__STDC__=0;;
++CFLAGS=$CFLAGS -std=c99;;
+ *-*-hpux*)
+ echo # Note: We are not using '-ansi' with HP/UX GCC because 
int64_t broke, see http://bugs.icu-project.org/trac/ticket/8493
+ CFLAGS=$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith 
-Wmissing-prototypes -Wwrite-strings -Wno-long-long;;
+@@ -4283,10 +4283,6 @@
+ if test $GXX = yes
+ then
+ CXXFLAGS=$CXXFLAGS -W -Wall -ansi -pedantic -Wpointer-arith 
-Wwrite-strings -Wno-long-long
+-case ${host} in
+-*-*-solaris*)
+-CXXFLAGS=$CXXFLAGS -D__STDC__=0;;
+-esac
+ else
+ case ${host} in
+ *-*-cygwin)
diff --git a/icu/makefile.mk b/icu/makefile.mk
index d6a73f9..f65481a 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -51,6 +51,7 @@ PATCH_FILES=\
 icu4c.9313.cygwin.patch \
 icu4c-macosx.patch \
 icu4c-interlck.patch \
+icu4c-solarisgcc.patch \
 
 .IF $(OS)==ANDROID
 PATCH_FILES+=\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: libicudata in non-standard directory linking issues.

2012-06-21 Thread Michael Stahl
On 21/06/12 16:54, Jonathan Adams wrote:
 umm ... it's 14Mb worth of patch ... oh, I've compiled 4.0.1 (i wonder
 how I got to that version ...) ... downloading and working through
 49.1.2 ...
 
 compiled ...
 
 running a check ...
 
 [All tests passed successfully...]
 Elapsed Time: 00:00:24.619
 
 Ok, applying to the in-tree icu ... not quite the same icu ... ok
 
 copying the intree, making the changes, makefile.mk modified to use
 the solaris patch ...
 
 compiled successfully ... apart from these errors:

great!

 gmake[2]: Leaving directory
 `/home/sal/LibreOffice/libo/icu/unxsogi/misc/build/icu/source'
 cp: cannot stat
 `./unxsogi/misc/build/icu/source/lib/libicudata.so.4.0.1': No such
 file or directory

it looks like it still has the version numbers from your system ICU
stored somewhere... you need to re-run configure, perhaps pass
--without-system-icu and ensure that the config_host.mk doesn't include
anything related to your system ICU.

 diff attached ...

i've added it to icu/makefile.mk and pushed it to master

i'm not sure if adding a defined(__IBMC__) etc. is the right approach
but if it doesn't break anything...

you should try to update your ICU bug with the new patch as well, to get
upstream's opinion and hopefully a fixed next ICU version.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Duplication of some includes due to last commit

2012-06-21 Thread Christophe JAILLET

Looking at the last commit :
http://cgit.freedesktop.org/libreoffice/core/commit/?id=ec5fa0164b9bae5c5bc6654f581e493206584301

we can see that replacing .hdl include with equivalent .hpp includes 
leads to duplication of some includes.


For example in filter/source/svg/svgfilter.cxx 
http://cgit.freedesktop.org/libreoffice/core/tree/filter/source/svg/svgfilter.cxx?id=b326c1d728e65afea4257d1142a02185ae6bc4d0, 
we now have :



#include com/sun/star/view/XSelectionSupplier.hpp
#include com/sun/star/view/XSelectionSupplier.hpp
#include com/sun/star/drawing/XDrawSubController.hpp
#include com/sun/star/drawing/XDrawSubController.hpp
#include com/sun/star/container/XNamed.hpp
#include com/sun/star/container/XNamed.hpp
#include com/sun/star/uno/XComponentContext.hpp
#include com/sun/star/uno/XComponentContext.hpp
#include com/sun/star/drawing/framework/XControllerManager.hpp
#include com/sun/star/drawing/framework/XControllerManager.hpp
#include com/sun/star/drawing/framework/XConfigurationController.hpp
#include com/sun/star/drawing/framework/XConfigurationController.hpp
#include com/sun/star/drawing/framework/XResource.hpp
#include com/sun/star/drawing/framework/XResource.hpp
#include com/sun/star/drawing/framework/XView.hpp
#include com/sun/star/drawing/framework/XView.hpp


/filter/source/svg/svgfilter.hxx 
http://cgit.freedesktop.org/libreoffice/core/tree/filter/source/svg/svgfilter.hxx?id=ec5fa0164b9bae5c5bc6654f581e493206584301 
also have some duplicated includes.



I've not checked all of them but it could be usefull.

Best regards.
Christophe

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


Re: Cleaning bug list

2012-06-21 Thread Michael Stahl
On 21/06/12 21:32, bfo wrote:
 
 Petr Mladek wrote

 I'd change the workflow a little bit by putting the obvious things at the
 top:
 - feature requests aka wishlist
 I do not have any strong opinion for this. I think that it is is good to
 be able to discuss features, so enhancement bugs in bugzilla might be
 usable.
  - add target milestone if a feature is planned already
 This must be done by developer, anyway :-)

 Well, to be clear, I see all this more like how to triage guide, that is why
 I started with enhancements.
 Target milestone can be set by QA member if feature is available.
 https://bugs.freedesktop.org/show_bug.cgi?id=33773#c11 for instance.

currently the target is set only after the bug is fixed, and this is how
it ought to work.  there general pattern is to add one target:x.y.z
value per branch where the fix is applied to the whiteboard.

in case you want the target to be set before the bug is fixed, as some
kind of planning mechanism, please be aware that this was actually done
in the OOo project, and that this worked so badly (i.e. the main result
was that every developer had some 100 bugs assigned to him that he moved
from target 3.0 to target 3.1 to target 3.2 etc. without ever having
time to fix them) that it was actually decided (shortly before the end)
to modify the process to set the target only after a bug is fixed, just
like it is in LO.

 You are right, regression are bad and we need to fix them with high
 priority. On the other hand, you still need to compare them with other
 reported bugs and decide what is more annoying for the daily work. We
 could not blindly set the highest priority for a tiny functional problem
 just because it is a regression. As someone said, you could view almost
 any bug as regression, so we need to prioritize them as well.
 I would keep the current approach. Add regression into Whiteboard and
 set one level higher priority that you would set for non-regression.

 I disagree. Many people just won't upgrade because of them. Fast query shows
 180 opened bugs with regression keyword. Very worrying...

agreed, regressions are generally more important than non-regressions,
precisely because they prevent users from using the latest version.

 If someone change the priority a wrong way, I would ask them not to do
 it, explain that the level is not that important, and change it back. If
 they change it once again, I would leave it as is. Developers would
 filter it themselves :-)

this developer has already learned to ignore bugzilla priorities :)

 I think that it is not worth spending resources on migrating bugs to a
 single bugzilla. IMHO, it is better to spend time on fixing other bugs,
 improving the functionality, testing, ...

 Already some bugs are migrated (from Symphony for instance). Some of them
 are fixed already. 
 I just can't imagine proper bug management in a project, when you have to
 follow many bugtrackers.

this is a general problem of our project due to the convoluted history.

 Disagree. It is a page for bug reporters. I really like the gerrit migration
 and would like to see it integrated with Bugzilla. Also always precommit
 hooks can be implemented if developers tend to forget to put a bug number
 into a commit message. I already stumbled upon UNCONFIRMED bugs which have
 been fixed already and suddenly changed into RESOLVED FIXED. I would like to
 know what is going on with the bugs at any moment.

such a precommit hook doesn't work so well.  there are lots of commits
that do cleanups, refactorings, fix build breakers, etc. none of which
have or need a bug id.

in the OOo project there was a policy that every commit include a bug
id, and the result was that all of these build breaker fixes used the
same notorious #i1# number, which doesn't help anybody.

i've sometimes found bugs that were already fixed on master, but in the
vast majority of the cases the author of the commit was not aware of the
bug, i.e. the bug was a almost-but-not-exactly duplicate of the bug the
author mentioned, or the author had a bug in a non-fdo tracker, or it
was just something the author found themselves or whatever.

 Well, we do not want to create bug report for each fix. It is too
 complex process with poor results. If a developer is talkative, she
 provides a good commit message. If she is not talkative, she would
 create useless bug report. We could motivate them by asking for details,
 saying thanks for info, ...
 Anyway, I think that it is not important now. We do not have enough
 people who could test all commits, so we do not need perfect commit
 messages.

 It is very unfortunate and doesn't help triaging bugs. Another resource to
 watch by QA member - the commits.
 I really like Bugzilla developers strict workflow. Every commit with bug
 number, patch reviewed by a specialist (not just +1 to get it as soon as
 possible), bug assigned and status changed upon commit. It can be done
 automatically.

we already have quite a bit of that, 

  1   2   3   >