Re: LO 4.3 Base - problems with sub forms

[Alex McMurchy]

After I wrote the note I too realised that my application had a form that had a 
sub form with a sub form. I raised Bug 82151 for this and attached a very cut 
down version of my application that should demonstrate the problem.

Alex



On Monday 04 Aug 2014 14:41:26 elderdanlewis wrote:
>The problem is Base in 4.3.0.4. I have a form that has a subfom with a 
> subfom. As you notice, 4.2.6.2 does not have this problem. I will be filing 
> bug reports later late today.
> 
> Dan
> 
>  Original message 
> From: Alex McMurchy  
> Date:08/04/2014  4:12 AM  (GMT-05:00) 
> To: libreoffice@lists.freedesktop.org 
> Subject: LO 4.3 Base - problems with sub forms 
> 
> Since and including LO 4.3 I've started having problems with sub forms
> 
> I have two tables Subscribers and Payments which are linked on Subscriber_ID.
> 
> I have a form Data_Entry" the main details of the form contains the data for 
> one particular Subscriber from the Subscribers table. The form also has a sub 
> form that contains the payment details for that subscriber linked on 
> Subscriber_Id.
> 
> Upto and including LO 4.2.4  this has worked flawlessly for the past 15 
> months.
> 
> Load the form and see the last viewed subscriber details with matching 
> payment details - Correct.
> 
> Select a different subscriber from a drop down box,  the contents of main 
> form changes to reflect the new subscriber and the contents of the sub form 
> changes to the new subscribers payment details - Correct.
> 
> 
> Since 4.3 what I get is this -
> 
> Load the form and see the last viewed subscriber details with matching 
> payment details - Correct.
> 
> Select a different subscriber from a drop down box,  the contents of main 
> form changes to reflect the new subscriber. The contents of the sub form 
> doesn't change  it still reflects the payments from the previous subscriber - 
> Wrong.
> 
> Restart LO.
> 
> Load the form and see the last viewed subscriber details with matching 
> payment details - Correct.
> 
> Select a different subscriber from a drop down box,  the contents of main 
> form changes to reflect the new subscriber. The contents of the sub form 
> doesn't change  it still reflects the payments from the previous subscriber - 
> Wrong.
> 
> 
> So the work around is to select a new subscriber, see the wrong payment 
> details. Close LO. Start LO and load the form and see the correct payment 
> details - bizarre.
> 
> I've had a quick search in bugzilla but found nothing. Will have another 
> search later today and if I don't find anything will raise a bug report with 
> the above detail. Then flesh it out with the steps to take to replicate the 
> bug.
> 
> In the meantime has anyone seen this or any thoughts on the matter.
> 
> 
> Alex
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
> 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Gerrit News for submodules on 2014-08-05

[gerrit]

Moin!



~~ Project dictionaries ~~

Nothing moved in the project for the last 25 hours

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

* Open changes on master for project help changed in the last 25 hours:

None

* Merged changes on master for project help changed in the last 25 hours:

+ Partial fix for fdo#80338: help for calc statistics
  in https://gerrit.libreoffice.org/10703 from Olivier Hallot


* Abandoned changes on master for project help changed in the last 25 hours:

None

* Open changes needing tweaks, but being untouched for more than a week:

None

Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

LibreOffice Gerrit News for core on 2014-08-05

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ fdo#70625 Add --cat parameter to make git diffs pretty
  in https://gerrit.libreoffice.org/10623 from Deena P. F.
  about module desktop
 End of freshness 

+ Fix java check on 64 bit kernel / 32 bit user
  in https://gerrit.libreoffice.org/10743 from Riccardo Magliocchetti
  about module build
+ fdo#81552 Fail nicely if avahi doesn't let libreoffice publish items
  in https://gerrit.libreoffice.org/10735 from Bryan Quigley
  about module sd
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/10729 from Takeshi Abe
  about module include, xmloff


* Merged changes on master for project core changed in the last 25 hours:

+ Convert RID_SCDLG_DPSHOWDETAIL to .ui
  in https://gerrit.libreoffice.org/10739 from Mihály Palenik
+ prevent memory leak
  in https://gerrit.libreoffice.org/10716 from Markus Mohrhard
+ Delete RID_XMLSECTP_MACROWARN dialog
  in https://gerrit.libreoffice.org/10718 from Mihály Palenik
+ avoid buffer overflow by using wrong buffer
  in https://gerrit.libreoffice.org/10717 from Markus Mohrhard
+ Convert DLG_PARAMETERS to .ui
  in https://gerrit.libreoffice.org/10725 from Mihály Palenik
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/10719 from Takeshi Abe
+ Convert RID_DLG_DEPENDENCIES to .ui
  in https://gerrit.libreoffice.org/10712 from Mihály Palenik
+ Convert RID_SVXDLG_ASSIGNCOMPONENT to .ui
  in https://gerrit.libreoffice.org/10710 from Mihály Palenik
+ PAGE_MYSQL_NATIVE and PAGE_DBWIZARD_MYSQL_NATIVE conversion to .ui
  in https://gerrit.libreoffice.org/10706 from Szymon Kłos
+ fdo#78301 : Size of word-arts change during import.
  in https://gerrit.libreoffice.org/10486 from Umesh Kadam


* Abandoned changes on master for project core changed in the last 25 hours:

+ Remove Mozilla browser plugin option
  in https://gerrit.libreoffice.org/10678 from Bryan Quigley
+ Remove the ability to Insert Plugins from the UI
  in https://gerrit.libreoffice.org/10680 from Bryan Quigley
+ Some missed makefiles
  in https://gerrit.libreoffice.org/10679 from Bryan Quigley
+ fdo#45071 - Remove NPAPI support
  in https://gerrit.libreoffice.org/9644 from Bryan Quigley


* Open changes needing tweaks, but being untouched for more than a week:

+ Rel fdo#48068: fix errors when 2 decimals in svg path position
  in https://gerrit.libreoffice.org/10544 from Joren De Cuyper
+ fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT
  in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami
+ VS2013: Make 64 bit shell extensions optional
  in https://gerrit.libreoffice.org/10163 from David Ostrovsky
+ fdo#57950 Replace chained append( with operator+)
  in https://gerrit.libreoffice.org/10149 from Petr Vorel
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ Use assert instead of OSL_ASSERT in sal/
  in https://gerrit.libreoffice.org/10113 from Arnaud Versini
+ move OpenGLContext to SAL
  in https://gerrit.libreoffice.org/9429 from David Tardon
+ Changes for Wordml
  in https://gerrit.libreoffice.org/9013 from Michel Messak
+ fdo#64945 Remove inconvenient localized symbol code.
  in https://gerrit.libreoffice.org/8696 from Darshana Padmadas
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

CC0 Universal Decalaration

[Audrey Tang]

To the extent possible under law, I waive all copyright and related or 
neighboring rights to my past & future contributions to LibreOffice.

http://creativecommons.org/publicdomain/zero/1.0

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

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

[Markus Mohrhard]

 sc/source/ui/app/inputhdl.cxx |   38 +++---
 1 file changed, 35 insertions(+), 3 deletions(-)

New commits:
commit 5e2b4da10caaa15ee7e846c42ada2a20218d9591
Author: Markus Mohrhard 
Date:   Sun Aug 3 18:05:38 2014 +0200

handle autocomplete with dot in formula name, fdo#80058

The problem is that a dot is a word separator so the break iterator
provided by ICU will think that the dot separates two words whereas it
is part of the name here.

Change-Id: I73cee4304f83888b1645fec7b1851b9f42ef879f

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index e5f77e1..91b4cac 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1121,6 +1121,12 @@ void ScInputHandler::NextFormulaEntry( bool bBack )
 }
 
 namespace {
+
+bool needToExtendSelection(const OUString& rSelectedText, const OUString& 
rInsertText)
+{
+SAL_DEBUG(rSelectedText);
+return !rInsertText.startsWithIgnoreAsciiCase(rSelectedText);
+}
 
 void completeFunction( EditView* pView, const OUString& rInsert, bool& 
rParInserted )
 {
@@ -1132,6 +1138,28 @@ void completeFunction( EditView* pView, const OUString& 
rInsert, bool& rParInser
 pView->SetSelection(aSel);
 pView->SelectCurrentWord();
 
+// a dot is a word separator so we need special
+// treatment for any formula containing a dot
+if(rInsert.indexOf(".") != -1)
+{
+// need to make sure that we replace also the part before the dot
+// incrementally go through the word to find the match with the 
insert string
+aSel = pView->GetSelection();
+ESelection aOldSelection = aSel;
+OUString aSelectedText = pView->GetSelected();
+while(needToExtendSelection(aSelectedText, rInsert))
+{
+assert(aSel.nStartPos > 0);
+--aSel.nStartPos;
+--aSel.nEndPos = aSel.nStartPos;
+pView->SetSelection(aSel);
+pView->SelectCurrentWord();
+aSelectedText = pView->GetSelected();
+}
+aSel.nEndPos = aOldSelection.nEndPos;
+pView->SetSelection(aSel);
+}
+
 OUString aInsStr = rInsert;
 sal_Int32 nInsLen = aInsStr.getLength();
 bool bDoParen = ( nInsLen > 1 && aInsStr[nInsLen-2] == '('
commit 2ee3b6deff5d1e65ca0ba1479a1125fbea73a9ab
Author: Markus Mohrhard 
Date:   Fri Aug 1 01:42:12 2014 +0200

use a anonymous namespace and sane function names

Change-Id: I8fdd5fb4f21e6c90e352089858ce98a62ac213de

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 2b70202..e5f77e1 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1120,7 +1120,9 @@ void ScInputHandler::NextFormulaEntry( bool bBack )
 pActiveView->ShowCursor();
 }
 
-static void lcl_CompleteFunction( EditView* pView, const OUString& rInsert, 
bool& rParInserted )
+namespace {
+
+void completeFunction( EditView* pView, const OUString& rInsert, bool& 
rParInserted )
 {
 if (pView)
 {
@@ -1167,6 +1169,8 @@ static void lcl_CompleteFunction( EditView* pView, const 
OUString& rInsert, bool
 }
 }
 
+}
+
 void ScInputHandler::PasteFunctionData()
 {
 if (pFormulaData && miAutoPosFormula != pFormulaData->end())
@@ -1178,8 +1182,8 @@ void ScInputHandler::PasteFunctionData()
 bool bParInserted = false;
 
 DataChanging(); // Cannot be new
-lcl_CompleteFunction( pTopView, aInsert, bParInserted );
-lcl_CompleteFunction( pTableView, aInsert, bParInserted );
+completeFunction( pTopView, aInsert, bParInserted );
+completeFunction( pTableView, aInsert, bParInserted );
 DataChanged();
 ShowTipCursor();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: 7 commits - chart2/source extensions/source hwpfilter/source l10ntools/source sal/osl unoidl/source

[Norbert Thiebaud]

On Mon, Aug 4, 2014 at 8:38 PM, Michael Stahl  wrote:
>
> a rule such as "if the condition is a single line, put the brace on the
> same line, if it is multiple lines, put the brace on a separate line"
> can still be called consistent  :)

I guess.. but the point of a formatting rule is easy to read and above
all _visually consistent_.
There is apparently debate about the readability of the different
braces scheme.. but surely there can't be any argument that a mix of
both is the worse of both world.

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

[PUSHED] Re: [PATCH] typo: and -> an

[julien2412]

Thank you Jan for your patch, I pushed it on master sources (future 4.4.0),
see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=04a65e2704ee80701ca750f2e7c8c0565d2aa830

Could you please send a license mail to  libreoffice@lists.freedesktop.org
as described on this page:
https://wiki.documentfoundation.org/Development/Developers#Example_Statement
?

Hope to hear about you for new patches very soon! :-)

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-typo-and-an-tp4117738p4117743.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

[Libreoffice-commits] core.git: README.Android

[xjcl]

 README.Android |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 04a65e2704ee80701ca750f2e7c8c0565d2aa830
Author: xjcl 
Date:   Mon Aug 4 21:33:49 2014 +0200

typo: and -> an

diff --git a/README.Android b/README.Android
index 9d022a7..2fe09e2 100644
--- a/README.Android
+++ b/README.Android
@@ -9,7 +9,7 @@ For instructions on how to build for Android, see README.cross.
 
Create an AVD in the android UI, don't even try to get
 the data partition size right in the GUI, that is doomed to producing
-and AVD that doesn't work. Instead start it from the console:
+an AVD that doesn't work. Instead start it from the console:
 
LD_LIBRARY_PATH=$(pwd)/lib emulator-arm -avd  -partition-size 500
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Spiros Georgaras license statement

[Spiros Georgaras]

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

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

[PATCH] typo: and -> an

[Jan Xjcl]

.
From bb246251754cdf0e9d7df4eb84093d910a4c669a Mon Sep 17 00:00:00 2001
From: xjcl 
Date: Mon, 4 Aug 2014 21:33:49 +0200
Subject: [PATCH] typo: and -> an

---
 README.Android | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.Android b/README.Android
index 68bec24..3ef052d 100644
--- a/README.Android
+++ b/README.Android
@@ -9,7 +9,7 @@ For instructions on how to build for Android, see README.cross.
 
 	Create an AVD in the android UI, don't even try to get
 the data partition size right in the GUI, that is doomed to producing
-and AVD that doesn't work. Instead start it from the console:
+an AVD that doesn't work. Instead start it from the console:
 
 	LD_LIBRARY_PATH=$(pwd)/lib emulator-arm -avd  -partition-size 500
 
-- 
1.9.1
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

RE: LO 4.3 Base - problems with sub forms

[elderdanlewis]

   The problem is Base in 4.3.0.4. I have a form that has a subfom with a 
subfom. As you notice, 4.2.6.2 does not have this problem. I will be filing bug 
reports later late today.

Dan

 Original message 
From: Alex McMurchy  
Date:08/04/2014  4:12 AM  (GMT-05:00) 
To: libreoffice@lists.freedesktop.org 
Subject: LO 4.3 Base - problems with sub forms 

Since and including LO 4.3 I've started having problems with sub forms

I have two tables Subscribers and Payments which are linked on Subscriber_ID.

I have a form Data_Entry" the main details of the form contains the data for 
one particular Subscriber from the Subscribers table. The form also has a sub 
form that contains the payment details for that subscriber linked on 
Subscriber_Id.

Upto and including LO 4.2.4  this has worked flawlessly for the past 15 months.

Load the form and see the last viewed subscriber details with matching payment 
details - Correct.

Select a different subscriber from a drop down box,  the contents of main form 
changes to reflect the new subscriber and the contents of the sub form changes 
to the new subscribers payment details - Correct.


Since 4.3 what I get is this -

Load the form and see the last viewed subscriber details with matching payment 
details - Correct.

Select a different subscriber from a drop down box,  the contents of main form 
changes to reflect the new subscriber. The contents of the sub form doesn't 
change  it still reflects the payments from the previous subscriber - Wrong.

Restart LO.

Load the form and see the last viewed subscriber details with matching payment 
details - Correct.

Select a different subscriber from a drop down box,  the contents of main form 
changes to reflect the new subscriber. The contents of the sub form doesn't 
change  it still reflects the payments from the previous subscriber - Wrong.


So the work around is to select a new subscriber, see the wrong payment 
details. Close LO. Start LO and load the form and see the correct payment 
details - bizarre.

I've had a quick search in bugzilla but found nothing. Will have another search 
later today and if I don't find anything will raise a bug report with the above 
detail. Then flesh it out with the steps to take to replicate the bug.

In the meantime has anyone seen this or any thoughts on the matter.


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

[Libreoffice-commits] core.git: 3 commits - writerfilter/source

[Miklos Vajna]

 writerfilter/source/ooxml/model.xml |   66 +---
 1 file changed, 25 insertions(+), 41 deletions(-)

New commits:
commit f77981e3c89f428c648da1a550f8d36344e1a927
Author: Miklos Vajna 
Date:   Mon Aug 4 21:23:27 2014 +0200

fix ref names

Change-Id: Iae8afadf78a54ec0938de487b78c9c3f14cdbcf8

diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index b6f985c..0a574d3 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -12869,10 +12869,10 @@
   
 
   
-
+
   
   
-
+
   
 
   
commit cd7963b0aa03d95f0e106a51a3c643a241e500ad
Author: Miklos Vajna 
Date:   Mon Aug 4 20:55:59 2014 +0200

reference to non-existing defines

Change-Id: Iaa99b8ff6ffa85616c2db47f14682a653b156398

diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 63895ec..b6f985c 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -262,17 +262,6 @@
 
   
 
-
-  
-
-
-  
-
-
-  
-
-  
-
 
   
 
@@ -450,11 +439,6 @@
   
 
 
-  
-
-  
-
-
   
 
   
commit f8197e1db8c00bb91b5216e5a4b939089f8e6d07
Author: Miklos Vajna 
Date:   Mon Aug 4 20:51:59 2014 +0200

ref names have no namespaces

Change-Id: Ie6290bbaf2d2982520de33136c787f818e437de8

diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 0555ea9..63895ec 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -6323,7 +6323,7 @@
   
 
   
-
+
   
   
 
@@ -6333,7 +6333,7 @@
   
 
   
-
+
   
   
 
@@ -6343,7 +6343,7 @@
   
 
   
-
+
   
   
 
@@ -6353,7 +6353,7 @@
   
 
   
-
+
   
   
 
@@ -6363,7 +6363,7 @@
   
 
   
-
+
   
   
 
@@ -6373,7 +6373,7 @@
   
 
   
-
+
   
   
 
@@ -6383,7 +6383,7 @@
   
 
   
-
+
   
   
 
@@ -6393,7 +6393,7 @@
   
 
   
-
+
   
   
 
@@ -6403,7 +6403,7 @@
   
 
   
-
+
   
   
 
@@ -6413,7 +6413,7 @@
   
 
   
-
+
   
   
 
@@ -6423,7 +6423,7 @@
   
 
   
-
+
   
   
 
@@ -6433,7 +6433,7 @@
   
 
   
-
+
   
   
 
@@ -6443,7 +6443,7 @@
   
 
   
-
+
   
   
 
@@ -6453,7 +6453,7 @@
   
 
   
-
+
   
   
 
@@ -6463,7 +6463,7 @@
   
 
   
-
+
   
   
 
@@ -6473,7 +6473,7 @@
   
 
   
-
+
   
   
 
@@ -6483,7 +6483,7 @@
   
 
   
-
+
   
   
 
@@ -6493,7 +6493,7 @@
   
 
   
-
+
   
   
 
@@ -6503,7 +6503,7 @@
   
 
   
-
+
   
   
 
@@ -6513,7 +6513,7 @@
   
 
   
-
+
   
   
 
@@ -6523,7 +6523,7 @@
   
 
   
-
+
   
   
 
@@ -6533,10 +6533,10 @@
   
 
   
-
+
   
   
-
+
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[David Tardon]

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

New commits:
commit 7c1d525b4ccfa5805b41017a19250927feacbe5c
Author: David Tardon 
Date:   Mon Aug 4 21:29:21 2014 +0200

Updated core
Project: help  3d472f792cc7d9e213e5fdce5b1a3ee95714c1f0

diff --git a/helpcontent2 b/helpcontent2
index 5e296a1..3d472f7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5e296a1bc01539ce917f4770f14c2a64d4005e2b
+Subproject commit 3d472f792cc7d9e213e5fdce5b1a3ee95714c1f0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 helpers/help_hid.lst  |2 --
 source/text/scalc/01/12090102.xhp |2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 3d472f792cc7d9e213e5fdce5b1a3ee95714c1f0
Author: David Tardon 
Date:   Mon Aug 4 21:29:21 2014 +0200

update help ids for Show Detail dlg

Change-Id: Id5f6d7de1ce298a479e190c51c93876b969a1dc9

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 7912ce4..e7da7b9 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2599,7 +2599,6 @@ HID_SC_APPEND_NAME,58914,
 HID_SC_ASCII_TABCTR,58926,
 HID_SC_AUTOFMT_NAME,58921,
 HID_SC_CHANGES_COMMENT,58990,
-HID_SC_DPSHOWDETAIL,59014,
 HID_SC_DRAW_RENAME,59007,
 HID_SC_DROPMODE_COPY,58924,
 HID_SC_DROPMODE_LINK,58923,
@@ -5095,7 +5094,6 @@ sc_ListBox_FID_FUNCTION_BOX_CB_CAT,3651276289,
 sc_ListBox_FID_FUNCTION_BOX_DDLB_FUNC,3651276291,
 sc_ListBox_FID_FUNCTION_BOX_LB_FUNC,3651276290,
 sc_ListBox_RID_SCDLG_DAPISERVICE_LB_SERVICE,1495338505,
-sc_ListBox_RID_SCDLG_DPSHOWDETAIL_LB_DIMS,1495453194,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_DEST,1493454338,
 sc_ListBox_RID_SCDLG_MOVETAB_LB_INSERT,1493454340,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
diff --git a/source/text/scalc/01/12090102.xhp 
b/source/text/scalc/01/12090102.xhp
index 7d363a7..ec5e879 100644
--- a/source/text/scalc/01/12090102.xhp
+++ b/source/text/scalc/01/12090102.xhp
@@ -98,7 +98,7 @@
  
   
   If you double-click a field which has adjacent fields at the same 
level, the Show Detail dialog opens:
-
+
 Show Detail
   Choose the field that you want to view the details 
for.
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Palenik Mihály]

 sc/UIConfig_scalc.mk |1 
 sc/source/ui/dbgui/pvfundlg.cxx  |   29 ++
 sc/source/ui/dbgui/pvfundlg.src  |   48 ---
 sc/source/ui/inc/pvfundlg.hxx|7 -
 sc/uiconfig/scalc/ui/showdetaildialog.ui |  132 +++
 5 files changed, 148 insertions(+), 69 deletions(-)

New commits:
commit 0db94ccc3ffd243af6d3a626a8a211ff106b7d48
Author: Palenik Mihály 
Date:   Mon Aug 4 20:06:46 2014 +0200

Convert RID_SCDLG_DPSHOWDETAIL to .ui

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

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 1de1c02..423dd8f 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -153,6 +153,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sharedfooterdialog \
sc/uiconfig/scalc/ui/sharedheaderdialog \
sc/uiconfig/scalc/ui/showchangesdialog \
+   sc/uiconfig/scalc/ui/showdetaildialog \
sc/uiconfig/scalc/ui/showsheetdialog \
sc/uiconfig/scalc/ui/sidebaralignment \
sc/uiconfig/scalc/ui/sidebarnumberformat \
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 7aca31e..8813613 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -34,7 +34,7 @@
 #include "scresid.hxx"
 #include "dpobject.hxx"
 #include "dpsave.hxx"
-#include "pvfundlg.hrc"
+#include "sc.hrc"
 #include "globstr.hrc"
 #include "dputil.hxx"
 
@@ -758,16 +758,11 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox 
)
 }
 
 ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, 
sal_uInt16 nOrient ) :
-ModalDialog ( pParent, ScResId( RID_SCDLG_DPSHOWDETAIL ) ),
-maFtDims( this, ScResId( FT_DIMS ) ),
-maLbDims( this, ScResId( LB_DIMS ) ),
-maBtnOk ( this, ScResId( BTN_OK ) ),
-maBtnCancel ( this, ScResId( BTN_CANCEL ) ),
-maBtnHelp   ( this, ScResId( BTN_HELP ) ),
-
+ModalDialog ( pParent, "ShowDetail", 
"modules/scalc/ui/showdetaildialog.ui" ),
 mrDPObj(rDPObj)
 {
-FreeResource();
+get(mpLbDims, "dimsTreeview");
+get(mpBtnOk, "ok");
 
 ScDPSaveData* pSaveData = rDPObj.GetSaveData();
 long nDimCount = rDPObj.GetDimCount();
@@ -787,27 +782,27 @@ ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, 
ScDPObject& rDPObj, sal_u
 if (pLayoutName)
 aName = *pLayoutName;
 }
-maLbDims.InsertEntry( aName );
+mpLbDims->InsertEntry( aName );
 maNameIndexMap.insert(DimNameIndexMap::value_type(aName, 
nDim));
 }
 }
 }
