RE: DOCX import of textbox within shape

[Adam Co]

Hi Abdulaziz,

Can you open a bug in bugzilla and attach a sample document to it?

Best,

Adam

 

From: Abdulaziz Ayed Khalid Alayed [mailto:aala...@kacst.edu.sa] 
Sent: Wednesday, December 18, 2013 9:34 AM
To: vmik...@collabora.co.uk
Cc: libreoffice@lists.freedesktop.org; rattles2...@gmail.com
Subject: DOCX import of textbox within shape

 

Hi all

in DOCX import if the file contain a text box within shape the importer does
not read the text box tag ...

I think there is a mistake in pushing of properties .

any ideas 

build-id : 31005a419d5fad3fc97bebf6df9b77a39a1d517b 

 

Warm Regards,
Abdulaziz Ayed Alayed
developer at Motah Program , KACST
http://www.motah.org.sa


Warning: This message and its attachment, if any, are confidential and may
contain information protected by law. If you are not the intended recipient,
please contact the sender immediately and delete the message and its
attachment, if any. You should not copy the message and its attachment, if
any, or disclose its contents to any other person or use it for any purpose.
Statements and opinions expressed in this e-mail and its attachment, if any,
are those of the sender, and do not necessarily reflect those of King
Abdulaziz city for Science and Technology (KACST) in the Kingdom of Saudi
Arabia. KACST accepts no liability for any damage caused by this email.

تحذير: هذه الرسالة وما تحويه من مرفقات (إن وجدت) تمثل وثيقة سرية قد تحتوي
على معلومات محمية بموجب القانون. إذا لم تكن الشخص المعني بهذه الرسالة فيجب
عليك تنبيه المُرسل بخطأ وصولها إليك، وحذف الرسالة ومرفقاتها (إن وجدت)، ولا
يجوز لك نسخ أو توزيع هذه الرسالة أو مرفقاتها (إن وجدت) أو أي جزء منها، أو
البوح بمحتوياتها للغير أو استعمالها لأي غرض. علماً بأن فحوى هذه الرسالة
ومرفقاتها (ان وجدت) تعبر عن رأي المُرسل وليس بالضرورة رأي مدينة الملك
عبدالعزيز للعلوم والتقنية بالمملكة العربية السعودية، ولا تتحمل المدينة أي
مسئولية عن الأضرار الناتجة عن ما قد يحتويه هذا البريد.

 

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

Re: Disabling unit tests, redux

[Markus Mohrhard]

Hey,


On Wed, Dec 18, 2013 at 2:32 AM, Keith Curtis keit...@gmail.com wrote:

 I don't even know the names of the various modules I'm working in and
 prefer to let the smart system figure it out ;-) make build-nocheck works
 great and things run so much faster on my little laptop. Thank you. I put
 this info in the wiki to save questions in the future.


Please don't. There are good reasons we don't document building without the
tests. We had some problems in the past and normally force every developer
to execute the minimum amount of tests during a full build. While working
on some parts of the code you normally only rebuild this part which limits
the number of executed tests.

Regards,
Markus


 -Keith


 On Mon, Dec 16, 2013 at 1:33 AM, Khaled Hosny khaledho...@eglug.orgwrote:

 On Mon, Dec 16, 2013 at 12:56:59AM -0500, Keith Curtis wrote:
  It appears when making changes to individual C++ files that my computer
  spends about 90% of the build time running unit tests.

 It seems that ‘make foo.build’ will not run the tests, at least this is
 what I “discovered” few days ago.



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


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

RE: DOCX import of textbox within shape

[Abdulaziz Ayed Khalid Alayed]

Hi Adam

thanks for responding

its allready opend https://bugs.freedesktop.org/show_bug.cgi?id=70942

I was have a code pointer and i was trying to solve it now after my last [ git 
pull ] i try again with the same code pointer and it does not work .
I use a debuger before last [ git pull ] in the same code pointer and the 
debuger catch the break point [textbox tag] , but now  the debuger can't catch 
the same break point.
  so, I think some one make (small) mistake :) with the pushing of DOCX 
properties (I mean it doesn't push the text box tag  within shape) .

Warm Regards,
Abdulaziz Ayed Alayed
developer at Motah Program , KACST
http://www.motah.org.sa

From: Adam Co [rattles2...@gmail.com]
Sent: Wednesday, December 18, 2013 11:01
To: Abdulaziz Ayed Khalid Alayed; vmik...@collabora.co.uk
Cc: libreoffice@lists.freedesktop.org
Subject: RE: DOCX import of textbox within shape

Hi Abdulaziz,
Can you open a bug in bugzilla and attach a sample document to it?
Best,
Adam

From: Abdulaziz Ayed Khalid Alayed [mailto:aala...@kacst.edu.sa]
Sent: Wednesday, December 18, 2013 9:34 AM
To: vmik...@collabora.co.uk
Cc: libreoffice@lists.freedesktop.org; rattles2...@gmail.com
Subject: DOCX import of textbox within shape

Hi all

in DOCX import if the file contain a text box within shape the importer does 
not read the text box tag ...

I think there is a mistake in pushing of properties .

any ideas

build-id : 31005a419d5fad3fc97bebf6df9b77a39a1d517b

Warm Regards,
Abdulaziz Ayed Alayed
developer at Motah Program , KACST
http://www.motah.org.sa
Warning: This message and its attachment, if any, are confidential and may 
contain information protected by law. If you are not the intended recipient, 
please contact the sender immediately and delete the message and its 
attachment, if any. You should not copy the message and its attachment, if any, 
or disclose its contents to any other person or use it for any purpose. 
Statements and opinions expressed in this e-mail and its attachment, if any, 
are those of the sender, and do not necessarily reflect those of King Abdulaziz 
city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST 
accepts no liability for any damage caused by this email.

تحذير: هذه الرسالة وما تحويه من مرفقات (إن وجدت) تمثل وثيقة سرية قد تحتوي على 
معلومات محمية بموجب القانون. إذا لم تكن الشخص المعني بهذه الرسالة فيجب عليك 
تنبيه المُرسل بخطأ وصولها إليك، وحذف الرسالة ومرفقاتها (إن وجدت)، ولا يجوز لك 
نسخ أو توزيع هذه الرسالة أو مرفقاتها (إن وجدت) أو أي جزء منها، أو البوح 
بمحتوياتها للغير أو استعمالها لأي غرض. علماً بأن فحوى هذه الرسالة ومرفقاتها (ان 
وجدت) تعبر عن رأي المُرسل وليس بالضرورة رأي مدينة الملك عبدالعزيز للعلوم 
والتقنية بالمملكة العربية السعودية، ولا تتحمل المدينة أي مسئولية عن الأضرار 
الناتجة عن ما قد يحتويه هذا البريد.


Warning: This message and its attachment, if any, are confidential and may 
contain information protected by law. If you are not the intended recipient, 
please contact the sender immediately and delete the message and its 
attachment, if any. You should not copy the message and its attachment, if any, 
or disclose its contents to any other person or use it for any purpose. 
Statements and opinions expressed in this e-mail and its attachment, if any, 
are those of the sender, and do not necessarily reflect those of King Abdulaziz 
city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST 
accepts no liability for any damage caused by this email.

تحذير: هذه الرسالة وما تحويه من مرفقات (إن وجدت) تمثل وثيقة سرية قد تحتوي على 
معلومات محمية بموجب القانون. إذا لم تكن الشخص المعني بهذه الرسالة فيجب عليك 
تنبيه المُرسل بخطأ وصولها إليك، وحذف الرسالة ومرفقاتها (إن وجدت)، ولا يجوز لك 
نسخ أو توزيع هذه الرسالة أو مرفقاتها (إن وجدت) أو أي جزء منها، أو البوح 
بمحتوياتها للغير أو استعمالها لأي غرض. علماً بأن فحوى هذه الرسالة ومرفقاتها (ان 
وجدت) تعبر عن رأي المُرسل وليس بالضرورة رأي مدينة الملك عبدالعزيز للعلوم 
والتقنية بالمملكة العربية السعودية، ولا تتحمل المدينة أي مسئولية عن الأضرار 
الناتجة عن ما قد يحتويه هذا البريد.

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

Re: Easy export filter testing

[Miklos Vajna]

On Tue, Dec 10, 2013 at 10:04:18AM +, Caolán McNamara caol...@redhat.com 
wrote:
  Caolán, do I remember correctly that FiltersTest is your baby? Any
  objections?
 
 I have no objections re export twiddling. It was the import and the
 ability to shovel a load of documents into the indeterminate dirs and
 just run make that I was interested in.

OK, I added initial export support in
73a808f6b300fddcaab1d3c916d92785a1801d63, for now it assumes that the
same filter is wished for import and export, that does what I need ATM.


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

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

[Stephan Bergmann]

 setup_native/source/win32/customactions/sellang/sellang.cxx |  179 +---
 1 file changed, 86 insertions(+), 93 deletions(-)

New commits:
commit a107c6bd8c40e5a147dcd18d0d9916a27218167b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 12 09:45:10 2013 +0100

Remove unnecessary macros

Change-Id: I1d7cdea37db59f58ca100489e593b882a951d96a

diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx 
b/setup_native/source/win32/customactions/sellang/sellang.cxx
index e9c4c57..e9b644a 100644
--- a/setup_native/source/win32/customactions/sellang/sellang.cxx
+++ b/setup_native/source/win32/customactions/sellang/sellang.cxx
@@ -60,103 +60,96 @@ langid_to_string( LANGID langid )
  * language part is returned in the string.
  */
 switch (PRIMARYLANGID (langid)) {
-#define CASE(name, primary) \
-case LANG_##primary: return #name
-CASE(af, AFRIKAANS);
-CASE(am, AMHARIC);
-CASE(ar, ARABIC);
-CASE(as, ASSAMESE);
-CASE(be, BELARUSIAN);
-CASE(bg, BULGARIAN);
-CASE(bn, BENGALI);
-CASE(br, BRETON);
-CASE(ca, CATALAN);
-CASE(cs, CZECH);
-CASE(cy, WELSH);
-CASE(da, DANISH);
-CASE(de, GERMAN);
-CASE(el, GREEK);
-CASE(en, ENGLISH);
-CASE(es, SPANISH);
-CASE(et, ESTONIAN);
-CASE(eu, BASQUE);
-CASE(fa, FARSI);
-CASE(fi, FINNISH);
-CASE(fo, FAEROESE);
-CASE(fr, FRENCH);
-CASE(ga, IRISH);
-CASE(gl, GALICIAN);
-CASE(gu, GUJARATI);
-CASE(he, HEBREW);
-CASE(hi, HINDI);
-CASE(hu, HUNGARIAN);
-CASE(hy, ARMENIAN);
-CASE(id, INDONESIAN);
-CASE(is, ICELANDIC);
-CASE(it, ITALIAN);
-CASE(ja, JAPANESE);
-CASE(ka, GEORGIAN);
-CASE(km, KHMER);
-CASE(kn, KANNADA);
-CASE(ko, KOREAN);
-CASE(ks, KASHMIRI);
-CASE(lo, LAO);
-CASE(lt, LITHUANIAN);
-CASE(lv, LATVIAN);
-CASE(mk, MACEDONIAN);
-CASE(ml, MALAYALAM);
-CASE(mn, MONGOLIAN);
-CASE(mr, MARATHI);
-CASE(ms, MALAY);
-CASE(mt, MALTESE);
-CASE(ne, NEPALI);
-CASE(nl, DUTCH);
-CASE(ns, SOTHO);
-CASE(or, ORIYA);
-CASE(pa, PUNJABI);
-CASE(pl, POLISH);
-CASE(pt, PORTUGUESE);
-CASE(rm, ROMANSH);
-CASE(ro, ROMANIAN);
-CASE(ru, RUSSIAN);
-CASE(rw, KINYARWANDA);
-CASE(sa, SANSKRIT);
-CASE(sb, UPPER_SORBIAN);
-CASE(sd, SINDHI);
-CASE(sk, SLOVAK);
-CASE(sl, SLOVENIAN);
-CASE(sq, ALBANIAN);
-CASE(sv, SWEDISH);
-CASE(sw, SWAHILI);
-CASE(ta, TAMIL);
-CASE(te, TELUGU);
-CASE(tg, TAJIK);
-CASE(th, THAI);
-CASE(ti, TIGRIGNA);
-CASE(tn, TSWANA);
-CASE(tr, TURKISH);
-CASE(tt, TATAR);
-CASE(uk, UKRAINIAN);
-CASE(ur, URDU);
-CASE(uz, UZBEK);
-CASE(vi, VIETNAMESE);
-CASE(xh, XHOSA);
-CASE(zh, CHINESE);
-CASE(zu, ZULU);
-#undef CASE
+case LANG_AFRIKAANS: return af;
+case LANG_AMHARIC: return am;
+case LANG_ARABIC: return ar;
+case LANG_ASSAMESE: return as;
+case LANG_BELARUSIAN: return be;
+case LANG_BULGARIAN: return bg;
+case LANG_BENGALI: return bn;
+case LANG_BRETON: return br;
+case LANG_CATALAN: return ca;
+case LANG_CZECH: return cs;
+case LANG_WELSH: return cy;
+case LANG_DANISH: return da;
+case LANG_GERMAN: return de;
+case LANG_GREEK: return el;
+case LANG_ENGLISH: return en;
+case LANG_SPANISH: return es;
+case LANG_ESTONIAN: return et;
+case LANG_BASQUE: return eu;
+case LANG_FARSI: return fa;
+case LANG_FINNISH: return fi;
+case LANG_FAEROESE: return fo;
+case LANG_FRENCH: return fr;
+case LANG_IRISH: return ga;
+case LANG_GALICIAN: return gl;
+case LANG_GUJARATI: return gu;
+case LANG_HEBREW: return he;
+case LANG_HINDI: return hi;
+case LANG_HUNGARIAN: return hu;
+case LANG_ARMENIAN: return hy;
+case LANG_INDONESIAN: return id;
+case LANG_ICELANDIC: return is;
+case LANG_ITALIAN: return it;
+case LANG_JAPANESE: return ja;
+case LANG_GEORGIAN: return ka;
+case LANG_KHMER: return km;
+case LANG_KANNADA: return kn;
+case LANG_KOREAN: return ko;
+case LANG_KASHMIRI: return ks;
+case LANG_LAO: return lo;
+case LANG_LITHUANIAN: return lt;
+case LANG_LATVIAN: return lv;
+case LANG_MACEDONIAN: return mk;
+case LANG_MALAYALAM: return ml;
+case LANG_MONGOLIAN: return mn;
+case LANG_MARATHI: return mr;
+case LANG_MALAY: return ms;
+case LANG_MALTESE: return mt;
+case LANG_NEPALI: return ne;
+case LANG_DUTCH: return nl;
+case LANG_SOTHO: return ns;
+case LANG_ORIYA: return or;
+case LANG_PUNJABI: return pa;
+case LANG_POLISH: return pl;
+case LANG_PORTUGUESE: return pt;
+case LANG_ROMANSH: return rm;
+case LANG_ROMANIAN: return ro;
+case LANG_RUSSIAN: return ru;
+case LANG_KINYARWANDA: return rw;
+case LANG_SANSKRIT: return sa;
+case LANG_UPPER_SORBIAN: return sb;
+case LANG_SINDHI: return sd;
+ 

Re: DOCX import of textbox within shape

[Miklos Vajna]

Hi,

On Wed, Dec 18, 2013 at 08:24:46AM +, Abdulaziz Ayed Khalid Alayed 
aala...@kacst.edu.sa wrote:
 thanks for responding
 
 its allready opend https://bugs.freedesktop.org/show_bug.cgi?id=70942
 
 I was have a code pointer and i was trying to solve it now after my last [ 
 git pull ] i try again with the same code pointer and it does not work .
 I use a debuger before last [ git pull ] in the same code pointer and the 
 debuger catch the break point [textbox tag] , but now  the debuger can't 
 catch the same break point.
   so, I think some one make (small) mistake :) with the pushing of DOCX 
 properties (I mean it doesn't push the text box tag  within shape) .

This is a known issue, with no easy solution. The problem is that in
Word, a shape can contain any text, while in Writer, there is a
difference between a Writer textframe and a drawinglayer shape.

Writer textframes can e.g. contain tables (drawinglayer shape text is
editengine, that doesn't support this), OTOH drawinglayer rectangles can
have rounded corners (Writer textframes don't support this) -- and there
are other similar differences.

The original VML import code simply imported every shape that has some
text as a textframe, to make sure no data (like tables, OLE objects,
etc) is lost during import; only formatting (like shape type). Up to
4.2, the Fallback branch of the mc:AlternateContent element is read. On
master, the Choice branch is read if the required feature is wps,
though the behavior is the same: if the shape has text, it's imported as
a textframe (unless it's part of a groupshape).

A long-term fix would be to implement missing features in editengine, so
there won't be need to import any kind of shape as a Writer textframe,
though that will take a huge amount of time to achieve.

A shorter-term fix for this would be to look ahead in the importer,
check if the shape text has any feature that requires a writer textframe
(like a table), and if not, then go ahead with the requested shape
instead.  Unfortunately ATM we parse the DOCX XML with a SAX parser that
doesn't allow such look ahead.

(A similar problem: if the shape is inside a group shape and the shape
text contains tables, it's better to import it as a textframe and not to
add it to the groupshape; but in general importing it as a drawinglayer
rectangle and adding to the groupshape is preferred. The RTF import
supports look ahead and decides what to do, based on if the shape text
contains tables or not.)

HTH,

Miklos


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

Re: Disabling unit tests, redux

[Stephan Bergmann]

On 12/18/2013 02:32 AM, Keith Curtis wrote:

I don't even know the names of the various modules I'm working in and
prefer to let the smart system figure it out ;-)


The module names match the top-level directory names, in case that 
wasn't obvious.  So if you do a change to e.g. 
desktop/source/app/app.cxx it suffices to make desktop to get instdir/ 
updated.


Stephan

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 53/e91e8867652a344f00e9badfe65023a395cbc6

[Caolán McNamara]

 53/e91e8867652a344f00e9badfe65023a395cbc6 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 41fb1075048ca7241963fecc340b3d4ec56a4452
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Dec 18 08:55:29 2013 +

Notes added by 'git notes add'

diff --git a/53/e91e8867652a344f00e9badfe65023a395cbc6 
b/53/e91e8867652a344f00e9badfe65023a395cbc6
new file mode 100644
index 000..f6b94a2
--- /dev/null
+++ b/53/e91e8867652a344f00e9badfe65023a395cbc6
@@ -0,0 +1 @@
+prefer: 59c08b6f768ee8b797ec51a03d1d22c7bf6138bb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6f/80044bc6371f22051f31628ecca7ee28695de3

[Caolán McNamara]

 6f/80044bc6371f22051f31628ecca7ee28695de3 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 31ccaaa00f50dbd53d59e7a531bd7741bc949886
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Dec 18 08:56:16 2013 +

Notes added by 'git notes add'

diff --git a/6f/80044bc6371f22051f31628ecca7ee28695de3 
b/6f/80044bc6371f22051f31628ecca7ee28695de3
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/6f/80044bc6371f22051f31628ecca7ee28695de3
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adam Co]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |5 -
 sw/source/filter/ww8/docxattributeoutput.cxx |6 --
 2 files changed, 4 insertions(+), 7 deletions(-)

New commits:
commit c7e66b3214a13e3ab94041874d4495e1dfb2c2dd
Author: Adam Co rattles2...@gmail.com
Date:   Tue Dec 17 16:54:27 2013 +0200

Revert code that push copy of 'rPr' inside 'pPr' in DOCX export

There was code that was inserted by commit id
'8c178a50334109b34ef456ca6aa51cd3d98699ae' that added logic to
also export 'rPr' in the 'pPr' node.
The 'rPr' represents the paragraph marker formatting.
However - simply copying the last run's formatting and assuming
it is the same for the paragraph marker should not be used.

Also refer to 'aafffe6d1c3734fb2acef4b2bb1385c1e2f49043' for
details on test-case disable.

Change-Id: I6004e4c706abfeb5f51d86d11d3ebf46256a68c5
Reviewed-on: https://gerrit.libreoffice.org/7121
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index bc7c87e..bd7c913 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -550,6 +550,8 @@ DECLARE_OOXMLEXPORT_TEST(testN789482, n789482.docx)
 getRun(xParagraph, 5,  After.);
 }
 
+/*
+ * doesn't work on openSUSE12.2 at least
 DECLARE_OOXMLEXPORT_TEST(test1Table1Page, 1-table-1-page.docx)
 {
 // 2 problem for this document after export:
@@ -561,6 +563,7 @@ DECLARE_OOXMLEXPORT_TEST(test1Table1Page, 
1-table-1-page.docx)
 xCursor-jumpToLastPage();
 CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage());
 }
+*/
 
 DECLARE_OOXMLEXPORT_TEST(testTextFrames, textframes.odt)
 {
@@ -1393,7 +1396,7 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar2, calendar2.docx)
 xCell.set(xTable-getCellByName(A2), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(16.f, getPropertyfloat(getRun(getParagraphOfText(1, 
xCell-getText()), 1), CharHeight));
 // Font size in the third row was 11 as well.
-xCell.set(xTable-getCellByName(A3), uno::UNO_QUERY);
+xCell.set(xTable-getCellByName(B3), uno::UNO_QUERY);
 CPPUNIT_ASSERT_EQUAL(14.f, getPropertyfloat(getRun(getParagraphOfText(1, 
xCell-getText()), 1), CharHeight));
 
 // This paragraph property was missing in table style.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ff041dc..f4aae40 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -702,9 +702,6 @@ void DocxAttributeOutput::EndParagraphProperties( const 
SwRedlineData* pRedlineD
 // Merge the marks for the ordered elements
 m_pSerializer-mergeTopMarks( );
 
-// insert copy of rPr
-m_pSerializer-copyTopMarkPop();
-
 m_pSerializer-endElementNS( XML_w, XML_pPr );
 
 if ( m_nColBreakStatus == COLBRK_WRITE )
@@ -1272,9 +1269,6 @@ void DocxAttributeOutput::EndRunProperties( const 
SwRedlineData* pRedlineData )
 
 m_pSerializer-endElementNS( XML_w, XML_rPr );
 
-// Clone rPr.../rPr for later re-use, in pPr
-m_pSerializer-copyTopMarkPush();
-
 // write footnotes/endnotes if we have any
 FootnoteEndnoteReference();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Nikhil Walvekar]

 writerfilter/source/dmapper/DomainMapper.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 910ec33b72fa7675e606c4389d50d3a0d4adbe45
Author: Nikhil Walvekar nikhil.walve...@synerzip.com
Date:   Tue Dec 17 20:04:30 2013 +0530

fdo#72790 Clear interop grab bag name, once grab bag is cleared.
This fixes problem while exporting documents containing table
styles.

Change-Id: I0c39ab18eda3b4aacbccfa9d5a6b0d3ac7ab005c
Reviewed-on: https://gerrit.libreoffice.org/7120
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 1ee9e2d..bc5d2bf 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -4440,6 +4440,7 @@ beans::PropertyValue DomainMapper::getInteropGrabBag()
 *pSeq++ = *i;
 
 m_pImpl-m_aInteropGrabBag.clear();
+m_pImpl-m_aInteropGrabBagName = ;
 aRet.Value = uno::makeAny(aSeq);
 return aRet;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - i18npool/inc i18npool/source include/com

[Stephan Bergmann]

 i18npool/inc/collator_unicode.hxx   |5 
+-
 i18npool/inc/transliteration_commonclass.hxx|8 
++-
 i18npool/source/breakiterator/breakiteratorImpl.cxx |4 
-
 i18npool/source/breakiterator/breakiterator_unicode.cxx |5 
--
 i18npool/source/calendar/calendarImpl.cxx   |9 
+---
 i18npool/source/calendar/calendar_gregorian.cxx |3 
-
 i18npool/source/characterclassification/cclass_unicode.cxx  |5 
--
 i18npool/source/characterclassification/characterclassificationImpl.cxx |5 
--
 i18npool/source/characterclassification/unoscripttypedetector.cxx   |6 
--
 i18npool/source/collator/chaptercollator.cxx|4 
-
 i18npool/source/collator/collatorImpl.cxx   |   11 
+
 i18npool/source/collator/collator_unicode.cxx   |3 
-
 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx   |3 
-
 i18npool/source/indexentry/indexentrysupplier.cxx   |3 
-
 i18npool/source/indexentry/indexentrysupplier_common.cxx|4 
-
 i18npool/source/inputchecker/inputsequencechecker.cxx   |4 
-
 i18npool/source/localedata/localedata.cxx   |8 
+--
 i18npool/source/nativenumber/nativenumbersupplier.cxx   |4 
-
 i18npool/source/numberformatcode/numberformatcode.cxx   |   13 
+-
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx |3 
-
 i18npool/source/search/textsearch.cxx   |6 
+-
 i18npool/source/textconversion/textconversion.cxx   |5 
--
 i18npool/source/textconversion/textconversionImpl.cxx   |5 
--
 i18npool/source/transliteration/transliterationImpl.cxx |4 
-
 i18npool/source/transliteration/transliteration_commonclass.cxx |8 
+--
 include/com/sun/star/uno/Any.h  |   21 
--
 26 files changed, 73 insertions(+), 86 deletions(-)

New commits:
commit c6e2fcb2867fc0ecc6f5823d1aaae84ad023d0de
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 18 10:17:02 2013 +0100

Consistently mark these as deleted on all platforms

Change-Id: I87b226fe8ade512fa5559be9cb66cff75543e383

diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index 72357e4..b7574bb 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -232,19 +232,18 @@ public:
 inline sal_Bool SAL_CALL operator != ( const Any  rAny ) const 
SAL_THROW(());
 
 private:
-// not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16)
-explicit Any( sal_uInt16 );
-#if defined(_MSC_VER)
-// Omitting the following private declarations leads to an internal 
compiler
-// error on MSVC (version 1310).
-// not impl: forbid use with ambiguous type (sal_Unicode, sal_uInt16)
-template 
-sal_uInt16 getsal_uInt16() const;
-template 
-bool hassal_uInt16() const;
-#endif // defined(_MSC_VER)
+/// @cond INTERNAL
+// Forbid use with ambiguous type (sal_Unicode, sal_uInt16):
+explicit Any(sal_uInt16) SAL_DELETED_FUNCTION;
+/// @endcond
 };
 
+/// @cond INTERNAL
+// Forbid use with ambiguous type (sal_Unicode, sal_uInt16):
+template sal_uInt16 Any::getsal_uInt16() const SAL_DELETED_FUNCTION;
+template bool Any::hassal_uInt16() const SAL_DELETED_FUNCTION;
+/// @endcond
+
 /** Template function to generically construct an any from a C++ value.
 
 @tparam C value type
commit 6cd3118b6370a0314e58692e08b68c4dcb0f922a
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Tue Dec 17 01:14:30 2013 -0200

fdo#54938: Convert i18npool to use cppu::supportsService

Change-Id: I9acc496cd95c8362972fa0c41d35b77fc0715aba
Signed-off-by: Stephan Bergmann sberg...@redhat.com

diff --git a/i18npool/inc/collator_unicode.hxx 
b/i18npool/inc/collator_unicode.hxx
index b7a0a74..1390d79 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -21,7 +21,8 @@
 
 #include com/sun/star/uno/Reference.h
 #include com/sun/star/i18n/XCollator.hpp
-#include cppuhelper/implbase1.hxx
+#include com/sun/star/lang/XServiceInfo.hpp
+#include cppuhelper/implbase2.hxx
 #include osl/module.h
 
 #include unicode/tblcoll.h
@@ -32,7 +33,7 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-class Collator_Unicode : public cppu::WeakImplHelper1  XCollator 
+class Collator_Unicode : public cppu::WeakImplHelper2  XCollator, 
com::sun::star::lang::XServiceInfo 
 {
 public:
 // Constructors
diff --git a/i18npool/inc/transliteration_commonclass.hxx 
b/i18npool/inc/transliteration_commonclass.hxx
index 6e909ea..4363457 100644
--- 

[Bug 54938] Adapt supportsService implementations to cppu::supportsService

[bugzilla-daemon]

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

--- Comment #26 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Marcos Paulo de Souza committed a patch related to this issue.
It has been pushed to master:

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

fdo#54938: Convert i18npool to use cppu::supportsService



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

Re: Disabling unit tests, redux

[Michael Meeks]

On Wed, 2013-12-18 at 09:20 +0100, Markus Mohrhard wrote:
 Please don't. There are good reasons we don't document building
 without the tests.

Indeed; this is/was the consensus of the ESC when this was last
discussed; we should not be advertising ways to disable the tests - they
are there for a reason.

Instead please build just the module you're concerned with.

Of course, profiles / patches welcome to speed them up =)

ATB,

Michael.

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

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

[Libreoffice-commits] libvisio.git: inc/libvisio src/lib

[Fridrich Štrba]

 inc/libvisio/VisioDocument.h |   16 +---
 src/lib/Makefile.am  |1 +
 src/lib/VisioDocument.cpp|6 +++---
 3 files changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 953c53d206307e5129b3282e093c57d70d491796
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Dec 18 10:36:21 2013 +0100

Export only needed stuff on Windows

Change-Id: Iac43500280f5639caf13e4f4171a83e1eade6ece

diff --git a/inc/libvisio/VisioDocument.h b/inc/libvisio/VisioDocument.h
index dab307f..4e3a8fa 100644
--- a/inc/libvisio/VisioDocument.h
+++ b/inc/libvisio/VisioDocument.h
@@ -33,6 +33,16 @@
 
 #include librevenge/librevenge.h
 
+#ifdef DLL_EXPORT
+#ifdef LIBVISIO_BUILD
+#define VSDAPI __declspec(dllexport)
+#else
+#define VSDAPI __declspec(dllimport)
+#endif
+#else
+#define VSDAPI
+#endif
+
 namespace libvisio
 {
 
@@ -40,11 +50,11 @@ class VisioDocument
 {
 public:
 
-  static bool isSupported(librevenge::RVNGInputStream *input);
+  static VSDAPI bool isSupported(librevenge::RVNGInputStream *input);
 
-  static bool parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
+  static VSDAPI bool parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
 
-  static bool parseStencils(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
+  static VSDAPI bool parseStencils(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
 };
 
 } // namespace libvisio
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index a3b4247..6080d31 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -11,6 +11,7 @@ 
libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_include_HEADERS = \
$(top_srcdir)/inc/libvisio/VisioDocument.h
 
 AM_CXXFLAGS = \
+   -DLIBVISIO_BUILD=1 \
-I$(top_srcdir)/inc \
-I$(top_srcdir)/src/lib \
-I$(top_builddir)/src/lib \
diff --git a/src/lib/VisioDocument.cpp b/src/lib/VisioDocument.cpp
index 20db396..eade1f5 100644
--- a/src/lib/VisioDocument.cpp
+++ b/src/lib/VisioDocument.cpp
@@ -341,7 +341,7 @@ Analyzes the content of an input stream to see if it can be 
parsed
 \return A value that indicates whether the content from the input
 stream is a Visio Document that libvisio able to parse
 */
-bool libvisio::VisioDocument::isSupported(librevenge::RVNGInputStream *input)
+VSDAPI bool libvisio::VisioDocument::isSupported(librevenge::RVNGInputStream 
*input)
 {
   if (isBinaryVisioDocument(input))
 return true;
@@ -360,7 +360,7 @@ librevenge::RVNGDrawingInterface class implementation when 
needed. This is often
 \param painter A WPGPainterInterface implementation
 \return A value that indicates whether the parsing was successful
 */
-bool libvisio::VisioDocument::parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter)
+VSDAPI bool libvisio::VisioDocument::parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter)
 {
   if (isBinaryVisioDocument(input))
   {
@@ -391,7 +391,7 @@ when needed.
 \param painter A WPGPainterInterface implementation
 \return A value that indicates whether the parsing was successful
 */
-bool libvisio::VisioDocument::parseStencils(librevenge::RVNGInputStream 
*input, librevenge::RVNGDrawingInterface *painter)
+VSDAPI bool libvisio::VisioDocument::parseStencils(librevenge::RVNGInputStream 
*input, librevenge::RVNGDrawingInterface *painter)
 {
   if (isBinaryVisioDocument(input))
   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: inc/libcdr src/lib

[Fridrich Štrba]

 inc/libcdr/CDRDocument.h |5 +++--
 inc/libcdr/CMXDocument.h |5 +++--
 inc/libcdr/Makefile.am   |1 +
 inc/libcdr/libcdr_api.h  |   45 +
 src/lib/CDRDocument.cpp  |4 ++--
 src/lib/CMXDocument.cpp  |4 ++--
 src/lib/Makefile.am  |3 ++-
 7 files changed, 58 insertions(+), 9 deletions(-)

New commits:
commit 3e06fd204357adc066efd1375540f0eb1908bb1c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Dec 18 10:44:18 2013 +0100

Export only needed stuff on Windows

Change-Id: I004e93c6159bfd7479ea14f2e40fefe9b20953b6

diff --git a/inc/libcdr/CDRDocument.h b/inc/libcdr/CDRDocument.h
index 5f11f87..fd93d07 100644
--- a/inc/libcdr/CDRDocument.h
+++ b/inc/libcdr/CDRDocument.h
@@ -32,6 +32,7 @@
 #define __CDRDOCUMENT_H__
 
 #include librevenge/librevenge.h
+#include libcdr_api.h
 
 namespace libcdr
 {
@@ -39,9 +40,9 @@ class CDRDocument
 {
 public:
 
-  static bool isSupported(librevenge::RVNGInputStream *input);
+  static CDRAPI bool isSupported(librevenge::RVNGInputStream *input);
 
-  static bool parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
+  static CDRAPI bool parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
 };
 
 } // namespace libcdr
diff --git a/inc/libcdr/CMXDocument.h b/inc/libcdr/CMXDocument.h
index b19d537..fe9cc17 100644
--- a/inc/libcdr/CMXDocument.h
+++ b/inc/libcdr/CMXDocument.h
@@ -30,6 +30,7 @@
 #define __CMXDOCUMENT_H__
 
 #include librevenge/librevenge.h
+#include libcdr_api.h
 
 namespace libcdr
 {
@@ -37,9 +38,9 @@ class CMXDocument
 {
 public:
 
-  static bool isSupported(librevenge::RVNGInputStream *input);
+  static CDRAPI bool isSupported(librevenge::RVNGInputStream *input);
 
-  static bool parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
+  static CDRAPI bool parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
 };
 
 } // namespace libcdr
diff --git a/inc/libcdr/Makefile.am b/inc/libcdr/Makefile.am
index 16634fc..214dcd4 100644
--- a/inc/libcdr/Makefile.am
+++ b/inc/libcdr/Makefile.am
@@ -1,4 +1,5 @@
 EXTRA_DIST = \
libcdr.h \
+   libcdr_api.h \
CDRDocument.h \
CMXDocument.h
diff --git a/inc/libcdr/libcdr_api.h b/inc/libcdr/libcdr_api.h
new file mode 100644
index 000..6197b10
--- /dev/null
+++ b/inc/libcdr/libcdr_api.h
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* libcdr
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the License); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an AS IS basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2012 Fridrich Strba fridrich.st...@bluewin.ch
+ *
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the GPLv2+), or
+ * the GNU Lesser General Public License Version 2 or later (the LGPLv2+),
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
+ * instead of those above.
+ */
+
+#ifndef __LIBCDR_API_H__
+#define __LIBCDR_API_H__
+
+#ifdef DLL_EXPORT
+#ifdef LIBCDR_BUILD
+#define CDRAPI __declspec(dllexport)
+#else
+#define CDRAPI __declspec(dllimport)
+#endif
+#else
+#define CDRAPI
+#endif
+
+#endif
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/CDRDocument.cpp b/src/lib/CDRDocument.cpp
index aad658c..9530f26 100644
--- a/src/lib/CDRDocument.cpp
+++ b/src/lib/CDRDocument.cpp
@@ -79,7 +79,7 @@ Analyzes the content of an input stream to see if it can be 
parsed
 \return A value that indicates whether the content from the input
 stream is a Corel Draw Document that libcdr is able to parse
 */
-bool libcdr::CDRDocument::isSupported(librevenge::RVNGInputStream *input)
+CDRAPI bool libcdr::CDRDocument::isSupported(librevenge::RVNGInputStream 
*input)
 {
   librevenge::RVNGInputStream *tmpInput = input;
   try
@@ -122,7 +122,7 @@ CDRPaintInterface class implementation when needed. This is 
often commonly calle
 \param painter A CDRPainterInterface implementation
 \return A value that indicates whether the parsing was successful
 */
-bool libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter)
+CDRAPI bool libcdr::CDRDocument::parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter)
 {
   

Re: registry and extension problems on master 4.3 Linux 64bit

[Stephan Bergmann]

On 12/17/2013 11:44 AM, Alex Thurgood wrote:

--enable-ext-barcode


...which causes your


Python exception: class 'AttributeError': 'module' object has no
attribute 'writeRegistryInfo', traceback follows
  /home/Development/libo/core/instdir/program/pythonloader.py:152 in
function writeRegistryInfo() [return mod.writeRegistryInfo(
self.ctx.ServiceManager, regKey )]


as already discussed in the mail thread starting at 
http://lists.freedesktop.org/archives/libreoffice/2011-October/019876.html 
Re: Mac OSX daily build 26/10/2011 - Base Report Builder, Beanshell, 
and Javascript extensions disabled but left dangling at 
http://lists.freedesktop.org/archives/libreoffice/2012-April/030700.html 
Re: Mac OSX daily build 26/10/2011 - Base Report Builder, Beanshell, 
and Javascript extensions disabled.


Kami, any update?

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

[Libreoffice-commits] libmspub.git: inc/libmspub src/lib

[Fridrich Štrba]

 inc/libmspub/MSPUBDocument.h |   14 --
 src/lib/MSPUBDocument.cpp|4 ++--
 src/lib/Makefile.am  |2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 30cead30b424282664a70f28636ab290ac7267fb
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Wed Dec 18 10:53:10 2013 +0100

Export only needed stuff on Windows

Change-Id: I276cdce38ad9b2a8a62ded67f7d34a5bca6a698f

diff --git a/inc/libmspub/MSPUBDocument.h b/inc/libmspub/MSPUBDocument.h
index 284d202..5ae2fd5 100644
--- a/inc/libmspub/MSPUBDocument.h
+++ b/inc/libmspub/MSPUBDocument.h
@@ -32,15 +32,25 @@
 
 #include librevenge/librevenge.h
 
+#ifdef DLL_EXPORT
+#ifdef LIBMSPUB_BUILD
+#define PUBAPI __declspec(dllexport)
+#else
+#define PUBAPI __declspec(dllimport)
+#endif
+#else
+#define PUBAPI
+#endif
+
 namespace libmspub
 {
 class MSPUBDocument
 {
 public:
 
-  static bool isSupported(librevenge::RVNGInputStream *input);
+  static PUBAPI bool isSupported(librevenge::RVNGInputStream *input);
 
-  static bool parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
+  static PUBAPI bool parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter);
 };
 
 } // namespace libmspub