-if( maLbDims.GetEntryCount() )
-maLbDims.SelectEntryPos( 0 );
+if( mpLbDims->GetEntryCount() )
+mpLbDims->SelectEntryPos( 0 );
 
-maLbDims.SetDoubleClickHdl( LINK( this, ScDPShowDetailDlg, DblClickHdl ) );
+mpLbDims->SetDoubleClickHdl( LINK( this, ScDPShowDetailDlg, DblClickHdl ) 
);
 }
 
 short ScDPShowDetailDlg::Execute()
 {
-return maLbDims.GetEntryCount() ? ModalDialog::Execute() : 
static_cast(RET_CANCEL);
+return mpLbDims->GetEntryCount() ? ModalDialog::Execute() : 
static_cast(RET_CANCEL);
 }
 
 OUString ScDPShowDetailDlg::GetDimensionName() const
 {
 // Look up the internal dimension name which may be different from the
 // displayed field name.
-OUString aSelectedName = maLbDims.GetSelectEntry();
+OUString aSelectedName = mpLbDims->GetSelectEntry();
 DimNameIndexMap::const_iterator itr = maNameIndexMap.find(aSelectedName);
 if (itr == maNameIndexMap.end())
 // This should never happen!
@@ -820,8 +815,8 @@ OUString ScDPShowDetailDlg::GetDimensionName() const
 
 IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox*, pLBox )
 {
-if( pLBox == &maLbDims )
-maBtnOk.Click();
+if( pLBox == mpLbDims )
+mpBtnOk->Click();
 return 0;
 }
 
diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src
index 14a42ae..fe33cf8 100644
--- a/sc/source/ui/dbgui/pvfundlg.src
+++ b/sc/source/ui/dbgui/pvfundlg.src
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "pvfundlg.hrc"
+#include "sc.hrc"
 
 StringArray SCSTR_DPFUNCLISTBOX
 {
@@ -37,50 +37,4 @@ StringArray SCSTR_DPFUNCLISTBOX
 };
 };
 