diff --git a/src/lib/MSPUBDocument.cpp b/src/lib/MSPUBDocument.cpp
index 0371b00..0d2f184 100644
--- a/src/lib/MSPUBDocument.cpp
+++ b/src/lib/MSPUBDocument.cpp
@@ -99,7 +99,7 @@ Analyzes the content of an input stream to see if it can be 
parsed
 \return A value that indicates whether the content from the input
 stream is a Microsoft Publisher Document that libmspub is able to parse
 */
-bool libmspub::MSPUBDocument::isSupported(librevenge::RVNGInputStream *input)
+PUBAPI bool libmspub::MSPUBDocument::isSupported(librevenge::RVNGInputStream 
*input)
 {
   try
   {
@@ -132,7 +132,7 @@ RVNGDrawingInterface class implementation when needed. This 
is often commonly ca
 \param painter A MSPUBPainterInterface implementation
 \return A value that indicates whether the parsing was successful
 */
-bool libmspub::MSPUBDocument::parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter)
+PUBAPI bool libmspub::MSPUBDocument::parse(librevenge::RVNGInputStream *input, 
librevenge::RVNGDrawingInterface *painter)
 {
   try
   {
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 5f98d61..89c06e1 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -10,7 +10,7 @@ 
libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_include_HEADERS = \
$(top_srcdir)/inc/libmspub/libmspub.h \
$(top_srcdir)/inc/libmspub/MSPUBDocument.h
 
-AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(ZLIB_CFLAGS) 
$(ICU_CFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(ZLIB_CFLAGS) 
$(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBMSPUB_BUILD=1
 
 libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LIBADD  = 
$(REVENGE_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@
 libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_DEPENDENCIES = 
@LIBMSPUB_WIN32_RESOURCE@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: l10n process, en_US version, Help files

[Caolán McNamara]

On Thu, 2013-12-12 at 12:40 +0200, Khaled Hosny wrote:
 If the localizers don’t test the actual UI (which I doubt they do, given
 how long it takes to build LibreOffice) and just translate the strings
 in Pootle, they are very unlikely to spot such inconsistencies, no
 matter how many teams we have.

What I hope we can eventually do here is that as we move completely to
the .ui format, we can then deploy/integrate something like deckard into
the translation process (http://deckard.malizor.org/) so that
translators can see an image of the dialog they are translating right in
the pootle site.

C.

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

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   12 ++--
 sw/source/filter/ww8/docxattributeoutput.cxx |   21 -
 2 files changed, 10 insertions(+), 23 deletions(-)

New commits:
commit cfb5b20cdc230320ff9f864d1cfd81aaea221da0
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Dec 18 11:03:57 2013 +0100

DocxAttributeOutput::OutputFlyFrame_Impl: enable DML export by default

This was only available in experimental mode previously. Also note that
export of Writer TextFrames are handled separately, there DML export is
still off by default.

Change-Id: Ie8eaa1670610d92a363a8558b68064e7d7de2cdd

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index bd7c913..bd099be 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1748,7 +1748,7 @@ DECLARE_OOXMLEXPORT_TEST(testVMLData, TestVMLData.docx)
 xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
 if (!pXmlDoc)
 return;
-CPPUNIT_ASSERT(getXPath(pXmlDoc, /w:hdr/w:p/w:r/w:pict/v:rect, 
stroked).match(f));
+CPPUNIT_ASSERT(getXPath(pXmlDoc, 
/w:hdr/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:rect, 
stroked).match(f));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testImageData, image_data.docx)
@@ -1758,7 +1758,7 @@ DECLARE_OOXMLEXPORT_TEST(testImageData, image_data.docx)
 xmlDocPtr pXmlDoc = parseExport(word/header1.xml);
 if (!pXmlDoc)
 return;
-CPPUNIT_ASSERT(getXPath(pXmlDoc, 
/w:hdr/w:p/w:r/w:pict/v:rect/v:imagedata, detectmouseclick).match(t));
+CPPUNIT_ASSERT(getXPath(pXmlDoc, 
/w:hdr/w:p/w:r/mc:AlternateContent/mc:Fallback/w:pict/v:rect/v:imagedata, 
detectmouseclick).match(t));
 }
 
 DECLARE_OOXMLEXPORT_TEST(testImageCrop, ImageCrop.docx)
@@ -1788,13 +1788,13 @@ DECLARE_OOXMLEXPORT_TEST(testFdo70838, fdo70838.docx)
 
 // get styles of the four shapes
 OUString aStyles[4];
-aStyles[0] = getXPath( pXmlDocument, 
/w:document/w:body/w:p/w:r/w:pict[1]/v:rect, style);
+aStyles[0] = getXPath( pXmlDocument, 
/w:document/w:body/w:p/w:r/mc:AlternateContent[1]/mc:Fallback/w:pict/v:rect, 
style);
 // original is: 
position:absolute;margin-left:97.6pt;margin-top:165pt;width:283.4pt;height:141.7pt;rotation:285
-aStyles[1] = getXPath( pXmlDocument, 
/w:document/w:body/w:p/w:r/w:pict[2]/v:rect, style);
+aStyles[1] = getXPath( pXmlDocument, 
/w:document/w:body/w:p/w:r/mc:AlternateContent[2]/mc:Fallback/w:pict/v:rect, 
style);
 // original is: 
position:absolute;margin-left:97.6pt;margin-top:164.95pt;width:283.4pt;height:141.7pt;rotation:255
-aStyles[2] = getXPath( pXmlDocument, 
/w:document/w:body/w:p/w:r/w:pict[3]/v:rect, style);
+aStyles[2] = getXPath( pXmlDocument, 
/w:document/w:body/w:p/w:r/mc:AlternateContent[3]/mc:Fallback/w:pict/v:rect, 
style);
 // original is: 
position:absolute;margin-left:97.5pt;margin-top:164.9pt;width:283.4pt;height:141.7pt;rotation:105
-aStyles[3] = getXPath( pXmlDocument, 
/w:document/w:body/w:p/w:r/w:pict[4]/v:rect, style);
+aStyles[3] = getXPath( pXmlDocument, 
/w:document/w:body/w:p/w:r/mc:AlternateContent[4]/mc:Fallback/w:pict/v:rect, 
style);
 // original is: 
position:absolute;margin-left:97.55pt;margin-top:164.95pt;width:283.4pt;height:141.7pt;rotation:75
 
 //check the size and position of each of the shapes
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f4aae40..4c7e6cc 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3380,24 +3380,11 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const 
sw::Frame rFrame, const Po
 }
 else
 {
-SvtMiscOptions aMiscOptions;
-if (aMiscOptions.IsExperimentalMode())
-{
-if ( m_postponedDMLDrawing == NULL )
-m_rExport.SdrExporter().writeDMLAndVMLDrawing( 
pSdrObj, rFrame.GetFrmFmt(), rNdTopLeft, m_anchorId++);
-else
-// we are writing out attributes, but 
w:drawing should not be inside w:rPr, so write it out later
-
m_postponedDMLDrawing-push_back(PostponedDrawing(pSdrObj, 
(rFrame.GetFrmFmt()), rNdTopLeft));
-}
+if ( m_postponedDMLDrawing == NULL )
+m_rExport.SdrExporter().writeDMLAndVMLDrawing( 
pSdrObj, rFrame.GetFrmFmt(), rNdTopLeft, m_anchorId++);
 else
-{
-if ( m_postponedVMLDrawing == NULL )
-m_rExport.SdrExporter().writeVMLDrawing( 
pSdrObj, rFrame.GetFrmFmt(), rNdTopLeft);
-else // we are writing out attributes, but w:pict 

Re: registry and extension problems on master 4.3 Linux 64bit

[Alex Thurgood]

Le 18/12/2013 10:46, Stephan Bergmann a écrit :

Hi Stephan,

 On 12/17/2013 11:44 AM, Alex Thurgood wrote:
 --enable-ext-barcode
 
 ...which causes your
 
 Python exception: class 'AttributeError': 'module' object has no
 attribute 'writeRegistryInfo', traceback follows
   /home/Development/libo/core/instdir/program/pythonloader.py:152 in
 function writeRegistryInfo() [return mod.writeRegistryInfo(
 self.ctx.ServiceManager, regKey )]

Ah, well that explains that one :-))


 
 as already discussed in the mail thread starting at
 http://lists.freedesktop.org/archives/libreoffice/2011-October/019876.html
 Re: Mac OSX daily build 26/10/2011 - Base Report Builder, Beanshell,
 and Javascript extensions disabled but left dangling at
 http://lists.freedesktop.org/archives/libreoffice/2012-April/030700.html
 Re: Mac OSX daily build 26/10/2011 - Base Report Builder, Beanshell,
 and Javascript extensions disabled.

I noticed yesterday that the OSX build currently fails when trying to
download any of the extra extensions, including SmartDiag, from the host
where the oxygenoffice extras are hosted. However, this does not happen
on my Linux 64bit machine, and am at a loss to why that might be, other
than a problem with the Mac version of curl ?


Alex


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

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

[Stephan Bergmann]

 sax/source/expatwrap/sax_expat.cxx   |   32 +---
 sax/source/expatwrap/saxwriter.cxx   |   31 ---
 sax/source/fastparser/fastparser.cxx |   35 ++-
 3 files changed, 51 insertions(+), 47 deletions(-)

New commits:
commit 71f33636dae11f3a53740ce73437255ad53641ed
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 18 11:13:37 2013 +0100

Change from ServiceManager- to ComponentContext-based implementations

Change-Id: Iba701c520ad27925bb5e67697e22132b53160ab2

diff --git a/sax/source/expatwrap/sax_expat.cxx 
b/sax/source/expatwrap/sax_expat.cxx
index 83dff1a..4f00ad9 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -129,7 +129,11 @@ OUString XmlChar2OUString( const XML_Char *p )
 
 class SaxExpatParser_Impl;
 
-static Sequence OUString  SaxExpatParser_getSupportedServiceNames(void)
+OUString SaxExpatParser_getImplementationName() {
+return OUString(com.sun.star.comp.extensions.xml.sax.ParserExpat);
+}
+
+Sequence OUString  SaxExpatParser_getSupportedServiceNames(void)
 {
 SequenceOUString seq(1);
 seq[0] = OUString(com.sun.star.xml.sax.Parser);
@@ -594,7 +598,7 @@ void SaxExpatParser::setLocale( const Locale  locale ) 
throw (RuntimeException)
 // XServiceInfo
 OUString SaxExpatParser::getImplementationName() throw ()
 {
-return OUString(com.sun.star.comp.extensions.xml.sax.ParserExpat);
+return SaxExpatParser_getImplementationName();
 }
 
 // XServiceInfo
@@ -1019,27 +1023,25 @@ void SaxExpatParser_Impl::callbackEndCDATA( void 
*pvThis )
 
CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(pImpl,rExtendedDocumentHandler-endCDATA()
 );
 }
 
-} // namespace
-
-static Reference XInterface  SaxExpatParser_CreateInstance(
-SAL_UNUSED_PARAMETER const Reference XMultiServiceFactory   )
-throw(Exception)
+Reference XInterface  SAL_CALL SaxExpatParser_CreateInstance(
+SAL_UNUSED_PARAMETER const Referencecss::uno::XComponentContext  )
+SAL_THROW((css::uno::Exception))
 {
 SaxExpatParser *p = new SaxExpatParser;
 return Reference XInterface  ( (OWeakObject * ) p );
 }
 
+} // namespace
+
 extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL
 com_sun_star_comp_extensions_xml_sax_ParserExpat_component_getFactory(
-const char * , void *pServiceManager, void * )
+const char *, void *, void * )
 {
-Reference XSingleServiceFactory  xFactory;
-Reference XMultiServiceFactory  xSMgr =
-reinterpret_cast XMultiServiceFactory * ( pServiceManager );
-xFactory = createSingleFactory( xSMgr,
-com.sun.star.comp.extensions.xml.sax.ParserExpat,
-SaxExpatParser_CreateInstance,
-SaxExpatParser_getSupportedServiceNames() );
+Referencecss::lang::XSingleComponentFactory xFactory(
+cppu::createSingleComponentFactory(
+SaxExpatParser_CreateInstance,
+SaxExpatParser_getImplementationName(),
+SaxExpatParser_getSupportedServiceNames()));
 xFactory-acquire();
 return xFactory.get();
 }
diff --git a/sax/source/expatwrap/saxwriter.cxx 
b/sax/source/expatwrap/saxwriter.cxx
index a6b9a31..b17f378 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -867,7 +867,11 @@ static inline sal_Int32 getFirstLineBreak( const OUString 
 str ) throw ()
 return -1;
 }
 
-static Sequence OUString  SAXWriter_getSupportedServiceNames(void) throw ()
+OUString SAXWriter_getImplementationName() {
+return OUString(com.sun.star.extensions.xml.sax.Writer);
+}
+
+Sequence OUString  SAXWriter_getSupportedServiceNames(void) throw ()
 {
 SequenceOUString seq(1);
 seq.getArray()[0] = OUString(com.sun.star.xml.sax.Writer);
@@ -994,7 +998,7 @@ static inline sal_Bool isFirstCharWhitespace( const 
sal_Unicode *p ) throw()
 // XServiceInfo
 OUString SAXWriter::getImplementationName() throw()
 {
-return OUString(com.sun.star.extensions.xml.sax.Writer);
+return SAXWriter_getImplementationName();
 }
 
 // XServiceInfo
@@ -1372,27 +1376,24 @@ void SAXWriter::unknown(const OUString sString) throw 
(SAXException, RuntimeExc
 }
 }
 
-} // namespace
-
-static Reference  XInterface  SAXWriter_CreateInstance(
-SAL_UNUSED_PARAMETER const Reference  XMultiServiceFactory   )
-throw (Exception)
+Reference  XInterface  SAL_CALL SAXWriter_CreateInstance(
+SAL_UNUSED_PARAMETER const Referencecss::uno::XComponentContext  )
+SAL_THROW((css::uno::Exception))
 {
 SAXWriter *p = new SAXWriter;
 return Reference XInterface  ( (static_cast OWeakObject * (p)) );
 }
 
+} // namespace
+
 extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL
 com_sun_star_extensions_xml_sax_Writer_component_getFactory(
-const char * , void *pServiceManager, void * )
+const char *, void *, void * )
 {
-Reference XSingleServiceFactory  xFactory;
-Reference XMultiServiceFactory  xSMgr =
-reinterpret_cast 

Re: l10n process, en_US version, Help files

[Caolán McNamara]

On Wed, 2013-12-11 at 17:19 +0100, Sophie wrote:
 Hi all,
 
 This mail is posted to the dev list and the l10n list, please follow up
 on the l10n list.
 
 I would like to open a discussion on the l10n workflow, the quality of
 the en_US version and the Help files. All is linked and I would like to
 discuss how we can improve the process here. I'm sure that having a
 better understanding between the l10n process and the dev process should
 help us to improve things :) So here is a proposal, it's a bit long,
 sorry for that.
 
 *Before updating Pootle:
 - it's important for l10n team to know the approx load of work that will
 be needed to achieve the whole work. Time between beta1 and rc1 is short
 and that will help to better organize this time between translation and
 proof reading.
 - depending also on the type of changes, we could use different tools to
 optimize the work.
 
 *When the l10n start:
 - we need a continuous communication and a planing of the updates made
 in Pootle, those translating off line are always frightened to lose
 something in the run.
 - it's exhausting when you think you are over and to see a new bunch of
 words coming. Knowing it in advance help to manage the time too
 
 *After RC1 and l10n integration
 - we need to know when integration is made after our fixes, there is
 currently no communication on this
 
 == for these three items, I have asked today to Andras and Christian
 how we can put that in place and where I can help them to do so, knowing
 also that Christian is managing this part almost alone now.
 
 *About the en_US overall quality
 - the process to rely on the l10n team to fix the en_US version is ok,
 even if it gives us extra work to understand what is meant before we
 realized it's a mistake. So it's also error prone for all the translations.
 - but that doesn't solve the several typos that already exist and that
 are overlooked by the l10n team (e.g in the Character  Font Effect
 dialog, there is Overline _c_olor and Underline _C_olor and this is the
 same for several dialogs)
 - that doesn't solve also the lack of universal vocabulary used in
 several dialogs (e.g Tab/Pane/Panel/Deck to name the same object or
 Graphic/Picture/Image). I've nothing to propose here but to define a
 glossary where developers could pick the good word but I'm not sure it
 will be used
 

 * About the help files
 - I always wonder why there is a Help button on a new dialog when no
 help file is appended ;)