-ModalDialog RID_SCDLG_DPSHOWDETAIL
-{
-OutputSize = TRUE;
-HelpId = HID_SC_DPSHOWDETAIL;
-SVLook = TRUE;
-Size = MAP_APPFONT( 200, 116 );
-Moveable = TRUE;
-Closeable = FALSE;
-FixedText FT_DIMS
-{
-Pos = MAP_APPFONT( 6, 3 );
-Size = MAP_APPFONT( 132, 24 );
-WordBreak = TRUE;
-Text [ en-US ] = "~Choose the field containing the detail you want to 
show";
-};
-ListBox LB_DIMS
-{
-He

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - Makefile.in

[David Tardon]

 Makefile.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6cbe7ec6a027aab829e1a800542ec3796ec719ae
Author: David Tardon 
Date:   Mon Aug 4 19:34:03 2014 +0200

fdo#82136 fix download of submodule tarballs

Change-Id: I07775391cb905f0563d1d1b3cae6f02b12d10f90
(cherry picked from commit 922b03f0818baa65e4c036f58fe7f8c29776b81e)
Reviewed-on: https://gerrit.libreoffice.org/10738
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/Makefile.in b/Makefile.in
index 09b9465..9db0823 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -195,7 +195,7 @@ $(if $(gb_LO_VER),,$(error Error while retrieving 
$$lo_sources_ver from $(SRCDIR
 get-submodules: | download
 ifneq ($(foreach i,$(subst 
helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),$(SRCDIR)/src/libreoffice-$(i)-$(gb_LO_VER)),$(wildcard
 $(foreach i,$(subst 
helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),$(SRCDIR)/src/libreoffice-$(i)-$(gb_LO_VER
$(foreach i,$(subst helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),\
-   $(call 
fetch_Download_item,http://download.documentfoundation.org/libreoffice/src/$(shell
 echo $(gb_LO_VER) | sed -e 
"s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/"),libreoffice-$(i)-$(gb_LO_VER).tar.xz,no-check))
+   $(call 
fetch_Download_item_unchecked,http://download.documentfoundation.org/libreoffice/src/$(shell
 echo $(gb_LO_VER) | sed -e 
"s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/"),libreoffice-$(i)-$(gb_LO_VER).tar.xz))
$(SRCDIR)/bin/unpack-sources $(SRCDIR) $(foreach i,$(subst 
helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),\
$(TARFILE_LOCATION)/libreoffice-$(i)-$(gb_LO_VER).tar.xz)
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: 7 commits - chart2/source extensions/source hwpfilter/source l10ntools/source sal/osl unoidl/source

[Michael Stahl]

On 04/08/14 19:56, Norbert Thiebaud wrote:
> On Mon, Aug 4, 2014 at 2:51 PM, Stephan Bergmann  wrote:

>>  And
>> especially so if a single file out of a coherent set of consistently
>> formatted files is reformatted differently.
>>
> 
> well it was not as illustrated by the snipset below:
> 
> case unoidl::Entity::SORT_CONSTANT_GROUP:
> {
> rtl::Reference ent2B(
> static_cast(entB.get()));
> for
> (std::vector::const_iterator
>  i(ent2B->getMembers().begin());
>  i != ent2B->getMembers().end(); ++i)
> {
> bool found = false;
> if (entA.is()) {
> rtl::Reference ent2A(
> static_cast(
> entA.get()));
> for
> (std::vector::const_iterator
>  j(ent2A->getMembers().begin());
>  j != ent2A->getMembers().end(); ++j)
> {
> if (i->name == j->name) {
> found = true;
> break;
> }
> }
> }
> if (!(found || valid(i->name))) {
> std::cerr
> << "Constant group " << name << " member "
> << i->name << " uses an invalid identifier"
> << std::endl;
> std::exit(EXIT_FAILURE);
> }
> }
> break;
> }
> 
> note the for() and case syntax use { below on a new line.. the if use
> { at the end of the line

> So, no, the source was not "consistently formatted"

a rule such as "if the condition is a single line, put the brace on the
same line, if it is multiple lines, put the brace on a separate line"
can still be called consistent  :)

(personally i would find this an improvement over the current formatting...)

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

Re: [Libreoffice-commits] core.git: 7 commits - chart2/source extensions/source hwpfilter/source l10ntools/source sal/osl unoidl/source

[Norbert Thiebaud]

On Mon, Aug 4, 2014 at 2:51 PM, Stephan Bergmann  wrote:
>
> I don't understand your problem.  Do you mean, you're unable to read code
> formatted as
>
>> bool operator ==(ConstantValue const & lhs, ConstantValue const & rhs) {
>> if (lhs.type == rhs.type) {
>> switch (lhs.type) {
>
>
> rather than as
>
>> bool operator ==(ConstantValue const & lhs, ConstantValue const & rhs)
>> {
>> if (lhs.type == rhs.type)
>> {
>> switch (lhs.type)
>> {
>

yes I find it very very hard to follow... especially matching the closing }
to me if feel as awkward to read as a right aligned text with a
hanging indent on the right.

for a very small block I can managed, but with enough lines between
the opening and the ending of a block, especially with
mutiple level of nesting in between.. it become quite hard to 'see'
the flow, and I end-up re-formatting just to see the code structure.
Now add to that the sometime extreme verbosity of c++ that turn a
simple for(;;) into a 4 or 5 lines animal, and it is clear why having
a { on a single line is much much more clearer.
Point in case is that you felt apparently compeleed to switch to that
mode when faced with such for() or if() see example below
cut-and-pasted from the 'original' source in question

>  And
> especially so if a single file out of a coherent set of consistently
> formatted files is reformatted differently.
>

well it was not as illustrated by the snipset below:

case unoidl::Entity::SORT_CONSTANT_GROUP:
{
rtl::Reference ent2B(
static_cast(entB.get()));
for
(std::vector::const_iterator
 i(ent2B->getMembers().begin());
 i != ent2B->getMembers().end(); ++i)
{
bool found = false;
if (entA.is()) {
rtl::Reference ent2A(
static_cast(
entA.get()));
for
(std::vector::const_iterator
 j(ent2A->getMembers().begin());
 j != ent2A->getMembers().end(); ++j)
{
if (i->name == j->name) {
found = true;
break;
}
}
}
if (!(found || valid(i->name))) {
std::cerr
<< "Constant group " << name << " member "
<< i->name << " uses an invalid identifier"
<< std::endl;
std::exit(EXIT_FAILURE);
}
}
break;
}

note the for() and case syntax use { below on a new line.. the if use
{ at the end of the line

or
case unoidl::Entity::SORT_SINGLE_INTERFACE_BASED_SERVICE:
{
rtl::Reference
ent2A(

static_cast(
entA.get()));
rtl::Reference
ent2B(

static_cast(
entB.get()));
if (ent2A->getBase() != ent2B->getBase()) {
std::cerr
<< "single-interface--based servcie " << name
<< " base changed from " << ent2A->getBase()
<< " to " << ent2B->getBase()
<< std::endl;
std::exit(EXIT_FAILURE);
}
if (ent2A->getConstructors().size()
!= ent2B->getConstructors().size())
{
std::cerr
<< "single-interface--based service " << name
<< " number of constructors changed from "
<< ent2A->getConstructors().size() << " to "
<< ent2B->getConstructors().size() << std::endl;
std::exit(EXIT_FAILURE);
}
for
(std::vector::const_iterator
 i(ent2A->getConstructors().begin()),
 j(ent2B->getConstructors().begin());
 i != ent2A->getConstructors().end(); ++i, ++j)
{
if (i->name != j->name || i->parameters != j->parameters
|| i->exceptions != j->exceptions
|| i->defaultConstructor != j->defaultConstructor)
{
std::cerr
<< "single-interface--based service " << name
<< " constructor #"
<< i - ent2A->getConstructors().begin() + 1

[Libreoffice-commits] core.git: Makefile.in

[David Tardon]

 Makefile.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 922b03f0818baa65e4c036f58fe7f8c29776b81e
Author: David Tardon 
Date:   Mon Aug 4 19:34:03 2014 +0200

fdo#82136 fix download of submodule tarballs

Change-Id: I07775391cb905f0563d1d1b3cae6f02b12d10f90

diff --git a/Makefile.in b/Makefile.in
index 915e11c..028c55c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -200,7 +200,7 @@ $(if $(gb_LO_VER),,$(error Error while retrieving 
$$lo_sources_ver from $(SRCDIR
 get-submodules: | download
 ifneq ($(foreach i,$(subst 
helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),$(SRCDIR)/src/libreoffice-$(i)-$(gb_LO_VER)),$(wildcard
 $(foreach i,$(subst 
helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),$(SRCDIR)/src/libreoffice-$(i)-$(gb_LO_VER
$(foreach i,$(subst helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),\
-   $(call 
fetch_Download_item,http://download.documentfoundation.org/libreoffice/src/$(shell
 echo $(gb_LO_VER) | sed -e 
"s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/"),libreoffice-$(i)-$(gb_LO_VER).tar.xz,no-check))
+   $(call 
fetch_Download_item_unchecked,http://download.documentfoundation.org/libreoffice/src/$(shell
 echo $(gb_LO_VER) | sed -e 
"s/\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/"),libreoffice-$(i)-$(gb_LO_VER).tar.xz))
$(SRCDIR)/bin/unpack-sources $(SRCDIR) $(foreach i,$(subst 
helpcontent2,help,$(GIT_NEEDED_SUBMODULES)),\
$(TARFILE_LOCATION)/libreoffice-$(i)-$(gb_LO_VER).tar.xz)
 endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source cui/source filter/source include/svx oox/source reportdesign/source sc/source sd/source svx/source sw/source

[Stephan Bergmann]

 chart2/source/controller/main/DrawCommandDispatch.cxx |6 +--
 cui/source/tabpages/textattr.cxx  |   12 +++---
 filter/source/msfilter/msdffimp.cxx   |   14 +++
 filter/source/msfilter/svdfppt.cxx|6 +--
 include/svx/sdtagitm.hxx  |   22 +++-
 oox/source/vml/vmlshape.cxx   |4 +-
 reportdesign/source/ui/report/ReportSection.cxx   |2 -
 sc/source/core/data/postit.cxx|8 ++--
 sc/source/core/tool/detfunc.cxx   |4 +-
 sc/source/filter/excel/xiescher.cxx   |4 +-
 sc/source/ui/drawfunc/fuconcustomshape.cxx|2 -
 sc/source/ui/drawfunc/futext.cxx  |   16 -
 sd/source/core/sdpage.cxx |   16 -
 sd/source/core/stlpool.cxx|2 -
 sd/source/filter/ppt/pptin.cxx|2 -
 sd/source/ui/func/fuconcs.cxx |2 -
 sd/source/ui/func/fuconrec.cxx|4 +-
 sd/source/ui/func/futext.cxx  |   32 +-
 sd/source/ui/view/drviews2.cxx|2 -
 svx/source/sdr/properties/customshapeproperties.cxx   |2 -
 svx/source/svdraw/svdattr.cxx |4 +-
 svx/source/svdraw/svddrgmt.cxx|6 +--
 svx/source/svdraw/svdedtv1.cxx|8 ++--
 svx/source/svdraw/svdfmtf.cxx |4 +-
 svx/source/svdraw/svdibrow.cxx|4 +-
 svx/source/svdraw/svdoashp.cxx|6 +--
 svx/source/svdraw/svdotext.cxx|   16 -
 sw/source/core/frmedt/feshview.cxx|8 ++--
 sw/source/filter/html/htmldrawreader.cxx  |4 +-
 sw/source/filter/ww8/ww8graf.cxx  |   10 ++---
 sw/source/filter/ww8/ww8par.cxx   |8 ++--
 sw/source/uibase/ribbar/concustomshape.cxx|2 -
 sw/source/uibase/ribbar/conrect.cxx   |8 ++--
 33 files changed, 120 insertions(+), 130 deletions(-)

New commits:
commit 151fbebf8ced85ee8582fe1ad8a8176e061845a6
Author: Stephan Bergmann 
Date:   Mon Aug 4 19:22:55 2014 +0200

Consistency around SdrOnOffItem in svx/sdtagitm.hxx

...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: I6d8b3709d6d55bd6958d38f262141c43779dfdcc

diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx 
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index c20e0af..f107662 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -175,7 +175,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
 pObj->SetMergedItem( SvxAdjustItem( SVX_ADJUST_CENTER, 0 ) );
 pObj->SetMergedItem( SdrTextVertAdjustItem( 
SDRTEXTVERTADJUST_CENTER ) );
 pObj->SetMergedItem( SdrTextHorzAdjustItem( 
SDRTEXTHORZADJUST_BLOCK ) );
-pObj->SetMergedItem( SdrTextAutoGrowHeightItem( false ) );
+pObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( false ) );
 
 SdrObjCustomShape* pShape(dynamic_cast< SdrObjCustomShape* >( 
pObj ));
 assert(pShape);
@@ -515,8 +515,8 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const 
sal_uInt16 nID )
 if ( bVertical )
 {
 SfxItemSet aSet( 
pDrawModelWrapper->GetItemPool() );
-aSet.Put( SdrTextAutoGrowWidthItem( 
true ) );
-aSet.Put( SdrTextAutoGrowHeightItem( 
false ) );
+aSet.Put( 
makeSdrTextAutoGrowWidthItem( true ) );
+aSet.Put( 
makeSdrTextAutoGrowHeightItem( false ) );
 aSet.Put( SdrTextVertAdjustItem( 
SDRTEXTVERTADJUST_TOP ) );
 aSet.Put( SdrTextHorzAdjustItem( 
SDRTEXTHORZADJUST_RIGHT ) );
 pTextObj->SetMergedItemSet( aSet );
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 0253342..40958b9 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -170,7 +170,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
 // adjust to height
 if ( rAttrs->GetItemState( SDRATTR_TEXT_AUTOGROWHEIGHT ) != 
SFX_ITEM_DONTCARE )
 {
-m_pTsbAutoGrowHeight->SetState( ( ( const SdrTextAu

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

[Kohei Yoshida]

 oox/source/ppt/pptimport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 013744a5b475e151ca0918565fb369e22dfbc1db
Author: Kohei Yoshida 
Date:   Mon Aug 4 12:40:38 2014 -0400

Let's not forget the keyword.

Change-Id: I86c114e903eaee1404875a794ed4f1c76f61169e

diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 9fb..de5ee83 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -189,7 +189,7 @@ class PptGraphicHelper : public GraphicHelper
 public:
 explicitPptGraphicHelper( const PowerPointImport& rFilter );
 virtual sal_Int32   getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE;
-virtual drawing::FillStyle getDefaultChartAreaFillStyle() const;
+virtual drawing::FillStyle getDefaultChartAreaFillStyle() const 
SAL_OVERRIDE;
 private:
 const PowerPointImport& mrFilter;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 012a759a67b3a930bfd437e8a9c5cc1f6efd3304
Author: Miklos Vajna 
Date:   Mon Aug 4 18:36:24 2014 +0200

more ambiguity fixes

Change-Id: I8c3af0976414ae444ec08b7e60485d8886f68a76

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 1569f37..4cecd37 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -85,26 +85,26 @@ bool DomainMapperTableManager::attribute(Id nName, Value& 
rValue)
 TablePropertyMapPtr pPropMap(new TablePropertyMap());
 pPropMap->Insert(PROP_TBL_LOOK, 
uno::makeAny(rValue.getInt()));
 insertTableProps(pPropMap);
-m_aTableLook["val"] = uno::makeAny(rValue.getInt());
+m_aTableLook["val"] = uno::makeAny(rValue.getInt());
 }
 break;
 case NS_ooxml::LN_CT_TblLook_noVBand:
-m_aTableLook["noVBand"] = uno::makeAny(rValue.getInt());
+m_aTableLook["noVBand"] = uno::makeAny(rValue.getInt());
 break;
 case NS_ooxml::LN_CT_TblLook_noHBand:
-m_aTableLook["noHBand"] = uno::makeAny(rValue.getInt());
+m_aTableLook["noHBand"] = uno::makeAny(rValue.getInt());
 break;
 case NS_ooxml::LN_CT_TblLook_lastColumn:
-m_aTableLook["lastColumn"] = uno::makeAny(rValue.getInt());
+m_aTableLook["lastColumn"] = uno::makeAny(rValue.getInt());
 break;
 case NS_ooxml::LN_CT_TblLook_lastRow:
-m_aTableLook["lastRow"] = uno::makeAny(rValue.getInt());
+m_aTableLook["lastRow"] = uno::makeAny(rValue.getInt());
 break;
 case NS_ooxml::LN_CT_TblLook_firstColumn:
-m_aTableLook["firstColumn"] = uno::makeAny(rValue.getInt());
+m_aTableLook["firstColumn"] = uno::makeAny(rValue.getInt());
 break;
 case NS_ooxml::LN_CT_TblLook_firstRow:
-m_aTableLook["firstRow"] = uno::makeAny(rValue.getInt());
+m_aTableLook["firstRow"] = uno::makeAny(rValue.getInt());
 break;
 default:
 bRet = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 writerfilter/source/dmapper/DomainMapperTableManager.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96019b49920f9d77f105fa22da00315359887247
Author: Stephan Bergmann 
Date:   Mon Aug 4 18:33:13 2014 +0200

fix ambiguity

Change-Id: I773aa61c4430aa999c3ea94d352102a4a3f7e9f0

diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index d5b60bd..1569f37 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -83,7 +83,7 @@ bool DomainMapperTableManager::attribute(Id nName, Value& 
rValue)
 case NS_ooxml::LN_CT_TblLook_val:
 {
 TablePropertyMapPtr pPropMap(new TablePropertyMap());
-pPropMap->Insert(PROP_TBL_LOOK, uno::makeAny(rValue.getInt()));
+pPropMap->Insert(PROP_TBL_LOOK, 
uno::makeAny(rValue.getInt()));
 insertTableProps(pPropMap);
 m_aTableLook["val"] = uno::makeAny(rValue.getInt());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx |3 +
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   41 ++-
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   27 +
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |5 +
 writerfilter/source/dmapper/PropertyIds.cxx  |1 
 writerfilter/source/dmapper/PropertyIds.hxx  |1 
 6 files changed, 55 insertions(+), 23 deletions(-)

New commits:
commit 7803a5d726890f3724548a7ab95741a75a19dc7e
Author: Miklos Vajna 
Date:   Mon Aug 4 18:14:25 2014 +0200

DOCX import: handle all attributes of CT_TblLook

Change-Id: I3bbd65af4f52ce28e2962a1b3e0c7f1c348f3a01

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 33b6a95d..f80d6c0 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2458,7 +2458,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 {
 writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
 if (pProperties.get())
+{
 pProperties->resolve(*this);
+m_pImpl->getTableManager().finishTableLook();
+}
 }
 break;
 default:
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 0b91ef6..8a121fa 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -313,8 +313,7 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 sal_Int32 nTableWidth = 0;
 sal_Int32 nTableWidthType = text::SizeType::FIX;
 
-uno::Sequence< beans::PropertyValue > aGrabBag( 6 );
-sal_Int32 nGrabBagSize = 0;
+comphelper::SequenceAsHashMap aGrabBag;
 
 if (0 != 
m_rDMapper_Impl.getTableManager().getCurrentTableRealPosition())
 {
@@ -352,9 +351,7 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 aGrabBagTS[9].Name = "vertAnchor";
 aGrabBagTS[9].Value = uno::makeAny( 
pTablePositions->getVertAnchor() );
 
-aGrabBag[nGrabBagSize].Name = "TablePosition";
-aGrabBag[nGrabBagSize].Value = uno::makeAny( aGrabBagTS );
-nGrabBagSize++;
+aGrabBag["TablePosition"] = uno::makeAny( aGrabBagTS );
 }
 
 boost::optional aTableStyleVal = 
m_aTableProperties->getProperty(META_PROP_TABLE_STYLE_NAME);
@@ -368,9 +365,7 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 pTableStyle = dynamic_cast( 
pStyleSheet.get( ) );
 m_aTableProperties->Erase( aTableStyleVal->first );
 
-aGrabBag[nGrabBagSize].Name = "TableStyleName";
-aGrabBag[nGrabBagSize].Value = uno::makeAny( sTableStyleName );
-nGrabBagSize++;
+aGrabBag["TableStyleName"] = uno::makeAny( sTableStyleName );
 
 if( pStyleSheet )
 {
@@ -386,27 +381,19 @@ TableStyleSheetEntry * 
DomainMapperTableHandler::endTableGetTableStyle(TableInfo
 TableInfo rStyleInfo;
 if (lcl_extractTableBorderProperty(pMergedProperties, 
PROP_TOP_BORDER, rStyleInfo, aBorderLine))
 {
-aGrabBag[nGrabBagSize].Name = "TableStyleTopBorder";
-aGrabBag[nGrabBagSize].Value = uno::makeAny( aBorderLine );
-nGrabBagSize++;
+aGrabBag["TableStyleTopBorder"] = uno::makeAny( 
aBorderLine );
 }
 if (lcl_extractTableBorderProperty(pMergedProperties, 
PROP_BOTTOM_BORDER, rStyleInfo, aBorderLine))
 {
-aGrabBag[nGrabBagSize].Name = "TableStyleBottomBorder";
-aGrabBag[nGrabBagSize].Value = uno::makeAny( aBorderLine );
-nGrabBagSize++;
+aGrabBag["TableStyleBottomBorder"] = uno::makeAny( 
aBorderLine );
 }
 if (lcl_extractTableBorderProperty(pMergedProperties, 
PROP_LEFT_BORDER, rStyleInfo, aBorderLine))
 {
-aGrabBag[nGrabBagSize].Name = "TableStyleLeftBorder";
-aGrabBag[nGrabBagSize].Value = uno::makeAny( aBorderLine );
-nGrabBagSize++;
+aGrabBag["TableStyleLeftBorder"] = uno::makeAny( 
aBorderLine );
 }
 if (lcl_extractTableBorderProperty(pMergedProperties, 
PROP_RIGHT_BORDER, rStyleInfo, aBorderLine))
 {
-aGrabBag[nGrabBagSize].Name = "TableStyleRightBorder";
-aGrabBag[nGrabBagSize].Value = uno::makeAny( aBorderLine );
-nGrabBagSize++;
+aGrabBag["TableStyleRightBorder"] = uno::make

[Libreoffice-commits] core.git: 2 commits - chart2/qa include/oox oox/source

[Kohei Yoshida]

 chart2/qa/extras/chart2export.cxx |   11 +++
 chart2/qa/extras/chart2import.cxx |   26 ++
 chart2/qa/extras/charttest.hxx|3 +-
 chart2/qa/extras/data/xlsx/chart-auto-background.xlsx |binary
 include/oox/helper/graphichelper.hxx  |3 ++
 oox/source/drawingml/chart/chartspaceconverter.cxx|8 -
 oox/source/helper/graphichelper.cxx   |5 +++
 oox/source/ppt/pptimport.cxx  |6 
 8 files changed, 60 insertions(+), 2 deletions(-)

New commits:
commit 0ee728634d29aa3e77139491d4eac2b2962ee418
Author: Kohei Yoshida 
Date:   Mon Aug 4 12:14:43 2014 -0400

bnc#886540: Add test cases for chart background fill variance.

"Automatic" fill in docx and xlsx should be solid white, whereas in
pptx it is no fill (transparent).

Change-Id: I7e64f2f895e4c4ed072a234e622a348599456f37

diff --git a/chart2/qa/extras/chart2export.cxx 
b/chart2/qa/extras/chart2export.cxx
index 0c31f22..1beb411 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -779,6 +779,17 @@ void Chart2ExportTest::testDataLabelBordersDOCX()
 load("/chart2/qa/extras/data/docx/", "data-label-borders.docx");
 
 Reference xChartDoc(getChartDocFromWriter(0), 
uno::UNO_QUERY);
+
+// "Automatic" chart background fill in docx should be loaded as solid 
white.
+Reference xPropSet = xChartDoc->getPageBackground();
+CPPUNIT_ASSERT(xPropSet.is());
+drawing::FillStyle eStyle = 
xPropSet->getPropertyValue("FillStyle").get();
+sal_Int32 nColor = 
xPropSet->getPropertyValue("FillColor").get();
+CPPUNIT_ASSERT_MESSAGE("'Automatic' chart background fill in docx should 
be loaded as solid fill.",
+eStyle == drawing::FillStyle_SOLID);
+CPPUNIT_ASSERT_MESSAGE("'Automatic' chart background fill in docx should 
be loaded as solid white.",
+(nColor & 0x00FF) == 0x00FF); // highest 2 bytes are 
transparency which we ignore here.
+
 aTest.checkObject1(xChartDoc);
 xChartDoc.set(getChartDocFromWriter(1), uno::UNO_QUERY);
 aTest.checkObject2(xChartDoc);
diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index 659987a..73200f9 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -52,6 +52,7 @@ public:
 void testFlatODSStackedColumnChart();
 void testFdo78080();
 void testFdo54361();
+void testAutoBackgroundXLSX();
 
 CPPUNIT_TEST_SUITE(Chart2ImportTest);
 CPPUNIT_TEST(Fdo60083);
@@ -83,6 +84,7 @@ public:
 CPPUNIT_TEST(testFlatODSStackedColumnChart);
 CPPUNIT_TEST(testFdo78080);
 CPPUNIT_TEST(testFdo54361);
+CPPUNIT_TEST(testAutoBackgroundXLSX);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -344,6 +346,13 @@ void Chart2ImportTest::testPPTXHiddenDataSeries()
 Reference xChartDoc(getChartDocFromDrawImpress(0, 
0), uno::UNO_QUERY);
 CPPUNIT_ASSERT(xChartDoc.is());
 
+// "Automatic" chart background fill in pptx should be loaded as no fill.
+Reference xPropSet = xChartDoc->getPageBackground();
+CPPUNIT_ASSERT(xPropSet.is());
+drawing::FillStyle eStyle = 
xPropSet->getPropertyValue("FillStyle").get();
+CPPUNIT_ASSERT_MESSAGE("'Automatic' chart background fill in pptx should 
be loaded as no fill (transparent).",
+eStyle == drawing::FillStyle_NONE);
+
 Reference xCT = getChartTypeFromDoc(xChartDoc, 0, 0);
 CPPUNIT_ASSERT(xCT.is());
 
@@ -600,6 +609,23 @@ void Chart2ImportTest::testFdo54361()
 CPPUNIT_ASSERT_MESSAGE("Background needs to be with solid fill style", 
aStyle == 1);
 }
 
+void Chart2ImportTest::testAutoBackgroundXLSX()
+{
+load("/chart2/qa/extras/data/xlsx/", "chart-auto-background.xlsx");
+uno::Reference xChartDoc = getChartDocFromSheet(0, 
mxComponent);
+CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
+
+// "Automatic" chart background fill in xlsx should be loaded as solid 
white.
+Reference xPropSet = xChartDoc->getPageBackground();
+CPPUNIT_ASSERT(xPropSet.is());
+drawing::FillStyle eStyle = 
xPropSet->getPropertyValue("FillStyle").get();
+sal_Int32 nColor = 
xPropSet->getPropertyValue("FillColor").get();
+CPPUNIT_ASSERT_MESSAGE("'Automatic' chart background fill in xlsx should 
be loaded as solid fill.",
+eStyle == drawing::FillStyle_SOLID);
+CPPUNIT_ASSERT_MESSAGE("'Automatic' chart background fill in xlsx should 
be loaded as solid white.",
+(nColor & 0x00FF) == 0x00FF); // highest 2 bytes are 
transparency which we ignore here.
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index 7c53b95..d9c022d 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -30,7 +30,6 @@
 
 #include 
 
-#include 
 #include 
 #

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

[Stephan Bergmann]

 vcl/osx/cuidraw.hxx  |   47 +++
 vcl/osx/salnativewidgets.cxx |8 +--
 2 files changed, 49 insertions(+), 6 deletions(-)

New commits:
commit 279fc1a2ae2ae8d51768e438787c3bc9a59df55e
Author: Stephan Bergmann 
Date:   Mon Aug 4 18:16:39 2014 +0200

loplugin:externandnotdefined

Change-Id: I5337cd288e3f5d6f7c42d7a1f5c9b2dbce5f06b4

diff --git a/vcl/osx/cuidraw.hxx b/vcl/osx/cuidraw.hxx
new file mode 100644
index 000..02cd2cd
--- /dev/null
+++ b/vcl/osx/cuidraw.hxx
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_OSX_CUIDRAW_HXX
+#define INCLUDED_VCL_OSX_CUIDRAW_HXX
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+#if !HAVE_FEATURE_MACOSX_SANDBOX
+
+extern "C" {
+
+typedef CFTypeRef CUIRendererRef;
+
+void CUIDraw(
+CUIRendererRef r, CGRect rect, CGContextRef ctx, CFDictionaryRef options,
+CFDictionaryRef * result);
+
+}
+
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 5aebe47..1dd622c 100644
--- a/vcl/osx/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -34,18 +34,14 @@
 #include 
 #include "postmac.h"
 
+#include 
+
 #ifndef NSAppKitVersionNumber10_7
 #define NSAppKitVersionNumber10_7 1138
 #endif
 
 #if !HAVE_FEATURE_MACOSX_SANDBOX
 
-extern "C"
-{
-typedef CFTypeRef CUIRendererRef;
-void CUIDraw(CUIRendererRef r, CGRect rect, CGContextRef ctx, 
CFDictionaryRef options, CFDictionaryRef* result);
-}
-
 @interface NSWindow(CoreUIRendererPrivate)
 + (CUIRendererRef)coreUIRenderer;
 @end
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/vcl vcl/osx

[Stephan Bergmann]

 include/vcl/svmain.hxx |1 +
 vcl/osx/salinst.cxx|2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e48179c1844471f8e2f472bc7f5aa0cb46bf5198
Author: Stephan Bergmann 
Date:   Mon Aug 4 17:56:19 2014 +0200

loplugin:externandnotdefined

Change-Id: I5f0c34a44898637b3c0d3d50cbc7ace8b656

diff --git a/include/vcl/svmain.hxx b/include/vcl/svmain.hxx
index be5a1b9..c4437b2 100644
--- a/include/vcl/svmain.hxx
+++ b/include/vcl/svmain.hxx
@@ -25,6 +25,7 @@
 
 // #i47888# allow for alternative initialization as required for e.g. MacOSX
 bool ImplSVMainHook( int* );
+int ImplSVMain();
 
 VCL_DLLPUBLIC int SVMain();
 
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index f88bf79..532fc38 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -64,8 +64,6 @@
 using namespace std;
 using namespace ::com::sun::star;
 
-extern int ImplSVMain();
-
 static int* gpnInit = 0;
 static NSMenu* pDockMenu = nil;
 static bool bNoSVMain = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sc/source/core/data/documen9.cxx|3 ++-
 sw/source/uibase/app/docst.cxx  |2 +-
 writerfilter/source/dmapper/StyleSheetTable.cxx |   18 +-
 3 files changed, 4 insertions(+), 19 deletions(-)

New commits:
commit d4b96b45727314585d02394bb5a084393b647729
Author: Michael Stahl 
Date:   Mon Aug 4 17:00:50 2014 +0200

fdo#81993: Revert "Resolves: #i119464# Update default alignment ...

... value for docx [Sub]Title"

This reverts commit acc671ec74c874ffd22803bb2ee54a1f2c027155.

The commit is clearly unnecessary:

1) commit 3f9e7e72c53ecbe8ee1ab060f811cb41eadfc7e1
   appears to be a better fix for alignment

2) commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a
   should have disabled the Center default in Writer already

Change-Id: Ib0cc60af037f12be0a1ab94ab32c743f7fca2b1d

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx 
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index d7dc1fc..96e5686 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1129,23 +1129,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr 
rFontTable )
 
xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT   
 ));
 
xState->setPropertyToDefault(rPropNameSupplier.GetName( 
PROP_CHAR_PROP_HEIGHT_ASIAN  ));
 
xState->setPropertyToDefault(rPropNameSupplier.GetName( 
PROP_CHAR_PROP_HEIGHT_COMPLEX));
-}
-else if (sConvertedStyleName == "Title" || 
sConvertedStyleName == "Subtitle")
-{
-//set the default adjust for ParaStyle Title and 
Subtitle to left
-try
-{
-uno::Reference< beans::XPropertySet > xProp( 
xStyle, uno::UNO_QUERY );
-if( xProp.is() )
-{
-uno::Any aMSDefaultVal = uno::makeAny( 
(sal_Int16)style::ParagraphAdjust_LEFT );
-xProp->setPropertyValue( 
rPropNameSupplier.GetName( PROP_PARA_ADJUST), aMSDefaultVal );
-}
-}
-catch(...)
-{
-OSL_ENSURE( false, "Default ParaAdjust style 
property could not be set");
-}
+
 }
 }
 
commit be575f31ede7aea4b09174a131cb3b7e36dfdd4d
Author: Michael Stahl 
Date:   Mon Aug 4 15:29:53 2014 +0200

sw: ApplyStyle: remove highly suspicious conditional

This contradicts the test in the next line.

Change-Id: I8c762af8789cd5e116abef7be2a438fba74d669f

diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index b9c27d8..cc03d2c 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -591,7 +591,7 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl)
 }
 
 //
-if(m_bNew && SFX_STYLE_FAMILY_FRAME == m_nFamily)
+if(m_bNew)
 {
 if(SFX_STYLE_FAMILY_FRAME == m_nFamily || SFX_STYLE_FAMILY_PARA == 
m_nFamily)
 {
commit 8c2301bf7575b7afbacca6bac10f5db97c73d3d6
Author: Michael Stahl 
Date:   Mon Aug 4 15:10:13 2014 +0200

sc: remove debugging printf

Change-Id: I1b403d8ae081347d756145e52539445e067efa91

diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index a6fc287..e366955 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -147,6 +147,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell )
 {
 OSL_ENSURE(!pLocalPool->GetSecondaryPool(), "OOps, already a 
secondary pool set where the DrawingLayer ItemPool is to be placed (!)");
 #if 0
+// FIXME apparently this is disabled because it breaks tests
 pLocalPool->SetSecondaryPool(&pDrawLayer->GetItemPool());
 #endif
 }
@@ -251,8 +252,8 @@ void ScDocument::DeleteDrawLayer()
 
 if(pLocalPool && pLocalPool->GetSecondaryPool())
 {
-fprintf(stderr, "RET is %p\n", pLocalPool->GetSecondaryPool());
 #if 0
+// FIXME apparently this is disabled because it breaks tests
 pLocalPool->SetSecondaryPool(0);
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx |   10 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   26 ---
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |1 
 writerfilter/source/ooxml/model.xml  |   34 ++-
 4 files changed, 63 insertions(+), 8 deletions(-)

New commits:
commit 65facd8c79ffb26e3a79c5139ece83dadfe65d9b
Author: Miklos Vajna 
Date:   Mon Aug 4 17:36:54 2014 +0200

writerfilter: tokenize all attributes of CT_TblLook

Change-Id: I0dcaef56804a6998f83afe73d01eb0d5b21a210a

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index e719ef1..33b6a95d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -179,6 +179,9 @@ DomainMapper::~DomainMapper()
 
 void DomainMapper::lcl_attribute(Id nName, Value & val)
 {
+if (m_pImpl->getTableManager().attribute(nName, val))
+return;
+
 static OUString sLocalBookmarkName;
 sal_Int32 nIntValue = val.getInt();
 OUString sStringValue = val.getString();
@@ -2451,6 +2454,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 m_pImpl->m_pSdtHelper->getInteropGrabBagAndClear();
 }
 break;
+case NS_ooxml::LN_CT_TblPrBase_tblLook:
+{
+writerfilter::Reference::Pointer_t pProperties = 
rSprm.getProps();
+if (pProperties.get())
+pProperties->resolve(*this);
+}
+break;
 default:
 {
 #ifdef DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index e5a5b8b..d5a36a9 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -74,6 +74,25 @@ DomainMapperTableManager::~DomainMapperTableManager()
 delete m_pTablePropsHandler, m_pTablePropsHandler = NULL;
 }
 
+bool DomainMapperTableManager::attribute(Id nName, Value& rValue)
+{
+bool bRet = true;
+
+switch (nName)
+{
+case NS_ooxml::LN_CT_TblLook_val:
+{
+TablePropertyMapPtr pPropMap(new TablePropertyMap());
+pPropMap->Insert(PROP_TBL_LOOK, uno::makeAny(rValue.getInt()));
+insertTableProps(pPropMap);
+}
+break;
+default:
+bRet = false;
+}
+
+return bRet;
+}
 
 bool DomainMapperTableManager::sprm(Sprm & rSprm)
 {
@@ -318,13 +337,6 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
 m_nGridSpan = nIntValue;
 }
 break;
-case NS_ooxml::LN_CT_TblPrBase_tblLook:
-{
-TablePropertyMapPtr pPropMap( new TablePropertyMap );
-pPropMap->Insert( PROP_TBL_LOOK, uno::makeAny( nIntValue ));
-insertTableProps(pPropMap);
-}
-break;
 case NS_ooxml::LN_CT_TcPrBase_textDirection:
 {
 TablePropertyMapPtr pPropMap( new TablePropertyMap );
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx 
b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index fea928b..24145bd 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -81,6 +81,7 @@ public:
 inline void SetStyleProperties( PropertyMapPtr pProperties ) { 
m_pStyleProps = pProperties; };
 
 virtual bool sprm(Sprm & rSprm) SAL_OVERRIDE;
+bool attribute(Id nName, Value & val);
 
 virtual void startLevel( ) SAL_OVERRIDE;
 virtual void endLevel( ) SAL_OVERRIDE;
diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index b1613d1..0555ea9 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -18377,7 +18377,7 @@
 
 
   
-
+
   
 
   
@@ -18458,6 +18458,29 @@
   
 
   
+  
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
   
   
 
@@ -23171,6 +23194,15 @@
   
 
 
+
+  
+  
+  
+  
+  
+  
+  
+
 
   pageBottom
   beneathText
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk

[David Tardon]

 RepositoryExternal.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e59420dd1ee5c3474ba3d6ef444b0ee947081624
Author: David Tardon 
Date:   Mon Aug 4 17:23:54 2014 +0200

make sure image zips are done when gengal is run

... to avoid potential uncaught exception.

Change-Id: I454b9fbb5c35fd72757dfc21687b980982453465

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f10c68f..4026bd7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3690,6 +3690,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, 
\
$(call gb_Library_get_target,vclplug_svp) \
)) \
+   $(call gb_Package_get_target_for_build,postprocess_images) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
$(call gb_Rdb_get_target_for_build,ure/services) \
$(INSTROOT)/$(LIBO_URE_SHARE_FOLDER)/misc/services.rdb \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC] Improved Color Selection, Week 11

[Maxim Monastirsky]

Hi Krisztian,

On Monday 04 August 2014 16:25:45 Krisztian Pinter wrote:
> As it was pointed out last week, I'd have to do something
> with these lines:
> http://opengrok.libreoffice.org/xref/core/svx/source/tbxctrls/tbcontrl.cxx#1
> 16
You can throw out this macro, and implement your own 
CreateImpl/RegisterControl methods. In RegisterControl you should check for 
nSlotId, and put the correct type in place of nItemClass. It should work.

You can find the macro definition at 
http://opengrok.libreoffice.org/xref/core/include/sfx2/tbxctrl.hxx#275

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

[GSOC] Personas - Weekly Report #11

[Rachit Gupta]

Hi all,

This week I converted RID_SVX_MDLG_HANGULHANJA and RID_XMLSECTP_DETAILS to
Widget Layout. This week I'll be working on merging my gsoc14-personas
branch to master and getting the code reviewed.

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

[PATCH] Bug 81516: PDF: export crash when Source Han Sans CJK

[audreyt]

Hi! Julien Nabet asked me to post here to inform the devs that a patch is
available at:

https://bugs.freedesktop.org/show_bug.cgi?id=81516#c16

It solves issues with OpenType fonts with more than 16 FDArray elements,
e.g. the Source Han Sans CJK / Noto Chinese recently released by Google and
Adobe, which is quickly gaining adoption as the preferred CJK font for
distributions and local users.

The patch has been vetted by @kenlunde, coordinator of the affected font, so
it'd be great if we can merge it for wider testing on the -dev train.

Cheers,
Audrey



--
View this message in context: 
http://nabble.documentfoundation.org/PATCH-Bug-81516-PDF-export-crash-when-Source-Han-Sans-CJK-tp4117712.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

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

[Miklos Vajna]

 oox/source/token/tokens.txt |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e9876fbe96598df54855fa812495b7654a364360
Author: Miklos Vajna 
Date:   Mon Aug 4 16:40:37 2014 +0200

oox: tokenize noHBand and noVBand

Change-Id: I43ea6cb2665e17239da61adffd0583b9201bef59

diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 1bdca90..45e90d4 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -3519,6 +3519,7 @@ noEndnote
 noExtraLineSpacing
 noFill
 noGrp
+noHBand
 noIndicator
 noLabel
 noLeading
@@ -3538,6 +3539,7 @@ noStrike
 noTabHangInd
 noTextEdit
 noUngrp
+noVBand
 noWrap
 node
 nodeHorzAlign
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Improved Color Selection, Week 11

[Krisztian Pinter]

Hi All!

Last week I made small refinemets to the UI.
- Selecting a color from the color picker popup now applies it immediately.
- Loading soc palettes is now done lazily.
- I changed a vector of pointer to a ptr_vector.

I was also investigating the possibility of killing some classes.
*SdrShadowColorItem*, *XFillColorItem*, *XFormTextShadowColorItem*,
*XLineColorItem* and *XSecondaryFillColorItem* all inherit from *XColorItem*,
but they don't really add anything, just have a different *nWhich* value. I
considered replacing the call sites of the ctors of the child classes with
ctors for the parent class, but with the different *nWhich* value as a
parameter, but that'd lose type checking, so I decided against it.

My other problem is, I don't know how I could replace
*SvxLineColorToolBoxControl* with *SvxColorToolBoxControl*. They were
almost identical but now I moved code for *XLineColorItem* from the first
to the latter. As it was pointed out last week, I'd have to do something
with these lines:
http://opengrok.libreoffice.org/xref/core/svx/source/tbxctrls/tbcontrl.cxx#116

I think I might have to replace all occurrences of XLineColorItem
with SvxColorItem?

I'd welcome some advice regarding whether these color types should be
refactored, and if yes, how.

If anyone has any insights, please share them! Thank you!

All the best,
Krisztian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

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

New commits:
commit 4ef4cf11c0c214e27fdc91ac75ccc49bfac05e71
Author: Stephan Bergmann 
Date:   Mon Aug 4 16:11:12 2014 +0200

Avoid invalid downcasts in DerivedFrom() vs. GetRegisteredIn()

...where SwFmt::DerivedFrom() is defined as

  return (SwFmt*)GetRegisteredIn();

and at least some tests like CppunitTest_sw_htmlexport ran into comparisons
(evaluating to false anyway) against DerivedFrom() for SwFmt instances whose
pRegisteredIn is merely set to a SwModify, not an SwFmt, via

  pDepend->pRegisteredIn = this;

toward the end of SwModify::Add (sw/source/core/attr/calbck.cxx).

Change-Id: I5de59c938b7f40bb9744df5189285fa5e1d5abd7

diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index ddd183e..9af7f6a 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -306,7 +306,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const 
SfxPoolItem* pNewValue )
 // skip my own Modify
 if ( pOldValue && pNewValue &&
 ((SwFmtChg*)pOldValue)->pChangedFmt != this &&
-((SwFmtChg*)pNewValue)->pChangedFmt == DerivedFrom() )
+((SwFmtChg*)pNewValue)->pChangedFmt == GetRegisteredIn() )
 {
 // attach Set to new parent
 aSet.SetParent( DerivedFrom() ? &DerivedFrom()->aSet : 0 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Downloading specific daily-build

[Michael Stahl]

On 03/08/14 17:23, Norbert Thiebaud wrote:
> On Sun, Aug 3, 2014 at 2:50 PM, Adam Fyne  wrote:
>>
>> Hi,
>>
>>   Any way to download a daily build from 29-06-2014 from
>> machine Win-x86@39 ?
>>
>>   I had a link for it, and now I get a 404 when I try to download
>> it... (I need that specific version).
>>
> 
> Daily builds get deleted after about 15 days or so...

is the upload of the Windows bibisect repo mentioned in the last ESC
minutes done by now ?


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

[Libreoffice-commits] core.git: 4 commits - dbaccess/source extensions/source include/vcl xmlsecurity/inc xmlsecurity/source

[Thomas Arnhold]

 dbaccess/source/ui/misc/WizardPages.src |1 
 extensions/source/abpilot/abpresid.hrc  |   15 
 extensions/source/dbpilots/dbpresid.hrc |6 
 include/vcl/outdev.hxx  |2 -
 xmlsecurity/inc/xmlsecurity/global.hrc  |1 
 xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx |2 -
 6 files changed, 2 insertions(+), 25 deletions(-)

New commits:
commit b8423c4f83542f27010ebbdceda45aec6585325b
Author: Thomas Arnhold 
Date:   Mon Aug 4 15:56:10 2014 +0200

remove unused resource ids

ui conversion fallout

Change-Id: I9c07728e6fccee46545171573fb95fbda8cf1fcb

diff --git a/dbaccess/source/ui/misc/WizardPages.src 
b/dbaccess/source/ui/misc/WizardPages.src
index 47ffbb9..de9634c 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -25,7 +25,6 @@
 #define WINDOW_SIZE_X   276
 #define WINDOW_SIZE_Y   185
 
-#define WINDOW_BORDER_X  12
 #define WINDOW_BORDER_Y  14
 
 #define BUTTON_SIZE_X50
diff --git a/extensions/source/abpilot/abpresid.hrc 
b/extensions/source/abpilot/abpresid.hrc
index af913fc..2b0681e 100644
--- a/extensions/source/abpilot/abpresid.hrc
+++ b/extensions/source/abpilot/abpresid.hrc
@@ -98,25 +98,10 @@
 #error "please adjust the resource id ranges!!"
 #endif
 
-// local resource ids
-#define FL_SEPARATOR1
-
-#define FT_NAME_EXPL 4
-
 // some defines
 #define WINDOW_SIZE_X   240
 #define WINDOW_SIZE_Y   185
 
-#define WINDOW_BORDER_X  12
-#define WINDOW_BORDER_Y  14
-
-#define BUTTON_SIZE_X50
-#define BUTTON_SIZE_Y14
-
-#define HEADER_SIZE_Y   30
-
-#define BORDER_X12
-
 #endif // EXTENSIONS_ABPRESID_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/dbpresid.hrc 
b/extensions/source/dbpilots/dbpresid.hrc
index 6c76237..503059a 100644
--- a/extensions/source/dbpilots/dbpresid.hrc
+++ b/extensions/source/dbpilots/dbpresid.hrc
@@ -112,12 +112,6 @@
 #define WINDOW_SIZE_Y   185
 #define WINDOW_HALF_SIZE_X  ( WINDOW_SIZE_X / 2 )
 
-#define BUTTON_SIZE_X   50
-#define BUTTON_SIZE_Y   14
-
-#define ITEM_BUTTON_SIZE_X  20
-#define ITEM_BUTTON_SIZE_Y  12
-
 #endif // _EXTENSIONS_DBP_DBPRESID_HRC_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5717de74f5bdeb975d9acc9ab7a4dc8968f0ca47
Author: Thomas Arnhold 
Date:   Mon Aug 4 15:55:42 2014 +0200

create OUString from literal

Change-Id: I8198fbad20daa7262e42a452c8d81fcfa3331680

diff --git a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx 
b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
index baac544..abdecc3 100644
--- a/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
+++ b/xmlsecurity/source/xmlsec/xmldocumentwrapper_xmlsecimpl.cxx
@@ -253,7 +253,7 @@ void XMLDocumentWrapper_XmlSecImpl::sendStartElement(
 else
 {
 ouAttrName = OUString(C2U( (sal_Char*)pAttrNs->prefix))
-+OUString(C2U( (sal_Char*)":" ))
++OUString(":")
 +OUString(C2U( (sal_Char*)pAttrName ));
 }
 
commit ec960ba032f613a22d482683a3c44074e4676613
Author: Thomas Arnhold 
Date:   Mon Aug 4 15:54:25 2014 +0200

remove unused resource id

leftover from e2b0e7571a8b082a2cb532e34b9770060128452b

Change-Id: I1e2e634e6cdfbc81f5d068136c9099de170dc1ef

diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc 
b/xmlsecurity/inc/xmlsecurity/global.hrc
index 12fd776..e56e8bb 100644
--- a/xmlsecurity/inc/xmlsecurity/global.hrc
+++ b/xmlsecurity/inc/xmlsecurity/global.hrc
@@ -23,7 +23,6 @@
 // global resource ids
 
 #define RID_XMLSECTP_GENERAL1003
-#define RID_XMLSECTP_DETAILS1004
 
 #define RID_XMLSECWB_NO_MOZILLA_PROFILE 1013
 
commit 4eb84ab8d677ec3f08792896f018932535ca47ce
Author: Thomas Arnhold 
Date:   Mon Aug 4 15:54:07 2014 +0200

typo

Change-Id: I74c2943c5967bb19a3d7b669313894134348adba

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 9b9c1e3..738e684 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -661,7 +661,7 @@ public:
 ///@}
 
 
-/** @name Rectangle functionsf
+/** @name Rectangle functions
  */
 ///@{
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - filter/source

[Maxim Monastirsky]

 filter/source/config/fragments/types/calc_MS_Works_Document.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5dcfa10a547eb60b826128a72b8eccc198e074a6
Author: Maxim Monastirsky 
Date:   Sun Aug 3 15:51:51 2014 +0300

Fix calc_MS_Works_Document extensions

Change-Id: Icbf087464997561b09c7b43c2269eea2c8c603bb
(cherry picked from commit e5ac048af125e82829d353ec031c99e96572e2c0)
Reviewed-on: https://gerrit.libreoffice.org/10728
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/filter/source/config/fragments/types/calc_MS_Works_Document.xcu 
b/filter/source/config/fragments/types/calc_MS_Works_Document.xcu
index 8785a32..f45dfe1 100644
--- a/filter/source/config/fragments/types/calc_MS_Works_Document.xcu
+++ b/filter/source/config/fragments/types/calc_MS_Works_Document.xcu
@@ -18,7 +18,7 @@
 
 com.sun.star.comp.Calc.MSWorksCalcImportFilter
 
-wks/wdb
+wks wdb
 
 true
 MS_Works_Calc
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[David Tardon]

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

New commits:
commit 0f4da47e4e496715c6afd47f324af2580098ec94
Author: David Tardon 
Date:   Mon Aug 4 15:51:26 2014 +0200

Updated core
Project: help  5e296a1bc01539ce917f4770f14c2a64d4005e2b

diff --git a/helpcontent2 b/helpcontent2
index af68ef0..5e296a1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit af68ef036484e6178c2d111b24a8242f1425e509
+Subproject commit 5e296a1bc01539ce917f4770f14c2a64d4005e2b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 source/text/scalc/01/statistics.xhp |   20 ++--
 source/text/shared/02/01170101.xhp  |2 +-
 source/text/shared/02/01170903.xhp  |6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 5e296a1bc01539ce917f4770f14c2a64d4005e2b
Author: David Tardon 
Date:   Mon Aug 4 15:51:26 2014 +0200

fix help ids

Change-Id: If858ffd43922fde28dd4075ec8a169abf5012dc7

diff --git a/source/text/scalc/01/statistics.xhp 
b/source/text/scalc/01/statistics.xhp
index f1c3bb7..bb46695 100644
--- a/source/text/scalc/01/statistics.xhp
+++ b/source/text/scalc/01/statistics.xhp
@@ -37,7 +37,7 @@
 
 Sampling
 
-  (to-do)
+  (to-do)
 
   
 Menu Data - Statistics - 
Sampling...
@@ -63,7 +63,7 @@
 
 Descriptive Statistics
 
-  (to-do)
+  (to-do)
 
   
 Menu Data - Statistics - Descriptive 
Statistics...
@@ -89,7 +89,7 @@
 
 Analysis of Variance (ANOVA)
 
-  (to-do)
+  (to-do)
 
   
 Menu Data - Statistics - Analysis of Variance 
(ANOVA)...
@@ -115,7 +115,7 @@
 
 Correlation
 
-  Calculates the 
correlation of two sets of numeric data.
+  Calculates 
the correlation of two sets of numeric data.
 
   
 Menu Data - Statistics - 
Correlation...
@@ -146,7 +146,7 @@
 
 Covariance
 
-  Calculates 
the covariance of two sets of numeric data.
+  Calculates 
the covariance of two sets of numeric data.
 
   
 Menu Data - Statistics - 
Covariance...
@@ -178,7 +178,7 @@
 
 Exponential Smoothing
 
-  (to-do)
+  (to-do)
 
   
 Menu Data - Statistics - Exponential 
Smoothing...
@@ -204,7 +204,7 @@
 
 Moving Average
 
-  (to-do)
+  (to-do)
 
   
 Menu Data - Statistics - Moving 
Average...
@@ -233,7 +233,7 @@
 
 t-test and F-test
 
-  (to-do)
+  (to-do)
 
   
 Menu Data - Statistics - 
t-test...
@@ -243,9 +243,9 @@
 
   (To do)
 
-
+
 Input Range
-Select 
the input data range.
+Select the input data 
range.
 
 Results to
 Selects 
the upper left cell where the samples will be displayed.
diff --git a/source/text/shared/02/01170101.xhp 
b/source/text/shared/02/01170101.xhp
index ffad7b3..2e86736 100644
--- a/source/text/shared/02/01170101.xhp
+++ b/source/text/shared/02/01170101.xhp
@@ -214,7 +214,7 @@
  To define one character of the label as a mnemonic, so 
that the user can access this control by pressing the character on the 
keyboard, insert a tilde (~) character in front of the character in the 
label.
  Only the text of a group frame can be used as the label 
field when using radio buttons. This text applies to all of the radio buttons 
of the same group.
  If you click on the ... button next to the 
text field, you will see the Label Field Selection dialog. Select 
a label from the list.
-Check the 
No assignment box to remove the link between a control and the 
assigned label field.
+Check the 
No assignment box to remove the link between a control and the 
assigned label field.
   
   
 
diff --git a/source/text/shared/02/01170903.xhp 
b/source/text/shared/02/01170903.xhp
index c241476..7eb914e 100644
--- a/source/text/shared/02/01170903.xhp
+++ b/source/text/shared/02/01170903.xhp
@@ -30,7 +30,7 @@
 
 
 
-
+
 List Box Wizard: Field Link
 Indicates through which fields tables of values and list tables are 
linked.
 
@@ -39,10 +39,10 @@
   
 
 Value table field
-Specifies the 
current form data field which should be related to a field in the linked 
table. In addition, click the desired data field in the list field 
below.
+Specifies 
the current form data field which should be related to a field in the linked 
table. In addition, click the desired data field in the list field 
below.
 In Control - Properties, the specified field will appear as an 
entry in the Data tab page under Data 
field.
 List table field
-Specifies the 
linked table data field, which is related to the specified value table 
field. In addition, click the data field in the lower list 
field.
+Specifies 
the linked table data field, which is related to the specified value table 
field. In addition, click the data field in the lower list 
field.
 In Control - Properties, the specified field will appear in the 
Data tab page of a SQL statement under List 
Contents.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/test-hid-vs-ui.py

[David Tardon]

 bin/test-hid-vs-ui.py |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 5f805a1b045a50911759baafed2d1d96c911981e
Author: David Tardon 
Date:   Mon Aug 4 15:50:19 2014 +0200

update module mappings

Change-Id: Ia0893eda90307e5dbb7265b3c321515a8b823a24

diff --git a/bin/test-hid-vs-ui.py b/bin/test-hid-vs-ui.py
index 72fa503..a5ee411 100755
--- a/bin/test-hid-vs-ui.py
+++ b/bin/test-hid-vs-ui.py
@@ -100,6 +100,12 @@ if __name__ == "__main__":
 uifile = "sd/simpress" + uifile[16:]
 elif uifile.startswith("modules/BasicIDE"):
 uifile = "basctl/basicide" + uifile[16:]
+elif uifile.startswith("modules/sabpilot"):
+uifile = "extensions/sabpilot" + uifile[16:]
+elif uifile.startswith("modules/sbibliography"):
+uifile = "extensions/sbibliography" + uifile[21:]
+elif uifile.startswith("modules/scanner"):
+uifile = "extensions/scanner" + uifile[15:]
 elif uifile.startswith("modules/spropctrlr"):
 uifile = "extensions/spropctrlr" + uifile[18:]
 elif uifile.startswith("sfx"):
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - jurt/com qadevOOo/runner

[Noel Grandin]

 jurt/com/sun/star/lib/util/UrlToFileMapper.java |  111 +---
 qadevOOo/runner/helper/PropertyHelper.java  |   25 -
 2 files changed, 26 insertions(+), 110 deletions(-)

New commits:
commit 586eea345e8a6b390fe7c71470c5e9fe86be3ec8
Author: Noel Grandin 
Date:   Mon Aug 4 15:31:41 2014 +0200

java: remove pre Java 1.5 workaround in UrlToFileMapper

Since we now require Java 1.5
Note that I tried to remove more code and use URL#toURI as the comment
suggests, but that results in errors during make check.

Change-Id: If283ee60f272b18920dcf8fc1be8766c0bed6ea5

diff --git a/jurt/com/sun/star/lib/util/UrlToFileMapper.java 
b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
index 8354b85..3380992 100644
--- a/jurt/com/sun/star/lib/util/UrlToFileMapper.java
+++ b/jurt/com/sun/star/lib/util/UrlToFileMapper.java
@@ -18,39 +18,22 @@
 package com.sun.star.lib.util;
 
 import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
-import java.net.URLDecoder;
 import java.net.URLEncoder;
 
 /**
  * Maps Java URL representations to File representations, on any Java version.
  *
+ * This used to be used to do URL to File mapping in pre-Java1.4 days, but 
since
+ * we now require Java 1.5, it is largely unnecessary.
+ *
  * @since UDK 3.2.8
  */
 public final class UrlToFileMapper {
 
-// java.net.URLEncoder.encode(String, String) and java.net.URI are only
-// available since Java 1.4:
-private static Method urlEncoderEncode;
-private static Constructor uriConstructor;
-private static Constructor fileConstructor;
-static {
-try {
-urlEncoderEncode = URLEncoder.class.getMethod(
-"encode", new Class[] { String.class, String.class });
-Class uriClass = Class.forName("java.net.URI");
-uriConstructor = uriClass.getConstructor(
-new Class[] { String.class });
-fileConstructor = File.class.getConstructor(
-new Class[] { uriClass });
-} catch (ClassNotFoundException e) {
-} catch (NoSuchMethodException e) {
-}
-}
-
 /**
  * Maps Java URL representations to File representations.
  *
@@ -60,64 +43,27 @@ public final class UrlToFileMapper {
 public static File mapUrlToFile(URL url) {
 if (url == null) {
 return null;
-} else if (fileConstructor == null) {
-// If java.net.URI is not available, hope that the following works
-// well:  First, check that the given URL has a certain form.
-// Second, use the URLDecoder to decode the URL path (taking care
-// not to change any plus signs to spaces), hoping that the used
-// default encoding is the proper one for file URLs.  Third, create
-// a File from the decoded path.
-return url.getProtocol().equalsIgnoreCase("file")
-&& url.getAuthority() == null && url.getQuery() == null
-&& url.getRef() == null
-? new File(URLDecoder.decode(
-   StringHelper.replace(url.getPath(), '+', 
"%2B")))
-: null;
 } else {
-// If java.net.URI is available, do
-//   URI uri = new URI(encodedUrl);
-//   try {
-//   return new File(uri);
-//   } catch (IllegalArgumentException e) {
-//   return null;
-//   }
-// where encodedUrl is url.toString(), but since that may contain
-// unsafe characters (e.g., space, " "), it is encoded, as 
otherwise
-// the URI constructor might throw java.net.URISyntaxException (in
-// Java 1.5, URL.toURI might be used instead).
-String encodedUrl = encode(url.toString());
 try {
-Object uri = uriConstructor.newInstance(
-new Object[] { encodedUrl });
+// where encodedUrl is url.toString(), but since that may 
contain
+// unsafe characters (e.g., space, " "), it is encoded, as 
otherwise
+// the URI constructor might throw java.net.URISyntaxException 
(in
+// Java 1.5, URL.toURI might be used instead).
+String encodedUrl = encode(url.toString());
+URI uri = new URI(encodedUrl);
 try {
-return fileConstructor.newInstance(
-new Object[] { uri });
-} catch (InvocationTargetException e) {
-if (e.getTargetException() instanceof
-IllegalArgumentException) {
-return null;
-} else {
-

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

[David Tardon]

 helpers/help_hid.lst  |   32 --
 source/text/shared/01/0620.xhp|   22 +++---
 source/text/shared/explorer/database/11150200.xhp |   20 +++---
 source/text/shared/explorer/database/dabawiz02ado.xhp |4 -
 source/text/shared/explorer/database/dabawiz02ldap.xhp|8 +-
 source/text/shared/explorer/database/dabawiz02mysql.xhp   |4 -
 source/text/shared/explorer/database/dabawiz02spreadsheet.xhp |2 
 source/text/shared/optionen/viewcertificate_d.xhp |6 -
 8 files changed, 33 insertions(+), 65 deletions(-)

New commits:
commit af68ef036484e6178c2d111b24a8242f1425e509
Author: David Tardon 
Date:   Mon Aug 4 15:17:52 2014 +0200

update help ids for CertDetails

Change-Id: If40379c7bb59c2d6879c608fa25642fd1a2a0998

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index cbbfb1d..7912ce4 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3109,7 +3109,6 @@ HID_XMLSEC_CALL,40016,
 HID_XMLSEC_CTRL_ELEMENTS,43079,
 HID_XMLSEC_DLG_CERTCHOOSER,43077,
 HID_XMLSEC_DLG_DIGSIG,43075,
-HID_XMLSEC_TP_DETAILS,43073,
 HID_XMLSEC_TP_GENERAL,43072,
 HID_XML_FILTER_DOCTYPE,64068,
 HID_XML_FILTER_DTD,64069,
@@ -5780,7 +5779,6 @@ 
uui_PushButton_RID_DLG_NEWER_VERSION_WARNING_PB_UPDATE,1312182797,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_IGNORE,1311359509,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_INTERACTIVE,1311359510,
 uui_RadioButton_DLG_COOKIES_RB_INFUTURE_SEND,1311359508,
-xmlsecurity_MultiLineEdit_RID_XMLSECTP_DETAILS_ML_ELEMENT,553323010,
 xmlsecurity_PushButton_RID_XMLSECDLG_CERTCHOOSER_BTN_VIEWCERT,1090146871,
 xmlsecurity_PushButton_RID_XMLSECDLG_DIGSIG_BTN_ADDCERT,1090130434,
 xmlsecurity_PushButton_RID_XMLSECDLG_DIGSIG_BTN_REMOVECERT,1090130435,
diff --git a/source/text/shared/optionen/viewcertificate_d.xhp 
b/source/text/shared/optionen/viewcertificate_d.xhp
index 1ac5c8e..7d4adb9 100644
--- a/source/text/shared/optionen/viewcertificate_d.xhp
+++ b/source/text/shared/optionen/viewcertificate_d.xhp
@@ -31,12 +31,12 @@
 
 
 
-
-
+
+
 Details
 
 The Details page of the View Certificate dialog 
displays detailed information about the certificate.
-
+
 Use the value list box to view values and copy them 
to the clipboard.
 
 
commit 3127ee5a71ab631f88c398ef4614d15ae4b0b69f
Author: David Tardon 
Date:   Mon Aug 4 15:13:47 2014 +0200

update help ids for UserAdminPage

Change-Id: I02cfa18869c9d937f6d5c218ac72d6f8a4284907

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index cc71cc1..cbbfb1d 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3053,12 +3053,6 @@ HID_TAB_ENT_TEXT_LEN,38900,
 HID_TAB_ENT_TYPE,38901,
 HID_TAB_NAMEMATCHING_COLS_ASSIGN,38917,
 HID_TAB_NAMEMATCHING_COLS_AVAIL,38916,
-HID_TAB_PAGE_LBUSER,38953,
-HID_TAB_PAGE_PBCHGPWD,38950,
-HID_TAB_PAGE_PBUSER,38949,
-HID_TAB_PAGE_PBUSERDELETE,38951,
-HID_TAB_PAGE_TBLGRANTS,38952,
-HID_TAB_PAGE_USERADMIN,38948,
 HID_TAB_WIZ_TYPE_SELECT,38915,
 HID_TBXCONTROL_FILENEW,33360,
 HID_TEMPLATEDLG_DIALOG,32989,
diff --git a/source/text/shared/explorer/database/11150200.xhp 
b/source/text/shared/explorer/database/11150200.xhp
index ef69865..c026784 100644
--- a/source/text/shared/explorer/database/11150200.xhp
+++ b/source/text/shared/explorer/database/11150200.xhp
@@ -34,16 +34,16 @@
 Manages user data for accessing Adabas or ADO 
databases.
 
 User selection
-User
-Select the user whose settings you 
want to modify.
-Add user
-Adds a new user for accessing the 
selected database.
-Change password
-Changes the current user 
password for accessing the database.
-Delete user
-Removes the selected 
user.
-Access rights for selected 
user.
-Displays and lets you edit the 
database access rights for the selected user.
+User
+Select the user whose 
settings you want to modify.
+Add user
+Adds a new user for 
accessing the selected database.
+Change password
+Changes the 
current user password for accessing the database.
+Delete user
+Removes the selected 
user.
+Access rights for selected 
user.
+Displays and lets you 
edit the database access rights for the selected user.
 
 Adabas D database format
 
commit 08be8e6a59a1d06297871805d4a4d430d50b2ee7
Author: David Tardon 
Date:   Mon Aug 4 15:01:16 2014 +0200

drop unused help id

Change-Id: I6aae4cba1a276c632d0f1448435c031b5b8988a3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index c4be392..cc71cc1 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1320,7 +1320,6 @@ HID_DSADMIN_SHOWDELETED,38812,
 HID_DSADMIN_TEXT_HEADER,38817,
 HID_DSADMIN_TEXT_SEPARATOR,38819,
 HID_DSADMIN_THOUSANDS_SEPARATOR,38821,
-HID_DSADMIN_TYPE_DIALOG,39051,
 HID_DSADMIN_URL_GENERAL,38808,
 HID_DSADMIN_USECATALOG,38929,
 HID_DSADMIN_USESSL_LDAP,39007,
commit af90cf6a05dbc162398f14f027f3dc8f541018a9
Author: David Tardon 
Date:   Mon Aug 4 14:59:50 2014 +0200

update help ids for LDAPConnectionPage

Change-

[Libreoffice-commits] core.git: helpcontent2

[David Tardon]

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

New commits:
commit 9135a9fc4d8a02641e7ae57ed0037763c22b09f1
Author: David Tardon 
Date:   Mon Aug 4 15:17:52 2014 +0200

Updated core
Project: help  af68ef036484e6178c2d111b24a8242f1425e509

diff --git a/helpcontent2 b/helpcontent2
index 1354980..af68ef0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 135498091966f63d582929446a084b41d3ffd4da
+Subproject commit af68ef036484e6178c2d111b24a8242f1425e509
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libmwaw external/libodfgen external/librevenge external/libwps

[David Tardon]

 external/libmwaw/ExternalProject_libmwaw.mk   |4 
 external/libodfgen/ExternalProject_libodfgen.mk   |4 
 external/librevenge/ExternalProject_librevenge.mk |4 
 external/libwps/ExternalProject_libwps.mk |4 
 4 files changed, 16 insertions(+)

New commits:
commit 0c4a1ecc7c46f67325bfb888a8db503abb4255b8
Author: David Tardon 
Date:   Mon Aug 4 09:27:24 2014 +0200

fdo#82035 fix loader paths

Change-Id: Ibecd7a89491b487bec54e8a86edbb1b133cdb8f0
(cherry picked from commit 6cf40d263e33dd6934005af8319ae6fc8a386592)
Reviewed-on: https://gerrit.libreoffice.org/10726
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/external/libmwaw/ExternalProject_libmwaw.mk 
b/external/libmwaw/ExternalProject_libmwaw.mk
index 1b51225..5a19d85 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -41,6 +41,10 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(MAKE)) \
+   $(if $(filter MACOSX,$(OS)),\
+   && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/lib/.libs/libmwaw-0.3.3.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
index f4e0072..54ff48b 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -36,6 +36,10 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& $(MAKE) \
+   $(if $(filter MACOSX,$(OS)),\
+   && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/.libs/libodfgen-0.1.1.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/librevenge/ExternalProject_librevenge.mk 
b/external/librevenge/ExternalProject_librevenge.mk
index 1783993..707b16e 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -39,6 +39,10 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) 
:
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& $(MAKE) \
+   $(if $(filter MACOSX,$(OS)),\
+   && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/lib/.libs/librevenge-0.0.0.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/ExternalProject_libwps.mk 
b/external/libwps/ExternalProject_libwps.mk
index 004c912..708b667 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -39,6 +39,10 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& $(MAKE) \
+   $(if $(filter MACOSX,$(OS)),\
+   && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.3.3.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/Library_localedata_others.mk i18npool/source

[Eike Rathke]

 i18npool/Library_localedata_others.mk  |1 
 i18npool/source/localedata/data/pap_BQ.xml |   42 +
 i18npool/source/localedata/localedata.cxx  |1 
 3 files changed, 44 insertions(+)

New commits:
commit 252cd689aca204e3437ac3fc7bd320330635f89d
Author: Eike Rathke 
Date:   Mon Aug 4 14:54:28 2014 +0200

add Papiamento (Bonaire) [pap-BQ] locale data, fdo#44112

Derived from [pap-CW] with USD.

Change-Id: I7a64deeae39a22dbbb9d96d45fd15b0aab3c2c1f

diff --git a/i18npool/Library_localedata_others.mk 
b/i18npool/Library_localedata_others.mk
index 59fe317..ea706b8 100644
--- a/i18npool/Library_localedata_others.mk
+++ b/i18npool/Library_localedata_others.mk
@@ -92,6 +92,7 @@ $(eval $(call 
gb_Library_add_generated_exception_objects,localedata_others,\
CustomTarget/i18npool/localedata/localedata_om_ET \
CustomTarget/i18npool/localedata/localedata_or_IN \
CustomTarget/i18npool/localedata/localedata_pa_IN \
+   CustomTarget/i18npool/localedata/localedata_pap_BQ \
CustomTarget/i18npool/localedata/localedata_pap_CW \
CustomTarget/i18npool/localedata/localedata_plt_MG \
CustomTarget/i18npool/localedata/localedata_pjt_AU \
diff --git a/i18npool/source/localedata/data/pap_BQ.xml 
b/i18npool/source/localedata/data/pap_BQ.xml
new file mode 100644
index 000..48620f5
--- /dev/null
+++ b/i18npool/source/localedata/data/pap_BQ.xml
@@ -0,0 +1,42 @@
+
+
+
+
+  
+
+  pap
+  Papiamento
+
+
+  BQ
+  Bonaire
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  USD
+  $
+  USD
+  US Dollar
+  2
+
+  
+  
+  
+  
+  
+
+
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index bcd087f..5554d3e 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -263,6 +263,7 @@ static const struct {
 { "kab_DZ", lcl_DATA_OTHERS },
 { "pt_AO",  lcl_DATA_OTHERS },
 { "pjt_AU", lcl_DATA_OTHERS },
+{ "pap_BQ", lcl_DATA_OTHERS },
 { "pap_CW", lcl_DATA_OTHERS },
 { "ebo_CG", lcl_DATA_OTHERS },
 { "tyx_CG", lcl_DATA_OTHERS },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/fdo80742.rtf   |6 ++
 sw/qa/extras/rtfimport/rtfimport.cxx   |7 +++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +++
 3 files changed, 16 insertions(+)

New commits:
commit 6ce5eaf63f2bcc3f61abd20bbf84751c3ba4741e
Author: Miklos Vajna 
Date:   Sat Aug 2 21:44:02 2014 +0200

fdo#80742 RTF filter: import RTF_OUTLINELEVEL

(cherry picked from commit c3657be928732f1b3b3b238f625de304a90a1ae1)

Change-Id: I49d94bd72af610e88128cd405e4786d2e9ba65ed
Reviewed-on: https://gerrit.libreoffice.org/10727
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/rtfimport/data/fdo80742.rtf 
b/sw/qa/extras/rtfimport/data/fdo80742.rtf
new file mode 100644
index 000..6055d13
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo80742.rtf
@@ -0,0 +1,6 @@
+{\rtf1
+{\stylesheet
+{\s13\outlinelevel1 Heading 2;}
+}
+\pard\s13\plain hello\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 5ed5d36..21458df 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1813,6 +1813,13 @@ DECLARE_RTFIMPORT_TEST(testOleInline, "ole-inline.rtf")
 CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AS_CHARACTER, 
getProperty(getShape(1), "AnchorType"));
 }
 
+DECLARE_RTFIMPORT_TEST(testFdo80742, "fdo80742.rtf")
+{
+uno::Reference 
xPropertySet(getStyles("ParagraphStyles")->getByName("Heading 2"), 
uno::UNO_QUERY);
+// This was 0, outline level was body text.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty(xPropertySet, 
"OutlineLevel"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 5823b70..1917276 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4550,6 +4550,9 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, 
int nParam)
 case RTF_RIN:
 lcl_putNestedAttribute(m_aStates.top().aParagraphSprms, 
NS_ooxml::LN_CT_PPrBase_ind, NS_ooxml::LN_CT_Ind_end, pIntValue);
 break;
+case RTF_OUTLINELEVEL:
+
m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_CT_PPrBase_outlineLvl, 
pIntValue);
+break;
 default:
 {
 SAL_INFO("writerfilter", "TODO handle value '" << 
lcl_RtfToString(nKeyword) << "'");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - bean/com jurt/com nlpsolver/ThirdParty odk/examples qadevOOo/runner ridljar/com

[Noel Grandin]

 bean/com/sun/star/beans/LocalOfficeConnection.java 
|   22 --
 bean/com/sun/star/comp/beans/LocalOfficeConnection.java
|   22 --
 jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java  
|   19 -
 
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java
 |3 
 odk/examples/DevelopersGuide/Charts/JavaSampleChartAddIn.java  
|   26 ---
 odk/examples/DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java 
|   11 ---
 
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java
 |   21 --
 odk/examples/DevelopersGuide/Components/JavaComponent/TestServiceProvider.java 
|   14 
 odk/examples/DevelopersGuide/Components/SimpleLicense/LicenseTest.java 
|   17 -
 
odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java
   |   11 ---
 odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java   
|   18 -
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
   |   25 ---
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java
   |   11 ---
 odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java
|   26 ---
 odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java  
|   26 ---
 odk/examples/DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java 
|   26 ---
 odk/examples/DevelopersGuide/Spreadsheet/ExampleAddIn.java 
|   14 
 odk/examples/DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java   
|   12 ---
 odk/examples/java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java   
|   10 --
 odk/examples/java/MinimalComponent/MinimalComponent.java   
|   18 -
 odk/examples/java/PropertySet/PropTest.java
|   10 --
 odk/examples/java/Spreadsheet/CalcAddins.java  
|   18 -
 odk/examples/java/ToDo/ToDo.java   
|   17 -
 qadevOOo/runner/convwatch/FilenameHelper.java  
|8 +-
 qadevOOo/runner/convwatch/PRNCompare.java  
|2 
 qadevOOo/runner/graphical/JPEGComparator.java  
|2 
 qadevOOo/runner/graphical/JPEGCreator.java 
|4 -
 qadevOOo/runner/helper/ClParser.java   
|2 
 qadevOOo/runner/helper/OfficeProvider.java 
|2 
 qadevOOo/runner/util/UITools.java  
|6 -
 qadevOOo/runner/util/utils.java
|   34 --
 ridljar/com/sun/star/uno/UnoRuntime.java   
|7 +-
 32 files changed, 25 insertions(+), 439 deletions(-)

New commits:
commit 884e1460b9bbed06717cc0404db6652f82001cc7
Author: Noel Grandin 
Date:   Mon Aug 4 14:02:40 2014 +0200

java: implement optimisation in UnoRuntime#setCurrentContext

which is now available since we started requiring Java 1.5

Change-Id: I9847b89af7f487be7812a5717716900e9a517381

diff --git a/ridljar/com/sun/star/uno/UnoRuntime.java 
b/ridljar/com/sun/star/uno/UnoRuntime.java
index 8178b51..28e79cb 100644
--- a/ridljar/com/sun/star/uno/UnoRuntime.java
+++ b/ridljar/com/sun/star/uno/UnoRuntime.java
@@ -382,8 +382,11 @@ public class UnoRuntime {
  * previously set context will be removed
 */
 public static void setCurrentContext(XCurrentContext context) {
-// optimize this by using Java 1.5 ThreadLocal.remove if context == 
null
-currentContext.set(context);
+if (context == null) {
+currentContext.remove();
+} else {
+currentContext.set(context);
+}
 }
 
 /**
commit 0781dad870cb48b8604e84df1750422c91d70f1a
Author: Noel Grandin 
Date:   Mon Aug 4 13:51:59 2014 +0200

java: remove commented out code for OpenOffice 3.3

Specifically the comment says:
 This method not longer necessary since OOo 3.4 where the component 
registration
 was changed to passive component registrat

Re: [Libreoffice-commits] core.git: 7 commits - chart2/source extensions/source hwpfilter/source l10ntools/source sal/osl unoidl/source

[Stephan Bergmann]

On 08/01/2014 10:48 PM, Norbert Thiebaud wrote:

On Thu, Jul 31, 2014 at 12:32 PM, Bjoern Michaelsen
 wrote:

Hi all,

On Thu, Jul 31, 2014 at 11:59:42AM +0200, Stephan Bergmann wrote:

Please refrain from such cosmetic changes in the future.  IIRC, the
unoidl module (being mostly written by a single person, me)
more-or-less consistently used a single formatting style until now.
I see no good reason to change that to another formatting style.


Before this explodes into a bikeshed, I tentatively agree with Stephan here,
despite me writing:

  https://wiki.openoffice.org/wiki/Writer/Code_Conventions

back in the days. Note that document wasnt build on what I assumed to be the
"right style"(*), but the most commonly used style in an attempt to bring more
consistency to the code base.

I dont think drive-by reformatting to be a good way to solve this though


Well damned if you do, damned it you don't.


Why are you damned if you don't?


If I do that _with_ other modifications, people complain... if I do
that stand-alone separated from other modifications people complain
So should I do the reformatting to be able to read the code and make
sure the other modification(s) make sens.. and then undo the
formatting ?


I don't understand your problem.  Do you mean, you're unable to read 
code formatted as



bool operator ==(ConstantValue const & lhs, ConstantValue const & rhs) {
if (lhs.type == rhs.type) {
switch (lhs.type) {


rather than as


bool operator ==(ConstantValue const & lhs, ConstantValue const & rhs)
{
if (lhs.type == rhs.type)
{
switch (lhs.type)
{


?


Or should I just ignore anything that has to do with that dialect ?
The issue is not 'written by one person', but read by many.


The parenthetical "being mostly written by a single person" was meant to 
clarify that it therefore uses consistent formatting throughout already. 
 It was not meant to imply that the code is readable only by one. 
(And, just to clarify, the somewhat redundant addition of ", me" was not 
meant to say "and now I'm angry" but rather "and that's why I noted this 
change in the first place.")


To make my point clear:  The costs of reformatting existing code IMO 
generally outweigh its benefits.  Even when done as a dedicated commit. 
 And especially so if a single file out of a coherent set of 
consistently formatted files is reformatted differently.


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

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

[Markus Mohrhard]

 chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx |   
20 +-
 sd/source/ui/func/futempl.cxx|   
14 ++--
 svx/source/sdr/properties/attributeproperties.cxx|   
30 --
 svx/source/svdraw/svdmodel.cxx   |   
27 -
 svx/source/xoutdev/xattr.cxx |   
16 ++---
 svx/source/xoutdev/xattrbmp.cxx  |
2 
 sw/source/core/doc/docfly.cxx|
4 -
 7 files changed, 61 insertions(+), 52 deletions(-)

New commits:
commit 02f0102b8bd7793ddd2fe7a54c46d41b9a608cec
Author: Markus Mohrhard 
Date:   Fri Aug 1 14:50:54 2014 +0200

prevent memory leak

Found by Lsan.

Returning this or a heap allocated object asks for trouble. Let the
caller handle it and return null instead of this.

Change-Id: I7586e103bef5a8c2727adfe214b052d6962d4467
Reviewed-on: https://gerrit.libreoffice.org/10716
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git 
a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx 
b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index b0d6da8..565aafd 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -324,7 +324,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
 // that the correct entry is chosen in the list of UI-names
 XLineDashItem* pItemToPut = aItem.checkForUniqueItem( & 
m_rDrawModel );
 
-rOutItemSet.Put( *pItemToPut );
+if(pItemToPut)
+rOutItemSet.Put( *pItemToPut );
+else
+rOutItemSet.Put(aItem);
 }
 break;
 
@@ -347,7 +350,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
 // that the correct entry is chosen in the list of UI-names
 XFillGradientItem* pItemToPut = aItem.checkForUniqueItem( & 
m_rDrawModel );
 
-rOutItemSet.Put( *pItemToPut );
+if(pItemToPut)
+rOutItemSet.Put( *pItemToPut );
+else
+rOutItemSet.Put(aItem);
 }
 break;
 
@@ -370,7 +376,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
 // that the correct entry is chosen in the list of UI-names
 XFillHatchItem* pItemToPut = aItem.checkForUniqueItem( & 
m_rDrawModel );
 
-rOutItemSet.Put( *pItemToPut );
+if(pItemToPut)
+rOutItemSet.Put( *pItemToPut );
+else
+rOutItemSet.Put(aItem);
 }
 break;
 
@@ -388,7 +397,10 @@ void GraphicPropertyItemConverter::FillSpecialItem(
 // that the correct entry is chosen in the list of UI-names
 XFillBitmapItem* pItemToPut = aItem.checkForUniqueItem( & 
m_rDrawModel );
 
-rOutItemSet.Put( *pItemToPut );
+if(pItemToPut)
+rOutItemSet.Put( *pItemToPut );
+else
+rOutItemSet.Put(aItem);
 }
 break;
 
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index 303e0b3..e352bd2 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -441,7 +441,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
 {
 const SfxPoolItem* pOldItem = rAttr.GetItem( 
XATTR_FILLBITMAP );
 SfxPoolItem* pNewItem = 
((XFillBitmapItem*)pOldItem)->checkForUniqueItem( mpDoc );
-if( pOldItem != pNewItem )
+if( pNewItem )
 {
 rAttr.Put( *pNewItem );
 delete pNewItem;
@@ -451,7 +451,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
 {
 const SfxPoolItem* pOldItem = rAttr.GetItem( 
XATTR_LINEDASH );
 SfxPoolItem* pNewItem = 
((XLineDashItem*)pOldItem)->checkForUniqueItem( mpDoc );
-if( pOldItem != pNewItem )
+if( pNewItem )
 {
 rAttr.Put( *pNewItem );
 delete pNewItem;
@@ -461,7 +461,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
 {
 const SfxPoolItem* pOldItem = rAttr.GetItem( 
XATTR_LINESTART );
 SfxPoolItem* pNewItem = 
((XLineStartItem*)pOldItem)->checkForUniqueItem( mpDoc );
-if(

Re: Tinderbox 'Linux-rpm_deb-x86_64@46-TDF' seems stuck

[Marina Latini]

Hi all,
we have no more rpm/deb packages from the Tinderbox number 46.
Where can I find a daily build of the master branch for a GNU/linux x86_64 OS 
with .debs package system?
Are there alternatives?

Best,
Marina

-- 

Marina Latini 
mar...@studiostorti.com


Studio Storti Srl
Viale Leonardo da Vinci, 18
36100 - Vicenza (VI)
http://www.studiostorti.com

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

[Libreoffice-commits] core.git: cui/source i18nlangtag/source include/i18nlangtag svx/source

[Eike Rathke]

 cui/source/tabpages/numfmt.cxx  |6 +-
 i18nlangtag/source/isolang/mslangid.cxx |   16 
 include/i18nlangtag/mslangid.hxx|3 +++
 svx/source/dialog/langbox.cxx   |1 +
 4 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 4189b715999bf9ebb0cd04a0c610a7b514e28d1b
Author: Eike Rathke 
Date:   Mon Aug 4 14:05:37 2014 +0200

suppress legacy locales, fdo#44112 related

With MsLangId::isLegacy() locales can be suppressed in language lists
and are not offered unless actually used at the current position of the
document. Language attribution now handles adding a language/locale to
the list on the fly.

For example, Serbian (Latin or Cyrillic) for "Serbia and Montenegro" are
legacy locales, the confederation doesn't exist anymore. A further
candidate would be pap-AN as the Netherlands Antilles ceased to exist,
see fdo#44112.

Suppressing "Serbian Cyrillic (Serbia and Montenegro)" also has the nice
benefit of narrowing the language list box width a little ...

Change-Id: Id05cce328622465016901524b759369c18bc4dbd

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 4528667..de36480 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -319,6 +320,8 @@ void SvxNumberFormatTabPage::Init_Impl()
 // initialize language ListBox
 
 m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM );
+/* TODO: any reason we're doing a manual init here instead of using
+ * SvxLanguageBoxBase::SetLanguageList( LANG_LIST_ONLY_KNOWN, ...)? */
 // Don't list ambiguous locales where we won't be able to convert the
 // LanguageType back to an identical Language_Country name and therefore
 // couldn't load the i18n LocaleData. Show DebugMsg in non-PRODUCT version.
@@ -327,7 +330,8 @@ void SvxNumberFormatTabPage::Init_Impl()
 sal_Int32 nCount = xLang.getLength();
 for ( sal_Int32 i=0; iInsertLanguage( xLang[i] );
+if (!MsLangId::isLegacy( xLang[i]))
+m_pLbLanguage->InsertLanguage( xLang[i] );
 }
 }
 
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 6bb92bb..7f6c42f 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -473,6 +473,22 @@ bool MsLangId::isNonLatinWestern( LanguageType nLang )
 
 
 // static
+bool MsLangId::isLegacy( LanguageType nLang )
+{
+switch (nLang)
+{
+case LANGUAGE_SERBIAN_CYRILLIC_SAM:
+case LANGUAGE_SERBIAN_LATIN_SAM:
+/* TODO: activate once dictionary was renamed from pap-AN to
+ * pap-CW, or the pap-CW one supports also pap-AN, see fdo#44112 */
+//case LANGUAGE_PAPIAMENTU:
+return true;
+}
+return false;
+}
+
+
+// static
 LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang, 
bool /*bUserInterfaceSelection*/ )
 {
 switch (nLang)
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index 63be1e9..c629b77 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -172,6 +172,9 @@ public:
 static LanguageType getReplacementForObsoleteLanguage( LanguageType nLang,
 bool bUserInterfaceSelection = false );
 
+/** Whether locale is legacy, i.e. country ot confederation doesn't exist 
anymore. */
+static bool isLegacy( LanguageType nLang );
+
 
 /** @ATTENTION: these are _ONLY_ to be called by the application's
 configuration! */
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 44aeecb..2eea8f6 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -267,6 +267,7 @@ void SvxLanguageBoxBase::SetLanguageList( sal_Int16 
nLangList,
 if ( nLangType != LANGUAGE_DONTKNOW &&
  nLangType != LANGUAGE_SYSTEM &&
  nLangType != LANGUAGE_NONE &&
+ !MsLangId::isLegacy( nLangType) &&
  (MsLangId::getSubLanguage( nLangType) != 0 ||
   (nLangList & LANG_LIST_ALSO_PRIMARY_ONLY)) &&
  ((nLangList & LANG_LIST_ALL) != 0 ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 76552] Massive memory leak in .moveRange (only) when called after .insertNewByName

[bugzilla-daemon]

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

Kohei Yoshida  changed:

   What|Removed |Added

 CC|libreoffice-b...@lists.free |
   |desktop.org,|
   |libreoffice@lists.freedeskt |
   |op.org  |

--- Comment #7 from Kohei Yoshida  ---
Don't add lists to CC!

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

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

[Markus Mohrhard]

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

New commits:
commit 2580f10e8cec6fd9e3356a3a26a1cb6d8192e850
Author: Markus Mohrhard 
Date:   Sun Aug 3 22:47:27 2014 +0200

avoid buffer overflow by using wrong buffer

Found by Asan.

(regression from CWS mba34issues01)

Change-Id: Ia7159c9bed9d7f823448acd02e18568a5f3f2093
Reviewed-on: https://gerrit.libreoffice.org/10717
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 955c5539a1ea5e971f111989d6c5bec11d936416)
Signed-off-by: Michael Stahl 

diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 50f8ee6..461d74c 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1021,7 +1021,7 @@ void TransformItems( sal_uInt16 nSlotId, const 
SfxItemSet& rSet, uno::SequenceGetFormalArgument( nArg );
+const SfxFormalArgument &rArg = bIsMediaDescriptor ? 
aFormalArgs[nArg] : pSlot->GetFormalArgument( nArg );
 
 sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
 if ( rSet.GetItemState( nWhich ) == SFX_ITEM_SET ) //???
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sfx2/source

[Markus Mohrhard]

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

New commits:
commit 0eb715086898543fb09addb6cd68526120f81f73
Author: Markus Mohrhard 
Date:   Sun Aug 3 22:47:27 2014 +0200

avoid buffer overflow by using wrong buffer

Found by Asan.

(regression from CWS mba34issues01)

Change-Id: Ia7159c9bed9d7f823448acd02e18568a5f3f2093
Reviewed-on: https://gerrit.libreoffice.org/10717
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
(cherry picked from commit 955c5539a1ea5e971f111989d6c5bec11d936416)
Signed-off-by: Michael Stahl 

diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 8f44b07..a16ab3e 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -972,7 +972,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& 
rSet, uno::SequenceGetFormalArgument( nArg );
+const SfxFormalArgument &rArg = bIsMediaDescriptor ? 
aFormalArgs[nArg] : pSlot->GetFormalArgument( nArg );
 
 sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
 if ( rSet.GetItemState( nWhich ) == SFX_ITEM_SET ) //???
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

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

New commits:
commit 955c5539a1ea5e971f111989d6c5bec11d936416
Author: Markus Mohrhard 
Date:   Sun Aug 3 22:47:27 2014 +0200

avoid buffer overflow by using wrong buffer

Found by Asan.

(regression from CWS mba34issues01)

Change-Id: Ia7159c9bed9d7f823448acd02e18568a5f3f2093
Reviewed-on: https://gerrit.libreoffice.org/10717
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 8f44b07..a16ab3e 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -972,7 +972,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& 
rSet, uno::SequenceGetFormalArgument( nArg );
+const SfxFormalArgument &rArg = bIsMediaDescriptor ? 
aFormalArgs[nArg] : pSlot->GetFormalArgument( nArg );
 
 sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId );
 if ( rSet.GetItemState( nWhich ) == SFX_ITEM_SET ) //???
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Palenik Mihály]

 xmlsecurity/inc/xmlsecurity/global.hrc   |1 
 xmlsecurity/inc/xmlsecurity/warnings.hxx |   78 ---
 xmlsecurity/source/dialogs/dialogs.hrc   |   31 ---
 xmlsecurity/source/dialogs/warnings.cxx  |  124 ---
 xmlsecurity/source/dialogs/warnings.src  |  108 ---
 5 files changed, 342 deletions(-)

New commits:
commit a246cad28a2354bc4394291b32cc5aa3a068ce44
Author: Palenik Mihály 
Date:   Sun Aug 3 23:43:49 2014 +0200

Delete RID_XMLSECTP_MACROWARN dialog

I deleted unused RID_XMLSECTP_MACROWARN and MacroWarning class.

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

diff --git a/xmlsecurity/inc/xmlsecurity/global.hrc 
b/xmlsecurity/inc/xmlsecurity/global.hrc
index 5c4a2df..12fd776 100644
--- a/xmlsecurity/inc/xmlsecurity/global.hrc
+++ b/xmlsecurity/inc/xmlsecurity/global.hrc
@@ -24,7 +24,6 @@
 
 #define RID_XMLSECTP_GENERAL1003
 #define RID_XMLSECTP_DETAILS1004
-#define RID_XMLSECTP_MACROWARN  1009
 
 #define RID_XMLSECWB_NO_MOZILLA_PROFILE 1013
 
diff --git a/xmlsecurity/inc/xmlsecurity/warnings.hxx 
b/xmlsecurity/inc/xmlsecurity/warnings.hxx
deleted file mode 100644
index 3a08991..000
--- a/xmlsecurity/inc/xmlsecurity/warnings.hxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_XMLSECURITY_INC_XMLSECURITY_WARNINGS_HXX
-#define INCLUDED_XMLSECURITY_INC_XMLSECURITY_WARNINGS_HXX
-
-#include 
-#include 
-#include 
-#include 
-
-namespace com {
-namespace sun {
-namespace star {
-namespace security {
-class XCertificate; }
-namespace xml { namespace crypto {
-class XSecurityEnvironment; }}
-}}}
-
-#include 
-#include 
-
-class HeaderBar;
-
-class MacroWarning : public ModalDialog
-{
-private:
-// XSecurityEnvironment is needed for building the certification path
-css::uno::Reference< css::xml::crypto::XSecurityEnvironment > 
mxSecurityEnvironment;
-
-//  css::uno::Sequence< css::uno::Reference< css::security::XCertificate > > 
maCerts;
-css::uno::Reference< css::security::XCertificate > mxCert;
-
-//  FixedImage  maQuestionMarkFI;
-FixedInfo   maDocNameFI;
-FixedInfo   maDescr1aFI;
-FixedInfo   maDescr1bFI;
-FixedInfo   maSignsFI;
-PushButton  maViewSignsBtn;
-FixedInfo   maDescr2FI;
-CheckBoxmaAlwaysTrustCB;
-FixedLine   maBottomSepFL;
-PushButton  maEnableBtn;
-CancelButtonmaDisableBtn;
-HelpButton  maHelpBtn;
-
-const bool  mbSignedMode;   // modus of dialog (signed / 
unsigned macros)
-
-DECL_LINK(  ViewSignsBtnHdl, void* );
-DECL_LINK(  EnableBtnHdl, void* );
-//  DECL_LINK(  DisableBtnHdl, void* );
-
-public:
-MacroWarning( Window* pParent, css::uno::Reference< 
css::xml::crypto::XSecurityEnvironment >& _rxSecurityEnvironment, 
css::uno::Reference< css::security::XCertificate >& _rxCert );
-MacroWarning( Window* pParent );
-~MacroWarning();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/dialogs.hrc 
b/xmlsecurity/source/dialogs/dialogs.hrc
index f07d52d..4d84c64 100644
--- a/xmlsecurity/source/dialogs/dialogs.hrc
+++ b/xmlsecurity/source/dialogs/dialogs.hrc
@@ -121,37 +121,6 @@
 #define STR_PATH_CERT_OK8
 #define STR_PATH_CERT_NOT_VALIDATED 9
 
-// - signed macro warning -
-
-#define FI_DOCNAME  1
-#define FI_DESCR1A  2
-#define FI_SIGNS3
-#define PB_VIEWSIGNS4
-#define FI_DESCR2   5
-#define CB_ALWAYSTRUST  6
-#define PB_ENABLE   7
-#define PB_DISABLE  8
-#define FI_DESCR1B  9
-
-#define MW_WIDTHDLGS_WIDTH
-#define MW_HEI

[Libreoffice-commits] core.git: external/libmwaw external/libodfgen external/librevenge external/libwps

[David Tardon]

 external/libmwaw/ExternalProject_libmwaw.mk   |4 
 external/libodfgen/ExternalProject_libodfgen.mk   |4 
 external/librevenge/ExternalProject_librevenge.mk |4 
 external/libwps/ExternalProject_libwps.mk |4 
 4 files changed, 16 insertions(+)

New commits:
commit 6cf40d263e33dd6934005af8319ae6fc8a386592
Author: David Tardon 
Date:   Mon Aug 4 09:27:24 2014 +0200

fdo#82035 fix loader paths

Change-Id: Ibecd7a89491b487bec54e8a86edbb1b133cdb8f0

diff --git a/external/libmwaw/ExternalProject_libmwaw.mk 
b/external/libmwaw/ExternalProject_libmwaw.mk
index 1b51225..5a19d85 100644
--- a/external/libmwaw/ExternalProject_libmwaw.mk
+++ b/external/libmwaw/ExternalProject_libmwaw.mk
@@ -41,6 +41,10 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
$(MAKE)) \
+   $(if $(filter MACOSX,$(OS)),\
+   && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/lib/.libs/libmwaw-0.3.3.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk 
b/external/libodfgen/ExternalProject_libodfgen.mk
index 8d88486..6e1c7ff 100644
--- a/external/libodfgen/ExternalProject_libodfgen.mk
+++ b/external/libodfgen/ExternalProject_libodfgen.mk
@@ -39,6 +39,10 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& $(MAKE) \
+   $(if $(filter MACOSX,$(OS)),\
+   && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/.libs/libodfgen-0.1.1.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/librevenge/ExternalProject_librevenge.mk 
b/external/librevenge/ExternalProject_librevenge.mk
index 1783993..707b16e 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -39,6 +39,10 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) 
:
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& $(MAKE) \
+   $(if $(filter MACOSX,$(OS)),\
+   && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/lib/.libs/librevenge-0.0.0.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/ExternalProject_libwps.mk 
b/external/libwps/ExternalProject_libwps.mk
index 004c912..708b667 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -39,6 +39,10 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)) \
$(if $(filter 
MACOSX,$(OS)),--prefix=/@.__OOO)
 \
&& $(MAKE) \
+   $(if $(filter MACOSX,$(OS)),\
+   && $(PERL) 
$(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+   
$(EXTERNAL_WORKDIR)/src/lib/.libs/libwps-0.3.3.dylib \
+   ) \
)
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

[Palenik Mihály]

 dbaccess/UIConfig_dbaccess.mk|1 
 dbaccess/source/ui/dlg/paramdialog.cxx   |  112 +-
 dbaccess/source/ui/inc/paramdialog.hxx   |   12 --
 dbaccess/uiconfig/ui/parametersdialog.ui |  186 +++
 4 files changed, 247 insertions(+), 64 deletions(-)

New commits:
commit b15c01e43071099c6cb631953e56e88e9961e29e
Author: Palenik Mihály 
Date:   Mon Aug 4 13:43:09 2014 +0200

Convert DLG_PARAMETERS to .ui

Conflicts:
dbaccess/UIConfig_dbaccess.mk

Change-Id: Ib9e1c986e2f58b0095e69890664764d1cf8badb0

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 0225fdb..52d2bf4 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/migratepage \
 dbaccess/uiconfig/ui/mysqlnativepage \
 dbaccess/uiconfig/ui/mysqlnativesettings \
+dbaccess/uiconfig/ui/parametersdialog \
 dbaccess/uiconfig/ui/password \
 dbaccess/uiconfig/ui/preparepage \
 dbaccess/uiconfig/ui/queryfilterdialog \
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx 
b/dbaccess/source/ui/dlg/paramdialog.cxx
index bd5d295..c59e415 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -54,19 +54,19 @@ namespace dbaui
 OParameterDialog::OParameterDialog(
 Window* pParent, const Reference< XIndexAccess > & rParamContainer,
 const Reference< XConnection > & _rxConnection, const Reference< 
XComponentContext >& rxContext)
-:ModalDialog( pParent, ModuleRes(DLG_PARAMETERS))
-,m_aNamesFrame  (this, ModuleRes(FL_PARAMS))
-,m_aAllParams   (this, ModuleRes(LB_ALLPARAMS))
-,m_aValueFrame  (this, ModuleRes(FT_VALUE))
-,m_aParam   (this, ModuleRes(ET_PARAM))
-,m_aTravelNext  (this, ModuleRes(BT_TRAVELNEXT))
-,m_aOKBtn   (this, ModuleRes(BT_OK))
-,m_aCancelBtn   (this, ModuleRes(BT_CANCEL))
+:ModalDialog( pParent, "Parameters", "dbaccess/ui/parametersdialog.ui")
 ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND)
 ,m_xConnection(_rxConnection)
 ,m_aPredicateInput( rxContext, _rxConnection, getParseContext() )
 ,m_bNeedErrorOnCurrent(true)
 {
+get(m_pAllParams, "allParamTreeview");
+get(m_pParam, "paramEntry");
+get(m_pTravelNext, "next");
+get(m_pOKBtn, "ok");
+get(m_pCancelBtn, "cancel");
+
+set_height_request(200);
 
 if (rxContext.is())
 m_xFormatter = Reference< XNumberFormatter>( 
NumberFormatter::create( rxContext ), UNO_QUERY_THROW);
@@ -94,7 +94,7 @@ namespace dbaui
 if(!xParamAsSet.is())
 continue;
 pValues->Name = 
::comphelper::getString(xParamAsSet->getPropertyValue(PROPERTY_NAME));
-m_aAllParams.InsertEntry(pValues->Name);
+m_pAllParams->InsertEntry(pValues->Name);
 
 if (!pValues->Value.hasValue())
 // it won't have a value, 'cause it's default constructed. 
But may be later we support
@@ -116,8 +116,6 @@ namespace dbaui
 Construct();
 
 m_aResetVisitFlag.SetTimeoutHdl(LINK(this, OParameterDialog, 
OnVisitedTimeout));
-
-FreeResource();
 }
 
 OParameterDialog::~OParameterDialog()
@@ -129,31 +127,31 @@ namespace dbaui
 
 void OParameterDialog::Construct()
 {
-m_aAllParams.SetSelectHdl(LINK(this, OParameterDialog, 
OnEntrySelected));
-m_aParam.SetLoseFocusHdl(LINK(this, OParameterDialog, 
OnValueLoseFocus));
-m_aParam.SetModifyHdl(LINK(this, OParameterDialog, OnValueModified));
-m_aTravelNext.SetClickHdl(LINK(this, OParameterDialog, 
OnButtonClicked));
-m_aOKBtn.SetClickHdl(LINK(this, OParameterDialog, OnButtonClicked));
-m_aCancelBtn.SetClickHdl(LINK(this, OParameterDialog, 
OnButtonClicked));
-
-if (m_aAllParams.GetEntryCount())
+m_pAllParams->SetSelectHdl(LINK(this, OParameterDialog, 
OnEntrySelected));
+m_pParam->SetLoseFocusHdl(LINK(this, OParameterDialog, 
OnValueLoseFocus));
+m_pParam->SetModifyHdl(LINK(this, OParameterDialog, OnValueModified));
+m_pTravelNext->SetClickHdl(LINK(this, OParameterDialog, 
OnButtonClicked));
+m_pOKBtn->SetClickHdl(LINK(this, OParameterDialog, OnButtonClicked));
+m_pCancelBtn->SetClickHdl(LINK(this, OParameterDialog, 
OnButtonClicked));
+
+if (m_pAllParams->GetEntryCount())
 {
-m_aAllParams.SelectEntryPos(0);
-LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams);
+m_pAllParams->SelectEntryPos(0);
+LINK(this, OParameterDialog, OnEntrySelected).Call(m_pAllParams);
 
-if (m_aAllParams.GetEntryCount() == 1)
+if (m_pAllParams->GetEntryCount() == 1)
 {
-

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-0' - external/hunspell external/hyphen external/mythes

[László Németh]

 external/hunspell/hunspell-fdo48017-wfopen.patch |9 +++--
 external/hyphen/hyphen-fdo48017-wfopen.patch |   12 
 external/mythes/mythes-fdo48017-wfopen.patch |9 +++--
 3 files changed, 22 insertions(+), 8 deletions(-)

New commits:
commit 9548c4ab5db6889ee91f01a8207bf4009d623f9f
Author: László Németh 
Date:   Sat Jul 19 03:44:07 2014 +0200

fdo#80363 add _wfullpath to expand ".." in dictionary paths

Change-Id: I6c9edd0b4d2c63f7735d090e5d2d72d5fb81b921
Reviewed-on: https://gerrit.libreoffice.org/10400
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 7efd83bb29ef8be8c78c4da5452fe3293ed15ea4)
Reviewed-on: https://gerrit.libreoffice.org/10405
(cherry picked from commit 24e9950f68ca57c454dbb35cf8562d82e76a42e7)

combined with

fdo#80363 _wfullpath in MyThes and Hyphen

(cherry picked from commit 0ad283adb51b3a1bb777e6341e61541d4bffaa44)
(cherry picked from commit 45e4cdcc66d01a987c4edc715cb4cf083868b5ff)

diff --git a/external/hunspell/hunspell-fdo48017-wfopen.patch 
b/external/hunspell/hunspell-fdo48017-wfopen.patch
index 47b803b..37203be 100644
--- a/external/hunspell/hunspell-fdo48017-wfopen.patch
+++ b/external/hunspell/hunspell-fdo48017-wfopen.patch
@@ -13,7 +13,7 @@ diff -ru hunspell/src/hunspell/csutil.cxx 
build/hunspell/src/hunspell/csutil.cxx
  #ifdef OPENOFFICEORG
  #  include 
  #else
-@@ -46,6 +50,21 @@
+@@ -51,6 +51,26 @@
  static struct unicode_info2 * utf_tbl = NULL;
  static int utf_tbl_count = 0; // utf_tbl can be used by multiple Hunspell 
instances
  
@@ -23,9 +23,14 @@ diff -ru hunspell/src/hunspell/csutil.cxx 
build/hunspell/src/hunspell/csutil.cxx
 +if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
 +int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
 +wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++wchar_t *buff2 = (wchar_t *) malloc(len * sizeof(wchar_t));
++FILE * f = NULL;
 +MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
-+FILE * f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++if (_wfullpath( buff2, buff, len ) != NULL) {
++  f = _wfopen(buff2, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++}
 +free(buff);
++free(buff2);
 +return f;
 +}
 +#endif
diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch 
b/external/hyphen/hyphen-fdo48017-wfopen.patch
index 27cffa0..e99a891 100644
--- a/external/hyphen/hyphen-fdo48017-wfopen.patch
+++ b/external/hyphen/hyphen-fdo48017-wfopen.patch
@@ -13,7 +13,7 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
  #define noVERBOSE
  
  /* calculate hyphenmin values with long ligature length (2 or 3 characters
-@@ -371,6 +376,22 @@
+@@ -371,6 +376,26 @@
}
  }
  
@@ -23,10 +23,14 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
 +if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
 +int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
 +wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
-+FILE * f;
++wchar_t *buff2 = (wchar_t *) malloc(len * sizeof(wchar_t));
++FILE * f = NULL;
 +MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
-+f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++if (_wfullpath( buff2, buff, len ) != NULL) {
++  f = _wfopen(buff2, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++}
 +free(buff);
++free(buff2);
 +return f;
 +}
 +#endif
@@ -36,7 +40,7 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
  HyphenDict *
  hnj_hyphen_load (const char *fn)
  {
-@@ -383,7 +404,7 @@
+@@ -383,7 +408,7 @@
HashEntry *e;
int state_num = 0;
  
diff --git a/external/mythes/mythes-fdo48017-wfopen.patch 
b/external/mythes/mythes-fdo48017-wfopen.patch
index 1621b1d..82d69ad 100644
--- a/external/mythes/mythes-fdo48017-wfopen.patch
+++ b/external/mythes/mythes-fdo48017-wfopen.patch
@@ -31,7 +31,7 @@ diff -u mythes/mythes.cxx build/mythes/mythes.cxx
  if (!pdfile) {
  return 0;
  } 
-@@ -370,3 +375,17 @@
+@@ -373,3 +378,22 @@
return -1;
  }
  
@@ -41,9 +41,14 @@ diff -u mythes/mythes.cxx build/mythes/mythes.cxx
 +if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
 +int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
 +wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++wchar_t *buff2 = (wchar_t *) malloc(len * sizeof(wchar_t));
++FILE * f = NULL;
 +MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
-+FILE * f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++if (_wfullpath( buff2, buff, len ) != NULL) {
++  f = _wfopen(buff2, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++}
 +free(buff);
++free(buff2);
 +return f;
 +}
 +#endif
___

[Bug 45618] Implement 3d slideshow transition framework also for windows

[bugzilla-daemon]

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

--- Comment #8 from David Tardon  ---
(In reply to comment #6)
> if you mean that glTF thingy - please no. At least not default.

No, this does not mean glTF. It is just a generic OpenGL support in VCL. (And
the 3D-transitions impl. for UNX already uses it in 4.3.)

-- 
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 45618] Implement 3d slideshow transition framework also for windows

[bugzilla-daemon]

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

David Tardon  changed:

   What|Removed |Added

 CC||dtar...@redhat.com

--- Comment #7 from David Tardon  ---
(In reply to comment #5)
> actually this should be much simpler now as we have a working modern OpenGL
> context on Windows. I think we can extend this easy hack to move the
> implementation to use the new OpenGL context in vcl.

Actually, as the generic impl. (currently only used for UNX) has been changed
to use OpenGLContext, it should compile and work on Windows without any change.

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

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/ole-inline.rtf |  188 +
 sw/qa/extras/rtfimport/rtfimport.cxx   |6 
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 
 3 files changed, 197 insertions(+)

New commits:
commit b28c11025b08cae4cd4685c75fbc474d2c216fb0
Author: Miklos Vajna 
Date:   Fri Aug 1 16:46:54 2014 +0200

RTF import: fix as-char anchored OLE objects

Regression from 2a35f5c7945d00b6f6e21fc7cf5b05b184eba88f (DOCX OLE
import: inherit anchor type from replacement graphic, 2014-02-18), then
problem was that dmapper expected that the anchor type of the
replacement graphic is set, but the RTF tokenizer wasn't adapted to
fulfill this requirement.

(cherry picked from commit 43b88364b0b05def27899d585a1dab46ba3fb729)

Conflicts:
sw/qa/extras/inc/swmodeltestbase.hxx
sw/qa/extras/rtfimport/rtfimport.cxx

Change-Id: I0f7e1a71052f337793d6f844fe5476c3868c03f4
Reviewed-on: https://gerrit.libreoffice.org/10677
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/rtfimport/data/ole-inline.rtf 
b/sw/qa/extras/rtfimport/data/ole-inline.rtf
new file mode 100644
index 000..b8af690
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/ole-inline.rtf
@@ -0,0 +1,188 @@
+{\rtf1
+{\object\objemb\objw797\objh299
+{\*\objclass Equation.3}
+{\*\objdata 
010502000b004571756174696f6e2e330c
+d0cf11e0a1b11ae13e000300feff090006000100011002000100feff
+
+
+
+fdff0400fefffefffeff
+
+
+
+52006f006f007400200045006e0074007200790016000500010002ce0200c046
+030201004f006c0065000a0002000200
+1400010043006f006d0070004f0062006a00120002000300
+010066004500710075006100740069006f006e0020004e006100740069007600650022000400
+03004600feff0200feff0400fefffeff
+f

LO 4.3 Base - problems with sub forms

[Alex McMurchy]

Since and including LO 4.3 I've started having problems with sub forms

I have two tables Subscribers and Payments which are linked on Subscriber_ID.

I have a form Data_Entry" the main details of the form contains the data for 
one particular Subscriber from the Subscribers table. The form also has a sub 
form that contains the payment details for that subscriber linked on 
Subscriber_Id.

Upto and including LO 4.2.4  this has worked flawlessly for the past 15 months.

Load the form and see the last viewed subscriber details with matching 
payment details - Correct.

Select a different subscriber from a drop down box,  the contents of 
main form changes to reflect the new subscriber and the contents of the sub 
form changes to the new subscribers payment details - Correct.


Since 4.3 what I get is this -

Load the form and see the last viewed subscriber details with matching 
payment details - Correct.

Select a different subscriber from a drop down box,  the contents of 
main form changes to reflect the new subscriber. The contents of the sub form 
doesn't change  it still reflects the payments from the previous subscriber - 
Wrong.

Restart LO.

Load the form and see the last viewed subscriber details with matching 
payment details - Correct.

Select a different subscriber from a drop down box,  the contents of 
main form changes to reflect the new subscriber. The contents of the sub form 
doesn't change  it still reflects the payments from the previous subscriber - 
Wrong.


So the work around is to select a new subscriber, see the wrong payment 
details. Close LO. Start LO and load the form and see the correct payment 
details - bizarre.

I've had a quick search in bugzilla but found nothing. Will have another search 
later today and if I don't find anything will raise a bug report with the above 
detail. Then flesh it out with the steps to take to replicate the bug.

In the meantime has anyone seen this or any thoughts on the matter.


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

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

[Zolnai Tamás]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 ++
 writerfilter/source/dmapper/DomainMapper.cxx |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 4336ba9770efb61d4131c005fb1d16ab2be20928
Author: Zolnai Tamás 
Date:   Mon Aug 4 11:02:55 2014 +0200

fdo#80986: disable highlight DOCX import

Highlight support is not implemented fully, so
it seems better to disable DOCX import of it until
it is finished.
Highlight can't be modified on the UI and is not
saved to ODT/DOC (regression).

Regression from:
8b949134441056a1455d67ddfdd7e0bc5f2ee682

(cherry picked from commit b5e60724ac73bb0e62b249145a8931fd6166bb69)

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx

Change-Id: I94891769766ae90017e8afa70e65d080d5270202
Reviewed-on: https://gerrit.libreoffice.org/10721
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 4db47e5..b269a11 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1540,6 +1540,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69636, "fdo69636.docx")
 CPPUNIT_ASSERT(getXPath(pXmlDoc, 
"/w:document/w:body/w:p/w:r/w:pict/v:rect/v:textbox", 
"style").match("mso-layout-flow-alt:bottom-to-top"));
 }
 
+/*
 DECLARE_OOXMLEXPORT_TEST(testCharHighlight, "char_highlight.docx")
 {
 const uno::Reference< text::XTextRange > xPara = getParagraph(1);
@@ -1586,6 +1587,7 @@ DECLARE_OOXMLEXPORT_TEST(testCharHighlight, 
"char_highlight.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), 
getProperty(xRun,"CharBackColor"));
 }
 }
+*/
 
 DECLARE_OOXMLEXPORT_TEST(testFontNameIsEmpty, "font-name-is-empty.docx")
 {
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index b9b1adf..aa6067d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2102,7 +2102,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 {
 sal_Int32 nColor = 0;
 if( (mbIsHighlightSet = getColorFromIndex(nIntValue, nColor)) )
-rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::makeAny( nColor ));
+rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( nColor ));
 else if (mnBackgroundColor)
 rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( 
mnBackgroundColor ));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 ++
 writerfilter/source/dmapper/DomainMapper.cxx |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e9297597088f36d4072515fd46d1299381dcfe6b
Author: Zolnai Tamás 
Date:   Sun Aug 3 10:45:23 2014 +0200

fdo#80986: disable highlight DOCX import

Highlight support is not implemented fully, so
it seems better to disable DOCX import of it until
it is finished.
Highlight can't be modified on the UI and is not
saved to ODT/DOC (regression).

Regression from:
8b949134441056a1455d67ddfdd7e0bc5f2ee682

Change-Id: I94891769766ae90017e8afa70e65d080d5270202
(cherry picked from commit b5e60724ac73bb0e62b249145a8931fd6166bb69)
Reviewed-on: https://gerrit.libreoffice.org/10722
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 8942d4c..18c4a7e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1486,6 +1486,7 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("RenderedShapes"), nValue); // Rendered 
bitmap has the proper name
 }
 
+/*
 DECLARE_OOXMLEXPORT_TEST(testCharHighlight, "char_highlight.docx")
 {
 const uno::Reference< text::XTextRange > xPara = getParagraph(1);
@@ -1532,6 +1533,7 @@ DECLARE_OOXMLEXPORT_TEST(testCharHighlight, 
"char_highlight.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), 
getProperty(xRun,"CharBackColor"));
 }
 }
+*/
 
 DECLARE_OOXMLEXPORT_TEST(testFontNameIsEmpty, "font-name-is-empty.docx")
 {
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 215bbaf..35ad80e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1333,7 +1333,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 {
 sal_Int32 nColor = 0;
 if( (mbIsHighlightSet = getColorFromIndex(nIntValue, nColor)) )
-rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::makeAny( nColor ));
+rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( nColor ));
 else if (mnBackgroundColor)
 rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( 
mnBackgroundColor ));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Completely random build crash in GAL

[Stephan Bergmann]

On 08/01/2014 10:41 AM, Tomáš Chvátal wrote:

[19219s] [build CMP] dbaccess/util/dba
[19219s] [build CMP] dbaccess/util/sdbt
[19219s] [build MOD] desktop
[19219s] [build MOD] embeddedobj
[19219s] [build CMP] extensions/source/bibliography/bib
[19219s] [build CMP] extensions/source/dbpilots/dbp
[19219s] [build CMP] extensions/source/propctrlr/pcr
[19219s] [build GAL] arrows
[19219s] [build GAL] computers
[19219s] [build GAL] diagrams
[19219s] [build GAL] education
[19219s] [build GAL] environment
[19220s] [build GAL] finance
[19221s] /bin/sh: line 1:  3869 Aborted ( SAL_USE_VCLPLUGIN=svp 
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"$I/ure/lib:$I/program" $I/program/gengal.bin 
"-env:BRAND_BASE_DIR=file://$S/instdir" 
"-env:CONFIGURATION_LAYERS=xcsxcu:file://$I/share/registry" 
"-env:UNO_SERVICES=file://$W/Rdb/ure/services.rdb  
file://$W/ComponentTarget/comphelper/util/comphelp.component  
file://$W/ComponentTarget/configmgr/source/configmgr.component  
file://$W/ComponentTarget/drawinglayer/drawinglayer.component  
file://$W/ComponentTarget/framework/util/fwk.component  file://$W/ComponentTarget/i18npool/util/i18npool.component 
 file://$W/ComponentTarget/package/source/xstor/xstor.component  
file://$W/ComponentTarget/package/util/package2.component  
file://$W/ComponentTarget/sax/source/expatwrap/expwrap.component  
file://$W/ComponentTarget/sfx2/util/sfx.component  file://$W/ComponentTarget/svgio/svgio.component  
file://$W/ComponentTarget/svx/util/svx.component  file://$W/Com!

ponentTarg
et/svx/util/svxcore.component  file://$W/ComponentTarget/ucb/source/core/ucb1.component  
file://$W/ComponentTarget/ucb/source/ucp/file/ucpfile1.component  
file://$W/ComponentTarget/unoxml/source/service/unoxml.component" "-env:UNO_TYPES= 
file://$I/program/types/offapi.rdb  file://$I/ure/share/misc/types.rdb" 
-env:URE_INTERNAL_LIB_DIR=file://$I/ure/lib -env:LO_LIB_DIR=file://$I/program --build-tree --destdir 
file://$S/extras/source/gallery --name "computers" --path $W/Gallery/computers 
file://$S/extras/source/gallery/computers/Computer-Cloud.png 
file://$S/extras/source/gallery/computers/Computer-Desktop.png 
file://$S/extras/source/gallery/computers/Computer-Laptop-Black.png 
file://$S/extras/source/gallery/computers/Computer-Laptop-Silver.png 
file://$S/extras/source/gallery/computers/Database-Add.png 
file://$S/extras/source/gallery/computers/Database-Delete.png 
file://$S/extras/source/gallery/computers/Database-Download.png 
file://$S/extras/source/gallery/computers/Database.pn!
g file://$
S/extras/source/gallery/computers/Folder01-Blue.png 
file://$S/extras/source/gallery/computers/Folder02-Green.png 
file://$S/extras/source/gallery/computers/Folder03-Manilla.png 
file://$S/extras/source/gallery/computers/Folder04-Yellow.png 
file://$S/extras/source/gallery/computers/Folder05-OpenBlue.png 
file://$S/extras/source/gallery/computers/Folder06-OpenGreen.png 
file://$S/extras/source/gallery/computers/Folder07-OpenManilla.png 
file://$S/extras/source/gallery/computers/Folder08-OpenYellow.png 
file://$S/extras/source/gallery/computers/Server.png 
file://$S/extras/source/gallery/computers/WirelessAccessPoint.png ) > 
$W/Gallery/computers.done.log 2>&1

[19221s] Work on gallery 
'file:///home/abuild/rpmbuild/BUILD/libreoffice-4.3.0.3/workdir/Gallery/computers'
[19221s] Existing themes: 0
[19221s] terminate called after throwing an instance of 'std::runtime_error'
[19221s]   what():  Provided a recursive symlink to a icon theme directory that 
could not be resolved.
[19221s] 
/home/abuild/rpmbuild/BUILD/libreoffice-4.3.0.3/solenv/gbuild/Gallery.mk:70: 
recipe for target 
'/home/abuild/rpmbuild/BUILD/libreoffice-4.3.0.3/workdir/Gallery/computers.done'
 failed
[19221s] make[1]: *** 
[/home/abuild/rpmbuild/BUILD/libreoffice-4.3.0.3/workdir/Gallery/computers.done]
 Error 1
[19221s] make[1]: *** Waiting for unfinished jobs
[19233s] Makefile:224: recipe for target 'build' failed
[19233s] make: *** [build] Error 2
[19234s] error: Bad exit status from /var/tmp/rpm-tmp.3mKSDx (%build)


Wild guess, but maybe related to 
 
"fdo#81532 Handle symlinks to icon themes correctly" (which apparently 
introduced the "Provided a recursive symlink..." runtime_error) in 
combination with some gbuild race condition?


Stephan

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

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

[Olivier Hallot]

 AllLangHelp_scalc.mk|1 
 source/text/scalc/01/statistics.xhp |  257 
 2 files changed, 258 insertions(+)

New commits:
commit 135498091966f63d582929446a084b41d3ffd4da
Author: Olivier Hallot 
Date:   Sat Aug 2 21:35:44 2014 -0300

Partial fix for fdo#80338: help for calc statistics

Entry page for Calc Data statistics. This is work in progress and the help 
content should be completed with the correct information.

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

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index c4ba90b..07ca0ad 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -206,6 +206,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_yearfrac \
 helpcontent2/source/text/scalc/01/solver \
 helpcontent2/source/text/scalc/01/solver_options \
+helpcontent2/source/text/scalc/01/statistics \
 helpcontent2/source/text/scalc/01/text2columns \
 helpcontent2/source/text/scalc/02/0213 \
 helpcontent2/source/text/scalc/02/0214 \
diff --git a/source/text/scalc/01/statistics.xhp 
b/source/text/scalc/01/statistics.xhp
new file mode 100644
index 000..f1c3bb7
--- /dev/null
+++ b/source/text/scalc/01/statistics.xhp
@@ -0,0 +1,257 @@
+
+
+
+
+
+
+
+
+Data Statistics
+/text/scalc/01/statistics.xhp
+
+
+
+Data Statistics
+
+
+  Analysis toolpack;sampling
+  sampling;Analysis toolpack
+  Data statistics;sampling
+
+
+Sampling
+
+  (to-do)
+
+  
+Menu Data - Statistics - 
Sampling...
+
+
+  (To do)
+
+
+Input Range
+Select the input data 
range.
+
+Results to
+Selects the upper left 
cell where the samples will be displayed.
+
+
+
+
+
+  Analysis toolpack;descriptive statistics
+  descriptive statistics;Analysis toolpack
+  Data statistics;descriptive statistics
+
+
+Descriptive Statistics
+
+  (to-do)
+
+  
+Menu Data - Statistics - Descriptive 
Statistics...
+
+
+  (To do)
+
+
+Input Range
+Select the 
input data range.
+
+Results to
+Selects 
the upper left cell where the samples will be displayed.
+
+
+
+
+
+  Analysis toolpack;analysis of variance
+  analysis of variance;Analysis toolpack
+  Data statistics;analysis of variance
+
+
+Analysis of Variance (ANOVA)
+
+  (to-do)
+
+  
+Menu Data - Statistics - Analysis of Variance 
(ANOVA)...
+
+
+  (To do)
+
+
+Input Range
+Select the 
input data range.
+
+Results to
+Selects the 
upper left cell where the samples will be displayed.
+
+
+
+
+
+  Analysis toolpack;correlation
+  correlation;Analysis toolpack
+  Data statistics;correlation
+
+
+Correlation
+
+  Calculates the 
correlation of two sets of numeric data.
+
+  
+Menu Data - Statistics - 
Correlation...
+
+The correlation coefficient (a value between -1 and +1) means how 
strongly two variables are related to each other. You can use the CORREL 
function or the Data Statistics to find the correlation coefficient between two 
variables.
+A correlation coefficient of +1 indicates a perfect positive 
correlation. 
+A correlation coefficient of -1 indicates a perfect negative 
correlation
+
+Input Range
+Select the inout 
data range.
+
+Results to
+Selects the upper 
left cell where the  correlation will be displayed.
+
+Columns
+The data 
series ae in columns.
+
+Rows
+The data 
series are in rows.
+
+
+
+
+  Analysis toolpack;covariance
+  covariance;Analysis toolpack
+  Data statistics;covariance
+
+
+Covariance
+
+  Calculates 
the covariance of two sets of numeric data.
+
+  
+Menu Data - Statistics - 
Covariance...
+
+
+  Covariance indicates how two variables are related. A positive covariance 
means the variables are positively related,
+  while a negative covariance means the variables are inversely related.
+
+
+Input Range
+Select the input data 
range.
+
+Results to
+Selects the upper 
left cell where the  correlation will be displayed.
+
+Columns
+The data series 
are in columns.
+
+Rows
+The data series 
are in rows.
+
+
+
+
+  Analysis toolpack;exponential smoothing
+  exponential smoothing;Analysis toolpack
+  Data statistics;exponential smoothing
+
+
+Exponential Smoothing
+
+  (to-do)
+
+  
+Menu Data - Statistics - Exponential 
Smoothing...
+
+
+  (To do)
+
+
+Input Range
+Select the 
input data range.
+
+Results to
+Selects 
the upper left cell where the samples will be displayed.
+
+
+
+
+
+  Analysis toolpack;moving average
+  moving average;Analysis toolpack
+  Data statistics;moving average
+
+
+Moving Average
+
+  (to-do)
+
+  
+Menu Data - Statistics - Moving 
Average...
+
+
+  (To do)
+
+
+Input Range
+Select the input 
data range.
+
+Results to
+Selects the upper 
left cell where the samples will be displayed.
+
+
+
+
+
+  Analysis toolpack;t-test
+  t-test;Analysis toolpack
+  Data statistics;t-test
+Analysis toolpack;F-test
+  F-test;Analysis toolpack
+  D

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit 31ddbd0d724e34a138bddb71082925c6f8695467
Author: Olivier Hallot 
Date:   Sat Aug 2 21:35:44 2014 -0300

Updated core
Project: help  135498091966f63d582929446a084b41d3ffd4da

Partial fix for fdo#80338: help for calc statistics

Entry page for Calc Data statistics. This is work in progress and the help 
content should be completed with the correct information.

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

diff --git a/helpcontent2 b/helpcontent2
index 4cdb895..1354980 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4cdb8959d25330c2b26123b5a89b126617066e1e
+Subproject commit 135498091966f63d582929446a084b41d3ffd4da
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75757] remove inheritance to std::map and std::vector

[bugzilla-daemon]

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

--- Comment #14 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

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

fdo#75757: remove inheritance to std::vector



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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

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

[Takeshi Abe]

 cui/source/dialogs/linkdlg.cxx |   18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

New commits:
commit c9be1193b0cf850aded26bd56a2ea63d02d808b1
Author: Takeshi Abe 
Date:   Mon Aug 4 08:42:38 2014 +0900

fdo#75757: remove inheritance to std::vector

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

diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 27abd85..45c5801 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -52,11 +52,14 @@
 using namespace sfx2;
 using namespace ::com::sun::star;
 
-class SvBaseLinkMemberList : private std::vector {
+class SvBaseLinkMemberList {
+private:
+std::vector mLinks;
+
 public:
 ~SvBaseLinkMemberList()
 {
-for( const_iterator it = begin(); it != end(); ++it )
+for( std::vector::const_iterator it = mLinks.begin(); it 
!= mLinks.end(); ++it )
 {
 SvBaseLink* p = *it;
 if( p )
@@ -64,10 +67,15 @@ public:
 }
 }
 
-using std::vector::size;
-using std::vector::operator[];
+size_t size() const { return mLinks.size(); }
+
+SvBaseLink *operator[](size_t i) const { return mLinks[i]; }
 
-void push_back(SvBaseLink* p) { std::vector::push_back(p); 
p->AddRef(); }
+void push_back(SvBaseLink* p)
+{
+mLinks.push_back(p);
+p->AddRef();
+}
 };
 
 // attention, this array is indexed directly (0, 1, ...) in the code
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSOC] Tiled Rendering, ahunt, Weekly Report 11 / WK31

[Andrzej Hunt]

Hi All,

* Added part names -- Calc and Impress.
* Added part mode (slide/notes/combined selection) -- Impress only for
  now.
** Can't select just notes yet (i.e. only the combined view as in
   Impress where a portrait page with slide + notes is availbale):
   would involve a fair bit of digging in Impress to implement
   (hard to estimate how long this would take...).
*** --> Not sure this even makes any sense, as the notes page can
include content outside the "notes" area -- being able to render
just the notes area (textbox?) might make sense but presumably any
images in this area would then be ignored? Alternatively we could
render just the portion of the notes page where the notes area is
(i.e. this would include other images/objects).
** Screenshot of the current notes page rendering (i.e. the combined
   mode) is attached.

* Started digging into Embedded Object selection
** Not sure whether we want to be able to select the embedded objects
   per document (globally) or per current part (slide/sheet), the
   latter seems somewhat more natural, especially if we are to return
   positions of the embedded objects within the overall "part".
   (The initial version of setPartMode has an EmbeddedObjectMode -- i.e.
this would correspond to the per-document object selection, but
instead I think we should probably for the following per-part
methods:
   (i.e. handle the objects for the current part):
   * getEmbeddedObjects() (and related getEmbeddedObjectName/
 getEmbeddedObjectPosition methods).
   * paintEmbeddedObjectToTile() or similar method.

* Some osl_areCommandArgsSet related cleanup -- not complete yet.

* Tests and general API:
** Tests for retrieval of part numbers, names, and document loading
   failure implemented.
** We can't restart LOK multiple times within one fixture, hence we run
   everything as part of the same test.
** We don't actually have any good form of feedback for document loading
   failures -- getError gives a more human readable form, which isn't
   really useful as part of the LOK API -> we should maybe add
   something here?

* Debugged unit test segfaults:
** fixed: shutdown conficts: glibc trying to cleanup with soffice_main
   thread still running:
*** LOK shutdown now calls Application::Quit and then joins the
soffice_main thread.

* GtkTiledViewer:
** Added part name display
** Added partmode selection.

* Killing the LOK static library:
** Some minor improvements:
*** Don't use LINUX/AIX LO-only defines, instead use standard defines.
*** And killed the reliance on sal headers -- we want to be as
independent of LO as possible here.
** -> now merged.
** Instead of building and linking the static library, one simply has to
   include LibreOfficeInit.h, everything else remains unchanged.

Cheers,
Andrzej

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

[Bug 76552] Massive memory leak in .moveRange (only) when called after .insertNewByName

[bugzilla-daemon]

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

--- Comment #6 from Roman Polach  ---
Not only in 4.3.0 final,
the bug is present also in 4.1.6 final and 4.2.6 final:
4.1.6: final workbook state: 1.3G RAM used, 1.28G swap used,
4.2.6: final workbook state: 0.6G RAM used, 1.6G swap used,
15 seconds to close the final document (slow release of memory?)

-- 
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 76552] Massive memory leak in .moveRange (only) when called after .insertNewByName

[bugzilla-daemon]

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

Roman Polach  changed:

   What|Removed |Added

Summary|Macro eats 1300M RAM +  |Massive memory leak in
   |1277M swap in 4.1.0 and |.moveRange (only)
   |only 521M RAM + 553M swap   |when called after
   |in 4.0.6|.insertNewByName

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

[Libreoffice-commits] core.git: dbaccess/AllLangResTarget_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

[Szymon Kłos]

 dbaccess/AllLangResTarget_dbu.mk  |1 
 dbaccess/UIConfig_dbaccess.mk |3 
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx|1 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |   14 -
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |3 
 dbaccess/source/ui/dlg/admincontrols.cxx  |  136 +-
 dbaccess/source/ui/dlg/admincontrols.hrc  |   41 ---
 dbaccess/source/ui/dlg/admincontrols.hxx  |   26 +-
 dbaccess/source/ui/dlg/admincontrols.src  |  126 -
 dbaccess/source/ui/dlg/dbadmin.hrc|5 
 dbaccess/source/ui/dlg/dbadmin.src|   42 ---
 dbaccess/source/ui/dlg/dbadminsetup.hrc   |   34 --
 dbaccess/source/ui/dlg/dbadminsetup.src   |   33 --
 dbaccess/source/ui/dlg/dbwizsetup.cxx |1 
 dbaccess/source/ui/dlg/detailpages.cxx|   77 ++---
 dbaccess/source/ui/dlg/detailpages.hxx|   12 
 dbaccess/source/ui/inc/dbu_resource.hrc   |2 
 dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui  |   89 ++
 dbaccess/uiconfig/ui/mysqlnativepage.ui   |  228 +
 dbaccess/uiconfig/ui/mysqlnativesettings.ui   |  286 ++
 20 files changed, 735 insertions(+), 425 deletions(-)

New commits:
commit 0059f083e511bb6c7113ad62a72abf3d7618f9e1
Author: Szymon Kłos 
Date:   Sun Aug 3 13:44:00 2014 +0200

PAGE_MYSQL_NATIVE and PAGE_DBWIZARD_MYSQL_NATIVE conversion to .ui

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

diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 11150f8..f44c220 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
 dbaccess/source/ui/control/TableGrantCtrl.src \
 dbaccess/source/ui/control/tabletree.src \
 dbaccess/source/ui/control/undosqledit.src \
-dbaccess/source/ui/dlg/admincontrols.src \
 dbaccess/source/ui/dlg/AutoControls.src \
 dbaccess/source/ui/dlg/ConnectionPage.src \
 dbaccess/source/ui/dlg/dbadmin2.src \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 522c009..0225fdb 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/copytablepage \
 dbaccess/uiconfig/ui/dbaseindexdialog \
 dbaccess/uiconfig/ui/dbwizmysqlintropage \
+dbaccess/uiconfig/ui/dbwizmysqlnativepage \
 dbaccess/uiconfig/ui/dbwizspreadsheetpage \
 dbaccess/uiconfig/ui/dbwiztextpage \
 dbaccess/uiconfig/ui/directsqldialog  \
@@ -36,6 +37,8 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/joindialog \
 dbaccess/uiconfig/ui/ldapconnectionpage \
 dbaccess/uiconfig/ui/migratepage \
+dbaccess/uiconfig/ui/mysqlnativepage \
+dbaccess/uiconfig/ui/mysqlnativesettings \
 dbaccess/uiconfig/ui/password \
 dbaccess/uiconfig/ui/preparepage \
 dbaccess/uiconfig/ui/queryfilterdialog \
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx 
b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 2c2d3fb..95174d5 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -19,7 +19,6 @@
 
 #include "ConnectionPageSetup.hxx"
 #include "AutoControls.hrc"
-#include "dbadminsetup.hrc"
 #include "dbu_dlg.hrc"
 #include 
 #include 
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 1d20da9..d2363fe 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -23,7 +23,6 @@
 #include "sqlmessage.hxx"
 #include "dbu_resource.hrc"
 #include "AutoControls.hrc"
-#include "dbadminsetup.hrc"
 #include 
 #include 
 #include 
@@ -291,18 +290,13 @@ using namespace ::com::sun::star;
 
 // MySQLNativeSetupPage
 MySQLNativeSetupPage::MySQLNativeSetupPage( Window* _pParent, const 
SfxItemSet& _rCoreAttrs )
-:OGenericAdministrationPage( _pParent, ModuleRes( 
PAGE_DBWIZARD_MYSQL_NATIVE ), _rCoreAttrs )
-,m_aHeader  ( this, ModuleRes( FT_SETUP_WIZARD_HEADER ) )
-,m_aHelpText( this, ModuleRes( FT_SETUP_WIZARD_HELP ) )
-,m_aMySQLSettings   ( *this, getControlModifiedLink() )
+:OGenericAdministrationPage( _pParent, "DBWizMysqlNativePage", 
"dbaccess/ui/dbwizmysqlnativepage.ui", _rCoreAttrs )
+,m_aMySQLSettings   ( *get("MySQLSettingsContainer"), 
getControlModifiedLink() )
 {
-SetControlFontWeight( &m_aHeader );
-
-LayoutHelper::positionBelow( m_aHelpText, m_aMySQLSettings, 
UnrelatedControls, 0 );
+get(m_pHelpText, 

[Libreoffice-commits] core.git: desktop/source desktop/uiconfig desktop/UIConfig_deployment.mk

[Palenik Mihály]

 desktop/UIConfig_deployment.mk|1 
 desktop/source/deployment/gui/dp_gui_dependencydialog.cxx |   29 
 desktop/source/deployment/gui/dp_gui_dependencydialog.hxx |7 
 desktop/uiconfig/ui/dependenciesdialog.ui |   99 ++
 4 files changed, 106 insertions(+), 30 deletions(-)

New commits:
commit 8c0bd0deee50a5f54926afe87d849411757c2f18
Author: Palenik Mihály 
Date:   Sun Aug 3 19:50:32 2014 +0200

Convert RID_DLG_DEPENDENCIES to .ui

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

diff --git a/desktop/UIConfig_deployment.mk b/desktop/UIConfig_deployment.mk
index c41eaa7..4bc03a5 100644
--- a/desktop/UIConfig_deployment.mk
+++ b/desktop/UIConfig_deployment.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,desktop))
 
 $(eval $(call gb_UIConfig_add_uifiles,desktop,\
 desktop/uiconfig/ui/cmdlinehelp \
+desktop/uiconfig/ui/dependenciesdialog \
 desktop/uiconfig/ui/extensionmanager \
 desktop/uiconfig/ui/licensedialog \
 desktop/uiconfig/ui/showlicensedialog \
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx 
b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
index 63e72c3..bcdf232 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx
@@ -37,38 +37,19 @@ using dp_gui::DependencyDialog;
 
 DependencyDialog::DependencyDialog(
 Window * parent, std::vector< OUString > const & dependencies):
-ModalDialog(parent, DpGuiResId(RID_DLG_DEPENDENCIES) ),
-m_text(this, DpGuiResId(RID_DLG_DEPENDENCIES_TEXT)),
-m_list(this, DpGuiResId(RID_DLG_DEPENDENCIES_LIST)),
-m_ok(this, DpGuiResId(RID_DLG_DEPENDENCIES_OK)),
-m_listDelta(
-GetOutputSizePixel().Width() - m_list.GetSizePixel().Width(),
-GetOutputSizePixel().Height() - m_list.GetSizePixel().Height())
+ModalDialog(parent, "Dependencies", "desktop/ui/dependenciesdialog.ui")
 {
-FreeResource();
+get(m_list, "depListTreeview");
+set_height_request(200);
 SetMinOutputSizePixel(GetOutputSizePixel());
-m_list.SetReadOnly();
+m_list->SetReadOnly();
 for (std::vector< OUString >::const_iterator i(dependencies.begin());
  i != dependencies.end(); ++i)
 {
-m_list.InsertEntry(*i);
+m_list->InsertEntry(*i);
 }
 }
 
 DependencyDialog::~DependencyDialog() {}
 
-void DependencyDialog::Resize() {
-long n = m_ok.GetPosPixel().Y() -
-(m_list.GetPosPixel().Y() + m_list.GetSizePixel().Height());
-m_list.SetSizePixel(
-Size(
-GetOutputSizePixel().Width() - m_listDelta.Width(),
-GetOutputSizePixel().Height() - m_listDelta.Height()));
-m_ok.SetPosPixel(
-Point(
-(m_list.GetPosPixel().X() +
- (m_list.GetSizePixel().Width() - m_ok.GetSizePixel().Width()) / 
2),
-m_list.GetPosPixel().Y() + m_list.GetSizePixel().Height() + n));
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx 
b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
index cab93b7..e9397e2 100644
--- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx
@@ -44,12 +44,7 @@ private:
 DependencyDialog(DependencyDialog &); // not defined
 void operator =(DependencyDialog &); // not defined
 
-virtual void Resize() SAL_OVERRIDE;
-
-FixedText m_text;
-ListBox m_list;
-OKButton m_ok;
-Size m_listDelta;
+ListBox*  m_list;
 };
 
 }
diff --git a/desktop/uiconfig/ui/dependenciesdialog.ui 
b/desktop/uiconfig/ui/dependenciesdialog.ui
new file mode 100644
index 000..cdc6bf3
--- /dev/null
+++ b/desktop/uiconfig/ui/dependenciesdialog.ui
@@ -0,0 +1,99 @@
+
+
+  
+  
+False
+True
+True
+6
+System dependencies 
check
+dialog
+
+  
+False
+True
+True
+vertical
+12
+
+  
+False
+center
+
+  
+gtk-ok
+False
+True
+True
+True
+True
+True
+True
+  
+  
+False
+True
+0
+  
+
+  
+  
+False
+True
+end
+0
+  
+
+
+  
+True
+False
+True
+True
+vertical
+12
+
+  
+True
+False
+0
+The extension cannot 
be installed as the following system dependencies 

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

[Palenik Mihály]

 cui/UIConfig_cui.mk  |1 
 cui/source/customize/macropg.cxx |   17 +---
 cui/source/customize/macropg.hrc |   54 -
 cui/source/customize/macropg.src |   47 ---
 cui/source/customize/macropg_impl.hxx|7 -
 cui/source/inc/cuires.hrc|1 
 cui/uiconfig/ui/assigncomponentdialog.ui |  124 +++
 7 files changed, 133 insertions(+), 118 deletions(-)

New commits:
commit c6f4f70b24eaddbedf8bb463dfc4bd225f3c7f86
Author: Palenik Mihály 
Date:   Sun Aug 3 15:55:33 2014 +0200

Convert RID_SVXDLG_ASSIGNCOMPONENT to .ui

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

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index dbd98d0..c806bfc 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/areadialog \
cui/uiconfig/ui/areatabpage \
cui/uiconfig/ui/asiantypography \
+   cui/uiconfig/ui/assigncomponentdialog \
cui/uiconfig/ui/autocorrectdialog \
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/baselinksdialog \
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 8ab8d2b..fcb3af8 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -35,7 +35,6 @@
 #include 
 #include "selector.hxx"
 #include "cfg.hxx"
-#include "macropg.hrc"
 #include "helpid.hrc"
 #include 
 #include "headertablistbox.hxx"
@@ -847,7 +846,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg( Window* pParent, 
const Reference< frame::X
 
 IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler)
 {
-OUString aMethodName = maMethodEdit.GetText();
+OUString aMethodName = mpMethodEdit->GetText();
 maURL = "";
 if( !aMethodName.isEmpty() )
 {
@@ -859,16 +858,12 @@ IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler)
 }
 
 AssignComponentDialog::AssignComponentDialog( Window * pParent, const 
OUString& rURL )
-: ModalDialog( pParent, CUI_RES( RID_SVXDLG_ASSIGNCOMPONENT ) )
-, maMethodLabel( this, CUI_RES( FT_METHOD ) )
-, maMethodEdit( this, CUI_RES( EDIT_METHOD ) )
-, maOKButton( this, CUI_RES( RID_PB_OK ) )
-, maCancelButton( this, CUI_RES( RID_PB_CANCEL ) )
-, maHelpButton( this, CUI_RES( RID_PB_HELP ) )
+: ModalDialog( pParent, "AssignComponent", 
"cui/ui/assigncomponentdialog.ui" )
 , maURL( rURL )
 {
-FreeResource();
-maOKButton.SetClickHdl(LINK(this, AssignComponentDialog, ButtonHandler));
+get(mpMethodEdit, "methodEntry");
+get(mpOKButton, "ok");
+mpOKButton->SetClickHdl(LINK(this, AssignComponentDialog, ButtonHandler));
 
 OUString aMethodName;
 if( maURL.startsWith( aVndSunStarUNO ) )
@@ -876,7 +871,7 @@ AssignComponentDialog::AssignComponentDialog( Window * 
pParent, const OUString&
 sal_Int32 nBegin = aVndSunStarUNO.getLength();
 aMethodName = maURL.copy( nBegin );
 }
-maMethodEdit.SetText( aMethodName, Selection( 0, SELECTION_MAX ) );
+mpMethodEdit->SetText( aMethodName, Selection( 0, SELECTION_MAX ) );
 }
 
 AssignComponentDialog::~AssignComponentDialog()
diff --git a/cui/source/customize/macropg.hrc b/cui/source/customize/macropg.hrc
deleted file mode 100644
index 5101a03..000
--- a/cui/source/customize/macropg.hrc
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _MACROPG_HRC
-#define _MACROPG_HRC
-
-#include 
-
-#define LB_EVENT1
-#define PB_DELETE   3
-#define STR_EVENT   4
-#define STR_ASSMACRO5
-#define FT_ASSIGN   6
-#define PB_ASSIGN_COMPONENT 7
-
-#define IMG_MACRO   30
-#define IMG_COMPONENT   31
-
-#define RID_PB_OK   41
-#define RID_PB_CANCEL   42
-#define RID_PB_HELP 43
-#define FT_METHOD   44
-#define EDIT_METHOD

[Bug 76552] Macro eats 1300M RAM + 1277M swap in 4.1.0 and only 521M RAM + 553M swap in 4.0.6

[bugzilla-daemon]

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

Roman Polach  changed:

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

-- 
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: [GSoC] Chained Text Boxes in Draw - Report 03/08/2014

[Thorsten Behrens]

Matteo Campanelli wrote:
> last week's work saw progress quite close to the final goal:
> I was able to deal with overflowing texts in boxes by actually sending
> only the overflowing paragraph in the next links.
>
Nice progress, very pleased to hear! :)

> There seems to be some misbehavior at the moment though (e.g.
> sometimes some paragraphs disappear not showing neither the source
> box nor in the recipient one).
> 
That might actually be there alright, but just the redraw happening at
an unfortunate time. Let's sit down on irc if the problem persists.

Cheers,

-- Thorsten


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

Re: [Libreoffice-commits] core.git: 7 commits - chart2/source extensions/source hwpfilter/source l10ntools/source sal/osl unoidl/source

[Thorsten Behrens]

Norbert Thiebaud wrote:
> Well damned if you do, damned it you don't.
>
I think the point Stephan was making is - consistency within a module,
or a subsystem, is probably worth more than consistency of patches
with the majority of LibreOffice code.

Otherwise, what Bjoern says. And I wouldn't mind to have this monster
decrustify run at some stage. ;)

Cheers,

-- Thorsten


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source

[Michael Stahl]

 chart2/source/controller/inc/TextLabelItemConverter.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6d9fc845f7b08977e3711b1dbe20ee44e62c3b3d
Author: Michael Stahl 
Date:   Mon Aug 4 11:47:28 2014 +0200

hate that stupid auto_ptr deprecation warning

Change-Id: I8b290b61d7f081d5b2b72805968a374c91721cc3

diff --git a/chart2/source/controller/inc/TextLabelItemConverter.hxx 
b/chart2/source/controller/inc/TextLabelItemConverter.hxx
index 405d459..2ff8875 100644
--- a/chart2/source/controller/inc/TextLabelItemConverter.hxx
+++ b/chart2/source/controller/inc/TextLabelItemConverter.hxx
@@ -33,6 +33,7 @@ namespace chart { namespace wrapper {
 class TextLabelItemConverter : public ::comphelper::ItemConverter
 {
 public:
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
 TextLabelItemConverter(
 const css::uno::Reference& xChartModel,
 const css::uno::Reference& rPropertySet,
@@ -42,6 +43,7 @@ public:
 bool bDataSeries = false,
 sal_Int32 nNumberFormat = 0,
 sal_Int32 nPercentNumberFormat = 0 );
+SAL_WNODEPRECATED_DECLARATIONS_POP
 
 virtual ~TextLabelItemConverter();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: jurt/com qadevOOo/tests

[Noel Grandin]

 jurt/com/sun/star/comp/loader/FactoryHelper.java   |   21 
++
 qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java |6 --
 2 files changed, 7 insertions(+), 20 deletions(-)

New commits:
commit dc2cd08af181e8f29ac403a242a15cf4cf7a5bd2
Author: Noel Grandin 
Date:   Mon Aug 4 10:10:02 2014 +0200

simplify some java static initializers

Change-Id: Ic767b655297bfb5fcfb5cd7878d7131a9cb6b2f1

diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java 
b/jurt/com/sun/star/comp/loader/FactoryHelper.java
index 191aa1d..64ef51f 100644
--- a/jurt/com/sun/star/comp/loader/FactoryHelper.java
+++ b/jurt/com/sun/star/comp/loader/FactoryHelper.java
@@ -55,17 +55,6 @@ public class FactoryHelper {
 static protected class Factory
 implements XSingleServiceFactory, XSingleComponentFactory, 
XServiceInfo,
 XTypeProvider {
-protected static Class __objectArray;
-
-static {
-try {
-__objectArray = Class.forName("[Ljava.lang.Object;");
-}
-catch(ClassNotFoundException classNotFoundException) {
-System.err.println(FactoryHelper.class.getName() + " exception 
occurred - " + classNotFoundException);
-}
-}
-
 //private static final boolean DEBUG = false;
 
 protected XMultiServiceFactory _xMultiServiceFactory;
@@ -92,7 +81,7 @@ public class FactoryHelper {
 if(parameters.length == 3
&& parameters[0].equals(XComponentContext.class)
  && parameters[1].equals(XRegistryKey.class)
- && parameters[2].equals(__objectArray)) {
+ && parameters[2].equals(Object[].class)) {
 _nCode = 0;
 _constructor = constructors[i];
 }
@@ -104,7 +93,7 @@ public class FactoryHelper {
 }
 else if(parameters.length == 2
  && parameters[0].equals(XComponentContext.class)
- && parameters[1].equals(__objectArray)) {
+ && parameters[1].equals(Object[].class)) {
 _nCode = 2;
 _constructor = constructors[i];
 }
@@ -117,7 +106,7 @@ public class FactoryHelper {
 else if(parameters.length == 3
  && parameters[0].equals(XMultiServiceFactory.class)
  && parameters[1].equals(XRegistryKey.class)
- && parameters[2].equals(__objectArray)) {
+ && parameters[2].equals(Object[].class)) {
 _nCode = 4;
 _constructor = constructors[i];
 }
@@ -129,7 +118,7 @@ public class FactoryHelper {
 }
 else if(parameters.length == 2
  && parameters[0].equals(XMultiServiceFactory.class)
- && parameters[1].equals(__objectArray)) {
+ && parameters[1].equals(Object[].class)) {
 _nCode = 6;
 _constructor = constructors[i];
 }
@@ -139,7 +128,7 @@ public class FactoryHelper {
 _constructor = constructors[i];
 }
 else if(parameters.length == 1
- && parameters[0].equals(__objectArray)) {
+ && parameters[0].equals(Object[].class)) {
 _nCode = 8;
 _constructor = constructors[i];
 }
diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java 
b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
index 773ea0a..8f454c7 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedIndexEntrySupplier.java
@@ -220,12 +220,10 @@ public class _XExtendedIndexEntrySupplier extends 
MultiMethodTest {
  */
 public static class UnicodeStringPair {
 final static int valCount = 78;
-static String[] sStringEquivalence = null;
-static char[] iUnicodeEquivalence = null;
+static final String[] sStringEquivalence = new String[valCount];
+static final char[] iUnicodeEquivalence = new char[valCount];
 
 static {
-sStringEquivalence = new String[valCount];
-iUnicodeEquivalence = new char[valCount];
 fillValues();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source filter/source include/svx sc/source sd/qa sd/source svx/source sw/source

[Stephan Bergmann]

 cui/source/tabpages/textattr.cxx |   16 ++--
 filter/source/msfilter/msdffimp.cxx  |   16 ++--
 filter/source/msfilter/svdfppt.cxx   |   18 ++---
 include/svx/sdtditm.hxx  |   35 +--
 sc/source/core/data/postit.cxx   |8 +++---
 sc/source/core/tool/detfunc.cxx  |8 +++---
 sc/source/filter/excel/xiescher.cxx  |8 +++---
 sd/qa/unit/export-tests.cxx  |8 +++---
 sd/qa/unit/import-tests.cxx  |8 +++---
 sd/source/core/drawdoc4.cxx  |   16 ++--
 sd/source/filter/ppt/pptin.cxx   |8 +++---
 sd/source/ui/func/fuconrec.cxx   |8 +++---
 sd/source/ui/view/drviews3.cxx   |4 +--
 svx/source/sdr/properties/textproperties.cxx |   18 ++---
 svx/source/svdraw/svdattr.cxx|8 +++---
 svx/source/svdraw/svdfmtf.cxx|8 +++---
 svx/source/svdraw/svdotext.cxx   |8 +++---
 svx/source/table/cell.cxx|8 +++---
 svx/source/table/tablecontroller.cxx |   16 ++--
 sw/source/filter/ww8/ww8graf.cxx |   16 ++--
 sw/source/filter/ww8/ww8par.cxx  |8 +++---
 21 files changed, 120 insertions(+), 131 deletions(-)

New commits:
commit 768d32cf5b7dc35ab1b93e898e1bb5beab43c27c
Author: Stephan Bergmann 
Date:   Mon Aug 4 11:29:51 2014 +0200

Consistency around SdrMetricItem in svx/sdtditm.hxx

...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: Ib0234883d441be668700df5ccd0e855973dc5426

diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 6b96c27..0253342 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -124,7 +124,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
 pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LEFTDIST );
 if( pItem )
 {
-long nValue = ( ( const SdrTextLeftDistItem* )pItem )->GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
 SetMetricValue( *m_pMtrFldLeft, nValue, eUnit );
 }
 else
@@ -136,7 +136,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
 pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_RIGHTDIST );
 if( pItem )
 {
-long nValue = ( ( const SdrTextRightDistItem* )pItem )->GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
 SetMetricValue( *m_pMtrFldRight, nValue, eUnit );
 }
 else
@@ -148,7 +148,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
 pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_UPPERDIST );
 if( pItem )
 {
-long nValue = ( ( const SdrTextUpperDistItem* )pItem )->GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
 SetMetricValue( *m_pMtrFldTop, nValue, eUnit );
 }
 else
@@ -160,7 +160,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
 pItem = &pPool->GetDefaultItem( SDRATTR_TEXT_LOWERDIST );
 if( pItem )
 {
-long nValue = ( ( const SdrTextLowerDistItem* )pItem )->GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
 SetMetricValue( *m_pMtrFldBottom, nValue, eUnit );
 }
 else
@@ -334,25 +334,25 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
 if( m_pMtrFldLeft->IsValueChangedFromSaved() )
 {
 nValue = GetCoreValue( *m_pMtrFldLeft, eUnit );
-rAttrs->Put( SdrTextLeftDistItem( nValue ) );
+rAttrs->Put( makeSdrTextLeftDistItem( nValue ) );
 }
 
 if( m_pMtrFldRight->IsValueChangedFromSaved() )
 {
 nValue = GetCoreValue( *m_pMtrFldRight, eUnit );
-rAttrs->Put( SdrTextRightDistItem( nValue ) );
+rAttrs->Put( makeSdrTextRightDistItem( nValue ) );
 }
 
 if( m_pMtrFldTop->IsValueChangedFromSaved() )
 {
 nValue = GetCoreValue( *m_pMtrFldTop, eUnit );
-rAttrs->Put( SdrTextUpperDistItem( nValue ) );
+rAttrs->Put( makeSdrTextUpperDistItem( nValue ) );
 }
 
 if( m_pMtrFldBottom->IsValueChangedFromSaved() )
 {
 nValue = GetCoreValue( *m_pMtrFldBottom, eUnit );
-rAttrs->Put( SdrTextLowerDistItem( nValue ) );
+rAttrs->Put( makeSdrTextLowerDistItem( nValue ) );
 }
 
 eState = m_pTsbAutoGrowHeight->GetState();
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index 0fe240b..c5bdd59 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1496,10 +1496,10 @@ void DffPropertyReader::ApplyCustomShapeTextAttributes( 
SfxItemSet& rSet ) const
 rSet.Put(

[GSoC] Varga Mihai - progress report week 11

[Mihai Varga]

Hello,

The SharePoint connection is almost ready and this week I'll be trying to
integrate it in LO and test it

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

[Libreoffice-commits] core.git: configure.ac

[Tor Lillqvist]

 configure.ac |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 83f37705679f5176f0aa0c8e58da681c0a3c2319
Author: Tor Lillqvist 
Date:   Mon Aug 4 11:12:11 2014 +0300

Presumably no point in automatically disabling avmedia for iOS either then

(Re: 7f36e996a07ed7f39a33fffb2d2c523adf00eefc)

Change-Id: I115bb35cd4c469661b5a8e3af378618b718f2a29

diff --git a/configure.ac b/configure.ac
index d9d9303..73705b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2448,9 +2448,7 @@ AC_SUBST(DISABLE_EXPORT)
 # Whether to build "avmedia" functionality or not.
 
 if test -z "$enable_avmedia"; then
-if test $_os != iOS; then
-enable_avmedia=yes
-fi
+enable_avmedia=yes
 fi
 
 if test "$enable_avmedia" = yes; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 ++
 writerfilter/source/dmapper/DomainMapper.cxx |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b5e60724ac73bb0e62b249145a8931fd6166bb69
Author: Zolnai Tamás 
Date:   Sun Aug 3 10:45:23 2014 +0200

fdo#80986: disable highlight DOCX import

Highlight support is not implemented fully, so
it seems better to disable DOCX import of it until
it is finished.
Highlight can't be modified on the UI and is not
saved to ODT/DOC (regression).

Regression from:
8b949134441056a1455d67ddfdd7e0bc5f2ee682

Change-Id: I94891769766ae90017e8afa70e65d080d5270202

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 207ad5b..62195cc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1482,6 +1482,7 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx")
 CPPUNIT_ASSERT_EQUAL(OUString("RenderedShapes"), nValue); // Rendered 
bitmap has the proper name
 }
 
+/*
 DECLARE_OOXMLEXPORT_TEST(testCharHighlight, "char_highlight.docx")
 {
 const uno::Reference< text::XTextRange > xPara = getParagraph(1);
@@ -1528,6 +1529,7 @@ DECLARE_OOXMLEXPORT_TEST(testCharHighlight, 
"char_highlight.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), 
getProperty(xRun,"CharBackColor"));
 }
 }
+*/
 
 DECLARE_OOXMLEXPORT_TEST(testFontNameIsEmpty, "font-name-is-empty.docx")
 {
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index bd0b370..e719ef1 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1367,7 +1367,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 {
 sal_Int32 nColor = 0;
 if( (mbIsHighlightSet = getColorFromIndex(nIntValue, nColor)) )
-rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::makeAny( nColor ));
+rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( nColor ));
 else if (mnBackgroundColor)
 rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( 
mnBackgroundColor ));
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Downloading specific daily-build

[Adam Fyne]

yeah, but I need a *Windows* build, so setting the entire build environment
would
take me at least a day... that's why I wanted to know if there is any
archive out
there somewhere...


On Mon, Aug 4, 2014 at 10:32 AM, Miklos Vajna 
wrote:

> On Sun, Aug 03, 2014 at 05:23:59PM +0200, Norbert Thiebaud <
> nthieb...@gmail.com> wrote:
> > Daily builds get deleted after about 15 days or so...
>
> Though if you need an older version, you can always build it yourself:
> 'git checkout ', then the usual autogen/make should produce
> it for debugging purposes.
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>


-- 




*Adam Fyne*
Interoperability Team Leader
Twitter  | LinkedIn
 | Facebook

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

Re: distro-pack-install do not install libsaxlo.so

[Tomáš Chvátal]

2014-07-21 9:03 GMT+02:00 Tomáš Chvátal :

> Hello guys,
>
> I found this out when packaging 4.3 for openSUSE and used following hack
> to fix the problem:
>
> make DESTDIR=%{buildroot} distro-pack-install
> # FIXME: Hack add missing file
> install -m755 instdir/program/libsaxlo.so
> %{buildroot}/%{_libdir}/%{name}/program/libsaxlo.so
> echo "%{_libdir}/%{name}/program/libsaxlo.so" >>file-lists/common_list.txt
>
> But I am not exactly sure how to fix this, so someone knowledgable on how
> the file-lists are generated needs to fix it :)
>
> Cheers
>
> Tom
>


More diging:

It is caused by mergedlib feature, if we disable that it is produced
correctly. So it is technically not caused by distro packaging.

Cheers

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

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

[Umesh Kadam]

 oox/source/vml/vmlshape.cxx|   16 
 sw/qa/extras/ooxmlimport/data/WordArt.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx   |   15 +++
 3 files changed, 31 insertions(+)

New commits:
commit ded5b1ecdef42fab84fa57ab504b4cc006a4df91
Author: Umesh Kadam 
Date:   Fri Jul 18 13:02:19 2014 +0530

fdo#78301 : Size of word-arts change during import.

- Do not resize the fallback geometry for Word-Arts(VML), since the
  overlay geometry is constructed using the properties of the
  fallback geometry.
- The resize autoshape to fit text attr of FontWork/Word-Art should
  always be false for the fallback geometry(the SdrObject).

Change-Id: If8badb382c525875a07a0a9e6268cec036739001
Reviewed-on: https://gerrit.libreoffice.org/10486
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index f98c717..842a65c 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -58,6 +58,9 @@
 #include "oox/vml/vmltextbox.hxx"
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/helper/containerhelper.hxx"
+#include "svx/EnhancedCustomShapeTypeNames.hxx"
+#include 
+#include 
 
 using ::com::sun::star::beans::XPropertySet;
 using ::com::sun::star::uno::Any;
@@ -534,6 +537,19 @@ Reference< XShape > SimpleShape::implConvertAndInsert( 
const Reference< XShapes
 }
 
 Reference< XShape > xShape = mrDrawing.createAndInsertXShape( maService, 
rxShapes, aShapeRect );
+SdrObject* pShape = GetSdrObjectFromXShape( xShape );
+if( pShape && getShapeType() >= 0 )
+{
+OUString aShapeType;
+aShapeType = EnhancedCustomShapeTypeNames::Get( static_cast< MSO_SPT 
>(getShapeType()) );
+//The resize autoshape to fit text attr of FontWork/Word-Art should 
always be false
+//for the fallback geometry.
+if(aShapeType.startsWith("fontwork"))
+{
+pShape->SetMergedItem(SdrTextAutoGrowHeightItem(false));
+pShape->SetMergedItem(SdrTextAutoGrowWidthItem(false));
+}
+}
 convertShapeProperties( xShape );
 
 // Handle left/right/top/bottom wrap distance.
diff --git a/sw/qa/extras/ooxmlimport/data/WordArt.docx 
b/sw/qa/extras/ooxmlimport/data/WordArt.docx
new file mode 100644
index 000..3960a15
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/WordArt.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index eca47da..371b303 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -982,6 +982,21 @@ DECLARE_OOXMLIMPORT_TEST(testN792778, "n792778.docx")
 CPPUNIT_ASSERT_EQUAL(sal_Int32(11684), xInnerShape->getPosition().Y);
 }
 
+DECLARE_OOXMLIMPORT_TEST(testWordArtResizing, "WordArt.docx")
+{
+/* The Word-Arts and watermarks were getting resized automatically, It was 
as if they were
+   getting glued to the fallback geometry(the sdrObj) and were getting 
bound to the font size.
+   The test-case esures the original height and width of the word-art is 
not changed while importing*/
+
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDrawPage(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
+
+uno::Reference xShape(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(10105), xShape->getSize().Width);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4755), xShape->getSize().Height);
+}
+
 DECLARE_OOXMLIMPORT_TEST(testGroupshapeLine, "groupshape-line.docx")
 {
 /*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Downloading specific daily-build

[Miklos Vajna]

On Sun, Aug 03, 2014 at 05:23:59PM +0200, Norbert Thiebaud 
 wrote:
> Daily builds get deleted after about 15 days or so...

Though if you need an older version, you can always build it yourself:
'git checkout ', then the usual autogen/make should produce
it for debugging purposes.


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

[Bug 45618] Implement 3d slideshow transition framework also for windows

[bugzilla-daemon]

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

--- Comment #6 from Rene Engelhard  ---
if you mean that glTF thingy - please no. At least not default.

At least my package builds still do --disable-gltf and that won't change until
I get all of those libs packaged sanely *and* implement --with-system-* for
them.

the OGLTrans thing for Linux works also without it:
https://packages.debian.org/sid/libreoffice-ogltrans, so please don't (well, I
don't care, but users might...) break it when changing it ;)

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