One thing that we could with the new .ui file format is to confirm if
each dialog actually has a help entry for it. There is an easy hack at
https://bugs.freedesktop.org/show_bug.cgi?id=67350 to extract out the
new-format helpids from the help and determine if they actually exist.
That would weed out typos where the help gets detached from the thing it
documents.

Similarly someone could script if each new-format dialog has a help
entry and make a list of stuff that is missing help and turn those into
a list of tasks to document those things.

Another thing that could be automated is to generate a skeleton help
page from a new-format dialog. i.e. generate the help ids bookmarks for
the interactive widgets, buttons, checkboxes, etc. and have fill-me-in
headings and bodytext.

C.

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

Re: [RESOLVED] cppcheck: Same expression in edtwin.cxx (sw module)

[Caolán McNamara]

On Fri, 2013-12-13 at 15:26 -0800, julien2412 wrote:
 Hello,
 
 Cppcheck reported this:
 [sw/source/ui/docvw/edtwin.cxx:3322] -
 [sw/source/ui/docvw/edtwin.cxx:3322]: (style) Same expression on both sides
 of ''
 
 Indeed we have:
3319 // if the cursor position was corrected or
 if a Fly
3320 // was selected in ReadOnlyMode, no word
 selection.
3321 if ( !bValidCrsrPos ||
3322 (rSh.IsFrmSelected() 
 rSh.IsFrmSelected() ))
3323 return;
 
 git history indicates it's like this since initial import in (2000-03-18)
 Of course I could remove one rSh.IsFrmSelected() but not sure at all when
 reading comment above.

On line 3388 we have the exact same comment and same condition, except
this time its not duplicating the IsFrmSelected test which swung the
vote for me. So I removed the redundant check on this 3321 line to match
it.

C.

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

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

[Caolán McNamara]

 sw/source/ui/docvw/edtwin.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 55ac75aab9c0368b1a46dd95d452ba37776fa44b
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Dec 18 10:29:11 2013 +

cppcheck: same expression

the same comment and expression here is duplicated further down, except this
time without the redundant repeat test

Change-Id: Ife4bebf181e7a6011137beaeec2b69f5cdcfe908

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 723602b..688edfe 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -3318,8 +3318,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent _rMEvt)
 
 // if the cursor position was corrected or if a Fly
 // was selected in ReadOnlyMode, no word selection.
-if ( !bValidCrsrPos ||
-(rSh.IsFrmSelected()  rSh.IsFrmSelected() ))
+if ( !bValidCrsrPos || rSh.IsFrmSelected() )
 return;
 
 SwField *pFld;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] Bugzilla Migration: Abbreviation to replace fdo#12345

[Robinson Tryon]

On Tue, Dec 17, 2013 at 4:51 AM, Joren DC jore...@libreoffice.org wrote:
 Robinson Tryon schreef op 17/12/13 13:41:
 lo (6)
 lobz (7)

 Separated by just a single vote, lo and lobz are (unsurprisingly) the
 favorites :-)
 What about lbz, which is a combination of our 2 top-votes (lo and lobz)?
 lbz was also one of the choises, but it looks like a golden midway
 between the top votes :)?

Sounds fine w/me.

(LBJ isn't as cool a mascot as a Lobster, but I will deal with it :-)

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

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

[Tor Lillqvist]

 README.Android |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 1371d07009b29539fe84595bf1a0c81afeb3eee5
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Dec 18 12:41:34 2013 +0200

Drop some obsolete stuff

Change-Id: Icc6bf58c295591347a3079d2a5312e1904e57060

diff --git a/README.Android b/README.Android
index 2bf1f44..3a78e76 100644
--- a/README.Android
+++ b/README.Android
@@ -44,12 +44,7 @@ know. But don't seem to be necessary on a real device anyway?
 
 * Debugging
 
-   Debugging is fun, the default NDK gdb (in v7) is busted, you
-need to download a new one from:
-
-   http://code.google.com/p/mingw-and-ndk/
-
-   Even this 'fixed' gdb is broken in the way that it can see
+   Some versions of the NDK had a broken gdb in the way that it can see
 symbols only for shlibs that were already loaded when the debuggee was
 attached, so you need to carefully guess where to put:
 
@@ -76,6 +71,9 @@ the file is truncated; check it out with adb shell ls -l 
/data/data/
 
 * Detailed explanation
 
+Note: the below talk about unit tests is obsolete; we no longer have
+any makefilery etc to build unit tests for Android.
+
 Unit tests are the first thing we want to run on Android, to get some
 idea how well, if at all, the basic LO libraries work. We want to
 build even unit tests as normal Android apps, i.e. packaged as .apk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] Bugzilla Migration: Abbreviation to replace fdo#12345

[Miklos Vajna]

Hi,

On Tue, Dec 17, 2013 at 01:51:11PM +0100, Joren DC jore...@libreoffice.org 
wrote:
  Here are the final tallies from the voting:
  https://wiki.documentfoundation.org/QA/Meetings/2013/December_16#PENDING_ITEM:_Bugzilla_Migration_etc.
 
  blo (1)
  libo (2)
  lbz (3)
  lob (3)
  lo (6)
  lobz (7)
 
  -
 
  Separated by just a single vote, lo and lobz are (unsurprisingly) the
  favorites :-)
 What about lbz, which is a combination of our 2 top-votes (lo and lobz)?
 lbz was also one of the choises, but it looks like a golden midway
 between the top votes :)?

I don't really want to get involved in this bikesheding, but if there
was a vote at a QA meeting, it sounds unfair to me take the result of
that into this list and start arguing against its result. Why would
anyone cast his/her vote seriously next time, if the result of the vote
is not respected?

Miklos


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

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

[Regina Henschel]

 extras/source/palettes/standard.soe |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 82b34e82c05f9fde6ca6c87fc5808d89492a761f
Author: Regina Henschel rb.hensc...@t-online.de
Date:   Wed Dec 18 09:35:15 2013 +0100

fdo#71993: Fix the tip of the Small Arrow line end.

Change-Id: Ie4b41c69014b347ea2cf9df94b3e3b98f17594cb

diff --git a/extras/source/palettes/standard.soe 
b/extras/source/palettes/standard.soe
index 587a7dc..22d18af 100644
--- a/extras/source/palettes/standard.soe
+++ b/extras/source/palettes/standard.soe
@@ -2,7 +2,7 @@
 office:marker-table xmlns:office=http://openoffice.org/2000/office; 
xmlns:style=http://openoffice.org/2000/style; 
xmlns:text=http://openoffice.org/2000/text; 
xmlns:table=http://openoffice.org/2000/table; 
xmlns:draw=http://openoffice.org/2000/drawing; 
xmlns:fo=http://www.w3.org/1999/XSL/Format; 
xmlns:xlink=http://www.w3.org/1999/xlink; 
xmlns:dc=http://purl.org/dc/elements/1.1/; 
xmlns:meta=http://openoffice.org/2000/meta; 
xmlns:number=http://openoffice.org/2000/datastyle; 
xmlns:svg=http://www.w3.org/2000/svg; 
xmlns:chart=http://openoffice.org/2000/chart; 
xmlns:dr3d=http://openoffice.org/2000/dr3d; 
xmlns:math=http://www.w3.org/1998/Math/MathML; 
xmlns:form=http://openoffice.org/2000/form; 
xmlns:script=http://openoffice.org/2000/script;
   draw:marker draw:name=Arrow svg:viewBox=0 0 20 30 svg:d=M10 0l-10 
30h20z /
   draw:marker draw:name=Square svg:viewBox=0 0 10 10 svg:d=M0 
0h10v10h-10z /
-  draw:marker draw:name=Small Arrow svg:viewBox=0 0 1321 3493 
svg:d=M1321 3493h-1321l702-3493z /
+  draw:marker draw:name=Small Arrow svg:viewBox=0 0 1321 3493 
svg:d=M1321 3493h-1321l661-3493z /
   draw:marker draw:name=Dimension Lines svg:viewBox=0 0 836 110 svg:d=M0 
0h278 278 280v36 36 38h-278-278-280v-36-36z /
   draw:marker draw:name=Double Arrow svg:viewBox=0 0 1131 1918 
svg:d=M737 1131h394l-564-1131-567 1131h398l-398 787h1131z /
   draw:marker draw:name=Rounded short Arrow svg:viewBox=0 0 1013 1130 
svg:d=M1009 1050l-449-1008-22-30-29-12-34 12-21 26-449 1012-5 13v8l5 21 12 21 
17 13 21 4h903l21-4 21-13 9-21 4-21v-8z /
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] Bugzilla Migration: Abbreviation to replace fdo#12345

[Robinson Tryon]

On Wed, Dec 18, 2013 at 3:06 AM, Miklos Vajna vmik...@collabora.co.uk wrote:
 On Tue, Dec 17, 2013 at 01:51:11PM +0100, Joren DC jore...@libreoffice.org 
 wrote:
 What about lbz, which is a combination of our 2 top-votes (lo and lobz)?
 lbz was also one of the choises, but it looks like a golden midway
 between the top votes :)?

 I don't really want to get involved in this bikesheding, but if there
 was a vote at a QA meeting, it sounds unfair to me take the result of
 that into this list and start arguing against its result.

Given that the top two choices (lo and lobz) were separated by only 1
vote and were both far ahead of the other options, suggesting a
compromise seems like a reasonable action.

 Why would
 anyone cast his/her vote seriously next time, if the result of the vote
 is not respected?

I believe the vote is being respected, but I don't want to get into
that here. As many have said, we're just bikeshedding here. I
apologize for drawing out this discussion on the dev list for so long
-- I'll take this discussion back to the QA list.

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

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

[Regina Henschel]

 extras/source/palettes/standard.soe |   40 ++--
 1 file changed, 20 insertions(+), 20 deletions(-)

New commits:
commit fad39087a742e30f4a30c0d223f84b21a32d6170
Author: Regina Henschel rb.hensc...@t-online.de
Date:   Wed Dec 18 09:35:15 2013 +0100

fdo#71993: Fix the tip of the Small Arrow line end.

Change-Id: Ie4b41c69014b347ea2cf9df94b3e3b98f17594cb

diff --git a/extras/source/palettes/standard.soe 
b/extras/source/palettes/standard.soe
index 587a7dc..22d18af 100644
--- a/extras/source/palettes/standard.soe
+++ b/extras/source/palettes/standard.soe
@@ -2,7 +2,7 @@
 office:marker-table xmlns:office=http://openoffice.org/2000/office; 
xmlns:style=http://openoffice.org/2000/style; 
xmlns:text=http://openoffice.org/2000/text; 
xmlns:table=http://openoffice.org/2000/table; 
xmlns:draw=http://openoffice.org/2000/drawing; 
xmlns:fo=http://www.w3.org/1999/XSL/Format; 
xmlns:xlink=http://www.w3.org/1999/xlink; 
xmlns:dc=http://purl.org/dc/elements/1.1/; 
xmlns:meta=http://openoffice.org/2000/meta; 
xmlns:number=http://openoffice.org/2000/datastyle; 
xmlns:svg=http://www.w3.org/2000/svg; 
xmlns:chart=http://openoffice.org/2000/chart; 
xmlns:dr3d=http://openoffice.org/2000/dr3d; 
xmlns:math=http://www.w3.org/1998/Math/MathML; 
xmlns:form=http://openoffice.org/2000/form; 
xmlns:script=http://openoffice.org/2000/script;
   draw:marker draw:name=Arrow svg:viewBox=0 0 20 30 svg:d=M10 0l-10 
30h20z /
   draw:marker draw:name=Square svg:viewBox=0 0 10 10 svg:d=M0 
0h10v10h-10z /
-  draw:marker draw:name=Small Arrow svg:viewBox=0 0 1321 3493 
svg:d=M1321 3493h-1321l702-3493z /
+  draw:marker draw:name=Small Arrow svg:viewBox=0 0 1321 3493 
svg:d=M1321 3493h-1321l661-3493z /
   draw:marker draw:name=Dimension Lines svg:viewBox=0 0 836 110 svg:d=M0 
0h278 278 280v36 36 38h-278-278-280v-36-36z /
   draw:marker draw:name=Double Arrow svg:viewBox=0 0 1131 1918 
svg:d=M737 1131h394l-564-1131-567 1131h398l-398 787h1131z /
   draw:marker draw:name=Rounded short Arrow svg:viewBox=0 0 1013 1130 
svg:d=M1009 1050l-449-1008-22-30-29-12-34 12-21 26-449 1012-5 13v8l5 21 12 21 
17 13 21 4h903l21-4 21-13 9-21 4-21v-8z /
commit 305d5021f1d968d01a031ad2e7e540fb44eb75c6
Author: Regina Henschel rb.hensc...@t-online.de
Date:   Thu Nov 28 12:04:07 2013 +0100

Related fdo#71919: Correct arrow heads for new installations.

Change-Id: If4ad335f4e645cc10cd7378d971b7389bb437f88

diff --git a/extras/source/palettes/standard.soe 
b/extras/source/palettes/standard.soe
index 4b576b1..587a7dc 100644
--- a/extras/source/palettes/standard.soe
+++ b/extras/source/palettes/standard.soe
@@ -1,23 +1,23 @@
 ?xml version=1.0 encoding=utf-8?
 office:marker-table xmlns:office=http://openoffice.org/2000/office; 
xmlns:style=http://openoffice.org/2000/style; 
xmlns:text=http://openoffice.org/2000/text; 
xmlns:table=http://openoffice.org/2000/table; 
xmlns:draw=http://openoffice.org/2000/drawing; 
xmlns:fo=http://www.w3.org/1999/XSL/Format; 
xmlns:xlink=http://www.w3.org/1999/xlink; 
xmlns:dc=http://purl.org/dc/elements/1.1/; 
xmlns:meta=http://openoffice.org/2000/meta; 
xmlns:number=http://openoffice.org/2000/datastyle; 
xmlns:svg=http://www.w3.org/2000/svg; 
xmlns:chart=http://openoffice.org/2000/chart; 
xmlns:dr3d=http://openoffice.org/2000/dr3d; 
xmlns:math=http://www.w3.org/1998/Math/MathML; 
xmlns:form=http://openoffice.org/2000/form; 
xmlns:script=http://openoffice.org/2000/script;
-  draw:marker draw:name=Arrow svg:viewBox=0 0 20 30 svg:d=m10 0-10 
30h20 /
-  draw:marker draw:name=Square svg:viewBox=0 0 10 10 svg:d=m0 
0h10v10h-10 /
-  draw:marker draw:name=Small Arrow svg:viewBox=0 0 1321 3493 
svg:d=m1321 3493h-1321l702-3493z /
-  draw:marker draw:name=Dimension Lines svg:viewBox=0 0 836 110 svg:d=m0 
0h278 278 280v36 36 38h-278-278-280v-36-36z /
-  draw:marker draw:name=Double Arrow svg:viewBox=0 0 1131 1918 
svg:d=m737 1131h394l-564-1131-567 1131h398l-398 787h1131z /
-  draw:marker draw:name=Rounded short Arrow svg:viewBox=0 0 1013 1130 
svg:d=m1009 1050-449-1008-22-30-29-12-34 12-21 26-449 1012-5 13v8l5 21 12 21 
17 13 21 4h903l21-4 21-13 9-21 4-21v-8z /
-  draw:marker draw:name=Symmetric Arrow svg:viewBox=0 0 1131 902 
svg:d=m564 0-564 902h1131z /
-  draw:marker draw:name=Line Arrow svg:viewBox=0 0 1122 2243 svg:d=m0 
2108v17 17l12 42 30 34 38 21 43 4 29-8 30-21 25-26 13-34 343-1532 339 1520 13 
42 29 34 39 21 42 4 42-12 34-30 21-42v-39-12l-4 
4-440-1998-9-42-25-39-38-25-43-8-42 8-38 25-26 39-8 42z /
-  draw:marker draw:name=Rounded large Arrow svg:viewBox=0 0 1131 2256 
svg:d=m1127 2120-449-2006-9-42-25-39-38-25-38-8-43 8-38 25-25 39-9 42-449 
2006v13l-4 9 9 42 25 38 38 25 42 9h903l42-9 38-25 26-38 8-42v-9z /
-  draw:marker draw:name=Circle svg:viewBox=0 0 1131 1131 svg:d=m462 
1118-102-29-102-51-93-72-72-93-51-102-29-102-13-105 13-102 29-106 51-102 72-89 
93-72 102-50 102-34 106-9 101 9 106 34 98 50 93 72 72 89 51 102 29 106 13 
102-13 105-29 102-51 102-72 93-93 72-98 51-106 29-101 13z /
-  

Re: Disabling unit tests, redux

[Keith Curtis]

Okay, I took it out.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Laurent Godard]

 include/test/sheet/xsheetannotations.hxx |3 ++-
 sc/qa/extras/scannotationsobj.cxx|   12 ++--
 sc/source/core/data/document.cxx |2 +-
 sc/source/ui/unoobj/docuno.cxx   |7 +--
 test/source/sheet/xsheetannotations.cxx  |   24 
 5 files changed, 38 insertions(+), 10 deletions(-)

New commits:
commit 2279208fa0570ef5fa2d49c14a721b7d59be069d
Author: Laurent Godard lgodard.li...@laposte.net
Date:   Fri Dec 6 12:36:41 2013 +0100

count notes - GetNotesInRange now include last tab

- refactor tests
- add unit test on counting notes on a sheet

Change-Id: I6762a0e791a745b828800645effdfc044ac33710
Reviewed-on: https://gerrit.libreoffice.org/6954
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/include/test/sheet/xsheetannotations.hxx 
b/include/test/sheet/xsheetannotations.hxx
index 24e1dd5..403af94 100644
--- a/include/test/sheet/xsheetannotations.hxx
+++ b/include/test/sheet/xsheetannotations.hxx
@@ -20,11 +20,12 @@ public:
 // XSheetAnnotations
 void testInsertNew();
 void testRemoveByIndex();
+void testCount();
 
 protected:
 ~XSheetAnnotations() {}
 
-virtual css::uno::Reference css::sheet::XSheetAnnotations 
getAnnotations() = 0;
+virtual css::uno::Reference css::sheet::XSheetAnnotations 
getAnnotations(long nIndex) = 0;
 };
 
 }
diff --git a/sc/qa/extras/scannotationsobj.cxx 
b/sc/qa/extras/scannotationsobj.cxx
index 485173c..190efe5 100644
--- a/sc/qa/extras/scannotationsobj.cxx
+++ b/sc/qa/extras/scannotationsobj.cxx
@@ -20,7 +20,7 @@ using namespace css::uno;
 
 namespace sc_apitest {
 
-#define NUMBER_OF_TESTS 2
+#define NUMBER_OF_TESTS 3
 
 class ScAnnontationsObj : public CalcUnoApiTest, apitest::XSheetAnnotations
 {
@@ -31,11 +31,12 @@ public:
 virtual void tearDown();
 
 virtual uno::Reference uno::XInterface  init();
-virtual uno::Reference sheet::XSheetAnnotations getAnnotations();
+virtual uno::Reference sheet::XSheetAnnotations  getAnnotations(long 
nIndex);
 
 CPPUNIT_TEST_SUITE(ScAnnontationsObj);
 CPPUNIT_TEST(testInsertNew);
 CPPUNIT_TEST(testRemoveByIndex);
+CPPUNIT_TEST(testCount);
 CPPUNIT_TEST_SUITE_END();
 private:
 
@@ -51,12 +52,12 @@ ScAnnontationsObj::ScAnnontationsObj()
 {
 }
 
-uno::Reference sheet::XSheetAnnotations ScAnnontationsObj::getAnnotations()
+uno::Reference sheet::XSheetAnnotations 
ScAnnontationsObj::getAnnotations(long nIndex)
 {
 // get the sheet
 uno::Reference sheet::XSpreadsheetDocument  xDoc(mxComponent, 
UNO_QUERY_THROW);
 uno::Reference container::XIndexAccess  xIndex (xDoc-getSheets(), 
UNO_QUERY_THROW);
-uno::Reference sheet::XSpreadsheet  xSheet( xIndex-getByIndex(0), 
UNO_QUERY_THROW);
+uno::Reference sheet::XSpreadsheet  xSheet( xIndex-getByIndex(nIndex), 
UNO_QUERY_THROW);
 
 // get the annotations collection
 uno::Reference sheet::XSheetAnnotationsSupplier  
xAnnotationSupplier(xSheet, UNO_QUERY_THROW);
@@ -76,9 +77,8 @@ uno::Reference uno::XInterface  ScAnnontationsObj::init()
 mxComponent = loadFromDesktop(aFileURL);
 CPPUNIT_ASSERT_MESSAGE(Component not loaded,mxComponent.is());
 
-return getAnnotations();
+return getAnnotations(0);
 }
-
 void ScAnnontationsObj::setUp()
 {
 nTest++;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 8048d02..1bd256e 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6240,7 +6240,7 @@ void ScDocument::GetNotesInRange( const ScRangeList 
rRange, std::vectorsc::Not
 for( size_t i = 0; i  rRange.size(); ++i)
 {
 const ScRange* pRange = rRange[i];
-for( SCTAB nTab = pRange-aStart.Tab(); nTab  pRange-aEnd.Tab(); 
++nTab )
+for( SCTAB nTab = pRange-aStart.Tab(); nTab = pRange-aEnd.Tab(); 
++nTab )
 {
 maTabs[nTab]-GetNotesInRange( *pRange, rNotes );
 }
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 0d39c5e..8cbd9fb 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -3611,7 +3611,7 @@ uno::Referencecontainer::XEnumeration SAL_CALL 
ScAnnotationsObj::createEnumera
 sal_Int32 SAL_CALL ScAnnotationsObj::getCount() throw(uno::RuntimeException)
 {
 SolarMutexGuard aGuard;
-sal_uLong nCount = 0;
+sal_Int32 nCount = 0;
 if (pDocShell)
 {
 ScDocument* pDoc = pDocShell-GetDocument();
diff --git a/test/source/sheet/xsheetannotations.cxx 
b/test/source/sheet/xsheetannotations.cxx
index 6671593..a56fc6b 100644
--- a/test/source/sheet/xsheetannotations.cxx
+++ b/test/source/sheet/xsheetannotations.cxx
@@ -22,6 +22,27 @@ using namespace css::uno;
 
 namespace apitest {
 
+void XSheetAnnotations::testCount()
+{
+uno::Reference sheet::XSheetAnnotations  aSheetAnnotations (init(), 
UNO_QUERY_THROW);
+
+// 

Re: [libreoffice-l10n] Re: l10n process, en_US version, Help files

[Tom Davies]

Hi :)
I am fairly sure the Documentation Team is NOT up to doing this but
perhaps with a little help they might be?  They wont be able to do any
of the coding, however easy it is, but the skeleton help-page sounds
like something they might be really good at.  They recently got into
doing the wiki-Faq so they might be less scared of working around
coding tags and such nowadays.  Would it be a good idea to give them a
proposal of what might be required?
Regards from
Tom :)

On 18 December 2013 10:19, Caolán McNamara caol...@redhat.com wrote:
 On Wed, 2013-12-11 at 17:19 +0100, Sophie wrote:
 Hi all,

 This mail is posted to the dev list and the l10n list, please follow up
 on the l10n list.

 I would like to open a discussion on the l10n workflow, the quality of
 the en_US version and the Help files. All is linked and I would like to
 discuss how we can improve the process here. I'm sure that having a
 better understanding between the l10n process and the dev process should
 help us to improve things :) So here is a proposal, it's a bit long,
 sorry for that.

 *Before updating Pootle:
 - it's important for l10n team to know the approx load of work that will
 be needed to achieve the whole work. Time between beta1 and rc1 is short
 and that will help to better organize this time between translation and
 proof reading.
 - depending also on the type of changes, we could use different tools to
 optimize the work.

 *When the l10n start:
 - we need a continuous communication and a planing of the updates made
 in Pootle, those translating off line are always frightened to lose
 something in the run.
 - it's exhausting when you think you are over and to see a new bunch of
 words coming. Knowing it in advance help to manage the time too

 *After RC1 and l10n integration
 - we need to know when integration is made after our fixes, there is
 currently no communication on this

 == for these three items, I have asked today to Andras and Christian
 how we can put that in place and where I can help them to do so, knowing
 also that Christian is managing this part almost alone now.

 *About the en_US overall quality
 - the process to rely on the l10n team to fix the en_US version is ok,
 even if it gives us extra work to understand what is meant before we
 realized it's a mistake. So it's also error prone for all the translations.
 - but that doesn't solve the several typos that already exist and that
 are overlooked by the l10n team (e.g in the Character  Font Effect
 dialog, there is Overline _c_olor and Underline _C_olor and this is the
 same for several dialogs)
 - that doesn't solve also the lack of universal vocabulary used in
 several dialogs (e.g Tab/Pane/Panel/Deck to name the same object or
 Graphic/Picture/Image). I've nothing to propose here but to define a
 glossary where developers could pick the good word but I'm not sure it
 will be used


 * About the help files
 - I always wonder why there is a Help button on a new dialog when no
 help file is appended ;)

 One thing that we could with the new .ui file format is to confirm if
 each dialog actually has a help entry for it. There is an easy hack at
 https://bugs.freedesktop.org/show_bug.cgi?id=67350 to extract out the
 new-format helpids from the help and determine if they actually exist.
 That would weed out typos where the help gets detached from the thing it
 documents.

 Similarly someone could script if each new-format dialog has a help
 entry and make a list of stuff that is missing help and turn those into
 a list of tasks to document those things.

 Another thing that could be automated is to generate a skeleton help
 page from a new-format dialog. i.e. generate the help ids bookmarks for
 the interactive widgets, buttons, checkboxes, etc. and have fill-me-in
 headings and bodytext.

 C.


 --
 To unsubscribe e-mail to: l10n+unsubscr...@global.libreoffice.org
 Problems? 
 http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
 Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
 List archive: http://listarchives.libreoffice.org/global/l10n/
 All messages sent to this list will be publicly archived and cannot be deleted
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 connectivity/source/drivers/firebird/Connection.cxx |2 +-
 connectivity/source/drivers/hsqldb/HDriver.cxx  |2 +-
 connectivity/source/inc/resource/hsqldb_res.hrc |2 +-
 connectivity/source/resource/conn_shared_res.src|2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 365baa17faa71bd2a2b9a372d779b0eca21d3a1b
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Dec 18 12:08:16 2013 +

STROAGE-STORAGE

Change-Id: I2c83c87d15f5fdc766a8464a8389e22120eabc52

diff --git a/connectivity/source/drivers/firebird/Connection.cxx 
b/connectivity/source/drivers/firebird/Connection.cxx
index 3f49b16..f555e2f 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -147,7 +147,7 @@ void Connection::construct(const ::rtl::OUString url, 
const Sequence PropertyV
 if ( !m_xEmbeddedStorage.is() )
 {
 ::connectivity::SharedResources aResources;
-const OUString sMessage = 
aResources.getResourceString(STR_NO_STROAGE);
+const OUString sMessage = 
aResources.getResourceString(STR_NO_STORAGE);
 ::dbtools::throwGenericSQLException(sMessage ,*this);
 }
 
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx 
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 3e2fd0d..9734d6a 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -202,7 +202,7 @@ namespace connectivity
 if ( !xStorage.is() || sURL.isEmpty() )
 {
 ::connectivity::SharedResources aResources;
-const OUString sMessage = 
aResources.getResourceString(STR_NO_STROAGE);
+const OUString sMessage = 
aResources.getResourceString(STR_NO_STORAGE);
 ::dbtools::throwGenericSQLException(sMessage ,*this);
 }
 
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc 
b/connectivity/source/inc/resource/hsqldb_res.hrc
index 4c58619..0ae5511 100644
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ b/connectivity/source/inc/resource/hsqldb_res.hrc
@@ -27,7 +27,7 @@
 // = the hsqldb driver's resource strings
 // 
 
-#define STR_NO_STROAGE  ( STR_HSQLDB_BASE +0 )
+#define STR_NO_STORAGE  ( STR_HSQLDB_BASE +0 )
 #define STR_INVALID_FILE_URL( STR_HSQLDB_BASE +1 )
 #define STR_NO_TABLE_CONTAINER  ( STR_HSQLDB_BASE +2 )
 #define STR_NO_TABLE_EDITOR_DIALOG  ( STR_HSQLDB_BASE +3 )
diff --git a/connectivity/source/resource/conn_shared_res.src 
b/connectivity/source/resource/conn_shared_res.src
index b98a560..693025e 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -591,7 +591,7 @@ String STR_NO_MAC_OS_FOUND
 };
 
 // hsqldb
-String STR_NO_STROAGE
+String STR_NO_STORAGE
 {
 Text [ en-US ] = The connection can not be established. No storage or URL 
was given.;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 4 commits - accessibility/inc accessibility/source sax/source svx/source sw/source xmloff/source

[Michael Stahl]

 accessibility/inc/accessibility/extended/AccessibleGridControl.hxx |2 -
 accessibility/source/extended/AccessibleGridControl.cxx|   15 
++
 sax/source/tools/converter.cxx |   10 
--
 svx/source/accessibility/ChildrenManagerImpl.cxx   |2 -
 sw/source/core/layout/atrfrm.cxx   |6 +++-
 sw/source/filter/xml/xmlexpit.cxx  |2 -
 xmloff/source/style/xmlbahdl.cxx   |5 ++-
 xmloff/source/style/xmlbahdl.hxx   |4 +-
 8 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit 3a5f11f6dd086efdb40e1e75e6588b4c62881918
Author: Michael Stahl mst...@redhat.com
Date:   Tue Dec 17 23:44:38 2013 +0100

fdo#72452: ODF import/export: fix handling of style:page-number

Class XMLNumberWithAutoInsteadZeroPropHdl (which appears to be used only
for this attribute) needs to be adapted to the change that
PageNumberOffset value 0 is no longer invalid; use void value for
invalid instead, which appears more appropriate anyway.

Unfortunately the type of style:page-number is positiveInteger so
writing 0 would be invalid; write auto instead for now.

Change-Id: I9621ea201fd928087b863c562607c3d77a3b0269
(cherry picked from commit 22355042a6fc7aecf3caab69b3fa3be1430b697f)

diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 4f482c5..b06cea4 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -710,7 +710,11 @@ bool SwFmtPageDesc::PutValue( const uno::Any rVal, 
sal_uInt8 nMemberId )
 case MID_PAGEDESC_PAGENUMOFFSET:
 {
 sal_Int16 nOffset = 0;
-if(rVal = nOffset)
+if (!rVal.hasValue())
+{
+SetNumOffset(boost::none);
+}
+else if (rVal = nOffset)
 SetNumOffset( nOffset );
 else
 bRet = false;
diff --git a/sw/source/filter/xml/xmlexpit.cxx 
b/sw/source/filter/xml/xmlexpit.cxx
index abe355d..b1e5182 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -1005,7 +1005,7 @@ bool SvXMLExportItemMapper::QueryXMLValue(
 if( MID_PAGEDESC_PAGENUMOFFSET==nMemberId )
 {
 ::boost::optionalsal_uInt16 oNumOffset = 
pPageDesc-GetNumOffset();
-if (oNumOffset)
+if (oNumOffset  oNumOffset.get()  0)
 {
 // #i114163# positiveInteger only!
 sal_Int32 const number(oNumOffset.get());
diff --git a/xmloff/source/style/xmlbahdl.cxx b/xmloff/source/style/xmlbahdl.cxx
index 3397e47..0a797e5 100644
--- a/xmloff/source/style/xmlbahdl.cxx
+++ b/xmloff/source/style/xmlbahdl.cxx
@@ -879,7 +879,7 @@ bool XMLNumberWithAutoInsteadZeroPropHdl::importXML(
 lcl_xmloff_setAny( rValue, nValue, 2 );
 else if( rStrImpValue == GetXMLToken( XML_AUTO ) )
 {
-rValue = (sal_Int16)nValue;
+rValue.clear(); // void
 bRet = true;
 }
 return bRet;
@@ -891,7 +891,8 @@ bool XMLNumberWithAutoInsteadZeroPropHdl::exportXML( 
OUString rStrExpValue, con
 sal_Int32 nValue = 0;
 lcl_xmloff_getAny( rValue, nValue, 2 );
 
-if( 0 == nValue )
+// FIXME: 0 is not a valid value - write auto instead
+if (0 == nValue || !rValue.hasValue())
 rStrExpValue = GetXMLToken( XML_AUTO );
 else
 {
diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index 58c6dc1..8b57ccb 100644
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
@@ -306,8 +306,8 @@ public:
 
 /**
 PropertyHandler for the XML-data-type: XML_TYPE_NUMBER16_AUTO
-Reads/writes numeric properties with special handling for the value zero
-(i.e., a value 0 property will be written as auto)
+Reads/writes numeric properties with special handling for void value
+(i.e., void property will be written as auto)
 */
 class XMLNumberWithAutoInsteadZeroPropHdl : public XMLNumberWithoutZeroPropHdl
 {
commit b233b5f754026600a0f9712538291eaaa48d5884
Author: Michael Stahl mst...@redhat.com
Date:   Tue Dec 17 17:29:49 2013 +0100

sax: avoid usage of double for parsing nanoseconds here too

Change-Id: Iddf93a116cb333db6465a915dae692c33a60241a
(cherry picked from commit 64575a5b91b0fae6283b9ad8b1356e76caa34b45)

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 02131ed..4e61f27 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1645,9 +1645,13 @@ static bool lcl_parseDateTime(
 }
 if (bSuccess)
 {
-const sal_Int32 nDigits = std::minsal_Int32(nPos - nStart, 
9);
-OSL_ENSURE(nDigits  0, bad code monkey);
-  

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

[Caolán McNamara]

 connectivity/source/drivers/hsqldb/HDriver.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit f5ef6b39fb572a581a54927930dda6b8e8d71797
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Dec 18 12:37:09 2013 +

nIndex can only be -1 or  sSystemPath.getLength()

from

sal_Int32 nIndex = sSystemPath.lastIndexOf('.');

so

OUString sConnPartURL = sSystemPath.copy( 0, ::std::max sal_Int32 ( 
nIndex, sSystemPath.getLength() )

is equivalent to

OUString sConnPartURL = sSystemPath.copy( 0, sSystemPath.getLength() )

which is

OUString sConnPartURL = sSystemPath;

so drop sConnPartURL and replace with sSystemPath

Change-Id: I3fc8e88a4b3e474c3dccd08cf356e4663503ae02

diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx 
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 9734d6a..8e6dff9 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -208,7 +208,6 @@ namespace connectivity
 
 OUString sSystemPath;
 osl_getSystemPathFromFileURL( sURL.pData, sSystemPath.pData );
-sal_Int32 nIndex = sSystemPath.lastIndexOf('.');
 if ( sURL.isEmpty() || sSystemPath.isEmpty() )
 {
 ::connectivity::SharedResources aResources;
@@ -221,8 +220,7 @@ namespace connectivity
 ::comphelper::NamedValueCollection aProperties;
 
 // properties for accessing the embedded storage
-OUString sConnPartURL = sSystemPath.copy( 0, ::std::max 
sal_Int32 ( nIndex, sSystemPath.getLength() ) );
-OUString sKey = StorageContainer::registerStorage( xStorage, 
sConnPartURL );
+OUString sKey = StorageContainer::registerStorage( xStorage, 
sSystemPath );
 aProperties.put( storage_key, sKey );
 aProperties.put( storage_class_name,
 OUString(  com.sun.star.sdbcx.comp.hsqldb.StorageAccess  
) );
@@ -335,7 +333,7 @@ namespace connectivity
 
 OUString sConnectURL(jdbc:hsqldb:);
 
-sConnectURL += sConnPartURL;
+sConnectURL += sSystemPath;
 ReferenceXConnection xOrig;
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Eike Rathke er...@redhat.com changed:

   What|Removed |Added

 Depends on||72778

--- Comment #39 from Eike Rathke er...@redhat.com ---
Adding bug 72778 - switching default locale leads to weird number format codes
behavior.

-- 
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: basctl/source

[Stephan Bergmann]

 basctl/source/dlged/dlgedobj.cxx |4 ++--
 basctl/source/inc/dlgedobj.hxx   |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 075a0b30c891014abcdfedfc19678255db05b025
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 18 14:14:20 2013 +0100

No need for DlgEdObj::supportsService to be virtual

Change-Id: Ib324adb4bc894f16c051fe956c25e37b0502006c

diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index e29480d..3645142 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -671,14 +671,14 @@ void DlgEdObj::TabIndexChange( const 
beans::PropertyChangeEvent evt ) throw (Ru
 
 //
 
-sal_Bool DlgEdObj::supportsService( const sal_Char* _pServiceName ) const
+bool DlgEdObj::supportsService( OUString const  serviceName ) const
 {
 bool bSupports = false;
 
 Reference lang::XServiceInfo  xServiceInfo( GetUnoControlModel() , 
UNO_QUERY );
 // TODO: cache xServiceInfo as member?
 if ( xServiceInfo.is() )
-bSupports = xServiceInfo-supportsService( OUString::createFromAscii( 
_pServiceName ) );
+bSupports = xServiceInfo-supportsService( serviceName );
 
 return bSupports;
 }
diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx
index e7817e4..651e4d9 100644
--- a/basctl/source/inc/dlgedobj.hxx
+++ b/basctl/source/inc/dlgedobj.hxx
@@ -103,7 +103,7 @@ public:
 // FullDrag support
 virtual SdrObject* getFullDragClone() const;
 
-virtual sal_BoolsupportsService( const sal_Char* _pServiceName ) 
const;
+bool supportsService( OUString const  serviceName ) const;
 virtual OUString GetDefaultName() const;
 virtual OUString GetUniqueName() const;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

QA Meeting Minutes - 2013-12-16

[Robinson Tryon]

Hi all,

Meeting minutes are available here:
https://wiki.documentfoundation.org/QA/Meetings/2013/December_16

Our next meeting will be in two weeks:
https://wiki.documentfoundation.org/QA/Meetings/2013/December_30

As always, our meetings are open to everyone -- please feel free to
join us for the last QA Meeting of the year!

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 71919, which changed state.

Bug 71919 Summary: Arrowheads with empty shape broken
https://bugs.freedesktop.org/show_bug.cgi?id=71919

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
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: sw/source

[Miklos Vajna]

 sw/source/filter/ww8/docxattributeoutput.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit e930d96d95edc1c1e5fd54493d289a76f31a846f
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Dec 18 14:31:43 2013 +0100

DocxAttributeOutput::EndParagraph: fix export of tables in textframes

This is triggered by
sw/qa/extras/ooxmlexport/data/floatingtbl_with_formula.docx when DML export 
of
TextFrames is enabled in non-experimental mode.

Change-Id: I2a342cd4eaec0d718b7d1f4781defd591583731c

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4c7e6cc..81f6479 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -503,6 +503,12 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 FSEND);
 WriteDMLTextFrame(pParentFrame);
 m_pSerializer-endElementNS(XML_mc, XML_Choice);
+
+// Reset table infos, otherwise the depth of the cells will be 
incorrect,
+// in case the text frame had table(s) and we try to export the
+// same table second time.
+m_rExport.mpTableInfo = ww8::WW8TableInfo::Pointer_t(new 
ww8::WW8TableInfo());
+
 m_pSerializer-startElementNS(XML_mc, XML_Fallback, FSEND);
 WriteVMLTextFrame(pParentFrame);
 m_pSerializer-endElementNS(XML_mc, XML_Fallback);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Muthu Subramanian]

 oox/source/export/drawingml.cxx |8 +++
 sd/qa/unit/data/n828390_4.odp   |binary
 sd/qa/unit/import-tests.cxx |   43 
 3 files changed, 47 insertions(+), 4 deletions(-)

New commits:
commit 33b59c555755283edbcb3bb50a44db153cb1c23f
Author: Muthu Subramanian sumu...@collabora.com
Date:   Wed Dec 18 20:01:11 2013 +0530

n#828390: Add unit test for font properties export.

diff --git a/sd/qa/unit/data/n828390_4.odp b/sd/qa/unit/data/n828390_4.odp
new file mode 100644
index 000..888611c
Binary files /dev/null and b/sd/qa/unit/data/n828390_4.odp differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 630891c..31b9e7b 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -16,6 +16,8 @@
 #include editeng/fhgtitem.hxx
 #include editeng/escapementitem.hxx
 #include editeng/colritem.hxx
+#include editeng/fontitem.hxx
+#include editeng/wghtitem.hxx
 #include rsc/rscsfx.hxx
 
 #include svx/svdotext.hxx
@@ -51,6 +53,7 @@ public:
 void testN828390();
 void testN828390_2();
 void testN828390_3();
+void testN828390_4();
 void testFdo68594();
 
 CPPUNIT_TEST_SUITE(SdFiltersTest);
@@ -63,6 +66,7 @@ public:
 CPPUNIT_TEST(testN828390);
 CPPUNIT_TEST(testN828390_2);
 CPPUNIT_TEST(testN828390_3);
+CPPUNIT_TEST(testN828390_4);
 CPPUNIT_TEST(testFdo68594);
 
 CPPUNIT_TEST_SUITE_END();
@@ -283,6 +287,45 @@ void SdFiltersTest::testN828390_3()
 CPPUNIT_ASSERT_MESSAGE(CharEscapment not imported properly, bPassed);
 }
 
+void SdFiltersTest::testN828390_4()
+{
+bool bPassed = false;
+::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc(/sd/qa/unit/data/n828390_4.odp) );
+CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() );
+
+xDocShRef = saveAndReload( xDocShRef, PPTX );
+CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() );
+CPPUNIT_ASSERT_MESSAGE( not in destruction, 
!xDocShRef-IsInDestruction() );
+
+SdDrawDocument *pDoc = xDocShRef-GetDoc();
+CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL );
+const SdrPage *pPage = pDoc-GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( no page, pPage != NULL );
+{
+std::vectorEECharAttrib rLst;
+SdrObject *pObj = pPage-GetObj(0);
+SdrTextObj *pTxtObj = dynamic_castSdrTextObj *( pObj );
+const EditTextObject aEdit = 
pTxtObj-GetOutlinerParaObject()-GetTextObject();
+aEdit.GetCharAttribs(1, rLst);
+for( std::vectorEECharAttrib::reverse_iterator it = rLst.rbegin(); 
it!=rLst.rend(); ++it)
+{
+const SvxFontHeightItem * pFontHeight = dynamic_castconst 
SvxFontHeightItem *((*it).pAttr);
+if( pFontHeight )
+CPPUNIT_ASSERT_MESSAGE( Font height is wrong, 
pFontHeight-GetHeight() == 1129 );
+const SvxFontItem *pFont = dynamic_castconst SvxFontItem 
*((*it).pAttr);
+if( pFont )
+{
+CPPUNIT_ASSERT_MESSAGE( Font is wrong, 
pFont-GetFamilyName().equalsAscii(Arial));
+bPassed = true;
+}
+const SvxWeightItem *pWeight = dynamic_castconst SvxWeightItem 
*((*it).pAttr);
+if( pWeight )
+CPPUNIT_ASSERT_MESSAGE( Font Weight is wrong, 
pWeight-GetWeight() == WEIGHT_BOLD);
+}
+}
+CPPUNIT_ASSERT(bPassed);
+}
+
 void SdFiltersTest::testN778859()
 {
 ::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc(/sd/qa/unit/data/pptx/n778859.pptx));
commit 33b796eb1484b9a3fc11a189faddb7fc36509856
Author: Muthu Subramanian sumu...@collabora.com
Date:   Wed Dec 18 19:56:28 2013 +0530

n#828390: Explictly export font properties.

Seems like the status is returned as default,
but the font properties needs to be still exported.

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0e8db87..6a0d65b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -711,14 +711,14 @@ void DrawingML::WriteRunProperties( Reference 
XPropertySet  rRun, sal_Bool bIs
 sal_Int32 nSize = 1800;
 sal_Int32 nCharEscapement = 0;
 
-if( GETAD( CharHeight ) )
+if( GETA( CharHeight ) )
 nSize = (sal_Int32) (100*(*((float*) mAny.getValue(;
 
-if ( ( bComplex  GETAD( CharWeightComplex ) ) || GETAD( CharWeight ) )
+if ( ( bComplex  GETA( CharWeightComplex ) ) || GETA( CharWeight ) )
 if ( *((float*) mAny.getValue()) = awt::FontWeight::SEMIBOLD )
 bold = 1;
 
-if ( ( bComplex  GETAD( CharPostureComplex ) ) || GETAD( CharPosture ) )
+if ( ( bComplex  GETA( CharPostureComplex ) ) || GETA( CharPosture ) )
 switch ( *((awt::FontSlant*) mAny.getValue()) )
 {
 case awt::FontSlant_OBLIQUE :
@@ -827,7 +827,7 @@ void DrawingML::WriteRunProperties( Reference XPropertySet 
 rRun, sal_Bool bIs
 WriteSolidFill( color );
 }
 
-if( GETAD( CharFontName ) ) {

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

[Muthu Subramanian]

 oox/inc/oox/drawingml/textcharacterproperties.hxx   |1 +
 oox/source/drawingml/textcharacterproperties.cxx|   10 ++
 oox/source/drawingml/textcharacterpropertiescontext.cxx |2 ++
 oox/source/export/drawingml.cxx |8 
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit c0dd1682420f0e9e18a74a0ec5fd02b029573c80
Author: Muthu Subramanian sumu...@collabora.com
Date:   Thu Dec 12 18:24:42 2013 +0530

n#828390: Reset charescapement.

Unless the value is reset - the escapement
seems to continue to the next set of textruns.

diff --git a/oox/source/drawingml/textcharacterproperties.cxx 
b/oox/source/drawingml/textcharacterproperties.cxx
index 4230148..c531bc1 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -129,6 +129,9 @@ void TextCharacterProperties::pushToPropMap( PropertyMap 
rPropMap, const XmlFil
 if( moBaseline.has() ) {
 rPropMap[ PROP_CharEscapement ] = sal_Int16(moBaseline.get( 0 ) / 
1000);
 rPropMap[ PROP_CharEscapementHeight ] = sal_Int8(DFLT_ESC_PROP);
+} else {
+rPropMap[ PROP_CharEscapement ] = sal_Int16(0);
+rPropMap[ PROP_CharEscapementHeight ] = sal_Int8(100); // 100%
 }
 
 if( !bUseOptional || moBold.has() ) {
commit 1d42520a36bb2a3131330e03e7f25d4ae5a99241
Author: Muthu Subramanian sumu...@collabora.com
Date:   Wed Dec 18 20:19:48 2013 +0530

Fix fdo#70220 Superscript not imported from pptx.

Ported from: 840a8573c8cebe67ddd3c9fe106c7dbd789bb334
(Original Author: Thorsten)

diff --git a/oox/inc/oox/drawingml/textcharacterproperties.hxx 
b/oox/inc/oox/drawingml/textcharacterproperties.hxx
index 3dc4062..1073fa6 100644
--- a/oox/inc/oox/drawingml/textcharacterproperties.hxx
+++ b/oox/inc/oox/drawingml/textcharacterproperties.hxx
@@ -46,6 +46,7 @@ struct TextCharacterProperties
 OptValue sal_Int32  moHeight;
 OptValue sal_Int32  moSpacing;
 OptValue sal_Int32  moUnderline;
+OptValue sal_Int32  moBaseline;
 OptValue sal_Int32  moStrikeout;
 OptValue sal_Int32  moCaseMap;
 OptValue bool moBold;
diff --git a/oox/source/drawingml/textcharacterproperties.cxx 
b/oox/source/drawingml/textcharacterproperties.cxx
index 0163f82..4230148 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -21,6 +21,7 @@
 #include com/sun/star/lang/Locale.hpp
 #include com/sun/star/awt/FontSlant.hpp
 #include com/sun/star/awt/FontWeight.hpp
+#include editeng/escapementitem.hxx
 #include oox/helper/helper.hxx
 #include oox/helper/propertyset.hxx
 #include oox/core/xmlfilterbase.hxx
@@ -52,6 +53,7 @@ void TextCharacterProperties::assignUsed( const 
TextCharacterProperties rSource
 moHeight.assignIfUsed( rSourceProps.moHeight );
 moSpacing.assignIfUsed( rSourceProps.moSpacing );
 moUnderline.assignIfUsed( rSourceProps.moUnderline );
+moBaseline.assignIfUsed( rSourceProps.moBaseline );
 moStrikeout.assignIfUsed( rSourceProps.moStrikeout );
 moCaseMap.assignIfUsed( rSourceProps.moCaseMap );
 moBold.assignIfUsed( rSourceProps.moBold );
@@ -124,6 +126,11 @@ void TextCharacterProperties::pushToPropMap( PropertyMap 
rPropMap, const XmlFil
 rPropMap[ PROP_CharStrikeout ] = GetFontStrikeout( moStrikeout.get( 
XML_noStrike ) );
 rPropMap[ PROP_CharCaseMap ] = GetCaseMap( moCaseMap.get( XML_none ) );
 
+if( moBaseline.has() ) {
+rPropMap[ PROP_CharEscapement ] = sal_Int16(moBaseline.get( 0 ) / 
1000);
+rPropMap[ PROP_CharEscapementHeight ] = sal_Int8(DFLT_ESC_PROP);
+}
+
 if( !bUseOptional || moBold.has() ) {
 float fWeight = moBold.get( false ) ? awt::FontWeight::BOLD : 
awt::FontWeight::NORMAL;
 rPropMap[ PROP_CharWeight ] = fWeight;
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx 
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 605ebb0..2119dc6 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -56,6 +56,8 @@ 
TextCharacterPropertiesContext::TextCharacterPropertiesContext(
 mrTextCharacterProperties.moUnderline = aAttribs.getToken( XML_u );
 if ( aAttribs.hasAttribute( XML_strike ) )
 mrTextCharacterProperties.moStrikeout = aAttribs.getToken( XML_strike 
);
+if ( aAttribs.hasAttribute( XML_baseline ) )
+mrTextCharacterProperties.moBaseline = aAttribs.getInteger( 
XML_baseline );
 
 //  mrTextCharacterProperties.moCaseMap = aAttribs.getToken( XML_cap );
 if ( aAttribs.hasAttribute( XML_b ) )
commit 4d4fb2a6f8afd525bffbc465779a6bf95e5debd9
Author: Muthu Subramanian sumu...@collabora.com
Date:   Wed Dec 18 20:08:41 2013 +0530

n#828390: Explictly export font properties.

Seems like the status is returned as default,
but the font properties needs to be still 

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

[Stephan Bergmann]

 test/source/sheet/xsheetannotations.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d9168242f5f8800f88d4947bd1fbfc30a969429c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Dec 6 14:32:26 2013 +0100

Fix integer ambiguity

Change-Id: I1247af709baf250b82a4156ea2cbf29c758f0c78

diff --git a/test/source/sheet/xsheetannotations.cxx 
b/test/source/sheet/xsheetannotations.cxx
index a56fc6b..cf4b82a 100644
--- a/test/source/sheet/xsheetannotations.cxx
+++ b/test/source/sheet/xsheetannotations.cxx
@@ -52,7 +52,7 @@ void XSheetAnnotations::testInsertNew()
 sal_Int32 nBefore = xAnnotationsIndex-getCount();
 
 CPPUNIT_ASSERT_EQUAL_MESSAGE(
-There should already be one note, 1, nBefore );
+There should already be one note, sal_Int32(1), nBefore );
 
 // insert the annotation
 table::CellAddress xTargetCellAddress (0,3,4);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60698] kill pointless one-file library ...

[bugzilla-daemon]

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

--- Comment #21 from Marcos Souza marcos.souza@gmail.com ---
Hi guys!

After sending my patch about animcore, I saw that evtatt(eventattacher) just
have one file... 

What's the best library to hold this implementation? Maybe basic?

By removing all these small libs and dirs, maybe some newcomers will don't be
scaned of the size of libreoffice project :)

-- 
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 'private/kohei/calc-data-stream' - sc/source

[Kohei Yoshida]

 sc/source/ui/miscdlgs/datastreamdlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1cd556be1b77ec9b5d503438b52438e9d8b7275f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 10:10:57 2013 -0500

Disable this mode for now.

Change-Id: I3206de5e379fb7091498f5e3d83ccc5d28071ae5

diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx 
b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index bc1bf3d..c004fbc 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -38,6 +38,7 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, Window* 
pParent)
 
 m_pCbUrl-SetSelectHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
 m_pRBAddressValue-SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
+m_pRBAddressValue-Enable(false);
 m_pRBValuesInLine-SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
 m_pEdRange-SetModifyHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
 m_pBtnBrowse-SetClickHdl( LINK( this, DataStreamDlg, BrowseHdl ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - odk/examples

[Stephan Bergmann]

 odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 4d678d76b51a14e81b0a29c7e96a338bd058526a
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 17 10:52:48 2013 +0100

Do not use Boost in SDK examples

Change-Id: I8b2af447fe3ee29261e538a53b4624ff8b6c4d1e
(cherry picked from commit ca4065680a402e3d0ff43e41744b24a9c980b2ef)
Reviewed-on: https://gerrit.libreoffice.org/7118
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h 
b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
index a1e633e..0fe4bd0 100644
--- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
+++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include map
 #include vector
-#include boost/unordered_map.hpp
 
 #include com/sun/star/frame/XFrame.hpp
 #include com/sun/star/frame/XStatusListener.hpp
@@ -29,14 +29,11 @@
 
 typedef std::vector  com::sun::star::uno::Reference  
com::sun::star::frame::XStatusListener   StatusListeners;
 
-typedef boost::unordered_map  ::rtl::OUString,
-   StatusListeners,
-   rtl::OUStringHash,
-   std::equal_to rtl::OUString   ListenerMap;
+typedef std::map  ::rtl::OUString, StatusListeners  ListenerMap;
 
 // For every frame there is *one* Dispatch object for all possible commands
 // this struct contains an array of listeners for every supported command
-// these arrays are accessed by a boost::unordered_map (with the command 
string as index)
+// these arrays are accessed by a std::map (with the command string as index)
 struct ListenerItem
 {
 ListenerMap aContainer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - desktop/test mysqlc/source odk/examples odk/settings

[Stephan Bergmann]

 desktop/test/deployment/active/active_native.cxx   
|7 +++
 desktop/test/deployment/passive/passive_native.cxx 
|7 +++
 mysqlc/source/mysqlc_services.cxx  
|7 +++
 
odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
  |8 
 odk/examples/DevelopersGuide/Components/CppComponent/service2_impl.cxx 
|7 +++
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx 
|7 +++
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx
 |7 +++
 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
 |7 +++
 odk/examples/DevelopersGuide/examples.html 
|4 ++--
 odk/examples/cpp/complextoolbarcontrols/exports.cxx
|7 +++
 odk/examples/cpp/counter/counter.cxx   
|8 
 odk/examples/cpp/custompanel/ctp_services.cxx  
|8 
 odk/examples/cpp/remoteclient/remoteclient.cxx 
|8 
 odk/settings/component.uno.def 
|1 +
 14 files changed, 91 insertions(+), 2 deletions(-)

New commits:
commit 8071d87b62ab87b2a825394847e9313ea8ddfcb4
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 17 10:53:29 2013 +0100

Keep using component_getImplementationEnvironment in extensions

...instead of relying on the implicit CPPU_CURRENT_LANGUAGE_BINDING_NAME
convention.  Keeping that convention an implementation detail makes it 
easier to
do improvements in the future.  (Theoretically, the bundled extension in 
mysqlc
could be considered internal code and not adapted, but just be safe.)

(cherry picked from commit fa2a7c1c95f78d20ed572091e12700fd4d852835)
Conflicts:
desktop/test/deployment/active/active_native.cxx

odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
odk/examples/cpp/counter/counter.cxx

Change-Id: Iae41a6e072dabc2bf7c1481ba6cfed61680edf37
Reviewed-on: https://gerrit.libreoffice.org/7119
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/desktop/test/deployment/active/active_native.cxx 
b/desktop/test/deployment/active/active_native.cxx
index 3afc099..0e0b1e6 100644
--- a/desktop/test/deployment/active/active_native.cxx
+++ b/desktop/test/deployment/active/active_native.cxx
@@ -252,6 +252,13 @@ extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL 
component_getFactory(
 pImplName, pServiceManager, pRegistryKey, services);
 }
 
+extern C SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+char const ** ppEnvTypeName, uno_Environment **)
+{
+*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
 extern C sal_Bool SAL_CALL component_writeInfo(
 void * pServiceManager, void * pRegistryKey)
 {
diff --git a/desktop/test/deployment/passive/passive_native.cxx 
b/desktop/test/deployment/passive/passive_native.cxx
index 819f6ab..22586a4 100644
--- a/desktop/test/deployment/passive/passive_native.cxx
+++ b/desktop/test/deployment/passive/passive_native.cxx
@@ -249,4 +249,11 @@ extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL 
component_getFactory(
 pImplName, pServiceManager, pRegistryKey, services);
 }
 
+extern C SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+char const ** ppEnvTypeName, uno_Environment **)
+{
+*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/mysqlc/source/mysqlc_services.cxx 
b/mysqlc/source/mysqlc_services.cxx
index af1cabe..0ffe9cd 100644
--- a/mysqlc/source/mysqlc_services.cxx
+++ b/mysqlc/source/mysqlc_services.cxx
@@ -22,6 +22,7 @@
 #include cppuhelper/factory.hxx
 #include osl/diagnose.h
 #include rtl/ustrbuf.hxx
+#include uno/lbnames.h
 
 using namespace connectivity::mysqlc;
 using ::com::sun::star::uno::Reference;
@@ -102,6 +103,12 @@ extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL 
component_getFactory(
 };
 /* }}} */
 
+extern C SAL_DLLPUBLIC_EXPORT void SAL_CALL
+component_getImplementationEnvironment(
+char const ** ppEnvTypeName, uno_Environment **)
+{
+*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+}
 
 /*
  * Local variables:
diff --git 
a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
 
b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx
index 20c2628..b71c694 100644
--- 

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

[Stephan Bergmann]

 sax/source/tools/converter.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 7a3eed5eb60d97fec397d3ad5c0bf62c703f8cf9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Dec 17 16:46:17 2013 +0100

Avoid inaccurate floating-point computations

...otherwise at least my --disable-dbgutil --disable-debug Linux x86_64 
build
failed the CppunitTest_sax_cpputest with 899 vs. 900 nanoseconds.

(cherry picked from commit 695671eb18674ea58103093b9cf31a31afe8d2fd,
incorporating follow-up fixes 71448690d7c5904df45bf98243c5bb05a99245e5
readUnsignedNumberMaxDigits can read more than maxDigits chars and
b9bcc9c5c10841dcdfa9ff5814344ce667678df3 ...and nDigits  9 is harmless in
following for loop and need not be capped)

Change-Id: I05e0febf413f9f9e01227a0cc4e0f46a5243fe61
(cherry picked from commit 5bffe4dffd7496057c1fd70e46af800396f5b346)
Reviewed-on: https://gerrit.libreoffice.org/7122
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index bc8b0c1..429f5e4 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1120,9 +1120,13 @@ bool Converter::convertDuration(util::Duration 
rDuration,
 {
 if (-1 != nTemp)
 {
-const sal_Int32 nDigits = std::minsal_Int32(nPos 
- nStart, 9);
-OSL_ENSURE(nDigits  0, bad code monkey: negative 
digits);
-
nNanoSeconds=static_castdouble(nTemp)*(10.0/pow(10.0,nDigits));
+nNanoSeconds = nTemp;
+sal_Int32 nDigits = nPos - nStart;
+assert(nDigits = 0);
+for (; nDigits  9; ++nDigits)
+{
+nNanoSeconds *= 10;
+}
 nTemp=-1;
 if (sal_Unicode('S') == string[nPos])
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 72598] [Easyhack] Remove SunStudio cruft from code base

[bugzilla-daemon]

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

--- Comment #5 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Jelle van der Waa committed a patch related to this issue.
It has been pushed to master:

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

fdo#72598 Remove SunStudio cruft from code base



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: sdext/source

[Jelle van der Waa]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 6e06bd6cb5199b5164975eff97dd22b0a69829e5
Author: Jelle van der Waa je...@vdwaa.nl
Date:   Wed Dec 18 16:44:17 2013 +0100

fdo#72598 Remove SunStudio cruft from code base

Change-Id: I8dfbbb36cca3cf71c8d347b248dd206c447db6d2
Reviewed-on: https://gerrit.libreoffice.org/7136
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index f7e4a98..760bfe7 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -27,8 +27,6 @@
 # pragma GCC diagnostic push
 # pragma GCC diagnostic ignored -Wunused-parameter
 #endif
-#elif defined __SUNPRO_CC
-#pragma disable_warn
 #elif defined _MSC_VER
 #pragma warning(push, 1)
 #endif
@@ -46,8 +44,6 @@
 #if HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE
 # pragma GCC diagnostic pop
 #endif
-#elif defined __SUNPRO_CC
-#pragma enable_warn
 #elif defined _MSC_VER
 #pragma warning(pop)
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 72598] [Easyhack] Remove SunStudio cruft from code base

[bugzilla-daemon]

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

--- Comment #6 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Michael Stahl committed a patch related to this issue.
It has been pushed to master:

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

fdo#72598: odk: remove SunStudio support



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: 3 commits - bin/distro-install-sdk external/hyphen external/mythes odk/config odk/settings

[Michael Stahl]

 bin/distro-install-sdk|1 
 external/hyphen/ExternalProject_hyphen.mk |1 
 external/mythes/ExternalProject_mythes.mk |1 
 odk/config/configure.pl   |   40 --
 odk/config/setsdkenv_unix.sh.in   |   14 --
 odk/settings/settings.mk  |   21 +--
 6 files changed, 8 insertions(+), 70 deletions(-)

New commits:
commit fab34eb54fffaaf1fc32a0901436d8940f6c8b43
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 18 18:02:40 2013 +0100

fdo#72598: remove last uses of C52

Change-Id: Ibf43da89c88596589c8e81f790c9d57c2a4e9701

diff --git a/external/hyphen/ExternalProject_hyphen.mk 
b/external/hyphen/ExternalProject_hyphen.mk
index 6687265..28b8323 100644
--- a/external/hyphen/ExternalProject_hyphen.mk
+++ b/external/hyphen/ExternalProject_hyphen.mk
@@ -20,7 +20,6 @@ $(call gb_ExternalProject_get_state_target,hyphen,build):
./configure --disable-shared \
$(if $(filter-out IOS,$(OS)),--with-pic) \
$(if $(filter 
YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) 
gio_can_sniff=no) \
-   $(if $(filter 
C52-SPARC64,$(COM)-$(CPUNAME)),CFLAGS=-m64) \
 $(MAKE) \
)
 
diff --git a/external/mythes/ExternalProject_mythes.mk 
b/external/mythes/ExternalProject_mythes.mk
index 88e2a61..2428aa2 100644
--- a/external/mythes/ExternalProject_mythes.mk
+++ b/external/mythes/ExternalProject_mythes.mk
@@ -19,7 +19,6 @@ $(call gb_ExternalProject_get_state_target,mythes,build):
$(call gb_ExternalProject_run,build,\
LIBS=$(gb_STDLIBS) $(LIBS) ./configure --disable-shared 
--with-pic \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM) gio_can_sniff=no) \
-   $(if $(filter C52-SPARC64,$(COM)-$(CPUNAME)),CFLAGS=-m64) \
 $(MAKE) \
)
 
commit 43dcbc8a6daa0dcca6f46934ee8900d8c5655321
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 18 17:58:06 2013 +0100

odk: pltfrm appears to be unused

Change-Id: Ia991593d53e31ad3d65881f9b6e62fede93e0266

diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 3254f43..1c2c629 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -153,7 +153,6 @@ case ${sdk_platform} in
platform='Solaris x86'
 fi
 comid=gcc3
-pltfrm=gcc
 soext=so
 exampleout=SOLARISexample.out
 
LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
@@ -163,7 +162,6 @@ case ${sdk_platform} in
   darwin*)
 directoryname=macosx
 comid=gcc3
-pltfrm=gcc
 soext=dylib
 exampleout=MACOSXexample.out
 platform=MacOSX
@@ -174,7 +172,6 @@ case ${sdk_platform} in
   linux-gnu)
 directoryname=linux
 comid=gcc3
-pltfrm=gcc
 soext=so
 exampleout=LINUXexample.out
 platform=Linux
@@ -185,7 +182,6 @@ case ${sdk_platform} in
   freebsd*)
 directoryname=freebsd
 comid=gcc3
-pltfrm=gcc
 soext=so
 exampleout=FREEBSDexample.out
 platform=FreeBSD
commit 1bffa142c530b638e245e1aca58a27414d65e927
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 18 17:56:20 2013 +0100

fdo#72598: odk: remove SunStudio support

No idea if the GCC stuff that's in there actually works.

Change-Id: Idd1b93edd88609f3c09d14134d00a15fa9c0b0b7

diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index 33554e8..4bc4edf 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -74,7 +74,6 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
 -e s,@OO_SDK_CPP_HOME@,/usr/bin, \
 -e s,@OO_SDK_SED_HOME@,/usr/bin, \
 -e s,@OO_SDK_CAT_HOME@,/usr/bin, \
--e s,@OO_SDK_CC_55_OR_HIGHER@,, \
 -e s,@OO_SDK_JAVA_HOME@,$JAVA_HOME, \
 -e s,@OO_SDK_OUTPUT_DIR@,\$HOME, \
 -e s,@SDK_AUTO_DEPLOYMENT@,NO, \
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 588f80b..dde3a94 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -77,12 +77,6 @@ $main::OO_SDK_SED_HOME_SUGGESTION = searchprog(sed);
 $main::OO_SDK_CPP_HOME = ;
 $main::cppName = gcc;
 $main::cppVersion = 4.0.1;
-if ( $main::operatingSystem =~ m/solaris/ )
-{
-$main::cppName = CC;
-$main::cppVersion = 5.2;
-}
-$main::OO_SDK_CC_55_OR_HIGHER = ;
 $main::OO_SDK_CPP_HOME_SUGGESTION = searchprog($main::cppName);
 
 $main::OO_SDK_JAVA_HOME = ;
@@ -420,39 +414,6 @@ while ( (!$main::correctVersion) 
 $main::OO_SDK_CPP_HOME = ;
 }
 }
-} else
-{
-# for Solaris we have to check the version too
-open(FILE, $OO_SDK_CPP_HOME/$main::cppName -V 21 |);
-my @lines = FILE;
-my $testVersion 

[Bug 72598] [Easyhack] Remove SunStudio cruft from code base

[bugzilla-daemon]

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

--- Comment #7 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Michael Stahl committed a patch related to this issue.
It has been pushed to master:

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

fdo#72598: remove last uses of C52



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: desktop/source i18nlangtag/source include/i18nlangtag unotools/source

[Eike Rathke]

 desktop/source/app/langselect.cxx  |2 +-
 i18nlangtag/source/isolang/mslangid.cxx|2 +-
 i18nlangtag/source/languagetag/languagetag.cxx |   19 ++-
 include/i18nlangtag/languagetag.hxx|3 +++
 include/i18nlangtag/mslangid.hxx   |   18 +-
 unotools/source/config/syslocaleoptions.cxx|4 ++--
 6 files changed, 42 insertions(+), 6 deletions(-)

New commits:
commit cc54c08a66046c00af3713fbe5e69995ccb7f73b
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 18 18:08:09 2013 +0100

resolved fdo#72778 keep setting system locale and LanguageTag in sync

Change-Id: I3547786bf77b8f611bc08d0e52c66ac00e199f13

diff --git a/desktop/source/app/langselect.cxx 
b/desktop/source/app/langselect.cxx
index cef2851..49d001a 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -197,7 +197,7 @@ bool prepareLocale() {
 }
 MsLangId::setConfiguredSystemUILanguage(tag.getLanguageType(false));
 OUString setupSysLoc(officecfg::Setup::L10N::ooSetupSystemLocale::get());
-MsLangId::setConfiguredSystemLanguage(
+LanguageTag::setConfiguredSystemLanguage(
 setupSysLoc.isEmpty()
 ? MsLangId::getSystemLanguage()
 : LanguageTag(setupSysLoc).getLanguageType(false));
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 4f86492..e27e13b 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -37,7 +37,7 @@ LanguageType MsLangId::nConfiguredAsianFallback= 
LANGUAGE_SYSTEM;
 LanguageType MsLangId::nConfiguredComplexFallback  = LANGUAGE_SYSTEM;
 
 // static
-void MsLangId::setConfiguredSystemLanguage( LanguageType nLang )
+void MsLangId::LanguageTagAccess::setConfiguredSystemLanguage( LanguageType 
nLang )
 {
 nConfiguredSystemLanguage = nLang;
 }
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 68ee64c..695343e 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -364,7 +364,6 @@ private:
 /** Convert Locale to BCP 47 string without resolving system and creating
 temporary LanguageTag instances. */
 static OUString convertToBcp47( const com::sun::star::lang::Locale 
rLocale );
-
 };
 
 
@@ -713,6 +712,24 @@ LanguageTag::ImplPtr LanguageTagImpl::registerOnTheFly( 
LanguageType nRegisterID
 return pImpl;
 }
 
+// static
+void LanguageTag::setConfiguredSystemLanguage( LanguageType nLang )
+{
+if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_SYSTEM)
+{
+SAL_WARN( i18nlangtag,
+LanguageTag::setConfiguredSystemLanguage: refusing to set 
unresolved system locale 0x 
+::std::hex  nLang);
+return;
+}
+SAL_INFO( i18nlangtag, LanguageTag::setConfiguredSystemLanguage: 
setting to 0x  ::std::hex  nLang);
+MsLangId::LanguageTagAccess::setConfiguredSystemLanguage( nLang);
+// Resest system locale to none and let registerImpl() do the rest to
+// initialize a new one.
+theSystemLocale::get().reset();
+LanguageTag aLanguageTag( LANGUAGE_SYSTEM);
+aLanguageTag.registerImpl();
+}
 
 static bool lcl_isKnownOnTheFlyID( LanguageType nLang )
 {
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 7e282bb..3c1a135 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -498,6 +498,9 @@ public:
 /** If nLang is a generated on-the-fly LangID */
 static bool isOnTheFlyID( LanguageType nLang );
 
+/** @ATTENTION: _ONLY_ to be called by the application's configuration! */
+static void setConfiguredSystemLanguage( LanguageType nLang );
+
 typedef ::boost::shared_ptr LanguageTagImpl  ImplPtr;
 
 private:
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index 36931e5..a30bb1d2 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -172,7 +172,6 @@ public:
 
 /** @ATTENTION: these are _ONLY_ to be called by the application's
 configuration! */
-static void setConfiguredSystemLanguage( LanguageType nLang );
 static void setConfiguredSystemUILanguage( LanguageType nLang );
 static void setConfiguredWesternFallback( LanguageType nLang );
 static void setConfiguredComplexFallback( LanguageType nLang );
@@ -180,6 +179,23 @@ public:
 
 // ---
 
+/** Encapsulated methods that shall only be accessed through
+class LanguageTag.
+ */
+class LanguageTagAccess
+{
+private:
+
+friend class LanguageTag;
+
+/** Configured system locale needs always be synchronized with
+LanguageTag's system locale.
+ */
+I18NLANGTAG_DLLPRIVATE static 

[Libreoffice-commits] core.git: external/vigra

[Michael Stahl]

 external/vigra/vigra1.6.0.patch |   32 +---
 1 file changed, 1 insertion(+), 31 deletions(-)

New commits:
commit bcafcd39794041e68ed4ea1c578d143ef58dd664
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 18 18:07:51 2013 +0100

vigra: remove SunStudio workarounds

Change-Id: Ib92cfca77dea62a7eb5ad29c7b129ef855be82b8

diff --git a/external/vigra/vigra1.6.0.patch b/external/vigra/vigra1.6.0.patch
index 560fd44..18eeb56 100644
--- a/external/vigra/vigra1.6.0.patch
+++ b/external/vigra/vigra1.6.0.patch
@@ -1296,14 +1296,7 @@ diff -uprN 
misc/vigra1.6.0/include/vigra/separableconvolution.hxx misc/build/vig
 diff -uprN misc/vigra1.6.0/include/vigra/sized_int.hxx 
misc/build/vigra1.6.0/include/vigra/sized_int.hxx
 --- misc/vigra1.6.0/include/vigra/sized_int.hxx2008-08-13 
08:15:41.0 -0500
 +++ misc/build/vigra1.6.0/include/vigra/sized_int.hxx  2012-09-19 
17:30:24.0 -0500
-@@ -73,11 +73,15 @@ struct SelectIntegerTypeSIZE, Int_type_
- typedef Int_type_not_supported_on_this_platform type;
- };
- 
-+#if defined __SUNPRO_CC
-+#pragma disable_warn
-+#endif
-+
+@@ -73,8 +73,8 @@ struct SelectIntegerTypeSIZE, Int_type_
  templateclass LIST
  struct SelectBiggestIntegerType
  {
@@ -1314,17 +1307,6 @@ diff -uprN misc/vigra1.6.0/include/vigra/sized_int.hxx 
misc/build/vigra1.6.0/inc
 size = (cursize  nextsize) ? nextsize : cursize };
  typedef typename 
 IfBool(cursize  nextsize), 
-@@ -86,6 +90,10 @@ struct SelectBiggestIntegerType
-type;
- };
- 
-+#if defined __SUNPRO_CC
-+#pragma enable_warn
-+#endif
-+
- template
- struct SelectBiggestIntegerTypeInt_type_not_supported_on_this_platform
- {
 diff -uprN misc/vigra1.6.0/include/vigra/splines.hxx 
misc/build/vigra1.6.0/include/vigra/splines.hxx
 --- misc/vigra1.6.0/include/vigra/splines.hxx  2008-08-13 08:15:41.0 
-0500
 +++ misc/build/vigra1.6.0/include/vigra/splines.hxx2012-09-19 
17:30:24.0 -0500
@@ -1394,18 +1376,6 @@ diff -uprN misc/vigra1.6.0/include/vigra/splines.hxx 
misc/build/vigra1.6.0/inclu
  {}
  
  result_type operator()(argument_type x) const
-diff -uprN misc/vigra1.6.0/include/vigra/static_assert.hxx 
misc/build/vigra1.6.0/include/vigra/static_assert.hxx
 misc/vigra1.6.0/include/vigra/static_assert.hxx2008-08-13 
08:15:41.0 -0500
-+++ misc/build/vigra1.6.0/include/vigra/static_assert.hxx  2012-09-19 
17:30:24.0 -0500
-@@ -115,7 +115,7 @@ assertImpl( void (*)(Predicate), typenam
- 
- TODO: provide more assertion base classes for other (non boolean) types of 
tests
- */
--#if !defined(__GNUC__) || __GNUC__  2
-+#if (!defined(__GNUC__) || __GNUC__  2)  (!defined(__SUNPRO_CC) || 
__SUNPRO_CC  0x550)
- #define VIGRA_STATIC_ASSERT(Predicate) \
- enum { \
- VIGRA_PREPROCESSOR_CONCATENATE(vigra_assertion_in_line_, __LINE__) = 
sizeof( \
 diff -uprN misc/vigra1.6.0/include/vigra/tinyvector.hxx 
misc/build/vigra1.6.0/include/vigra/tinyvector.hxx
 --- misc/vigra1.6.0/include/vigra/tinyvector.hxx   2008-08-13 
08:15:42.0 -0500
 +++ misc/build/vigra1.6.0/include/vigra/tinyvector.hxx 2012-09-19 
17:30:24.0 -0500
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - desktop/source i18nlangtag/source include/i18nlangtag unotools/source

[Eike Rathke]

 desktop/source/app/langselect.cxx  |2 +-
 i18nlangtag/source/isolang/mslangid.cxx|2 +-
 i18nlangtag/source/languagetag/languagetag.cxx |   19 ++-
 include/i18nlangtag/languagetag.hxx|3 +++
 include/i18nlangtag/mslangid.hxx   |   18 +-
 unotools/source/config/syslocaleoptions.cxx|4 ++--
 6 files changed, 42 insertions(+), 6 deletions(-)

New commits:
commit 72c08bbb00ac9c10b9e41a693728be9814b64a83
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 18 18:08:09 2013 +0100

resolved fdo#72778 keep setting system locale and LanguageTag in sync

Change-Id: I3547786bf77b8f611bc08d0e52c66ac00e199f13
(cherry picked from commit cc54c08a66046c00af3713fbe5e69995ccb7f73b)

diff --git a/desktop/source/app/langselect.cxx 
b/desktop/source/app/langselect.cxx
index cef2851..49d001a 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -197,7 +197,7 @@ bool prepareLocale() {
 }
 MsLangId::setConfiguredSystemUILanguage(tag.getLanguageType(false));
 OUString setupSysLoc(officecfg::Setup::L10N::ooSetupSystemLocale::get());
-MsLangId::setConfiguredSystemLanguage(
+LanguageTag::setConfiguredSystemLanguage(
 setupSysLoc.isEmpty()
 ? MsLangId::getSystemLanguage()
 : LanguageTag(setupSysLoc).getLanguageType(false));
diff --git a/i18nlangtag/source/isolang/mslangid.cxx 
b/i18nlangtag/source/isolang/mslangid.cxx
index 772822e..0f7cfaa 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -37,7 +37,7 @@ LanguageType MsLangId::nConfiguredAsianFallback= 
LANGUAGE_SYSTEM;
 LanguageType MsLangId::nConfiguredComplexFallback  = LANGUAGE_SYSTEM;
 
 // static
-void MsLangId::setConfiguredSystemLanguage( LanguageType nLang )
+void MsLangId::LanguageTagAccess::setConfiguredSystemLanguage( LanguageType 
nLang )
 {
 nConfiguredSystemLanguage = nLang;
 }
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 68ee64c..695343e 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -364,7 +364,6 @@ private:
 /** Convert Locale to BCP 47 string without resolving system and creating
 temporary LanguageTag instances. */
 static OUString convertToBcp47( const com::sun::star::lang::Locale 
rLocale );
-
 };
 
 
@@ -713,6 +712,24 @@ LanguageTag::ImplPtr LanguageTagImpl::registerOnTheFly( 
LanguageType nRegisterID
 return pImpl;
 }
 
+// static
+void LanguageTag::setConfiguredSystemLanguage( LanguageType nLang )
+{
+if (nLang == LANGUAGE_DONTKNOW || nLang == LANGUAGE_SYSTEM)
+{
+SAL_WARN( i18nlangtag,
+LanguageTag::setConfiguredSystemLanguage: refusing to set 
unresolved system locale 0x 
+::std::hex  nLang);
+return;
+}
+SAL_INFO( i18nlangtag, LanguageTag::setConfiguredSystemLanguage: 
setting to 0x  ::std::hex  nLang);
+MsLangId::LanguageTagAccess::setConfiguredSystemLanguage( nLang);
+// Resest system locale to none and let registerImpl() do the rest to
+// initialize a new one.
+theSystemLocale::get().reset();
+LanguageTag aLanguageTag( LANGUAGE_SYSTEM);
+aLanguageTag.registerImpl();
+}
 
 static bool lcl_isKnownOnTheFlyID( LanguageType nLang )
 {
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 7e282bb..3c1a135 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -498,6 +498,9 @@ public:
 /** If nLang is a generated on-the-fly LangID */
 static bool isOnTheFlyID( LanguageType nLang );
 
+/** @ATTENTION: _ONLY_ to be called by the application's configuration! */
+static void setConfiguredSystemLanguage( LanguageType nLang );
+
 typedef ::boost::shared_ptr LanguageTagImpl  ImplPtr;
 
 private:
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index 36931e5..a30bb1d2 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/mslangid.hxx
@@ -172,7 +172,6 @@ public:
 
 /** @ATTENTION: these are _ONLY_ to be called by the application's
 configuration! */
-static void setConfiguredSystemLanguage( LanguageType nLang );
 static void setConfiguredSystemUILanguage( LanguageType nLang );
 static void setConfiguredWesternFallback( LanguageType nLang );
 static void setConfiguredComplexFallback( LanguageType nLang );
@@ -180,6 +179,23 @@ public:
 
 // ---
 
+/** Encapsulated methods that shall only be accessed through
+class LanguageTag.
+ */
+class LanguageTagAccess
+{
+private:
+
+friend class LanguageTag;
+
+/** Configured system locale needs always be synchronized with
+

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Bug 65675 depends on bug 72778, which changed state.

Bug 72778 Summary: FORMATTING Date format dialogue box is unusable
https://bugs.freedesktop.org/show_bug.cgi?id=72778

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 67011, which changed state.

Bug 67011 Summary: EDITING: Libreoffice calc hangs when dragdropping cell(s) 
in KDE4
https://bugs.freedesktop.org/show_bug.cgi?id=67011

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
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: android/Bootstrap

[Tor Lillqvist]

 android/Bootstrap/Makefile.shared |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 4175118929c2483ad80d822b90eb2e82bb20813a
Author: Tor Lillqvist t...@collabora.com
Date:   Wed Dec 18 19:31:24 2013 +0200

Bin obsolete comment

Change-Id: I21d233996d21d78f601d427e89c14f668af85bcf

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index ec5fa95..7af927b 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -74,11 +74,6 @@ clean: android_version_setup properties
 # Build / link the single .so for this app
 #
 
-# Sigh, it's sad that now with solver dying we have to list the
-# locations of each needed bundled 3rd-party lib like this. Maybe we
-# really should try to make these experimental Android apps (and the
-# iOS one) buildable with gbuild.
-
 LIBS = \
   -Wl,--start-group \
   $(shell $(SRCDIR)/bin/lo-all-static-libs) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sc/source/ui/docshell/datastream.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit e23951b81fcff0d135eec7ff82116d2327021e76
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 18 18:34:19 2013 +0100

-Werror,-Wunused-private-field

Change-Id: I6db1082fa4797c312268d2768d9573f2e3a0f427

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 1bb9cd6..9121d48 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -443,10 +443,7 @@ class CSVHandler
 {
 DocumentStreamAccess mrDoc;
 ScAddress maPos;
-SCROW mnRow;
-SCCOL mnCol;
 SCCOL mnEndCol;
-SCTAB mnTab;
 
 public:
 CSVHandler( DocumentStreamAccess rDoc, const ScAddress rPos, SCCOL 
nEndCol ) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nlangtag/source svtools/source

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |2 +-
 svtools/source/misc/langtab.src|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4256491ffe48b8be09ec66a003988193e8585584
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 18 18:47:20 2013 +0100

the MS Serbian Latin Neutral mess

There are two LangID values mapping to Serbian Latin (without country)
which lead to the UI language selector displaying sr-Latn instead of
Serbian Latin because conversion picked the other one. Consistently
use LANGUAGE_SERBIAN_LATIN_LSO and don't trap into
LANGUAGE_SERBIAN_LATIN_NEUTRAL (whatever that might be).

Change-Id: I6ae6c2027048c99096b4d9d703a0dc73784b52f1

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 2109928..0cf8328 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -659,7 +659,7 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_SERBIAN_LATIN_SAM,   sr-Latn, CS, 0 },  
 // Serbian Latin in Serbia and Montenegro; note that not all applications may 
know about the 'CS' reusage mess, see 
https://en.wikipedia.org/wiki/ISO_3166-2:CS
 { LANGUAGE_SERBIAN_LATIN_SAM,   sr-Latn, YU, 0 },  
 // legacy Serbian Latin in Yugoslavia
 { LANGUAGE_SERBIAN_LATIN_LSO,   sr-Latn,   , 0 },
-{ LANGUAGE_SERBIAN_LATIN_NEUTRAL,   sr-Latn,   , 0 },  
 // MS lists this as 'sr' only, what a mess
+{ LANGUAGE_SERBIAN_LATIN_NEUTRAL,   sr-Latn,   , 
LANGUAGE_SERBIAN_LATIN_LSO },  // MS lists this as 'sr' only, what a mess
 { LANGUAGE_SERBIAN_CYRILLIC_SERBIA, sr-Cyrl, RS, kSAME },  
 // MS
 { LANGUAGE_SERBIAN_CYRILLIC_MONTENEGRO, sr-Cyrl, ME, kSAME },  
 // MS
 { LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA, sr-Cyrl, BA, kSAME },  
 // MS
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 93ebdaa..341fa4a 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -158,7 +158,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Serbian Latin (Serbia) ; LANGUAGE_USER_SERBIAN_LATIN_SERBIA ;  ;
  Serbian Cyrillic (Montenegro) ; 
LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO ;  ;
  Serbian Latin (Montenegro) ; 
LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO ;  ;
- Serbian Latin ; LANGUAGE_SERBIAN_LATIN_NEUTRAL ;  ;
+ Serbian Latin ; LANGUAGE_SERBIAN_LATIN_LSO ;  ;
  Sidama ; LANGUAGE_USER_SIDAMA ;  ;
  Sindhi ; LANGUAGE_SINDHI ;  ;
  Slovak ; LANGUAGE_SLOVAK ;  ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |2 +-
 svtools/source/misc/langtab.src|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cdd695b5048455a611fb44fbc60ef1844ae60fe1
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 18 18:47:20 2013 +0100

the MS Serbian Latin Neutral mess

There are two LangID values mapping to Serbian Latin (without country)
which lead to the UI language selector displaying sr-Latn instead of
Serbian Latin because conversion picked the other one. Consistently
use LANGUAGE_SERBIAN_LATIN_LSO and don't trap into
LANGUAGE_SERBIAN_LATIN_NEUTRAL (whatever that might be).

Change-Id: I6ae6c2027048c99096b4d9d703a0dc73784b52f1
(cherry picked from commit 4256491ffe48b8be09ec66a003988193e8585584)

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 2611dbb..19f5fa9 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -659,7 +659,7 @@ static IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_SERBIAN_LATIN_SAM,   sr-Latn, CS, 0 },  
 // Serbian Latin in Serbia and Montenegro; note that not all applications may 
know about the 'CS' reusage mess, see 
https://en.wikipedia.org/wiki/ISO_3166-2:CS
 { LANGUAGE_SERBIAN_LATIN_SAM,   sr-Latn, YU, 0 },  
 // legacy Serbian Latin in Yugoslavia
 { LANGUAGE_SERBIAN_LATIN_LSO,   sr-Latn,   , 0 },
-{ LANGUAGE_SERBIAN_LATIN_NEUTRAL,   sr-Latn,   , 0 },  
 // MS lists this as 'sr' only, what a mess
+{ LANGUAGE_SERBIAN_LATIN_NEUTRAL,   sr-Latn,   , 
LANGUAGE_SERBIAN_LATIN_LSO },  // MS lists this as 'sr' only, what a mess
 { LANGUAGE_SERBIAN_CYRILLIC_SERBIA, sr-Cyrl, RS, kSAME },  
 // MS
 { LANGUAGE_SERBIAN_CYRILLIC_MONTENEGRO, sr-Cyrl, ME, kSAME },  
 // MS
 { LANGUAGE_SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA, sr-Cyrl, BA, kSAME },  
 // MS
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 3e51f60..ef7ab45 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -158,7 +158,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
  Serbian Latin (Serbia) ; LANGUAGE_USER_SERBIAN_LATIN_SERBIA ;  ;
  Serbian Cyrillic (Montenegro) ; 
LANGUAGE_USER_SERBIAN_CYRILLIC_MONTENEGRO ;  ;
  Serbian Latin (Montenegro) ; 
LANGUAGE_USER_SERBIAN_LATIN_MONTENEGRO ;  ;
- Serbian Latin ; LANGUAGE_SERBIAN_LATIN_NEUTRAL ;  ;
+ Serbian Latin ; LANGUAGE_SERBIAN_LATIN_LSO ;  ;
  Sidama ; LANGUAGE_USER_SIDAMA ;  ;
  Sindhi ; LANGUAGE_SINDHI ;  ;
  Slovak ; LANGUAGE_SLOVAK ;  ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source

[Stephan Bergmann]

 sc/source/ui/docshell/datastream.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 51fc4e2d51e5650771236ceee7bb906f1efbe7d5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Wed Dec 18 18:34:19 2013 +0100

-Werror,-Wunused-private-field

Change-Id: I6db1082fa4797c312268d2768d9573f2e3a0f427

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 1bb9cd6..9121d48 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -443,10 +443,7 @@ class CSVHandler
 {
 DocumentStreamAccess mrDoc;
 ScAddress maPos;
-SCROW mnRow;
-SCCOL mnCol;
 SCCOL mnEndCol;
-SCTAB mnTab;
 
 public:
 CSVHandler( DocumentStreamAccess rDoc, const ScAddress rPos, SCCOL 
nEndCol ) :
___
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

[Katarina Behrens]

 sc/UIConfig_scalc.mk|1 
 sc/source/ui/dbgui/tpsubt.cxx   |  129 +++
 sc/source/ui/inc/tpsubt.hxx |   11 --
 sc/source/ui/src/subtdlg.src|   83 ---
 sc/uiconfig/scalc/ui/subtotalgrppage.ui |  175 
 5 files changed, 242 insertions(+), 157 deletions(-)

New commits:
commit 151cc01f6afb389ab4d98131ba918dbf6e06e749
Author: Katarina Behrens bu...@bubli.org
Date:   Wed Dec 18 18:59:19 2013 +0100

Converted subtotals group tab page to .ui

+ translated some German comments :P

Change-Id: I2e3aa8bbdb1fc39c963ed5c59ef4511dce0044f9

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 033238b..fb8b696 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -133,6 +133,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortoptionspage \
sc/uiconfig/scalc/ui/sortwarning \
sc/uiconfig/scalc/ui/subtotaloptionspage \
+   sc/uiconfig/scalc/ui/subtotalgrppage \
sc/uiconfig/scalc/ui/statisticsinfopage \
sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 48b12e9..94be603 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -33,19 +33,13 @@
 #include tpsubt.hxx
 
 //
-// Zwischenergebnisgruppen-Tabpage:
+// Subtotals group tabpage:
 
-ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, sal_uInt16 nResId,
+ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent,
   const SfxItemSet rArgSet )
 :   SfxTabPage  ( pParent,
-  ScResId( nResId ),
+  SubTotalGrpPage, 
modules/scalc/ui/subtotalgrppage.ui,
   rArgSet ),
-aFtGroup( this, ScResId( FT_GROUP ) ),
-aLbGroup( this, ScResId( LB_GROUP ) ),
-aFtColumns  ( this, ScResId( FT_COLUMNS ) ),
-aLbColumns  ( this, ScResId( WND_COLUMNS ) ),
-aFtFunctions( this, ScResId( FT_FUNCTIONS ) ),
-aLbFunctions( this, ScResId( LB_FUNCTIONS ) ),
 aStrNone( SC_RESSTR( SCSTR_NONE ) ),
 aStrColumn  ( SC_RESSTR( SCSTR_COLUMN ) ),
 pViewData   ( NULL ),
@@ -56,21 +50,22 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, 
sal_uInt16 nResId,
 GetSubTotalData() ),
 nFieldCount ( 0 )
 {
+get( mpLbGroup, group_by);
+get( mpLbColumns, columns);
+get( mpLbFunctions, functions);
 // Font is correctly initialized by SvTreeListBox ctor
-aLbColumns.SetSelectionMode( SINGLE_SELECTION );
-aLbColumns.SetDragDropMode( SV_DRAGDROP_NONE );
-aLbColumns.SetSpaceBetweenEntries( 0 );
-aLbColumns.Show();
+mpLbColumns-SetSelectionMode( SINGLE_SELECTION );
+mpLbColumns-SetDragDropMode( SV_DRAGDROP_NONE );
+mpLbColumns-SetSpaceBetweenEntries( 0 );
 
 Init ();
-FreeResource();
 }
 
 // ---
 
 ScTpSubTotalGroup::~ScTpSubTotalGroup()
 {
-sal_uInt16  nCount = (sal_uInt16)aLbColumns.GetEntryCount();
+sal_uInt16  nCount = (sal_uInt16)mpLbColumns-GetEntryCount();
 
 if ( nCount  0 )
 {
@@ -78,7 +73,7 @@ ScTpSubTotalGroup::~ScTpSubTotalGroup()
 
 for ( sal_uInt16 i=0; inCount; i++ )
 {
-pData = (sal_uInt16*)(aLbColumns.GetEntryData( i ));
+pData = (sal_uInt16*)(mpLbColumns-GetEntryData( i ));
 OSL_ENSURE( pData, EntryData not found );
 
 delete pData;
@@ -98,10 +93,10 @@ void ScTpSubTotalGroup::Init()
 
 OSL_ENSURE( pViewData  pDoc, ViewData or Document not found :-( );
 
-aLbGroup.SetSelectHdl   ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
-aLbColumns.SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
-aLbColumns.SetCheckButtonHdl( LINK( this, ScTpSubTotalGroup, CheckHdl 
) );
-aLbFunctions.SetSelectHdl   ( LINK( this, ScTpSubTotalGroup, SelectHdl ) );
+mpLbGroup-SetSelectHdl   ( LINK( this, ScTpSubTotalGroup, SelectHdl ) 
);
+mpLbColumns-SetSelectHdl ( LINK( this, ScTpSubTotalGroup, SelectHdl ) 
);
+mpLbColumns-SetCheckButtonHdl( LINK( this, ScTpSubTotalGroup, 
CheckHdl ) );
+mpLbFunctions-SetSelectHdl   ( LINK( this, ScTpSubTotalGroup, SelectHdl ) 
);
 
 nFieldArr[0] = 0;
 FillListBoxes();
@@ -124,12 +119,12 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16 
nGroupNo,
 //--
 
 // first we have to clear the listboxes...
-for ( sal_uInt16 nLbEntry = 0; nLbEntry  aLbColumns.GetEntryCount(); 
++nLbEntry )
+ 

[Libreoffice-commits] core.git: 2 commits - sw/CppunitTest_sw_filters_test.mk sw/qa sw/source

[Miklos Vajna]

 dev/null |binary
 sw/CppunitTest_sw_filters_test.mk|2 ++
 sw/qa/core/exportdata/rtf/pass/i23357.odt|binary
 sw/qa/core/filters-test.cxx  |   19 +--
 sw/qa/extras/rtfexport/rtfexport.cxx |5 -
 sw/source/filter/ww8/docxattributeoutput.cxx |   13 -
 sw/source/filter/ww8/docxattributeoutput.hxx |2 ++
 7 files changed, 33 insertions(+), 8 deletions(-)

New commits:
commit d0f8b0262707529f36a7317663df1b1035d0c62a
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Dec 18 19:14:54 2013 +0100

SwFiltersTest::filter: detect import filter on export test

This allows e.g. crash-testing the RTF export, even if the input source
is not RTF but ODT.

Change-Id: I3cf6afd1bc44bb475f1bd8da622d10dac0d3baa6

diff --git a/sw/CppunitTest_sw_filters_test.mk 
b/sw/CppunitTest_sw_filters_test.mk
index 95be87c..102b8a0 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -73,6 +73,8 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\
 svtools/util/svt \
 sw/util/msword \
 sw/util/sw \
+   sw/util/swd \
+   uui/util/uui \
 toolkit/util/tk \
 ucb/source/core/ucb1 \
 ucb/source/ucp/file/ucpfile1 \
diff --git a/sw/qa/extras/rtfexport/data/i23357.odt 
b/sw/qa/core/exportdata/rtf/pass/i23357.odt
similarity index 100%
rename from sw/qa/extras/rtfexport/data/i23357.odt
rename to sw/qa/core/exportdata/rtf/pass/i23357.odt
diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 7c811a4..7caa99f 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -91,7 +91,18 @@ bool SwFiltersTest::filter(const OUString rFilter, const 
OUString rURL,
 
 SwDocShellRef xDocShRef = new SwDocShell;
 SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READ);
-pSrcMed-SetFilter(pFilter);
+
+const SfxFilter* pImportFilter = 0;
+SfxFilter* pExportFilter = 0;
+if (bExport)
+{
+SFX_APP()-GetFilterMatcher().GuessFilter(*pSrcMed, pImportFilter, 
SFX_FILTER_IMPORT, 0);
+pExportFilter = pFilter;
+}
+else
+pImportFilter = pFilter;
+
+pSrcMed-SetFilter(pImportFilter);
 
 if (rUserData == FILTER_TEXT_DLG)
 {
@@ -107,10 +118,14 @@ bool SwFiltersTest::filter(const OUString rFilter, const 
OUString rURL,
 return bLoaded;
 }
 
+// How come an error may be set, and still DoLoad() returns success? 
Strange...
+if (bLoaded)
+xDocShRef-ResetError();
+
 utl::TempFile aTempFile;
 aTempFile.EnableKillingFile();
 SfxMedium aDstMed(aTempFile.GetURL(), STREAM_STD_WRITE);
-aDstMed.SetFilter(pFilter);
+aDstMed.SetFilter(pExportFilter);
 bool bSaved = xDocShRef-DoSaveAs(aDstMed);
 if (xDocShRef.Is())
 xDocShRef-DoClose();
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index b4d7254..b6084cb 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -579,11 +579,6 @@ DECLARE_RTFEXPORT_TEST(testFdo66743, fdo66743.rtf)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(0xd8d8d8), getPropertysal_Int32(xCell, 
BackColor));
 }
 
-DECLARE_RTFEXPORT_TEST(testI23357, i23357.odt)
-{
-// crashtest
-}
-
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
commit 5fbea544470d1a3edc51e881c12063ef1bf56dda
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Wed Dec 18 15:33:50 2013 +0100

drawingml export of sw textframe inset

This is triggered by testFdo66929 in CppunitTest_sw_ooxmlexport when DML
export of TextFrames is enabled in non-experimental mode.

Change-Id: I39481c55fc101aa9c61984cc5646911b4c207bc9

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 81f6479..725a579 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -462,6 +462,7 @@ void DocxAttributeOutput::WriteDMLTextFrame(sw::Frame* 
pParentFrame)
 XML_prst, rect,
 FSEND);
 m_bDMLTextFrameSyntax = true;
+m_pBodyPrAttrList = m_pSerializer-createAttrList();
 m_rExport.OutputFormat( pParentFrame-GetFrmFmt(), false, false, true );
 m_bDMLTextFrameSyntax = false;
 m_pSerializer-endElementNS(XML_wps, XML_spPr);
@@ -472,7 +473,9 @@ void DocxAttributeOutput::WriteDMLTextFrame(sw::Frame* 
pParentFrame)
 m_rExport.WriteText( );
 m_pSerializer-endElementNS( XML_w, XML_txbxContent );
 m_pSerializer-endElementNS( XML_wps, XML_txbx );
-m_pSerializer-singleElementNS( XML_wps, XML_bodyPr, FSEND );
+XFastAttributeListRef xBodyPrAttrList(m_pBodyPrAttrList);
+m_pBodyPrAttrList = NULL;
+m_pSerializer-singleElementNS( XML_wps, XML_bodyPr, xBodyPrAttrList );
 
 m_pSerializer-endElementNS(XML_wps, XML_wsp);
 m_pSerializer-endElementNS(XML_a, XML_graphicData);
@@ -5891,7 +5894,13 @@ 

[Libreoffice-commits] core.git: Branch 'feature/chart-opengl' - chart2/source

[Markus Mohrhard]

 chart2/source/view/main/OpenGLRender.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1a799cbf6075dd4bf6b75751619c2c21b784f5cf
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Wed Dec 18 20:04:34 2013 +0100

fix crash when creating bitmaps

Change-Id: I72982abcfcb0edff35a7000944146e8d924c120f

diff --git a/chart2/source/view/main/OpenGLRender.cxx 
b/chart2/source/view/main/OpenGLRender.cxx
index 7ae8fd3..ffe7293 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -651,10 +651,10 @@ int OpenGLRender::RenderLine2FBO(int wholeFlag)
 boost::scoped_arraysal_uInt8 buf(new sal_uInt8[m_iWidth * m_iHeight * 
4]);
 glReadPixels(0, 0, m_iWidth, m_iHeight, GL_BGR, GL_UNSIGNED_BYTE, 
buf.get());
 BitmapEx aBmp;
-aBmp.SetSizePixel(Size(m_iWidth, m_iHeight));
+aBmp.Expand(m_iWidth, m_iHeight);
 
-Bitmap aBitmap( aBmp.GetBitmap() );
-Bitmap aAlpha( aBmp.GetAlpha().GetBitmap() );
+Bitmap aBitmap( Size( m_iWidth, m_iHeight ), 24 );
+Bitmap aAlpha( Size( m_iWidth, m_iHeight ), 24 );
 
 Bitmap::ScopedWriteAccess pWriteAccess( aBitmap );
 Bitmap::ScopedWriteAccess pAlphaWriteAccess( aAlpha );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source

[Kohei Yoshida]

 sc/source/ui/docshell/datastream.cxx |   14 +-
 sc/source/ui/inc/datastream.hxx  |4 +---
 2 files changed, 6 insertions(+), 12 deletions(-)

New commits:
commit fdef94da800a80e32cb8494f7a123162b59a962a
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 14:15:29 2013 -0500

Just do hard-recalc on stream refresh. That takes care of all our needs.

Change-Id: I9a454089843d1373153988a29843b95db22ee284

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index 9121d48..cbf8957 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -370,23 +370,19 @@ void DataStream::StopImport()
 return;
 
 mbRunning = false;
-Repaint();
+Refresh();
 }
 
-void DataStream::Repaint()
+void DataStream::Refresh()
 {
 SCROW nEndRow = mpEndRange ? mpEndRange-aEnd.Row() : MAXROW;
 ScRange aRange(maStartRange.aStart);
 aRange.aEnd = ScAddress(maStartRange.aEnd.Col(), nEndRow, 
maStartRange.aStart.Tab());
 
-mpDocShell-PostPaint(aRange, PAINT_GRID);
 mnRepaintCounter = 0;
-}
 
-void DataStream::Broadcast()
-{
-mpDoc-BroadcastCells(maBroadcastRanges, SC_HINT_DATACHANGED);
-maBroadcastRanges.RemoveAll();
+// Hard recalc will repaint the grid area.
+mpDocShell-DoHardRecalc(true);
 }
 
 void DataStream::MoveData()
@@ -541,7 +537,7 @@ bool DataStream::ImportData()
 }
 
 if (mnRepaintCounter  200)
-Repaint();
+Refresh();
 
 return mbRunning;
 }
diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx
index 494a73e..86be03b 100644
--- a/sc/source/ui/inc/datastream.hxx
+++ b/sc/source/ui/inc/datastream.hxx
@@ -79,8 +79,7 @@ public:
 void StopImport();
 
 private:
-void Repaint();
-void Broadcast();
+void Refresh();
 
 private:
 ScDocShell* mpDocShell;
@@ -97,7 +96,6 @@ private:
 size_t mnRepaintCounter;
 SCROW mnCurRow;
 ScRange maStartRange;
-ScRangeList maBroadcastRanges;
 boost::scoped_ptrScRange mpEndRange;
 rtl::Referencedatastreams::CallerThread mxThread;
 rtl::Referencedatastreams::ReaderThread mxReaderThread;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 cui/source/options/optgdlg.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit c30de064af34e288f3e224c1c7cf1923858eb738
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 18 19:55:56 2013 +0100

do not resolve the Default ... locale entry, it means SYSTEM

Once selected, the locale was resolved and the Default ... entry never
displayed again.

Change-Id: I4d94730b1c104e0b96e7e02275958b78e2899eca

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e2129cd..9904688 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1250,6 +1250,13 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet 
rSet )
 LanguageType eOldLocale = (!sLang.isEmpty() ?
 LanguageTag::convertToLanguageTypeWithFallback( sLang ) : 
LANGUAGE_SYSTEM);
 LanguageType eNewLocale = m_pLocaleSettingLB-GetSelectLanguage();
+
+// If the Default ... entry was selected that means SYSTEM, the actual
+// eNewLocale value is temporary for the dialog only, do not resolve to
+// what system currently is.
+if (eNewLocale == LANGUAGE_USER_SYSTEM_CONFIG)
+eNewLocale = LANGUAGE_SYSTEM;
+
 if ( eOldLocale != eNewLocale )
 {
 // an empty string denotes SYSTEM locale
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 cui/source/options/optgdlg.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 57bf54e1691691c606cd04baa60b677b9376c2ae
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 18 19:55:56 2013 +0100

do not resolve the Default ... locale entry, it means SYSTEM

Once selected, the locale was resolved and the Default ... entry never
displayed again.

Change-Id: I4d94730b1c104e0b96e7e02275958b78e2899eca
(cherry picked from commit c30de064af34e288f3e224c1c7cf1923858eb738)

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e2129cd..9904688 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1250,6 +1250,13 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet 
rSet )
 LanguageType eOldLocale = (!sLang.isEmpty() ?
 LanguageTag::convertToLanguageTypeWithFallback( sLang ) : 
LANGUAGE_SYSTEM);
 LanguageType eNewLocale = m_pLocaleSettingLB-GetSelectLanguage();
+
+// If the Default ... entry was selected that means SYSTEM, the actual
+// eNewLocale value is temporary for the dialog only, do not resolve to
+// what system currently is.
+if (eNewLocale == LANGUAGE_USER_SYSTEM_CONFIG)
+eNewLocale = LANGUAGE_SYSTEM;
+
 if ( eOldLocale != eNewLocale )
 {
 // an empty string denotes SYSTEM locale
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source

[Kohei Yoshida]

 sc/source/ui/docshell/datastream.cxx |   23 +--
 sc/source/ui/inc/datastream.hxx  |3 ++-
 2 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit 8d181be07c62f0b762bed05b0517d9841de4c761
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 14:55:17 2013 -0500

Fine-tune our refresh policy during streaming.

Change-Id: I9eff0bc0e4087261e2283a55211c8a9daf2a8b24

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index cbf8957..db5f34a 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -13,12 +13,12 @@
 #include com/sun/star/ui/XUIElement.hpp
 #include officecfg/Office/Common.hxx
 #include osl/conditn.hxx
+#include osl/time.h
 #include rtl/strbuf.hxx
 #include salhelper/thread.hxx
 #include sfx2/linkmgr.hxx
 #include sfx2/viewfrm.hxx
 #include arealink.hxx
-#include asciiopt.hxx
 #include datastreamdlg.hxx
 #include dbfunc.hxx
 #include docsh.hxx
@@ -42,6 +42,13 @@
 
 namespace sc {
 
+inline double getNow()
+{
+TimeValue now;
+osl_getSystemTime(now);
+return static_castdouble(now.Seconds) + static_castdouble(now.Nanosec) 
/ 10.0;
+}
+
 namespace datastreams {
 
 class CallerThread : public salhelper::Thread
@@ -246,7 +253,8 @@ DataStream::DataStream(ScDocShell *pShell, const OUString 
rURL, const ScRange
 mbRunning(false),
 mpLines(0),
 mnLinesCount(0),
-mnRepaintCounter(0),
+mnLinesSinceRefresh(0),
+mfLastRefreshTime(0.0),
 mnCurRow(0)
 {
 mxThread = new datastreams::CallerThread( this );
@@ -379,10 +387,11 @@ void DataStream::Refresh()
 ScRange aRange(maStartRange.aStart);
 aRange.aEnd = ScAddress(maStartRange.aEnd.Col(), nEndRow, 
maStartRange.aStart.Tab());
 
-mnRepaintCounter = 0;
-
 // Hard recalc will repaint the grid area.
 mpDocShell-DoHardRecalc(true);
+
+mfLastRefreshTime = getNow();
+mnLinesSinceRefresh = 0;
 }
 
 void DataStream::MoveData()
@@ -477,7 +486,7 @@ void DataStream::Text2Doc()
 orcus::csv_parserCSVHandler parser(aLine.getStr(), aLine.getLength(), 
aHdl, aConfig);
 parser.parse();
 
-++mnRepaintCounter;
+++mnLinesSinceRefresh;
 }
 
 #else
@@ -536,7 +545,9 @@ bool DataStream::ImportData()
 //  maStartRange.aStart.Col(), mnCurRow, SC_FOLLOW_JUMP);
 }
 
-if (mnRepaintCounter  200)
+if (getNow() - mfLastRefreshTime  0.1  mnLinesSinceRefresh  200)
+// Refresh no more frequently than every 0.1 second, and wait until at
+// least we have processed 200 lines.
 Refresh();
 
 return mbRunning;
diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx
index 86be03b..a593aad 100644
--- a/sc/source/ui/inc/datastream.hxx
+++ b/sc/source/ui/inc/datastream.hxx
@@ -93,7 +93,8 @@ private:
 bool mbValuesInLine;
 LinesList* mpLines;
 size_t mnLinesCount;
-size_t mnRepaintCounter;
+size_t mnLinesSinceRefresh;
+double mfLastRefreshTime;
 SCROW mnCurRow;
 ScRange maStartRange;
 boost::scoped_ptrScRange mpEndRange;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source

[Kohei Yoshida]

Rebased ref, commits from common ancestor:
commit 1e5fb1d9504c76e63f5392742368369ae704dcd3
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 14:55:17 2013 -0500

Fine-tune our refresh policy during streaming.

Change-Id: I9eff0bc0e4087261e2283a55211c8a9daf2a8b24

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index cbf8957..f9686ae 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -13,12 +13,12 @@
 #include com/sun/star/ui/XUIElement.hpp
 #include officecfg/Office/Common.hxx
 #include osl/conditn.hxx
+#include osl/time.h
 #include rtl/strbuf.hxx
 #include salhelper/thread.hxx
 #include sfx2/linkmgr.hxx
 #include sfx2/viewfrm.hxx
 #include arealink.hxx
-#include asciiopt.hxx
 #include datastreamdlg.hxx
 #include dbfunc.hxx
 #include docsh.hxx
@@ -42,6 +42,13 @@
 
 namespace sc {
 
+inline double getNow()
+{
+TimeValue now;
+osl_getSystemTime(now);
+return static_castdouble(now.Seconds) + static_castdouble(now.Nanosec) 
/ 10.0;
+}
+
 namespace datastreams {
 
 class CallerThread : public salhelper::Thread
@@ -246,7 +253,8 @@ DataStream::DataStream(ScDocShell *pShell, const OUString 
rURL, const ScRange
 mbRunning(false),
 mpLines(0),
 mnLinesCount(0),
-mnRepaintCounter(0),
+mnLinesSinceRefresh(0),
+mfLastRefreshTime(0.0),
 mnCurRow(0)
 {
 mxThread = new datastreams::CallerThread( this );
@@ -375,14 +383,11 @@ void DataStream::StopImport()
 
 void DataStream::Refresh()
 {
-SCROW nEndRow = mpEndRange ? mpEndRange-aEnd.Row() : MAXROW;
-ScRange aRange(maStartRange.aStart);
-aRange.aEnd = ScAddress(maStartRange.aEnd.Col(), nEndRow, 
maStartRange.aStart.Tab());
-
-mnRepaintCounter = 0;
-
 // Hard recalc will repaint the grid area.
 mpDocShell-DoHardRecalc(true);
+
+mfLastRefreshTime = getNow();
+mnLinesSinceRefresh = 0;
 }
 
 void DataStream::MoveData()
@@ -477,7 +482,7 @@ void DataStream::Text2Doc()
 orcus::csv_parserCSVHandler parser(aLine.getStr(), aLine.getLength(), 
aHdl, aConfig);
 parser.parse();
 
-++mnRepaintCounter;
+++mnLinesSinceRefresh;
 }
 
 #else
@@ -536,7 +541,9 @@ bool DataStream::ImportData()
 //  maStartRange.aStart.Col(), mnCurRow, SC_FOLLOW_JUMP);
 }
 
-if (mnRepaintCounter  200)
+if (getNow() - mfLastRefreshTime  0.1  mnLinesSinceRefresh  200)
+// Refresh no more frequently than every 0.1 second, and wait until at
+// least we have processed 200 lines.
 Refresh();
 
 return mbRunning;
diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx
index 86be03b..a593aad 100644
--- a/sc/source/ui/inc/datastream.hxx
+++ b/sc/source/ui/inc/datastream.hxx
@@ -93,7 +93,8 @@ private:
 bool mbValuesInLine;
 LinesList* mpLines;
 size_t mnLinesCount;
-size_t mnRepaintCounter;
+size_t mnLinesSinceRefresh;
+double mfLastRefreshTime;
 SCROW mnCurRow;
 ScRange maStartRange;
 boost::scoped_ptrScRange mpEndRange;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 cui/source/options/optgdlg.cxx |   20 +++-
 cui/source/options/optgdlg.hxx |3 ++-
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit aec792c1a429bd96a172d529521247a2b3391987
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 18 21:37:57 2013 +0100

resolved fdo#51961 let Default ... currency entry follow selected locale

Change-Id: I69b13d1009638451fa6c2bc9336cdac0bab6ec32

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 9904688..f4599e11 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1025,9 +1025,9 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 
 // initialize user interface language selection
 SvtLanguageTable* pLanguageTable = new SvtLanguageTable;
-const OUString aStr( pLanguageTable-GetString( LANGUAGE_SYSTEM ) );
+m_sSystemDefaultString = pLanguageTable-GetString( LANGUAGE_SYSTEM );
 
-OUString aUILang = aStr +
+OUString aUILang = m_sSystemDefaultString +
 -  +
pLanguageTable-GetString( 
Application::GetSettings().GetUILanguageTag().getLanguageType(), true );
 
@@ -1100,7 +1100,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 const NfCurrencyTable rCurrTab = SvNumberFormatter::GetTheCurrencyTable();
 const NfCurrencyEntry rCurr = SvNumberFormatter::GetCurrencyEntry( 
LANGUAGE_SYSTEM );
 // insert SYSTEM entry
-OUString aDefaultCurr = aStr +  -  + rCurr.GetBankSymbol();
+OUString aDefaultCurr = m_sSystemDefaultString +  -  + 
rCurr.GetBankSymbol();
 m_pCurrencyLB-InsertEntry( aDefaultCurr );
 // all currencies
 OUString aTwoSpace();
@@ -1633,13 +1633,15 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, 
SvxLanguageBox*, pBox )
 SupportHdl( m_pAsianSupportCB );
 }
 
-sal_uInt16 nPos;
-if ( eLang == LANGUAGE_USER_SYSTEM_CONFIG )
-nPos = m_pCurrencyLB-GetEntryPos( (void*) NULL );
-else
+const NfCurrencyEntry* pCurr = SvNumberFormatter::GetCurrencyEntry(
+((eLang == LANGUAGE_USER_SYSTEM_CONFIG) ? 
MsLangId::getSystemLanguage() : eLang));
+sal_uInt16 nPos = m_pCurrencyLB-GetEntryPos( (void*) NULL );
+if (pCurr)
 {
-const NfCurrencyEntry* pCurr = SvNumberFormatter::GetCurrencyEntry( 
eLang );
-nPos = m_pCurrencyLB-GetEntryPos( (void*) pCurr );
+// Update the Default ... currency.
+m_pCurrencyLB-RemoveEntry( nPos );
+OUString aDefaultCurr = m_sSystemDefaultString +  -  + 
pCurr-GetBankSymbol();
+nPos = m_pCurrencyLB-InsertEntry( aDefaultCurr );
 }
 m_pCurrencyLB-SelectEntryPos( nPos );
 
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index c82e001..3b5799f 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -152,7 +152,8 @@ class OfaLanguagesTabPage : public SfxTabPage
 sal_Boolm_bOldCtl;
 LanguageConfig_Impl*pLangConfig;
 
-OUString m_sUserLocaleValue;
+OUStringm_sUserLocaleValue;
+OUStringm_sSystemDefaultString;
 
 DECL_LINK(  SupportHdl, CheckBox* ) ;
 DECL_LINK(  LocaleSettingHdl, SvxLanguageBox* ) ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 51961] The default currency in the options-dialog isn't correct

[bugzilla-daemon]

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

Commit Notification libreoffice-comm...@lists.freedesktop.org changed:

   What|Removed |Added

 Whiteboard|EasyHack SkillCpp TopicUI   |EasyHack SkillCpp TopicUI
   ||target:4.3.0

--- Comment #7 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Eike Rathke committed a patch related to this issue.
It has been pushed to master:

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

resolved fdo#51961 let Default ... currency entry follow selected locale



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

[Bug 51961] The default currency in the options-dialog isn't correct

[bugzilla-daemon]

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

Commit Notification libreoffice-comm...@lists.freedesktop.org changed:

   What|Removed |Added

 Whiteboard|EasyHack SkillCpp TopicUI   |EasyHack SkillCpp TopicUI
   |target:4.3.0|target:4.3.0 target:4.2.0.2

--- Comment #8 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Eike Rathke committed a patch related to this issue.
It has been pushed to libreoffice-4-2:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=68a9ac8623b6b80544e9ab117804cc19c7794f44h=libreoffice-4-2

resolved fdo#51961 let Default ... currency entry follow selected locale


It will be available in LibreOffice 4.2.

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: Branch 'libreoffice-4-2' - cui/source

[Eike Rathke]

 cui/source/options/optgdlg.cxx |   20 +++-
 cui/source/options/optgdlg.hxx |3 ++-
 2 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 68a9ac8623b6b80544e9ab117804cc19c7794f44
Author: Eike Rathke er...@redhat.com
Date:   Wed Dec 18 21:37:57 2013 +0100

resolved fdo#51961 let Default ... currency entry follow selected locale

Change-Id: I69b13d1009638451fa6c2bc9336cdac0bab6ec32
(cherry picked from commit aec792c1a429bd96a172d529521247a2b3391987)

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 9904688..f4599e11 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1025,9 +1025,9 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 
 // initialize user interface language selection
 SvtLanguageTable* pLanguageTable = new SvtLanguageTable;
-const OUString aStr( pLanguageTable-GetString( LANGUAGE_SYSTEM ) );
+m_sSystemDefaultString = pLanguageTable-GetString( LANGUAGE_SYSTEM );
 
-OUString aUILang = aStr +
+OUString aUILang = m_sSystemDefaultString +
 -  +
pLanguageTable-GetString( 
Application::GetSettings().GetUILanguageTag().getLanguageType(), true );
 
@@ -1100,7 +1100,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 const NfCurrencyTable rCurrTab = SvNumberFormatter::GetTheCurrencyTable();
 const NfCurrencyEntry rCurr = SvNumberFormatter::GetCurrencyEntry( 
LANGUAGE_SYSTEM );
 // insert SYSTEM entry
-OUString aDefaultCurr = aStr +  -  + rCurr.GetBankSymbol();
+OUString aDefaultCurr = m_sSystemDefaultString +  -  + 
rCurr.GetBankSymbol();
 m_pCurrencyLB-InsertEntry( aDefaultCurr );
 // all currencies
 OUString aTwoSpace();
@@ -1633,13 +1633,15 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, 
SvxLanguageBox*, pBox )
 SupportHdl( m_pAsianSupportCB );
 }
 
-sal_uInt16 nPos;
-if ( eLang == LANGUAGE_USER_SYSTEM_CONFIG )
-nPos = m_pCurrencyLB-GetEntryPos( (void*) NULL );
-else
+const NfCurrencyEntry* pCurr = SvNumberFormatter::GetCurrencyEntry(
+((eLang == LANGUAGE_USER_SYSTEM_CONFIG) ? 
MsLangId::getSystemLanguage() : eLang));
+sal_uInt16 nPos = m_pCurrencyLB-GetEntryPos( (void*) NULL );
+if (pCurr)
 {
-const NfCurrencyEntry* pCurr = SvNumberFormatter::GetCurrencyEntry( 
eLang );
-nPos = m_pCurrencyLB-GetEntryPos( (void*) pCurr );
+// Update the Default ... currency.
+m_pCurrencyLB-RemoveEntry( nPos );
+OUString aDefaultCurr = m_sSystemDefaultString +  -  + 
pCurr-GetBankSymbol();
+nPos = m_pCurrencyLB-InsertEntry( aDefaultCurr );
 }
 m_pCurrencyLB-SelectEntryPos( nPos );
 
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index c82e001..3b5799f 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -152,7 +152,8 @@ class OfaLanguagesTabPage : public SfxTabPage
 sal_Boolm_bOldCtl;
 LanguageConfig_Impl*pLangConfig;
 
-OUString m_sUserLocaleValue;
+OUStringm_sUserLocaleValue;
+OUStringm_sSystemDefaultString;
 
 DECL_LINK(  SupportHdl, CheckBox* ) ;
 DECL_LINK(  LocaleSettingHdl, SvxLanguageBox* ) ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 51961] The default currency in the options-dialog isn't correct

[bugzilla-daemon]

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

Eike Rathke er...@redhat.com changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |er...@redhat.com
   |desktop.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

[Bug 51961] The default currency in the options-dialog isn't correct

[bugzilla-daemon]

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

Eike Rathke er...@redhat.com changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

-- 
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: [PATCH] HiDPI fixes for squiggly underlines

[Jan Holesovsky]

Hi Keith,

Keith Curtis píše v Pá 13. 12. 2013 v 15:58 -0500:

 Good to hear from you. I've got a number of things in progress on my
 computer beyond the underlines
 (https://wiki.documentfoundation.org/Development/HiDpi) but I wait to
 get an API first as I'm just writing if (1) //hidpi.

I am sorry it takes me so long to get back to you - I am trying to find
out the best place for this, so that we have the smallest amount of
places to touch; unfortunately each experiment triggered a ~whole
LibreOffice rebuild, so it is progressing slowly.

What looks best at the moment is just adding it to OutputDevice, next to
mnDPIX and mnDPIY; looks most promising that way.  I believe with this,
we will be able to do the scaling directly in vcl in case the
OutputDevice is in fact a Window.

I hope to have some results tomorrow; again - sorry that it takes so
long.

All the best,
Kendy


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

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source

[Kohei Yoshida]

 sc/source/ui/docshell/datastream.cxx|  121 +++-
 sc/source/ui/inc/datastream.hxx |3 
 sc/source/ui/inc/datastreamdlg.hxx  |1 
 sc/source/ui/miscdlgs/datastreamdlg.cxx |3 
 4 files changed, 79 insertions(+), 49 deletions(-)

New commits:
commit cb53fdb78bc3f2bc1ccf6d4a4727dce781980053
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 16:19:05 2013 -0500

Handle refresh on empty line setting from the UI.

With this set, when we detect an empty line, we'll trigger refresh and
discard the line.  If not set, we'll import an empty line.

Change-Id: Ic3ccb1adbd0c7273c3a82a2d111c378f2af3

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index f9686ae..e9b49d8 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -251,6 +251,8 @@ DataStream::DataStream(ScDocShell *pShell, const OUString 
rURL, const ScRange
 maDocAccess(*mpDoc),
 meMove(NO_MOVE),
 mbRunning(false),
+mbValuesInLine(false),
+mbRefreshOnEmptyLine(false),
 mpLines(0),
 mnLinesCount(0),
 mnLinesSinceRefresh(0),
@@ -381,6 +383,11 @@ void DataStream::StopImport()
 Refresh();
 }
 
+void DataStream::SetRefreshOnEmptyLine( bool bVal )
+{
+mbRefreshOnEmptyLine = bVal;
+}
+
 void DataStream::Refresh()
 {
 // Hard recalc will repaint the grid area.
@@ -437,18 +444,38 @@ IMPL_LINK_NOARG(DataStream, RefreshHdl)
 
 namespace {
 
+struct StrVal
+{
+ScAddress maPos;
+OUString maStr;
+
+StrVal( const ScAddress rPos, const OUString rStr ) : maPos(rPos), 
maStr(rStr) {}
+};
+
+struct NumVal
+{
+ScAddress maPos;
+double mfVal;
+
+NumVal( const ScAddress rPos, double fVal ) : maPos(rPos), mfVal(fVal) {}
+};
+
+typedef std::vectorStrVal StrValArray;
+typedef std::vectorNumVal NumValArray;
+
 /**
  * This handler handles a single line CSV input.
  */
 class CSVHandler
 {
-DocumentStreamAccess mrDoc;
 ScAddress maPos;
 SCCOL mnEndCol;
 
+StrValArray maStrs;
+NumValArray maNums;
+
 public:
-CSVHandler( DocumentStreamAccess rDoc, const ScAddress rPos, SCCOL 
nEndCol ) :
-mrDoc(rDoc), maPos(rPos), mnEndCol(nEndCol) {}
+CSVHandler( const ScAddress rPos, SCCOL nEndCol ) : maPos(rPos), 
mnEndCol(nEndCol) {}
 
 void begin_parse() {}
 void end_parse() {}
@@ -462,12 +489,15 @@ public:
 OUString aStr(p, n, RTL_TEXTENCODING_UTF8);
 double fVal;
 if (ScStringUtil::parseSimpleNumber(aStr, '.', ',', fVal))
-mrDoc.setNumericCell(maPos, fVal);
+maNums.push_back(NumVal(maPos, fVal));
 else
-mrDoc.setStringCell(maPos, aStr);
+maStrs.push_back(StrVal(maPos, aStr));
 }
 maPos.IncCol();
 }
+
+const StrValArray getStrs() const { return maStrs; }
+const NumValArray getNums() const { return maNums; }
 };
 
 }
@@ -478,61 +508,34 @@ void DataStream::Text2Doc()
 orcus::csv_parser_config aConfig;
 aConfig.delimiters.push_back(',');
 aConfig.text_qualifier = '';
-CSVHandler aHdl(maDocAccess, ScAddress(maStartRange.aStart.Col(), 
mnCurRow, maStartRange.aStart.Tab()), maStartRange.aEnd.Col());
+CSVHandler aHdl(ScAddress(maStartRange.aStart.Col(), mnCurRow, 
maStartRange.aStart.Tab()), maStartRange.aEnd.Col());
 orcus::csv_parserCSVHandler parser(aLine.getStr(), aLine.getLength(), 
aHdl, aConfig);
 parser.parse();
 
-++mnLinesSinceRefresh;
-}
-
-#else
-
-void DataStream::Text2Doc() {}
-
-#endif
-
-bool DataStream::ImportData()
-{
-SolarMutexGuard aGuard;
-if (ScDocShell::GetViewData()-GetViewShell()-NeedsRepaint())
-return mbRunning;
+const StrValArray rStrs = aHdl.getStrs();
+const NumValArray rNums = aHdl.getNums();
+if (rStrs.empty()  rNums.empty()  mbRefreshOnEmptyLine)
+{
+// Empty line detected.  Trigger refresh and discard it.
+Refresh();
+return;
+}
 
 MoveData();
-if (mbValuesInLine)
 {
-// do CSV import
-Text2Doc();
+StrValArray::const_iterator it = rStrs.begin(), itEnd = rStrs.end();
+for (; it != itEnd; ++it)
+maDocAccess.setStringCell(it-maPos, it-maStr);
 }
-else
-{
-#if 0 // TODO : temporarily disable this code.
-ScDocumentImport aDocImport(*mpDoc);
-// read more lines at once but not too much
-for (int i = 0; i  10; ++i)
-{
-OUString sLine( OStringToOUString(ConsumeLine(), 
RTL_TEXTENCODING_UTF8) );
-if (sLine.indexOf(',') = 0)
-continue;
-
-OUString sAddress( sLine.copy(0, sLine.indexOf(',')) );
-OUString sValue( sLine.copy(sLine.indexOf(',') + 1) );
-ScAddress aAddress;
-aAddress.Parse(sAddress, mpDoc);
-if (!aAddress.IsValid())
-continue;
 
-

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source

[Kohei Yoshida]

 sc/source/ui/docshell/datastream.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5a832dc542c08713a79f25dac2d4d583346d39ee
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 16:40:36 2013 -0500

Don't forget to set document modified afterward.

Change-Id: I5b2b9a3dad2aeee6bc5a4a4767b239c92865b2f4

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index e9b49d8..c506ee4 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -392,6 +392,7 @@ void DataStream::Refresh()
 {
 // Hard recalc will repaint the grid area.
 mpDocShell-DoHardRecalc(true);
+mpDocShell-SetDocumentModified(true);
 
 mfLastRefreshTime = getNow();
 mnLinesSinceRefresh = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

DOCX import of textbox within shape

[Abdulaziz Ayed Khalid Alayed]

Hi all

in DOCX import if the file contain a text box within shape the importer does 
not read the text box tag ...

I think there is a mistake in pushing of properties .

any ideas

build-id : 31005a419d5fad3fc97bebf6df9b77a39a1d517b

Warm Regards,
Abdulaziz Ayed Alayed
developer at Motah Program , KACST
http://www.motah.org.sa
Warning: This message and its attachment, if any, are confidential and may 
contain information protected by law. If you are not the intended recipient, 
please contact the sender immediately and delete the message and its 
attachment, if any. You should not copy the message and its attachment, if any, 
or disclose its contents to any other person or use it for any purpose. 
Statements and opinions expressed in this e-mail and its attachment, if any, 
are those of the sender, and do not necessarily reflect those of King Abdulaziz 
city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST 
accepts no liability for any damage caused by this email.

?: ??? ??? ??? ? ?? ?? (?? )  ?  ?? ? ??? 
??? ? ? ???. ??? ?? ??? ? ??  ???   
? ???  ?? ?  ??? ? (?? )? ???  ?? 
??? ?? ? ??? ??? ??  (?? ) ?? ?? ??? ? ?? ? 
?? ? ?? ? ??? ???. ? ???  ??? ??? ? (?? 
)  ?? ??? ???   ??? ? ? ? ?? 
  ??? ? ??? ? ??? ?? ??? ?? ??? 
??? ?? ?? ?? ?? ??? ??.

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

Make error for barcode extension

[Marina Latini]

Hi all,
I've got a make error while trying to build from git source with the option 
--enable-ext-barcode.

here the output:
--
cd libreoffice/external/tarballs/tmp  wget --progress=dot:mega -Q 0 -P . -l 
0 -nd -nH -N 
http://ooo.itc.hu/oxygenoffice/download/libreoffice/3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt
 21 | tee -a libreoffice/external/tarballs/fetch.log  [ $PIPESTATUS -eq 0 ] 
 SUM=`md5sum 3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt | sed s/ 
.*//`  if test $SUM != 3ed18025a766f1e955707b969c8113a5; then echo 
ERROR: expected checksum for 
3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt is 
3ed18025a766f1e955707b969c8113a5 21 | tee -a 
libreoffice/external/tarballs/fetch.log; false; fi  mv 
3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt ../ 
--2013-12-18 13:28:47--  
http://ooo.itc.hu/oxygenoffice/download/libreoffice/3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt
Risoluzione di ooo.itc.hu (ooo.itc.hu)... 91.208.36.36
Connessione a ooo.itc.hu (ooo.itc.hu)|91.208.36.36|:80... fallito: Connessione 
rifiutata.
make: *** [libreoffice/workdir/download] Errore 1
--

I think that the error is in Makefile.fetch at line 195:
,$(call 
fetch_Download_item,http://ooo.itc.hu/oxygenoffice/download/libreoffice,$(item)))

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

Copying and pasting docx theme font attributes

[Jacobo Aragunde Pérez]

Hi,

recently we added some support to preserve theme-related font
attributes, like font name and color, when importing/exporting docx
documents. But now I'm wondering how wondering how these attributes
interact with copypasting.

This is the current behaviour of LibreOffice:

* Copy  paste inside the same document works properly, all the
supported theme attributes of the text are preserved.

* When you paste into a different document, the theme attributes that
belong to the characters are preserved. It means that your text is using
the main theme colour and the major theme font, those attributes are
preserved. But:
  * The theme file itself is not copied to the other document, so the
actual font and colour shown will fall back to the ones in the default
theme when you open that document in Word.
  * If your text didn't have theme attributes and it was using the
default row properties contained in the styles file, those properties
are not preserved.

Copying the information in the theme and the styles files when pasting
things is probably not a viable idea, but maybe we should transform the
theme format into direct format when pasting the text to a new document.
For example, if the major theme font is Arial, the pasted font would
become Arial too.

What do you think? And if you agree, where I should start reading code? ;)

-- 
Jacobo Aragunde
Software Engineer at Igalia
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

XStream Desktop beta EA1 - featuring LibreOffice

[Gabriele Bulfon]

Hi,
anyone interested can download the first early access release of XStream 
Desktop,
featuring a fresh build of LibreOffice on an illumos based kernel.
Please read the instructions for virtualized environements (vbox an vmware):
http://www.sonicle.com/index.jsp?pagename=xstreamos-desktopparent;productslanguage=en
We will be very pleased to receive any feedback, comments and/or requests you 
may provide,
by registering and using the mailing list stated at the end of the page.
We've been already told that the SF mailman is not exactly a good place.
We will be setting up our own installation of GNU mailman and notify about the 
change.
Feel free to suggest a different solution for this.
Next step, other than fixing and adding features, will be to publish the 
sources repository.
Hope you enjoy it!
Gabriele.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: ios/experimental

[Tor Lillqvist]

 ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |   74 ++-
 1 file changed, 14 insertions(+), 60 deletions(-)

New commits:
commit 2753bc1eff1bc595131a59518c1f7e131824b10d
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 19 00:16:31 2013 +0200

Adapt TiledLibreOffice to the new library name to component mapping API

Change-Id: I96e2931763c277d72ff1bb7ebdf5b71c0d6e091b

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
index d9f724c..074e472 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
@@ -16,69 +16,12 @@
 #include osl/process.h
 #include touch/touch.h
 
-extern C {
-extern void * analysis_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * animcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * avmedia_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * chartcore_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * cui_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * date_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * dba_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * dbaxml_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * embobj_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * emboleobj_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * evtatt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * expwrap_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * filterconfig1_component_getFactory( const char * pImplName, 
void * pServiceManager, void * pRegistryKey );
-extern void * frm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * fsstorage_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * fwk_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * fwl_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * fwm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * hwp_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * hyphen_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * lng_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * lnth_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * oox_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * pricing_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sc_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * scd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * scfilt_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sdd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sm_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * smd_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * sot_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * spell_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * spl_component_getFactory( const char * pImplName, void * 
pServiceManager, void * pRegistryKey );
-extern void * svgfilter_component_getFactory( const char * pImplName, void 
* pServiceManager, void * pRegistryKey );
-extern void * svt_component_getFactory( 

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

[Tor Lillqvist]

 vcl/inc/headless/svpgdi.hxx |4 
 vcl/inc/quartz/salgdi.h |8 ++--
 vcl/osx/salprn.cxx  |2 +-
 vcl/quartz/ctfonts.cxx  |   10 +-
 vcl/quartz/salgdi.cxx   |4 +---
 vcl/quartz/salgdicommon.cxx |7 ++-
 vcl/quartz/salgdiutils.cxx  |3 +--
 7 files changed, 12 insertions(+), 26 deletions(-)

New commits:
commit 0d9c4baf86c502e7cc2b6072a530c6fad2179abe
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 19 00:04:55 2013 +0200

The fake DPI scale was always 1

Thanks to kendy for noticing.

Change-Id: I6b62d5a0c1dc5df374629a8f7c6e7d2f7cd7ffbd

diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 1135c7d..c3ffc65 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -74,10 +74,6 @@ class SvpSalGraphics : public SalGraphics
 int mnWidth;
 int mnHeight;
 int  mnBitmapDepth;  // zero unless bitmap
-/// some graphics implementations (e.g. AquaSalInfoPrinter) scale
-/// everything down by a factor (see SetupPrinterGraphics for details)
-/// so we have to compensate for it with the inverse factor
-double   mfFakeDPIScale;
 
 /// path representing current clip region
 CGMutablePathRefmxClipPath;
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 49140fa..e0b86c3 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -92,7 +92,7 @@ public:
 
 SalLayout* GetTextLayout( void ) const;
 
-void   GetFontMetric( float fPDIY, ImplFontMetricData ) const;
+void   GetFontMetric( ImplFontMetricData ) const;
 bool   GetGlyphBoundRect( sal_GlyphId, Rectangle ) const;
 bool   GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon ) const;
 
@@ -156,10 +156,6 @@ protected:
 /// device resolution of this graphics
 longmnRealDPIX;
 longmnRealDPIY;
-/// some graphics implementations (e.g. AquaSalInfoPrinter) scale
-/// everything down by a factor (see SetupPrinterGraphics for details)
-/// so we have to compensate for it with the inverse factor
-double  mfFakeDPIScale;
 
 /// path representing current clip region
 CGMutablePathRefmxClipPath;
@@ -194,7 +190,7 @@ public:
 boolIsBrushVisible() const  { return 
maFillColor.IsVisible(); }
 
 voidSetWindowGraphics( AquaSalFrame* pFrame );
-voidSetPrinterGraphics( CGContextRef, long nRealDPIX, long 
nRealDPIY, double fFakeScale );
+voidSetPrinterGraphics( CGContextRef, long nRealDPIX, long 
nRealDPIY );
 voidSetVirDevGraphics( CGLayerRef, CGContextRef, int 
nBitDepth = 0 );
 
 voidinitResolution( NSWindow* );
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 082fa1c..37fa0ec 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -139,7 +139,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef 
i_rContext ) const
 // scale to be top/down and reflect our virtual DPI
 CGContextScaleCTM( i_rContext, -(72.0/double(nDPIY)), 
(72.0/double(nDPIX)) );
 }
-mpGraphics-SetPrinterGraphics( i_rContext, nDPIX, nDPIY, 1.0 );
+mpGraphics-SetPrinterGraphics( i_rContext, nDPIX, nDPIY );
 }
 else
 OSL_FAIL( no print info in SetupPrinterGraphics );
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index d93d4b5..8211b9f 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -112,20 +112,20 @@ CoreTextStyle::~CoreTextStyle( void )
 
 // ---
 
-void CoreTextStyle::GetFontMetric( float fPixelSize, ImplFontMetricData 
rMetric ) const
+void CoreTextStyle::GetFontMetric( ImplFontMetricData rMetric ) const
 {
 // get the matching CoreText font handle
 // TODO: is it worth it to cache the CTFontRef in SetFont() and reuse it 
here?
 CTFontRef aCTFontRef = (CTFontRef)CFDictionaryGetValue( mpStyleDict, 
kCTFontAttributeName );
 
-rMetric.mnAscent   = lrint( CTFontGetAscent( aCTFontRef ) * 
fPixelSize);
-rMetric.mnDescent  = lrint( CTFontGetDescent( aCTFontRef ) * 
fPixelSize);
-rMetric.mnExtLeading   = lrint( CTFontGetLeading( aCTFontRef ) * 
fPixelSize);
+rMetric.mnAscent   = CTFontGetAscent( aCTFontRef );
+rMetric.mnDescent  = CTFontGetDescent( aCTFontRef );
+rMetric.mnExtLeading   = CTFontGetLeading( aCTFontRef );
 rMetric.mnIntLeading   = 0;
 // since ImplFontMetricData::mnWidth is only used for stretching/squeezing 
fonts
 // setting this width to the pixel height of the fontsize is 

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/document.hxx  |3 ---
 sc/source/core/data/documen7.cxx |   28 
 2 files changed, 31 deletions(-)

New commits:
commit f8d5a34082e009f8b3d3e2ed375d4200162c91ef
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 17:48:59 2013 -0500

We don't need these yet.

Change-Id: Iff875a690f319eb92ccfb8010853714ac60dcc9a

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 61dd1bd..74d9cd1 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1818,9 +1818,6 @@ public:
  */
 voidBroadcast( const ScHint rHint );
 
-void BroadcastCells( const ScRange rRange, sal_uLong nHint );
-void BroadcastCells( const ScRangeList rRanges, sal_uLong nHint );
-
 /// only area, no cell broadcast
 voidAreaBroadcast( const ScHint rHint );
 /// only areas in range, no cell broadcasts
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index ec2e1cf..b8f691b 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -104,34 +104,6 @@ void ScDocument::Broadcast( const ScHint rHint )
 }
 }
 
-void ScDocument::BroadcastCells( const ScRange rRange, sal_uLong nHint )
-{
-// TODO : For now, this simply makes multiple Broadcast() calls one cell
-// at a time.  In the future, we should add a more efficient way to
-// make a range of cell broadcasts.
-
-ScHint aHint(nHint, rRange.aStart);
-
-for (SCCOL nCol = rRange.aStart.Col(); nCol = rRange.aEnd.Col(); ++nCol)
-{
-for (SCROW nRow = rRange.aStart.Row(); nRow = rRange.aEnd.Row(); 
++nRow)
-{
-aHint.GetAddress().SetCol(nCol);
-aHint.GetAddress().SetRow(nRow);
-Broadcast(aHint);
-}
-}
-}
-
-void ScDocument::BroadcastCells( const ScRangeList rRanges, sal_uLong nHint )
-{
-for (size_t i = 0, n = rRanges.size(); i  n; ++i)
-{
-const ScRange* p = rRanges[i];
-BroadcastCells(*p, nHint);
-}
-}
-
 void ScDocument::AreaBroadcast( const ScHint rHint )
 {
 if ( !pBASM )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 xmloff/source/text/XMLTextHeaderFooterContext.cxx |1 
 xmloff/source/text/XMLTextMasterPageExport.cxx|   24 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 8f73c7615ebe60ef71d6e8b49a0f19ddac6f03a0
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 18 23:34:54 2013 +0100

fdo#72850: ODF export: don't export spurious style:display=false

... on style:header-left, style:header-first, style:footer-left,
style:footer-first.

(regression from d92345561c998f7382cf9ef0fdcd29096f978435)

Change-Id: I48c51fcd2b07ae8b0e3ec2c1087a388c6900b366

diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx 
b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index b1ef767..2a711b0 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -54,6 +54,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( 
SvXMLImport rImport, sa
 bLeft( bLft ),
 bFirst( bFrst )
 {
+// NOTE: if this ever handles XML_DISPLAY attr then beware of fdo#72850 !
 if( bLeft || bFirst )
 {
 Any aAny;
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx 
b/xmloff/source/text/XMLTextMasterPageExport.cxx
index fa473ec..b82cace 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -128,18 +128,18 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 sal_Bool bHeader = sal_False;
 aAny = bHeader;
 
-sal_Bool bHeaderFirst = sal_False;
+sal_Bool bHeaderFirstShared = sal_False;
 if( bHeader )
 {
 aAny = rPropSet-getPropertyValue( sFirstShareContent );
-aAny = bHeaderFirst;
+aAny = bHeaderFirstShared;
 }
 
-sal_Bool bHeaderLeft = sal_False;
+sal_Bool bHeaderLeftShared = sal_False;
 if( bHeader )
 {
 aAny = rPropSet-getPropertyValue( sHeaderShareContent );
-aAny = bHeaderLeft;
+aAny = bHeaderLeftShared;
 }
 
 if( xHeaderText.is() )
@@ -154,7 +154,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xHeaderTextFirst.is()  xHeaderTextFirst != xHeaderText )
 {
-if( !bHeaderFirst )
+if (bHeaderFirstShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
@@ -164,7 +164,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xHeaderTextLeft.is()  xHeaderTextLeft != xHeaderText )
 {
-if( !bHeaderLeft )
+if (bHeaderLeftShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
@@ -176,18 +176,18 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 sal_Bool bFooter = sal_False;
 aAny = bFooter;
 
-sal_Bool bFooterFirst = sal_False;
+sal_Bool bFooterFirstShared = sal_False;
 if( bFooter )
 {
 aAny = rPropSet-getPropertyValue( sFirstShareContent );
-aAny = bFooterFirst;
+aAny = bFooterFirstShared;
 }
 
-sal_Bool bFooterLeft = sal_False;
+sal_Bool bFooterLeftShared = sal_False;
 if( bFooter )
 {
 aAny = rPropSet-getPropertyValue( sFooterShareContent );
-aAny = bFooterLeft;
+aAny = bFooterLeftShared;
 }
 
 if( xFooterText.is() )
@@ -202,7 +202,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xFooterTextFirst.is()  xFooterTextFirst != xFooterText )
 {
-if( !bFooterFirst )
+if (bFooterFirstShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
@@ -212,7 +212,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xFooterTextLeft.is()  xFooterTextLeft != xFooterText )
 {
-if( !bFooterLeft )
+if (bFooterLeftShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 xmloff/source/text/XMLTextHeaderFooterContext.cxx |1 
 xmloff/source/text/XMLTextMasterPageExport.cxx|   24 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 8d00de2114f148857291aee9a5dc31e92597412d
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 18 23:34:54 2013 +0100

fdo#72850: ODF export: don't export spurious style:display=false

... on style:header-left, style:header-first, style:footer-left,
style:footer-first.

(regression from d92345561c998f7382cf9ef0fdcd29096f978435)

Change-Id: I48c51fcd2b07ae8b0e3ec2c1087a388c6900b366
(cherry picked from commit 8f73c7615ebe60ef71d6e8b49a0f19ddac6f03a0)

diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx 
b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index b1ef767..2a711b0 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -54,6 +54,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( 
SvXMLImport rImport, sa
 bLeft( bLft ),
 bFirst( bFrst )
 {
+// NOTE: if this ever handles XML_DISPLAY attr then beware of fdo#72850 !
 if( bLeft || bFirst )
 {
 Any aAny;
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx 
b/xmloff/source/text/XMLTextMasterPageExport.cxx
index fa473ec..b82cace 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -128,18 +128,18 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 sal_Bool bHeader = sal_False;
 aAny = bHeader;
 
-sal_Bool bHeaderFirst = sal_False;
+sal_Bool bHeaderFirstShared = sal_False;
 if( bHeader )
 {
 aAny = rPropSet-getPropertyValue( sFirstShareContent );
-aAny = bHeaderFirst;
+aAny = bHeaderFirstShared;
 }
 
-sal_Bool bHeaderLeft = sal_False;
+sal_Bool bHeaderLeftShared = sal_False;
 if( bHeader )
 {
 aAny = rPropSet-getPropertyValue( sHeaderShareContent );
-aAny = bHeaderLeft;
+aAny = bHeaderLeftShared;
 }
 
 if( xHeaderText.is() )
@@ -154,7 +154,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xHeaderTextFirst.is()  xHeaderTextFirst != xHeaderText )
 {
-if( !bHeaderFirst )
+if (bHeaderFirstShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
@@ -164,7 +164,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xHeaderTextLeft.is()  xHeaderTextLeft != xHeaderText )
 {
-if( !bHeaderLeft )
+if (bHeaderLeftShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
@@ -176,18 +176,18 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 sal_Bool bFooter = sal_False;
 aAny = bFooter;
 
-sal_Bool bFooterFirst = sal_False;
+sal_Bool bFooterFirstShared = sal_False;
 if( bFooter )
 {
 aAny = rPropSet-getPropertyValue( sFirstShareContent );
-aAny = bFooterFirst;
+aAny = bFooterFirstShared;
 }
 
-sal_Bool bFooterLeft = sal_False;
+sal_Bool bFooterLeftShared = sal_False;
 if( bFooter )
 {
 aAny = rPropSet-getPropertyValue( sFooterShareContent );
-aAny = bFooterLeft;
+aAny = bFooterLeftShared;
 }
 
 if( xFooterText.is() )
@@ -202,7 +202,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xFooterTextFirst.is()  xFooterTextFirst != xFooterText )
 {
-if( !bFooterFirst )
+if (bFooterFirstShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
@@ -212,7 +212,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xFooterTextLeft.is()  xFooterTextLeft != xFooterText )
 {
-if( !bFooterLeft )
+if (bFooterLeftShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] HiDPI fixes for squiggly underlines

[Keith Curtis]

Hi Kendy,

I had no idea to where to put this so I appreciate your help. I verified
your idea works for all of the places I worked on so far because it can get
to a Window. If there were static constructors that loaded and cached
shared bitmaps, I think it could be a problem, but the earliest I've found
yet is control instance construction.

Thanks!

-Keith



On Wed, Dec 18, 2013 at 4:07 PM, Jan Holesovsky ke...@collabora.com wrote:

 Hi Keith,

 Keith Curtis píše v Pá 13. 12. 2013 v 15:58 -0500:

  Good to hear from you. I've got a number of things in progress on my
  computer beyond the underlines
  (https://wiki.documentfoundation.org/Development/HiDpi) but I wait to
  get an API first as I'm just writing if (1) //hidpi.

 I am sorry it takes me so long to get back to you - I am trying to find
 out the best place for this, so that we have the smallest amount of
 places to touch; unfortunately each experiment triggered a ~whole
 LibreOffice rebuild, so it is progressing slowly.

 What looks best at the moment is just adding it to OutputDevice, next to
 mnDPIX and mnDPIY; looks most promising that way.  I believe with this,
 we will be able to do the scaling directly in vcl in case the
 OutputDevice is in fact a Window.

 I hope to have some results tomorrow; again - sorry that it takes so
 long.

 All the best,
 Kendy



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

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

[Kohei Yoshida]

 sc/inc/document.hxx |3 
 sc/source/core/data/documen7.cxx|   28 -
 sc/source/ui/docshell/datastream.cxx|  155 ++--
 sc/source/ui/inc/datastream.hxx |   10 +-
 sc/source/ui/inc/datastreamdlg.hxx  |1 
 sc/source/ui/miscdlgs/datastreamdlg.cxx |3 
 6 files changed, 101 insertions(+), 99 deletions(-)

New commits:
commit 12a0bf110bca1f4365a254a09ebf8761ce222865
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 17:48:59 2013 -0500

We don't need these yet.

Change-Id: Iff875a690f319eb92ccfb8010853714ac60dcc9a

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 61dd1bd..74d9cd1 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1818,9 +1818,6 @@ public:
  */
 voidBroadcast( const ScHint rHint );
 
-void BroadcastCells( const ScRange rRange, sal_uLong nHint );
-void BroadcastCells( const ScRangeList rRanges, sal_uLong nHint );
-
 /// only area, no cell broadcast
 voidAreaBroadcast( const ScHint rHint );
 /// only areas in range, no cell broadcasts
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index ec2e1cf..b8f691b 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -104,34 +104,6 @@ void ScDocument::Broadcast( const ScHint rHint )
 }
 }
 
-void ScDocument::BroadcastCells( const ScRange rRange, sal_uLong nHint )
-{
-// TODO : For now, this simply makes multiple Broadcast() calls one cell
-// at a time.  In the future, we should add a more efficient way to
-// make a range of cell broadcasts.
-
-ScHint aHint(nHint, rRange.aStart);
-
-for (SCCOL nCol = rRange.aStart.Col(); nCol = rRange.aEnd.Col(); ++nCol)
-{
-for (SCROW nRow = rRange.aStart.Row(); nRow = rRange.aEnd.Row(); 
++nRow)
-{
-aHint.GetAddress().SetCol(nCol);
-aHint.GetAddress().SetRow(nRow);
-Broadcast(aHint);
-}
-}
-}
-
-void ScDocument::BroadcastCells( const ScRangeList rRanges, sal_uLong nHint )
-{
-for (size_t i = 0, n = rRanges.size(); i  n; ++i)
-{
-const ScRange* p = rRanges[i];
-BroadcastCells(*p, nHint);
-}
-}
-
 void ScDocument::AreaBroadcast( const ScHint rHint )
 {
 if ( !pBASM )
commit d5452cef5f8c40fbb9da9e91c6606d525c98bfd3
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 16:40:36 2013 -0500

Don't forget to set document modified afterward.

Change-Id: I5b2b9a3dad2aeee6bc5a4a4767b239c92865b2f4

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index e9b49d8..c506ee4 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -392,6 +392,7 @@ void DataStream::Refresh()
 {
 // Hard recalc will repaint the grid area.
 mpDocShell-DoHardRecalc(true);
+mpDocShell-SetDocumentModified(true);
 
 mfLastRefreshTime = getNow();
 mnLinesSinceRefresh = 0;
commit df57f73ff7cfa8a23537d9aa9f50aca1ca7664de
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 16:19:05 2013 -0500

Handle refresh on empty line setting from the UI.

With this set, when we detect an empty line, we'll trigger refresh and
discard the line.  If not set, we'll import an empty line.

Change-Id: Ic3ccb1adbd0c7273c3a82a2d111c378f2af3

diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index f9686ae..e9b49d8 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -251,6 +251,8 @@ DataStream::DataStream(ScDocShell *pShell, const OUString 
rURL, const ScRange
 maDocAccess(*mpDoc),
 meMove(NO_MOVE),
 mbRunning(false),
+mbValuesInLine(false),
+mbRefreshOnEmptyLine(false),
 mpLines(0),
 mnLinesCount(0),
 mnLinesSinceRefresh(0),
@@ -381,6 +383,11 @@ void DataStream::StopImport()
 Refresh();
 }
 
+void DataStream::SetRefreshOnEmptyLine( bool bVal )
+{
+mbRefreshOnEmptyLine = bVal;
+}
+
 void DataStream::Refresh()
 {
 // Hard recalc will repaint the grid area.
@@ -437,18 +444,38 @@ IMPL_LINK_NOARG(DataStream, RefreshHdl)
 
 namespace {
 
+struct StrVal
+{
+ScAddress maPos;
+OUString maStr;
+
+StrVal( const ScAddress rPos, const OUString rStr ) : maPos(rPos), 
maStr(rStr) {}
+};
+
+struct NumVal
+{
+ScAddress maPos;
+double mfVal;
+
+NumVal( const ScAddress rPos, double fVal ) : maPos(rPos), mfVal(fVal) {}
+};
+
+typedef std::vectorStrVal StrValArray;
+typedef std::vectorNumVal NumValArray;
+
 /**
  * This handler handles a single line CSV input.
  */
 class CSVHandler
 {
-DocumentStreamAccess mrDoc;
 ScAddress maPos;
 SCCOL mnEndCol;
 
+StrValArray maStrs;
+NumValArray maNums;
+
 public:
-CSVHandler( 

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

[Matteo Casalin]

 sw/source/core/table/swtable.cxx  |4 ++--
 sw/source/filter/ww1/fltshell.cxx |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 65e6d651ceef55f569521a4f4e609f7e5e88847b
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Tue Dec 17 00:12:03 2013 +0100

xub_StrLen/sal_uInt16 to sal_Int32

Change-Id: I61b717f080b9c667b75eac8dd3b5bd4cb50e6881

diff --git a/sw/source/filter/ww1/fltshell.cxx 
b/sw/source/filter/ww1/fltshell.cxx
index bc8f395..5342ed1 100644
--- a/sw/source/filter/ww1/fltshell.cxx
+++ b/sw/source/filter/ww1/fltshell.cxx
@@ -767,9 +767,9 @@ void SwFltControlStack::Delete(const SwPaM rPam)
 return;
 
 SwNodeIndex aStartNode(pStt-nNode, -1);
-sal_uInt16 nStartIdx = pStt-nContent.GetIndex();
+const sal_Int32 nStartIdx = pStt-nContent.GetIndex();
 SwNodeIndex aEndNode(pEnd-nNode, -1);
-sal_uInt16 nEndIdx = pEnd-nContent.GetIndex();
+const sal_Int32 nEndIdx = pEnd-nContent.GetIndex();
 
 //We don't support deleting content that is over one node, or removing a 
node.
 OSL_ENSURE(aEndNode == aStartNode, nodes must be the same, or this method 
extended);
@@ -817,7 +817,7 @@ void SwFltControlStack::Delete(const SwPaM rPam)
 continue;
 }
 
-xub_StrLen nCntntDiff = nEndIdx - nStartIdx;
+const sal_Int32 nCntntDiff = nEndIdx - nStartIdx;
 
 //to be adjusted
 if (bEntryStartAfterSelStart)
commit a85d10e0c1a0f79fc807007dbd49975f35f218fe
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Mon Dec 16 23:39:58 2013 +0100

xub_StrLen to sal_Int32

Change-Id: I614c8a7e3bf508b2f69ae50b07db33c7df691c2e

diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 59e4487..1a7ed99 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -167,7 +167,7 @@ void SwTableBox::setDummyFlag( bool bDummy )
 static OUString lcl_TabToBlankAtSttEnd( OUString rTxt )
 {
 sal_Unicode c;
-xub_StrLen n;
+sal_Int32 n;
 
 for( n = 0; n  rTxt.getLength()  ' ' = ( c = rTxt[n] ); ++n )
 if( '\x9' == c )
@@ -2536,7 +2536,7 @@ sal_uLong SwTableBox::IsValidNumTxtNd( sal_Bool 
bCheckAttr ) const
 // Flys/fields/...
 if( pHts )
 {
-xub_StrLen nNextSetField = 0;
+sal_Int32 nNextSetField = 0;
 for( sal_uInt16 n = 0; n  pHts-Count(); ++n )
 {
 const SwTxtAttr* pAttr = (*pHts)[ n ];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 164a8c409c2f070ee51ca4258585cf0c8579af51
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 19 01:02:34 2013 +0100

support ca_ES@valencia glibc locale modifier, fdo#68714

Change-Id: I2723ee4664844923d7c441cfd33c7bd767f1e7d3

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 0cf8328..65a42ca 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1359,6 +1359,7 @@ static IsoLangGLIBCModifiersEntry const 
aImplIsoLangGLIBCModifiersEntries[] =
 { LANGUAGE_SERBIAN_LATIN_LSO,   sr, ,   latin },
 { LANGUAGE_AZERI_CYRILLIC,  az, AZ, cyrillic },
 { LANGUAGE_UZBEK_CYRILLIC,  uz, UZ, cyrillic },
+{ LANGUAGE_CATALAN_VALENCIAN,   ca, ES, valencia },
 { LANGUAGE_DONTKNOW,,   ,  }   
// marks end of table
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 981ac4435369acb0c789c77b8ef5517f53fc2f3f
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 19 01:02:34 2013 +0100

support ca_ES@valencia glibc locale modifier, fdo#68714

Change-Id: I2723ee4664844923d7c441cfd33c7bd767f1e7d3
(cherry picked from commit 164a8c409c2f070ee51ca4258585cf0c8579af51)

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 19f5fa9..e7f3dd0 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -1359,6 +1359,7 @@ static IsoLangGLIBCModifiersEntry const 
aImplIsoLangGLIBCModifiersEntries[] =
 { LANGUAGE_SERBIAN_LATIN_LSO,   sr, ,   latin },
 { LANGUAGE_AZERI_CYRILLIC,  az, AZ, cyrillic },
 { LANGUAGE_UZBEK_CYRILLIC,  uz, UZ, cyrillic },
+{ LANGUAGE_CATALAN_VALENCIAN,   ca, ES, valencia },
 { LANGUAGE_DONTKNOW,,   ,  }   
// marks end of table
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: I need some help to improve the crash testing

[Thorsten Behrens]

Markus Mohrhard wrote:
 Please write me the format and the name of the export filter as needed by
 storeToURL. I'll add that to the script and will hopefully soon be able to
 provide results for a first full scale import/export testing run.
 
Can look into that for Impress, can you point me to the script?

-- Thorsten


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

Re: I need some help to improve the crash testing

[Markus Mohrhard]

Hey,


On Thu, Dec 19, 2013 at 1:29 AM, Thorsten Behrens 
t...@documentfoundation.org wrote:

 Markus Mohrhard wrote:
  Please write me the format and the name of the export filter as needed by
  storeToURL. I'll add that to the script and will hopefully soon be able
 to
  provide results for a first full scale import/export testing run.
 
 Can look into that for Impress, can you point me to the script?

 -- Thorsten


Attached is the list of unhandled mimetypes. Additionally bewlow is the
part of the existing mapping.

validCalcFileExtensions = [ .xlsx, .xltx, .xls, .ods, .ots,
.sxc, .stc, .fods, .xlsb, .xlsm, .xltm, .csv, .slk, .wks,
.sdc, .sdc5 ]
validWriterFileExtensions = [ .docx , .rtf, .odt, .fodt, .doc,
.odm, .ott, .oth, .sxw, .sxg, .stw, .dotx, .lwp, .wpd,
.wps, .abw, .hwp, .docm, .dotm, .sdw, .sdw5, .sgl5 ]
validImpressFileExtensions = [ .ppt, .pptx, .odp, .fodp, .otp,
.sxi, .sti, .pptm, .sldm, .ppsm, .potm, .ppotx, .ppsx,
.sldx, .key, .sdd_i, .sdd5, .sdp5 ]
validDrawFileExtensions = [ .odg, .fodg, .otg, .sxd, .std,
.vsd, .vdx, .pub, .cdr, .sda5, .sdd_d ]
validBaseFileExtensions = [ .odb ]
validMathFileExtensions = [ .odf, .otf, .sxm, .mml, .smf, .smf5
]


I plan to push the code soon to the repository but i#m currently still
eliminating embarrassing crashes in the script ;)

If you see any errors please shout. Below is also a list of the export
mapping that I currently use. If you want to see another format in there
please tell me.

Regards,
Markus

'application/vnd.oasis.opendocument.chart': 'odc',
'application/vnd.oasis.opendocument.chart-template': 'otc',
,
# OOo XML
'application/vnd.sun.xml.chart': 'sxs',

# MSO

# W3C
'application/xhtml+xml': 'xhtml',
'text/html': 'html',
'application/docbook+xml': 'docbook',
# misc
'application/x-dbase': 'dbf',
'application/clarisworks' : 'cwk',
'application/macwriteii' : 'mw',
'application/x-hwp': 'hwp',
'application/x-aportisdoc': 'pdb',
'application/prs.plucker' : 'pdb_plucker',
'application/vnd.palm' : 'pdb_palm',
'application/x-sony-bbeb' : 'lrf',
'application/x-pocket-word': 'psw',
'application/x-t602': '602',
'application/x-fictionbook+xml': 'fb2',

# binfilter
'application/x-starchart': 'sds',
'application/vnd.stardivision.chart': 'sds5',

# relatively uncommon image mimetypes
'image/x-freehand': 'fh',
'image/cgm': 'cgm',
'image/tiff': 'tiff',
'image/vnd.dxf': 'dxf',
'image/x-emf': 'emf',
'image/x-targa': 'tga',
'image/x-sgf': 'sgf',
'image/x-svm': 'svm',
'image/x-wmf': 'wmf',
'image/x-pict': 'pict',
'image/x-cmx': 'cmx',
'image/svg+xml': 'svg',
'image/x-MS-bmp': 'bmp',
'image/x-wpg': 'wpg',
'image/x-eps': 'eps',
'image/x-met': 'met',
'image/x-portable-bitmap': 'pbm',
'image/x-photo-cd': 'pcd',
'image/x-pcx': 'pcx',
'image/x-portable-graymap': 'pgm',
'image/x-portable-pixmap': 'ppm',
'image/vnd.adobe.photoshop': 'psd',
'image/x-cmu-raster': 'ras',
'image/x-xbitmap': 'xbm',
'image/x-xpixmap': 'xpm',
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source

[Kohei Yoshida]

Rebased ref, commits from common ancestor:
commit 6116bf7eaae2ca9066f5ed506ea28a3b99bf793c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 19:51:17 2013 -0500

Hide the Overwrite existing data option.

With the address,value mode gone, this option makes no sense.

Change-Id: Iec4925afb03b81d0b4d9fe912c8f20b135ef74d3

diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx 
b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index fa21dd9..41a9c7b 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -40,6 +40,7 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, Window* 
pParent)
 m_pCbUrl-SetSelectHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
 m_pRBAddressValue-SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
 m_pRBAddressValue-Enable(false);
+m_pRBNoMove-Hide();
 m_pRBValuesInLine-SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
 m_pEdRange-SetModifyHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
 m_pBtnBrowse-SetClickHdl( LINK( this, DataStreamDlg, BrowseHdl ) );
@@ -68,7 +69,6 @@ void DataStreamDlg::UpdateEnable()
 bool bOk = !m_pCbUrl-GetURL().isEmpty();
 if (m_pRBAddressValue-IsChecked())
 {
-m_pRBNoMove-Check();
 m_pVclFrameLimit-Disable();
 m_pVclFrameMove-Disable();
 m_pEdRange-Disable();
@@ -129,13 +129,12 @@ void DataStreamDlg::Init(
 case DataStream::MOVE_DOWN:
 m_pRBDataDown-Check();
 break;
-case DataStream::NO_MOVE:
-m_pRBNoMove-Check();
 break;
 case DataStream::RANGE_DOWN:
 m_pRBRangeDown-Check();
 break;
 case DataStream::MOVE_UP:
+case DataStream::NO_MOVE:
 default:
 ;
 }
@@ -161,8 +160,7 @@ void DataStreamDlg::StartStream(DataStream *pStream)
nSettings |= DataStream::VALUES_IN_LINE;
 
 DataStream::MoveType eMove =
-m_pRBNoMove-IsChecked() ? DataStream::NO_MOVE : 
m_pRBRangeDown-IsChecked()
-? DataStream::RANGE_DOWN : DataStream::MOVE_DOWN;
+m_pRBRangeDown-IsChecked() ? DataStream::RANGE_DOWN : 
DataStream::MOVE_DOWN;
 
 if (pStream)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/source

[Kohei Yoshida]

 sc/source/ui/miscdlgs/datastreamdlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e77feb1ad3377324b2d9bbdb443a61d66ab8f499
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Wed Dec 18 20:15:14 2013 -0500

Disable script source option.

Change-Id: I6cbfff1d9740e284b05d4737e13794bc2b098167

diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx 
b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index 41a9c7b..728e74b 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -40,6 +40,7 @@ DataStreamDlg::DataStreamDlg(ScDocShell *pDocShell, Window* 
pParent)
 m_pCbUrl-SetSelectHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
 m_pRBAddressValue-SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
 m_pRBAddressValue-Enable(false);
+m_pRBScriptData-Enable(false);
 m_pRBNoMove-Hide();
 m_pRBValuesInLine-SetClickHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
 m_pEdRange-SetModifyHdl( LINK( this, DataStreamDlg, UpdateHdl ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits