date:20150427

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

2015-04-27 Thread David Tardon

 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |   65 +++-
 1 file changed, 29 insertions(+), 36 deletions(-)

New commits:
commit fe7fa0baffe2cbc282eb3108be53762b919396c1
Author: David Tardon 
Date:   Mon Apr 27 11:37:07 2015 -0400

ppc64: do not use asm block to retrieve args

Some versions of gcc clobber one of the registries that are used to pass
arguments in the function's prologue, like:

Dump of assembler code for function (anonymous 
namespace)::privateSnippetExecutor():
510 {
   0x3fffaffe8454 <+0>: mflrr0
   0x3fffaffe8458 <+4>: std r0,16(r1)
   0x3fffaffe845c <+8>: std r29,-24(r1)
   0x3fffaffe8460 <+12>:std r30,-16(r1)
   0x3fffaffe8464 <+16>:std r31,-8(r1)
   0x3fffaffe8468 <+20>:stdur1,-352(r1)
   0x3fffaffe846c <+24>:mr  r31,r1
=> 0x3fffaffe8470 <+28>:ld  r8,-28688(r13)
   0x3fffaffe8474 <+32>:std r8,312(r31)
   0x3fffaffe8478 <+36>:li  r8,0

Reading the registries through variables makes gcc aware that they are
used, so it does not touch them. It has got no negative effect on
performance, as it produces the same object code as the current asm
block.

Change-Id: I3b99b0aa9944f9f33de9a42508e9d4dd23cec5e0

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index 0748d24..6b58246 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -510,49 +510,42 @@ static typelib_TypeClass cpp_mediate(
 extern "C" void privateSnippetExecutor( ... )
 {
 sal_uInt64 gpreg[ppc64::MAX_GPR_REGS];
+
+register long r3 asm("r3"); gpreg[0] = r3;
+register long r4 asm("r4"); gpreg[1] = r4;
+register long r5 asm("r5"); gpreg[2] = r5;
+register long r6 asm("r6"); gpreg[3] = r6;
+register long r7 asm("r7"); gpreg[4] = r7;
+register long r8 asm("r8"); gpreg[5] = r8;
+register long r9 asm("r9"); gpreg[6] = r9;
+register long r10 asm("r10"); gpreg[7] = r10;
+
 double fpreg[ppc64::MAX_SSE_REGS];
 
 __asm__ __volatile__ (
-"std 3,   0(%0)\t\n"
-"std 4,   8(%0)\t\n"
-"std 5,  16(%0)\t\n"
-"std 6,  24(%0)\t\n"
-"std 7,  32(%0)\t\n"
-"std 8,  40(%0)\t\n"
-"std 9,  48(%0)\t\n"
-"std 10, 56(%0)\t\n"
-"stfd 1,   0(%1)\t\n"
-"stfd 2,   8(%1)\t\n"
-"stfd 3,  16(%1)\t\n"
-"stfd 4,  24(%1)\t\n"
-"stfd 5,  32(%1)\t\n"
-"stfd 6,  40(%1)\t\n"
-"stfd 7,  48(%1)\t\n"
-"stfd 8,  56(%1)\t\n"
-"stfd 9,  64(%1)\t\n"
-"stfd 10, 72(%1)\t\n"
-"stfd 11, 80(%1)\t\n"
-"stfd 12, 88(%1)\t\n"
-"stfd 13, 96(%1)\t\n"
-: : "r" (gpreg), "r" (fpreg)
-: "r0", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11",
-  "fr1", "fr2", "fr3", "fr4", "fr5", "fr6", "fr7", "fr8", "fr9",
+"stfd 1,   0(%0)\t\n"
+"stfd 2,   8(%0)\t\n"
+"stfd 3,  16(%0)\t\n"
+"stfd 4,  24(%0)\t\n"
+"stfd 5,  32(%0)\t\n"
+"stfd 6,  40(%0)\t\n"
+"stfd 7,  48(%0)\t\n"
+"stfd 8,  56(%0)\t\n"
+"stfd 9,  64(%0)\t\n"
+"stfd 10, 72(%0)\t\n"
+"stfd 11, 80(%0)\t\n"
+"stfd 12, 88(%0)\t\n"
+"stfd 13, 96(%0)\t\n"
+: : "r" (fpreg)
+: "fr1", "fr2", "fr3", "fr4", "fr5", "fr6", "fr7", "fr8", "fr9",
   "fr10", "fr11", "fr12", "fr13"
 );
 
-volatile long nOffsetAndIndex;
-
-//mr %r3, %r11# move into arg1 the 64bit value passed from OOo
-__asm__ __volatile__ (
-"mr %0,11\n\t"
-: "=r" (nOffsetAndIndex) : );
-
-volatile long sp;
+register long r11 asm("r11");
+const long nOffsetAndIndex = r11;
 
-//stack pointer
-__asm__ __volatile__ (
-"mr %0,1\n\t"
-: "=r" (sp) : );
+register long r1 asm("r1");
+const long sp = r1;
 
 #if defined(_CALL_ELF) && _CALL_ELF == 2
 volatile long nRegReturn[2];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/rendercontext' - 5 commits - avmedia/source basctl/source chart2/source cui/source dbaccess/source desktop/source extensions/source filter/source forms/

2015-04-27 Thread Tomaž Vajngerl

 avmedia/source/viewer/mediawindow_impl.cxx   |2 -
 avmedia/source/viewer/mediawindow_impl.hxx   |2 -
 basctl/source/basicide/baside2.cxx   |4 +--
 basctl/source/basicide/baside2.hxx   |   12 -
 basctl/source/basicide/baside2b.cxx  |8 +++---
 basctl/source/basicide/baside3.cxx   |2 -
 basctl/source/basicide/linenumberwindow.cxx  |2 -
 basctl/source/basicide/linenumberwindow.hxx  |2 -
 basctl/source/inc/baside3.hxx|2 -
 chart2/source/controller/main/ChartWindow.cxx|6 ++--
 chart2/source/controller/main/ChartWindow.hxx|2 -
 cui/source/dialogs/about.cxx |2 -
 cui/source/dialogs/colorpicker.cxx   |   12 -
 cui/source/dialogs/cuicharmap.cxx|2 -
 cui/source/dialogs/cuigrfflt.cxx |4 +--
 cui/source/dialogs/hangulhanjadlg.cxx|4 +--
 cui/source/dialogs/hlmarkwn.cxx  |4 +--
 cui/source/dialogs/thesdlg.cxx   |4 +--
 cui/source/inc/about.hxx |2 -
 cui/source/inc/cuicharmap.hxx|2 -
 cui/source/inc/cuigrfflt.hxx |2 -
 cui/source/inc/grfpage.hxx   |2 -
 cui/source/inc/hlmarkwn.hxx  |2 -
 cui/source/inc/numfmt.hxx|2 -
 cui/source/inc/numpages.hxx  |2 -
 cui/source/inc/thesdlg.hxx   |2 -
 cui/source/tabpages/backgrnd.cxx |8 +++---
 cui/source/tabpages/grfpage.cxx  |2 -
 cui/source/tabpages/numfmt.cxx   |2 -
 cui/source/tabpages/numpages.cxx |2 -
 cui/source/tabpages/tabstpge.cxx |4 +--
 dbaccess/source/ui/app/AppDetailPageHelper.cxx   |4 +--
 dbaccess/source/ui/app/AppDetailPageHelper.hxx   |2 -
 dbaccess/source/ui/app/AppDetailView.cxx |4 +--
 dbaccess/source/ui/app/AppDetailView.hxx |2 -
 dbaccess/source/ui/browser/dataview.cxx  |4 +--
 dbaccess/source/ui/control/marktree.cxx  |6 ++--
 dbaccess/source/ui/inc/JoinTableView.hxx |2 -
 dbaccess/source/ui/inc/TableWindow.hxx   |2 -
 dbaccess/source/ui/inc/marktree.hxx  |2 -
 dbaccess/source/ui/querydesign/JoinTableView.cxx |2 -
 dbaccess/source/ui/querydesign/TableWindow.cxx   |6 ++--
 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx |2 -
 dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx |2 -
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx  |2 -
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx  |2 -
 desktop/source/splash/splash.cxx |   10 +++
 extensions/source/scanner/grid.cxx   |   12 +++--
 extensions/source/scanner/sanedlg.cxx|6 ++--
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |4 +--
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx |2 -
 forms/source/richtext/richtextviewport.cxx   |2 -
 forms/source/richtext/richtextviewport.hxx   |2 -
 include/dbaccess/dataview.hxx|2 -
 include/sfx2/dockwin.hxx |2 -
 include/sfx2/infobar.hxx |2 -
 include/sfx2/recentdocsview.hxx  |2 -
 include/sfx2/sidebar/SidebarToolBox.hxx  |2 -
 include/sfx2/templateabstractview.hxx|2 -
 include/sfx2/thumbnailview.hxx   |2 -
 include/sfx2/titledockwin.hxx|2 -
 include/svtools/brwbox.hxx   |2 -
 include/svtools/calendar.hxx |2 -
 include/svtools/editbrowsebox.hxx|2 -
 include/svtools/headbar.hxx  |2 -
 include/svtools/ivctrl.hxx   |2 -
 include/svtools/ruler.hxx|2 -
 include/svtools/simptabl.hxx |2 -
 include/svtools/svtabbx.hxx  |2 -
 include/svtools/tabbar.hxx   |2 -
 include/svtools/toolbarmenu.hxx  |2 -
 include/svtools/toolpanel/paneltabbar.hxx|2 -
 include/svtools/treelistbox.hxx  |2 -
 include/svtools/valueset.hxx |2 -
 include/svx/charmap.hxx  |2 -
 include/svx/connctrl.hxx |2 -
 include/svx/dialcontrol.hxx  |2 -
 include/svx/dlgctl3d.hxx |4 +--
 include/sv

LibreOffice Gerrit News for core on 2015-04-28

2015-04-27 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ Breeze: update existing icons from jays recommandations
  in https://gerrit.libreoffice.org/15554 from Andreas Kainz
  about module icon-themes
+ tdf#34555 Make cropping handles for images available for all
  in https://gerrit.libreoffice.org/15541 from Philippe Jung
  about module icon-themes, include, officecfg, svx, sw
+ tdf#90802 add Church Slavic [cu-RU] locale
  in https://gerrit.libreoffice.org/15540 from Aleksandr Andreev
  about module i18nlangtag, i18npool, include, svtools
+ tdf#90812: rPr is not exported after roundtrip.
  in https://gerrit.libreoffice.org/15548 from Yogesh Bharate
  about module sc
+ tdf#86606 Removal of additional direct formatting
  in https://gerrit.libreoffice.org/15547 from Yousuf Philips
  about module sc, sw
+ tdf#88314: fix uninitialized SvMemoryStream
  in https://gerrit.libreoffice.org/15526 from Andrew Savonichev
  about module unotools
 End of freshness 

+ Rendering support for  multiStop GradientFill (OOXML LINEAR)
  in https://gerrit.libreoffice.org/12056 from Vinaya Mandke
  about module UnoControls, chart2, drawinglayer, filter, include, offapi, oox, 
sc, sd, sfx2, svx, sw, toolkit, vbahelper, vcl, xmloff
+ tdf#71034: [OS X] Ugly (too heavy) fake bold
  in https://gerrit.libreoffice.org/15553 from Khaled Hosny
  about module vcl
+ tdf#90258 Toggle Thousand Separator with Engineering Notation
  in https://gerrit.libreoffice.org/15152 from Laurent BP
  about module cui, svl
+ tdf#40835 avoid confusion between UI FDIST and ODFF FDIST
  in https://gerrit.libreoffice.org/14724 from Winfried Donkers
  about module sc
+ allow a different notebook tab font than the rest of the ui
  in https://gerrit.libreoffice.org/15552 from Caolán McNamara
  about module include, vcl
+ WIP: stash extra type information to verify 'void*' field
  in https://gerrit.libreoffice.org/15551 from Noel Grandin
  about module accessibility, avmedia, dbaccess, extensions, framework, 
include, reportdesign, sc, sd, sfx2, svtools, svx, sw, toolkit, vcl
+ use osl_get_system_random data in rtlRamdomPool
  in https://gerrit.libreoffice.org/15474 from Norbert Thiebaud
  about module sal


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

+ tdf#90133 Extend ODF: variable decimal in scientific format
  in https://gerrit.libreoffice.org/15135 from Laurent BP
+ Fix tdf#87373: Kerning broken on OS X
  in https://gerrit.libreoffice.org/15539 from Thorsten Wagner
+ tdf#90133 Extend ODF: exponent sign of scientific format
  in https://gerrit.libreoffice.org/14955 from Laurent BP
+ Add engineering notation to format list for all l10n
  in https://gerrit.libreoffice.org/15527 from Laurent BP
+ use std::unique_ptr<> to simplify ctor and dtor
  in https://gerrit.libreoffice.org/15489 from Takeshi Abe
+ Clarifying which direction inserting rows/columns goes in
  in https://gerrit.libreoffice.org/15545 from Yousuf Philips
+ tdf#75360 tdf#90474 line breaks in exporting to mediawiki
  in https://gerrit.libreoffice.org/15449 from Robert Antoni Buj i Gelonch
+ odt2mediawiki.xsl: vertical & horizontal align of a image
  in https://gerrit.libreoffice.org/15544 from Robert Antoni Buj i Gelonch
+ tdf#75531 failed to convert the margins
  in https://gerrit.libreoffice.org/15451 from Robert Antoni Buj i Gelonch
+ tdf#75019 bookmarks in exporting to mediawiki
  in https://gerrit.libreoffice.org/15486 from Robert Antoni Buj i Gelonch
+ use std::unique_ptr<> to simplify ctor and dtor
  in https://gerrit.libreoffice.org/15515 from Takeshi Abe
+ tdf#86619 - Create new table context menu submenus and reorganize entries
  in https://gerrit.libreoffice.org/15535 from Yousuf Philips


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

+ odt2mediawiki.xsl: paragraph justification
  in https://gerrit.libreoffice.org/15550 from Robert Antoni Buj i Gelonch


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

+ preserve whitespaces here, tdf#88137, tdf#89254
  in https://gerrit.libreoffice.org/15375 from Markus Mohrhard
+ add kde5 build of vcl
  in https://gerrit.libreoffice.org/15327 from Jonathan Riddell
+ added currency dropdown menu may have some erors
  in https://gerrit.libreoffice.org/15274 from rajat vijay
+ Remove compiler Warnings
  in https://gerrit.libreoffice.org/15260 from Delveri Chick
+ Init
  in https://gerrit.libreoffice.org/15259 from Delveri Chick
+ tdf#90222: replace ScaList in scaddins with a std container
  in https://gerrit.libreoffice.org/15012 from Pieter Adriaensen
+ replace ScaList in scaddins with a std container tdf#90222
  in https://gerrit.libreoffice.org/15177 from Pieter Adriaensen
+ fdo#82335.
  in https://gerrit.libreoffice.org/11555 from Sudarshan Rao
+ tdf#64575 Photo Album: Better Image Layout
  in https://gerrit.libreoffice.org/14912 from Enes Ateş
+ WIP fdo#72987 Use firebird backu

LibreOffice Gerrit News for submodules on 2015-04-28

2015-04-27 Thread gerrit

Moin!



~~ Project dictionaries ~~

Nothing moved in the project for the last 25 hours

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

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

None

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

+ tdf#61397 improve gluepoints help page
  in https://gerrit.libreoffice.org/15543 from Olivier Hallot


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

None

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

None

Best,

Your friendly LibreOffice Gerrit Digest Mailer

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

[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications

2015-04-27 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=34555

Adolfo Jayme  changed:

   What|Removed |Added

 CC||elsupre...@hotmail.com

--- Comment #58 from Adolfo Jayme  ---
*** Bug 90902 has been marked as a duplicate of this bug. ***

-- 
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: include/xmloff xmloff/source

2015-04-27 Thread Laurent Balland-Poirier

 include/xmloff/xmlnumfe.hxx  |6 ++---
 include/xmloff/xmltoken.hxx  |1 
 xmloff/source/core/xmltoken.cxx  |1 
 xmloff/source/style/xmlnumfe.cxx |   43 +--
 xmloff/source/style/xmlnumfi.cxx |   34 +++---
 5 files changed, 59 insertions(+), 26 deletions(-)

New commits:
commit 4fee05e680217e876210b341f904df9441a0b7cd
Author: Laurent Balland-Poirier 
Date:   Fri Apr 3 11:59:37 2015 +0200

tdf#90133 Extend ODF: variable decimal in scientific format

Variable decimal is only saved in ODF for number, and do not consider
partial variable decimal: 0.0## is saved as 0.000
This patch extend ODF with loext:min-decimal-digit for number format and
scientific format

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

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 1f4198a..9a770a1 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -62,11 +62,11 @@ private:
 SAL_DLLPRIVATE void FinishTextElement_Impl(bool bUseExtensionNS = false);
 
 SAL_DLLPRIVATE void WriteColorElement_Impl( const Color& rColor );
-SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nInteger,
-const OUString& rDashStr, bool 
bVarDecimals,
+SAL_DLLPRIVATE void WriteNumberElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nMinDecimals,
+sal_Int32 nInteger, const OUString& 
rDashStr,
 bool bGrouping, sal_Int32 
nTrailingThousands,
 const SvXMLEmbeddedTextEntryArr& 
rEmbeddedEntries );
-SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nInteger,
+SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nMinDecimals, sal_Int32 nInteger,
 bool bGrouping, sal_Int32 nExp, 
sal_Int32 nExpInterval, bool bExpSign );
 SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, bool 
bGrouping,
 sal_Int32 nNumeratorDigits, sal_Int32 
nDenominatorDigits, sal_Int32 nDenominator );
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index af2fcdb..5b01671 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3251,6 +3251,7 @@ namespace xmloff { namespace token {
 
 XML_EXPONENT_INTERVAL,
 XML_EXPONENT_SIGN,
+XML_MIN_DECIMAL_DIGITS,
 
 XML_TOKEN_END
 };
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 5a853e7..e242f8c 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3249,6 +3249,7 @@ namespace xmloff { namespace token {
 
 TOKEN( "exponent-interval",   XML_EXPONENT_INTERVAL ),
 TOKEN( "exponent-sign",   XML_EXPONENT_SIGN ),
+TOKEN( "min-decimal-digits",  XML_MIN_DECIMAL_DIGITS ),
 
 #if OSL_DEBUG_LEVEL > 0
 { 0, NULL, NULL,   XML_TOKEN_END }
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 2c0bab4..6b7142f 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -556,8 +556,8 @@ void SvXMLNumFmtExport::WriteAMPMElement_Impl()
 //  numbers
 
 void SvXMLNumFmtExport::WriteNumberElement_Impl(
-sal_Int32 nDecimals, sal_Int32 nInteger,
-const OUString& rDashStr, bool bVarDecimals,
+sal_Int32 nDecimals, sal_Int32 nMinDecimals,
+sal_Int32 nInteger, const OUString& rDashStr,
 bool bGrouping, sal_Int32 nTrailingThousands,
 const SvXMLEmbeddedTextEntryArr& rEmbeddedEntries )
 {
@@ -570,6 +570,12 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
   OUString::number( nDecimals ) );
 }
 
+if ( nMinDecimals >= 0 )   // negative = automatic
+{
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_MIN_DECIMAL_DIGITS,
+  OUString::number( nMinDecimals ) );
+}
+
 //  integer digits
 if ( nInteger >= 0 )// negative = automatic
 {
@@ -578,9 +584,9 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
 }
 
 //  decimal replacement (dashes) or variable decimals (#)
-if ( !rDashStr.isEmpty() || bVarDecimals )
+if ( !rDashStr.isEmpty() ||  nMinDecimals < nDecimals )
 {
-//  variable decimals means an empty replacement string
+// full variable decimals means an empty replacement string
 rExport.AddAttribute( XML_NAMESPACE_NUMBER, XML_DECIMAL_REPLACEMENT,

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

2015-04-27 Thread Laurent Balland-Poirier

 include/xmloff/xmlnumfe.hxx  |2 +-
 include/xmloff/xmltoken.hxx  |1 +
 xmloff/source/core/xmltoken.cxx  |1 +
 xmloff/source/style/xmlnumfe.cxx |   17 +++--
 xmloff/source/style/xmlnumfi.cxx |   13 -
 5 files changed, 30 insertions(+), 4 deletions(-)

New commits:
commit 38992b419a4655eba9b85d337edbb208fd2fff95
Author: Laurent Balland-Poirier 
Date:   Sun Mar 22 22:01:53 2015 +0100

tdf#90133 Extend ODF: exponent sign of scientific format

Scientific Format without sign in exponent, such as 0.00E0,
are managed by LibO, and can be saved in XLS format
This commit allows to save in ODF

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

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index ceffa35..1f4198a 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -67,7 +67,7 @@ private:
 bool bGrouping, sal_Int32 
nTrailingThousands,
 const SvXMLEmbeddedTextEntryArr& 
rEmbeddedEntries );
 SAL_DLLPRIVATE void WriteScientificElement_Impl( sal_Int32 nDecimals, 
sal_Int32 nInteger,
-bool bGrouping, sal_Int32 nExp, 
sal_Int32 nExpInterval );
+bool bGrouping, sal_Int32 nExp, 
sal_Int32 nExpInterval, bool bExpSign );
 SAL_DLLPRIVATE void WriteFractionElement_Impl( sal_Int32 nInteger, bool 
bGrouping,
 sal_Int32 nNumeratorDigits, sal_Int32 
nDenominatorDigits, sal_Int32 nDenominator );
 SAL_DLLPRIVATE void WriteCurrencyElement_Impl( const OUString& rString,
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index a4f026d..af2fcdb 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3250,6 +3250,7 @@ namespace xmloff { namespace token {
 XML_EXTERNALDATA,
 
 XML_EXPONENT_INTERVAL,
+XML_EXPONENT_SIGN,
 
 XML_TOKEN_END
 };
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 27d4c32..5a853e7 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -3248,6 +3248,7 @@ namespace xmloff { namespace token {
 TOKEN( "external-data", XML_EXTERNALDATA),
 
 TOKEN( "exponent-interval",   XML_EXPONENT_INTERVAL ),
+TOKEN( "exponent-sign",   XML_EXPONENT_SIGN ),
 
 #if OSL_DEBUG_LEVEL > 0
 { 0, NULL, NULL,   XML_TOKEN_END }
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index 91c78e4..2c0bab4 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -634,7 +634,7 @@ void SvXMLNumFmtExport::WriteNumberElement_Impl(
 
 void SvXMLNumFmtExport::WriteScientificElement_Impl(
 sal_Int32 nDecimals, sal_Int32 nInteger,
-bool bGrouping, sal_Int32 nExp, sal_Int32 
nExpInterval )
+bool bGrouping, sal_Int32 nExp, sal_Int32 
nExpInterval, bool bExpSign )
 {
 FinishTextElement_Impl();
 
@@ -679,6 +679,16 @@ void SvXMLNumFmtExport::WriteScientificElement_Impl(
 }
 }
 
+//  exponent sign
+if ( bExpSign )
+{
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, 
XML_TRUE );
+}
+else
+{
+rExport.AddAttribute( XML_NAMESPACE_LO_EXT, XML_EXPONENT_SIGN, 
XML_FALSE );
+}
+
 SvXMLElementExport aElem( rExport,
   XML_NAMESPACE_NUMBER, XML_SCIENTIFIC_NUMBER,
   true, false );
@@ -1162,6 +1172,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const 
SvNumberformat& rFormat, sal_uInt
 bool bExpFound   = false;
 bool bCurrFound  = false;
 bool bInInteger  = true;
+bool bExpSign = true;
 sal_Int32 nExpDigits = 0;
 sal_Int32 nIntegerSymbols = 0;  // for embedded-text, 
including "#"
 sal_Int32 nTrailingThousands = 0;   // thousands-separators after 
all digits
@@ -1204,6 +1215,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const 
SvNumberformat& rFormat, sal_uInt
 case NF_SYMBOLTYPE_EXP:
 bExpFound = true;   // following digits are 
exponent digits
 bInInteger = false;
+if ( pElemStr && pElemStr->getLength() == 1 )
+bExpSign = false;   // for 0.00E0
 break;
 case NF_SYMBOLTYPE_CURRENCY:
 bCurrFound = true;
@@ -1415,7 +1428,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const 
SvNumberformat& rFormat, sal_uInt
 // #i43959# for scientific numbers, count all 
integer symbols ("0" and "

[Libreoffice-commits] core.git: Branch 'feature/rendercontext' - 2 commits - compilerplugins/clang include/vcl vcl/source

2015-04-27 Thread Tomaž Vajngerl

 compilerplugins/clang/paintmethodconversion.cxx |   95 
 include/vcl/window.hxx  |4 -
 vcl/source/window/window.cxx|2 
 3 files changed, 98 insertions(+), 3 deletions(-)

New commits:
commit 217c76f72256076e0e125580e8d1b781828456e6
Author: TomaÅ¾ Vajngerl 
Date:   Tue Apr 28 08:14:47 2015 +0900

Paint method clang rewriter plugin

Change-Id: Ib66089f43b1df19a4c726f3cf198e8a4c4b101b6

diff --git a/compilerplugins/clang/paintmethodconversion.cxx 
b/compilerplugins/clang/paintmethodconversion.cxx
new file mode 100644
index 000..47e4108
--- /dev/null
+++ b/compilerplugins/clang/paintmethodconversion.cxx
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "clang/Lex/Lexer.h"
+
+#include "compat.hxx"
+#include "plugin.hxx"
+#include 
+#include 
+
+/**
+ * Rewrites all Paint method on subclasses of vcl::Window to include 
RenderContext& as parameter.
+ *
+ * run as: make COMPILER_PLUGIN_TOOL=paintmethodconversion UPDATE_FILES=all 
FORCE_COMPILE_ALL=1
+ */
+
+namespace
+{
+
+bool baseCheckNotWindowSubclass(const CXXRecordDecl* aBaseDefinition, void* 
/*pInput*/)
+{
+if (aBaseDefinition && aBaseDefinition->getQualifiedNameAsString() == 
"vcl::Window")
+{
+return false;
+}
+return true;
+}
+
+bool isDerivedFromWindow(const CXXRecordDecl* decl) {
+if (!decl)
+return false;
+// skip vcl::Window
+if (decl->getQualifiedNameAsString() == "vcl::Window")
+return false;
+if (!decl->forallBases(baseCheckNotWindowSubclass, nullptr, true))
+return true;
+
+return false;
+}
+
+class PaintMethodConversion: public 
RecursiveASTVisitor, public loplugin::RewritePlugin
+{
+public:
+explicit PaintMethodConversion(InstantiationData const& data):
+RewritePlugin(data)
+{}
+
+virtual void run() override
+{
+TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+}
+
+bool TraverseCXXMethodDecl(const CXXMethodDecl* methodDeclaration)
+{
+if (!rewriter)
+return true;
+
+if (methodDeclaration->getNameAsString() != "Paint")
+return true;
+
+if (!isDerivedFromWindow(methodDeclaration->getParent()))
+{
+return true;
+}
+
+unsigned int nNoOfParameters = methodDeclaration->getNumParams();
+
+if (nNoOfParameters == 1) // we expect only one parameter Paint(Rect&)
+{
+const ParmVarDecl* parameterDecl = 
methodDeclaration->getParamDecl(0);
+if (methodDeclaration->hasBody())
+{
+rewriter->InsertText(parameterDecl->getLocStart(), 
"vcl::RenderContext& /*rRenderContext*/, ", true, true);
+}
+else
+{
+rewriter->InsertText(parameterDecl->getLocStart(), 
"vcl::RenderContext& rRenderContext, ", true, true);
+}
+}
+return true;
+}
+
+};
+
+loplugin::Plugin::Registration 
X("paintmethodconversion", true);
+
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit fc6719f6ad0c9c23f28de2af9453b5bcca3badc1
Author: TomaÅ¾ Vajngerl 
Date:   Tue Apr 28 08:11:44 2015 +0900

change Paint input parameter to ref

Change-Id: I4bf97d46736ce8186c3699c9a861e44103ab0d4b

diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index d11067d..59c27ef 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+y/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
*/
 /*
  * This file is part of the LibreOffice project.
  *
@@ -718,7 +718,7 @@ public:
 virtual voidKeyInput( const KeyEvent& rKEvt );
 virtual voidKeyUp( const KeyEvent& rKEvt );
 virtual voidPrePaint();
-virtual voidPaint(vcl::RenderContext* 
pRenderContext, const Rectangle& rRect);
+virtual voidPaint(vcl::RenderContext& 
rRenderContext, const Rectangle& rRect);
 virtual voidPaint(const Rectangle& rRect);
 virtual voidErase() SAL_OVERRIDE;
 virtual voidErase( const Rectangle& rRect ) 
SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); }
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0be526f..7b90e8a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3893,7 +3893,7 @@ Any Window::GetSystemDataAny() const
 return aRet;
 }

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

2015-04-27 Thread Eike Rathke

 i18npool/source/localedata/data/es_HN.xml |2 +-
 i18npool/source/localedata/data/es_PA.xml |2 +-
 i18npool/source/localedata/data/es_PR.xml |2 +-
 i18npool/source/localedata/data/es_SV.xml |2 +-
 i18npool/source/localedata/data/es_UY.xml |4 
 5 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit ac885af343aa4f4536cf029655826b12fd9c4340
Author: Eike Rathke 
Date:   Tue Apr 28 00:48:31 2015 +0200

add comment it's ok here

Change-Id: I615a9ed50141327d672e12db1da500d372ff5232

diff --git a/i18npool/source/localedata/data/es_UY.xml 
b/i18npool/source/localedata/data/es_UY.xml
index b993c32..9c678d1 100644
--- a/i18npool/source/localedata/data/es_UY.xml
+++ b/i18npool/source/localedata/data/es_UY.xml
@@ -29,6 +29,10 @@
 
   
   
+
 
   /
   .
commit 0c490b86b0b6382bcbc9a7944cf570bfe48143b0
Author: Eike Rathke 
Date:   Tue Apr 28 00:38:19 2015 +0200

match separators by inheriting from same locale as format codes

... which leads to swapped decimal and group separators in this case,
which were wrong before and generated wrong format codes.

Change-Id: I08a74262f7e1d8453957895beeffa34116cb4577

diff --git a/i18npool/source/localedata/data/es_SV.xml 
b/i18npool/source/localedata/data/es_SV.xml
index c8ba2d2..232684d 100644
--- a/i18npool/source/localedata/data/es_SV.xml
+++ b/i18npool/source/localedata/data/es_SV.xml
@@ -28,7 +28,7 @@
   El Salvador
 
   
-  
+  
   
   
   
commit 313793f15c7dfcc98db56abc15084f25fbad4e85
Author: Eike Rathke 
Date:   Tue Apr 28 00:35:59 2015 +0200

match separators by inheriting from same locale as format codes

... which leads to identical separators in this case.

Change-Id: I061c9f47d052e6e30e3b01d1697dc814e104559d

diff --git a/i18npool/source/localedata/data/es_PR.xml 
b/i18npool/source/localedata/data/es_PR.xml
index a1e29c4..1115c18 100644
--- a/i18npool/source/localedata/data/es_PR.xml
+++ b/i18npool/source/localedata/data/es_PR.xml
@@ -28,7 +28,7 @@
   Puerto Rico
 
   
-  
+  
   
   
   
commit 5dffcb028a8ae38e5262530f41c2c0d52f7b75e9
Author: Eike Rathke 
Date:   Tue Apr 28 00:34:10 2015 +0200

match separators by inheriting from same locale as format codes

... which leads to identical separators in this case.

Change-Id: I85ea0004344532221c9a03b29b2f1ba2e0100ac8

diff --git a/i18npool/source/localedata/data/es_PA.xml 
b/i18npool/source/localedata/data/es_PA.xml
index bec5962..bb4bb0e 100644
--- a/i18npool/source/localedata/data/es_PA.xml
+++ b/i18npool/source/localedata/data/es_PA.xml
@@ -28,7 +28,7 @@
   Panama
 
   
-  
+  
   
   
   
commit 242c5ad01083560586adfb446e18ac178fa178b7
Author: Eike Rathke 
Date:   Tue Apr 28 00:29:47 2015 +0200

match separators by inheriting from same locale as format codes

... which leads to identical separators in this case.

Change-Id: Id886917de66df046481f957ec467e74942d7ba6b

diff --git a/i18npool/source/localedata/data/es_HN.xml 
b/i18npool/source/localedata/data/es_HN.xml
index 38e3040..d67779c 100644
--- a/i18npool/source/localedata/data/es_HN.xml
+++ b/i18npool/source/localedata/data/es_HN.xml
@@ -28,7 +28,7 @@
   Honduras
 
   
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Crash test update

2015-04-27 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/f0edb677f09ad338e22ac3b5d91497b4479e0b3c/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-04-27 Thread Eike Rathke

 i18npool/source/localedata/data/es_NI.xml |   24 +---
 1 file changed, 1 insertion(+), 23 deletions(-)

New commits:
commit d344875ab68f21bcc60351d580111a51a070908e
Author: Eike Rathke 
Date:   Tue Apr 28 00:18:23 2015 +0200

format code separators have to match defined separators

... and the only difference to es_GT was '-' vs '/' date separator,
which according to
https://ssl.icu-project.org/icu-bin/locexp?d_=en&_=es_NI
should be '/'

Change-Id: I10aeb0849132b3502e73163261060d2e6eaa1c39

diff --git a/i18npool/source/localedata/data/es_NI.xml 
b/i18npool/source/localedata/data/es_NI.xml
index bbf16292..982b498 100644
--- a/i18npool/source/localedata/data/es_NI.xml
+++ b/i18npool/source/localedata/data/es_NI.xml
@@ -28,29 +28,7 @@
   Nicaragua
 
   
-  
-
-  -
-  ,
-  .
-  :
-  .
-  ;
-   
-   de 
-   de 
-   
-
-
-  â
-  â
-  â
-  â
-
-a.m.
-p.m.
-Metric
-  
+  
   
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC 2015] Accepted Student - Self Introduction

2015-04-27 Thread Pranav Kant

Hello everyone !

I am Pranav, an undergraduate computer science student from India. I have
been accepted into GSoC 2015 to hack on project[1] titled ``Integrate
gtktiledviewer into gnome-documents''. Here[2] is my GSoC proposal. Michael
Meeks and Miklos Vajna would be mentoring me for this project. I am really
excited to spend my summer hacking on libreoffice, and hoping to learn a
lot of things from all of you.


[1]
https://wiki.documentfoundation.org/Development/GSoC/Ideas#Integrate_gtktiledviewer_into_GNOME-Documents
[2]
https://www.google-melange.com/gsoc/project/details/google/gsoc2015/pranav913/5728116278296576

-- 
Regards,
Pranav Kant,
Department of Computer Science
National Institute of Technology Hamirpur
http://pricked.in/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-04-27 Thread Eike Rathke

 i18npool/source/localedata/data/mk_MK.xml |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit cd4ecb7c637a9a2d74e150fc430070c9c55bc952
Author: Eike Rathke 
Date:   Mon Apr 27 23:55:11 2015 +0200

decimal separator is comma

Change-Id: I7236d79877e6761cc97cbc093b83033deb84b417

diff --git a/i18npool/source/localedata/data/mk_MK.xml 
b/i18npool/source/localedata/data/mk_MK.xml
index 52cb7c2..3686f77 100644
--- a/i18npool/source/localedata/data/mk_MK.xml
+++ b/i18npool/source/localedata/data/mk_MK.xml
@@ -72,13 +72,13 @@
   #.###,00
 
 
-  0.00E+000
+  0,00E+000
 
 
-  0.00E+00
+  0,00E+00
 
 
-  ##0.00E+00
+  ##0,00E+00
 
 
   0%
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread Laurent Balland-Poirier

 i18npool/source/localedata/data/ak_GH.xml   |3 +++
 i18npool/source/localedata/data/an_ES.xml   |3 +++
 i18npool/source/localedata/data/ar_DZ.xml   |3 +++
 i18npool/source/localedata/data/ar_EG.xml   |3 +++
 i18npool/source/localedata/data/ar_OM.xml   |3 +++
 i18npool/source/localedata/data/ast_ES.xml  |3 +++
 i18npool/source/localedata/data/az_AZ.xml   |3 +++
 i18npool/source/localedata/data/be_BY.xml   |3 +++
 i18npool/source/localedata/data/bg_BG.xml   |3 +++
 i18npool/source/localedata/data/bm_ML.xml   |3 +++
 i18npool/source/localedata/data/bn_IN.xml   |3 +++
 i18npool/source/localedata/data/bo_CN.xml   |3 +++
 i18npool/source/localedata/data/bo_IN.xml   |3 +++
 i18npool/source/localedata/data/br_FR.xml   |3 +++
 i18npool/source/localedata/data/bs_BA.xml   |3 +++
 i18npool/source/localedata/data/ca_ES.xml   |3 +++
 i18npool/source/localedata/data/cs_CZ.xml   |3 +++
 i18npool/source/localedata/data/cv_RU.xml   |3 +++
 i18npool/source/localedata/data/da_DK.xml   |3 +++
 i18npool/source/localedata/data/de_AT.xml   |3 +++
 i18npool/source/localedata/data/de_CH.xml   |3 +++
 i18npool/source/localedata/data/de_DE.xml   |3 +++
 i18npool/source/localedata/data/de_LI.xml   |3 +++
 i18npool/source/localedata/data/de_LU.xml   |3 +++
 i18npool/source/localedata/data/dsb_DE.xml  |3 +++
 i18npool/source/localedata/data/dz_BT.xml   |3 +++
 i18npool/source/localedata/data/ee_GH.xml   |3 +++
 i18npool/source/localedata/data/el_GR.xml   |3 +++
 i18npool/source/localedata/data/en_AU.xml   |3 +++
 i18npool/source/localedata/data/en_CA.xml   |3 +++
 i18npool/source/localedata/data/en_GB.xml   |3 +++
 i18npool/source/localedata/data/en_GH.xml   |3 +++
 i18npool/source/localedata/data/en_JM.xml   |3 +++
 i18npool/source/localedata/data/en_NA.xml   |3 +++
 i18npool/source/localedata/data/en_US.xml   |3 +++
 i18npool/source/localedata/data/en_ZA.xml   |3 +++
 i18npool/source/localedata/data/eo.xml  |3 +++
 i18npool/source/localedata/data/es_AR.xml   |3 +++
 i18npool/source/localedata/data/es_BO.xml   |3 +++
 i18npool/source/localedata/data/es_CL.xml   |3 +++
 i18npool/source/localedata/data/es_CO.xml   |3 +++
 i18npool/source/localedata/data/es_CR.xml   |3 +++
 i18npool/source/localedata/data/es_DO.xml   |3 +++
 i18npool/source/localedata/data/es_EC.xml   |3 +++
 i18npool/source/localedata/data/es_ES.xml   |3 +++
 i18npool/source/localedata/data/es_GT.xml   |3 +++
 i18npool/source/localedata/data/es_PE.xml   |3 +++
 i18npool/source/localedata/data/et_EE.xml   |3 +++
 i18npool/source/localedata/data/eu.xml  |3 +++
 i18npool/source/localedata/data/fa_IR.xml   |3 +++
 i18npool/source/localedata/data/fi_FI.xml   |3 +++
 i18npool/source/localedata/data/fo_FO.xml   |3 +++
 i18npool/source/localedata/data/fr_BE.xml   |3 +++
 i18npool/source/localedata/data/fr_BF.xml   |3 +++
 i18npool/source/localedata/data/fr_CA.xml   |3 +++
 i18npool/source/localedata/data/fr_CH.xml   |3 +++
 i18npool/source/localedata/data/fr_FR.xml   |3 +++
 i18npool/source/localedata/data/fr_LU.xml   |3 +++
 i18npool/source/localedata/data/fur_IT.xml  |3 +++
 i18npool/source/localedata/data/fy_NL.xml   |3 +++
 i18npool/source/localedata/data/gd_GB.xml   |3 +++
 i18npool/source/localedata/data/gl_ES.xml   |3 +++
 i18npool/source/localedata/data/gsc_FR.xml  |3 +++
 i18npool/source/localedata/data/gug_PY.xml  |3 +++
 i18npool/source/localedata/data/ha_Latn_GH.xml  |3 +++
 i18npool/source/localedata/data/haw_US.xml  |3 +++
 i18npool/source/localedata/data/he_IL.xml   |3 +++
 i18npool/source/localedata/data/hi_IN.xml   |3 +++
 i18npool/source/localedata/data/hil_PH.xml  |3 +++
 i18npool/source/localedata/data/hr_HR.xml   |3 +++
 i18npool/source/localedata/data/hsb_DE.xml  |3 +++
 i18npool/source/localedata/data/ht_HT.xml   |3 +++
 i18npool/source/localedata/data/hu_HU.xml   |3 +++
 i18npool/source/localedata/data/hy_AM.xml   |3 +++
 i18npool/source/localedata/data/ia.xml  |3 +++
 i18npool/source/localedata/data/id_ID.xml   |3 +++
 i18npool/source/localedata/data/is_IS.xml   |3 +++
 i18npool/source/localedata/data/it_CH.xml   |3 +++
 i18npool/source/localedata/data/it_IT.xml   |3 +++
 i18npool/source/localedata/data/ja_JP.xml   |3 +++
 i18npool/source/localedata/data/jbo.xml |3 +++
 i18npool/source/localedata/data/ka_GE.xml   |3 +++
 i18npool/source/localedata/data/kab_DZ.xml  |3 +++
 i18npool/source/lo

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

2015-04-27 Thread Takeshi Abe

 starmath/source/mathmlimport.cxx |   42 ++-
 starmath/source/mathmlimport.hxx |   21 ++-
 2 files changed, 22 insertions(+), 41 deletions(-)

New commits:
commit f0ec37e1374177e31236c5a3a6dafde6b45dd74a
Author: Takeshi Abe 
Date:   Thu Apr 23 13:36:38 2015 +0900

use std::unique_ptr<> to simplify ctor and dtor

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

diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index d60f4d0..2a8179e 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -399,16 +399,6 @@ SmXMLImport::SmXMLImport(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::uno::XComponentContext >& rContext,
 OUString const & implementationName, SvXMLImportFlags nImportFlags)
 :   SvXMLImport(rContext, implementationName, nImportFlags),
-pPresLayoutElemTokenMap(0),
-pPresLayoutAttrTokenMap(0),
-pFencedAttrTokenMap(0),
-pOperatorAttrTokenMap(0),
-pAnnotationAttrTokenMap(0),
-pPresElemTokenMap(0),
-pPresScriptEmptyElemTokenMap(0),
-pPresTableElemTokenMap(0),
-pColorTokenMap(0),
-pActionAttrTokenMap(0),
 bSuccess(false)
 {
 }
@@ -1966,14 +1956,14 @@ static const SvXMLTokenMapEntry aActionAttrTokenMap[] =
 const SvXMLTokenMap& SmXMLImport::GetPresLayoutElemTokenMap()
 {
 if (!pPresLayoutElemTokenMap)
-pPresLayoutElemTokenMap = new SvXMLTokenMap(aPresLayoutElemTokenMap);
+pPresLayoutElemTokenMap.reset(new 
SvXMLTokenMap(aPresLayoutElemTokenMap));
 return *pPresLayoutElemTokenMap;
 }
 
 const SvXMLTokenMap& SmXMLImport::GetPresLayoutAttrTokenMap()
 {
 if (!pPresLayoutAttrTokenMap)
-pPresLayoutAttrTokenMap = new SvXMLTokenMap(aPresLayoutAttrTokenMap);
+pPresLayoutAttrTokenMap.reset(new 
SvXMLTokenMap(aPresLayoutAttrTokenMap));
 return *pPresLayoutAttrTokenMap;
 }
 
@@ -1981,57 +1971,57 @@ const SvXMLTokenMap& 
SmXMLImport::GetPresLayoutAttrTokenMap()
 const SvXMLTokenMap& SmXMLImport::GetFencedAttrTokenMap()
 {
 if (!pFencedAttrTokenMap)
-pFencedAttrTokenMap = new SvXMLTokenMap(aFencedAttrTokenMap);
+pFencedAttrTokenMap.reset(new SvXMLTokenMap(aFencedAttrTokenMap));
 return *pFencedAttrTokenMap;
 }
 
 const SvXMLTokenMap& SmXMLImport::GetOperatorAttrTokenMap()
 {
 if (!pOperatorAttrTokenMap)
-pOperatorAttrTokenMap = new SvXMLTokenMap(aOperatorAttrTokenMap);
+pOperatorAttrTokenMap.reset(new SvXMLTokenMap(aOperatorAttrTokenMap));
 return *pOperatorAttrTokenMap;
 }
 
 const SvXMLTokenMap& SmXMLImport::GetAnnotationAttrTokenMap()
 {
 if (!pAnnotationAttrTokenMap)
-pAnnotationAttrTokenMap = new SvXMLTokenMap(aAnnotationAttrTokenMap);
+pAnnotationAttrTokenMap.reset(new 
SvXMLTokenMap(aAnnotationAttrTokenMap));
 return *pAnnotationAttrTokenMap;
 }
 
 const SvXMLTokenMap& SmXMLImport::GetPresElemTokenMap()
 {
 if (!pPresElemTokenMap)
-pPresElemTokenMap = new SvXMLTokenMap(aPresElemTokenMap);
+pPresElemTokenMap.reset(new SvXMLTokenMap(aPresElemTokenMap));
 return *pPresElemTokenMap;
 }
 
 const SvXMLTokenMap& SmXMLImport::GetPresScriptEmptyElemTokenMap()
 {
 if (!pPresScriptEmptyElemTokenMap)
-pPresScriptEmptyElemTokenMap = new
-SvXMLTokenMap(aPresScriptEmptyElemTokenMap);
+pPresScriptEmptyElemTokenMap.reset(new
+SvXMLTokenMap(aPresScriptEmptyElemTokenMap));
 return *pPresScriptEmptyElemTokenMap;
 }
 
 const SvXMLTokenMap& SmXMLImport::GetPresTableElemTokenMap()
 {
 if (!pPresTableElemTokenMap)
-pPresTableElemTokenMap = new SvXMLTokenMap(aPresTableElemTokenMap);
+pPresTableElemTokenMap.reset(new 
SvXMLTokenMap(aPresTableElemTokenMap));
 return *pPresTableElemTokenMap;
 }
 
 const SvXMLTokenMap& SmXMLImport::GetColorTokenMap()
 {
 if (!pColorTokenMap)
-pColorTokenMap = new SvXMLTokenMap(aColorTokenMap);
+pColorTokenMap.reset(new SvXMLTokenMap(aColorTokenMap));
 return *pColorTokenMap;
 }
 
 const SvXMLTokenMap& SmXMLImport::GetActionAttrTokenMap()
 {
 if (!pActionAttrTokenMap)
-pActionAttrTokenMap = new SvXMLTokenMap(aActionAttrTokenMap);
+pActionAttrTokenMap.reset(new SvXMLTokenMap(aActionAttrTokenMap));
 return *pActionAttrTokenMap;
 }
 
@@ -2901,16 +2891,6 @@ SvXMLImportContext 
*SmXMLImport::CreateActionContext(sal_uInt16 nPrefix,
 
 SmXMLImport::~SmXMLImport() throw ()
 {
-delete pPresLayoutElemTokenMap;
-delete pPresElemTokenMap;
-delete pPresScriptEmptyElemTokenMap;
-delete pPresTableElemTokenMap;
-delete pPresLayoutAttrTokenMap;
-delete pFencedAttrTokenMap;
-delete pColorTokenMap;
-delete pOperatorAttrTokenMap;
-delete pAnnotationAttrTokenMap;
-delete pActionAttrTokenMap;
 }
 
 void SmXMLImport::SetViewSett

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

2015-04-27 Thread Caolán McNamara

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |   48 +-
 writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |   48 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

New commits:
commit 17aa71dd5ae2b88dd452afe171fc494eb61f6f36
Author: CaolÃ¡n McNamara 
Date:   Fri Apr 24 16:41:34 2015 +0100

Related: rhbz#1215060 pass std::exceptions through

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

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 6f03fdc..b51ae35 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -203,7 +203,7 @@ throw (uno::RuntimeException, xml::sax::SAXException, 
std::exception)
 void OOXMLFastContextHandler::lcl_startFastElement
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 OOXMLFactory::getInstance()->startAction(this, Element);
 if( Element == (NMSP_dmlWordDr|XML_positionV) )
@@ -215,7 +215,7 @@ void OOXMLFastContextHandler::lcl_startFastElement
 
 void OOXMLFastContextHandler::lcl_endFastElement
 (Token_t Element)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 OOXMLFactory::getInstance()->endAction(this, Element);
 }
@@ -245,7 +245,7 @@ uno::Reference< xml::sax::XFastContextHandler >
  OOXMLFastContextHandler::lcl_createFastChildContext
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 return OOXMLFactory::getInstance()->createFastChildContext(this, Element);
 }
@@ -270,7 +270,7 @@ void SAL_CALL OOXMLFastContextHandler::characters
 
 void OOXMLFastContextHandler::lcl_characters
 (const OUString & rString)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 if (!m_bDiscardChildren)
 OOXMLFactory::getInstance()->characters(this, rString);
@@ -992,7 +992,7 @@ 
OOXMLFastContextHandlerProperties::~OOXMLFastContextHandlerProperties()
 
 void OOXMLFastContextHandlerProperties::lcl_endFastElement
 (Token_t Element)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 endAction(Element);
 
@@ -1136,7 +1136,7 @@ 
OOXMLFastContextHandlerPropertyTable::~OOXMLFastContextHandlerPropertyTable()
 
 void OOXMLFastContextHandlerPropertyTable::lcl_endFastElement
 (Token_t Element)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 OOXMLPropertySet::Pointer_t pPropSet(mpPropertySet->clone());
 OOXMLTableImpl::ValuePointer_t pTmpVal
@@ -1177,7 +1177,7 @@ OOXMLValue::Pointer_t 
OOXMLFastContextHandlerValue::getValue() const
 
 void OOXMLFastContextHandlerValue::lcl_endFastElement
 (Token_t Element)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 sendPropertyToParent();
 
@@ -1248,7 +1248,7 @@ OOXMLFastContextHandlerTable::createFastChildContext
 
 void OOXMLFastContextHandlerTable::lcl_endFastElement
 (Token_t /*Element*/)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 addCurrentChild();
 
@@ -1300,7 +1300,7 @@ 
OOXMLFastContextHandlerXNote::~OOXMLFastContextHandlerXNote()
 void OOXMLFastContextHandlerXNote::lcl_startFastElement
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 mbForwardEventsSaved = isForwardEvents();
 
@@ -1315,7 +1315,7 @@ void OOXMLFastContextHandlerXNote::lcl_startFastElement
 
 void OOXMLFastContextHandlerXNote::lcl_endFastElement
 (Token_t Element)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
 {
 endAction(Element);
 
@@ -1524,7 +1524,7 @@ 
OOXMLFastContextHandlerTextTable::~OOXMLFastContextHandlerTextTable()
 void OOXMLFastContextHandlerTextTable::lcl_startFastElement
 (Token_t Element,
  const uno::Reference< xml::sax::XFastAttributeList > & /*Attribs*/)
-throw (uno::RuntimeException, xml::sax::SAXException)
+throw (uno::RuntimeException, xml::sax::SAXException, std::exce

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

2015-04-27 Thread Lionel Elie Mamane

 connectivity/source/commontools/FValue.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 462a22db365551c376ca8d719911305dd68d98eb
Author: Lionel Elie Mamane 
Date:   Sat Apr 25 19:34:58 2015 +0200

tdf#90614 oups... I was too eager in replacing getAny() with makeAny()

also handle the SQLNULL case

Conflicts:
connectivity/source/commontools/FValue.cxx

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

diff --git a/connectivity/source/commontools/FValue.cxx 
b/connectivity/source/commontools/FValue.cxx
index cc53d24..8248fd7 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -886,6 +886,9 @@ Any ORowSetValue::makeAny() const
 {
 switch(getTypeKind())
 {
+case DataType::SQLNULL:
+assert(rValue == Any());
+break;
 case DataType::CHAR:
 case DataType::VARCHAR:
 case DataType::DECIMAL:
@@ -965,7 +968,7 @@ Any ORowSetValue::makeAny() const
 break;
 default:
 SAL_WARN( "connectivity.commontools","ORowSetValue::makeAny(): 
UNSPUPPORTED TYPE!");
-rValue = makeAny();
+rValue = getAny();
 break;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread Thorsten Wagner

 vcl/quartz/ctlayout.cxx |   49 
 1 file changed, 29 insertions(+), 20 deletions(-)

New commits:
commit bec8fc58a827c220b3f28462ae127cc1c571d1bf
Author: Thorsten Wagner 
Date:   Sun Apr 26 13:05:35 2015 +0200

Fix tdf#87373: Kerning broken on OS X

Adjustments to character positions less than one pixel are ignored.
These adjustments are probably introduced by lossy conversions between
integer based and float based coordinates.

Change-Id: Ie4506658aba7bb3e2b211817568676b099afef03
Reviewed-on: https://gerrit.libreoffice.org/15539
Reviewed-by: Norbert Thiebaud 
Tested-by: Norbert Thiebaud 

diff --git a/vcl/quartz/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index b9d4f1b..bf207b6 100644
--- a/vcl/quartz/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
@@ -215,19 +215,38 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 return;
 }
 
-DeviceCoordinate nPixelWidth = 0;
+DeviceCoordinate nPixelWidth = rArgs.mnLayoutWidth;
 
-if(rArgs.mpDXArray && !(rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL) )
+if( rArgs.mpDXArray && !(rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL) )
 {
 nPixelWidth = rArgs.mpDXArray[ mnCharCount - 1 ];
-if( nPixelWidth <= 0)
-return;
+}
+if( nPixelWidth <= 0)
+{
+return;
+}
+// short-circuit when justifying an all-whitespace string
+if( mnTrailingSpaceCount >= mnCharCount)
+{
+mfCachedWidth = nPixelWidth;
+return;
+}
+
+// justification requests which change the width by just one pixel are 
probably
+// introduced by lossy conversions between integer based coordinate system
+const DeviceCoordinate nOrigWidth = GetTextWidth();
+
+if( (nOrigWidth >= nPixelWidth - 1) && (nOrigWidth <= nPixelWidth + 1) )
+{
+return;
+}
+if( rArgs.mpDXArray && !(rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL) )
+{
 ApplyDXArray( rArgs );
 if( mnTrailingSpaceCount )
 {
 DeviceCoordinate nFullPixelWidth = nPixelWidth;
-nPixelWidth = (mnTrailingSpaceCount == mnCharCount) ? 0 :
-rArgs.mpDXArray[ mnCharCount - mnTrailingSpaceCount - 1];
+nPixelWidth = rArgs.mpDXArray[ mnCharCount - mnTrailingSpaceCount 
- 1];
 mfTrailingSpaceWidth = nFullPixelWidth - nPixelWidth;
 if( nPixelWidth <= 0)
 return;
@@ -236,15 +255,6 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 }
 else
 {
-nPixelWidth = rArgs.mnLayoutWidth;
-
-if( nPixelWidth <= 0 && rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL)
-{
-nPixelWidth = GetTextWidth();
-}
-
-if( nPixelWidth <= 0)
-return;
 
 // if the text to be justified has whitespace in it then
 // - Writer goes crazy with its HalfSpace magic
@@ -255,10 +265,10 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 {
 mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( 
mpCTLine );
 nPixelWidth -= mfTrailingSpaceWidth;
-}
-if(nPixelWidth <= 0)
-{
-return;
+if( nPixelWidth <= 0)
+{
+return;
+}
 }
 
 // recreate the CoreText line layout without trailing spaces
@@ -285,7 +295,6 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 }
 CTLineRef pNewCTLine = CTLineCreateJustifiedLine( mpCTLine, 1.0, 
nPixelWidth);
 SAL_INFO( "vcl.ct", "CTLineCreateJustifiedLine(" << mpCTLine << 
",1.0," << nPixelWidth << ") = " << pNewCTLine );
-
 if( !pNewCTLine )
 {
 // CTLineCreateJustifiedLine can and does fail
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread Caolán McNamara

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 31cb5c19f8ad28f25fcff24648789772dee3afe5
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 27 21:06:26 2015 +0100

loplugin:literaltoboolconversion wrong condition

Change-Id: I9ad2a52434329acc961db2e5a3e28816af7cda7c

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 0112ced..9bf9824 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -,11 +,11 @@ bool GtkSalGraphics::getNativeControlRegion( 
ControlType nType, ControlPart nPar
 {
 aEditRect = AdjustRectForTextBordersPadding(mpListboxStyle, 
rValue.getNumericVal(), rControlRegion);
 }
-else if (CTRL_COMBOBOX && nPart == PART_ENTIRE_CONTROL)
+else if (nType == CTRL_COMBOBOX && nPart == PART_ENTIRE_CONTROL)
 {
 aEditRect = AdjustRectForTextBordersPadding(mpComboboxStyle, 
rValue.getNumericVal(), rControlRegion);
 }
-else if (CTRL_SPINBOX && nPart == PART_ENTIRE_CONTROL)
+else if (nType == CTRL_SPINBOX && nPart == PART_ENTIRE_CONTROL)
 {
 aEditRect = AdjustRectForTextBordersPadding(mpSpinStyle, 
rValue.getNumericVal(), rControlRegion);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

2015-04-27 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 87876, which changed state.

Bug 87876 Summary: Tools -> Options -> View tab crushed by new OpenGL Graphics 
Output strings
https://bugs.documentfoundation.org/show_bug.cgi?id=87876

   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: minutes of ESC call ...

2015-04-27 Thread David Ostrovsky

On Mon, 2015-04-27 at 09:28 +0200, Thorsten Behrens wrote:
> David Ostrovsky wrote:

[...]

> > Existing Google accounts must not be upgraded to Google+ accounts,
> > to be used for Gerrit OAuth.
> >
> Umm - so most of us cannot use this?
> 

Oh, I see, how my statement can be misunderstood.
What I was trying to say is that OAuth Gerrit integration works with
both types of accounts: basic or Google+ accounts. I don't make any use
of Google+ API in the plugin, just basic stuff: [1].

* [1]
https://github.com/davido/gerrit-oauth-provider/blob/master/src/main/java/com/googlesource/gerrit/plugins/oauth/GoogleOAuthService.java#L58,L60

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

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

2015-04-27 Thread Katarina Behrens

 cui/uiconfig/ui/numberingoptionspage.ui|   32 ++---
 sw/source/ui/misc/numberingtypelistbox.src |6 ++---
 2 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit fa9ac78d0c12b307c401bfede2cb08f89d0a15e3
Author: Katarina Behrens 
Date:   Mon Apr 27 18:56:19 2015 +0200

tdf#69316: Sort numbering options meaningfully

+ unify terminology image vs. graphics

In an ideal world, those strings wouldn't be duplicated in both sw
and cui and change like this would be done in a single place. But
there's currently no straightforward way how to share strings between
those two ...

Change-Id: I5311aca3e7b4070c82cf4f84f96ab1b6eff473c6

diff --git a/cui/uiconfig/ui/numberingoptionspage.ui 
b/cui/uiconfig/ui/numberingoptionspage.ui
index c3430a6..5a1ed48 100644
--- a/cui/uiconfig/ui/numberingoptionspage.ui
+++ b/cui/uiconfig/ui/numberingoptionspage.ui
@@ -57,6 +57,22 @@
 
 
   
+None
+5
+  
+  
+Bullet
+6
+  
+  
+Graphics
+8
+  
+  
+Linked graphics
+136
+  
+  
 1, 2, 3, ...
 4
   
@@ -85,22 +101,6 @@
 10
   
   
-Bullet
-6
-  
-  
-Graphics
-8
-  
-  
-Linked graphics
-136
-  
-  
-None
-5
-  
-  
 Native Numbering
 12
   
diff --git a/sw/source/ui/misc/numberingtypelistbox.src 
b/sw/source/ui/misc/numberingtypelistbox.src
index a06c7a9..f7b23cc 100644
--- a/sw/source/ui/misc/numberingtypelistbox.src
+++ b/sw/source/ui/misc/numberingtypelistbox.src
@@ -26,6 +26,9 @@ Resource STRRES_NUMTYPES
 
 ItemList [ en-US ] =
 {
+< "None" ;  5/*SVX_NUM_NUMBER_NONE */; 
> ;
+< "Bullet" ;6/*SVX_NUM_CHAR_SPECIAL*/; 
> ;
+< "Graphics" ;  8/*SVX_NUM_BITMAP  */; 
> ;
 < "1, 2, 3, ..." ;  4/*SVX_NUM_ARABIC  */; 
> ;
 < "A, B, C, ..." ;  0/*SVX_NUM_CHARS_UPPER_LETTER  */; 
> ;
 < "a, b, c, ..." ;  1/*SVX_NUM_CHARS_LOWER_LETTER  */; 
> ;
@@ -33,9 +36,6 @@ Resource STRRES_NUMTYPES
 < "i, ii, iii, ..." ;   3/*SVX_NUM_ROMAN_LOWER */; 
> ;
 < "A, .., AA, .., AAA, ..." ;   9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; 
> ;
 < "a, .., aa, .., aaa, ..." ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; 
> ;
-< "Bullet" ;6/*SVX_NUM_CHAR_SPECIAL*/; 
> ;
-< "Image" ; 8/*SVX_NUM_BITMAP  */; 
> ;
-< "None" ;  5/*SVX_NUM_NUMBER_NONE */; 
> ;
 < "Native Numbering" ;  12 /*NATIVE_NUMBERING  
 */; > ;
 < "Ð, Ð, .., ÐÐ°, ÐÐ±, ... (Bulgarian)" ; 38 
/*CHARS_CYRILLIC_UPPER_LETTER_BG */; > ;
 < "Ð°, Ð±, .., Ð°Ð°, Ð°Ð±, ... (Bulgarian)" ; 39 
/*CHARS_CYRILLIC_LOWER_LETTER_BG */; > ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 8 commits - include/vcl svx/source vcl/inc vcl/source vcl/unx

2015-04-27 Thread Caolán McNamara

 include/vcl/combobox.hxx  |2 
 include/vcl/lstbox.hxx|2 
 svx/source/tbxctrls/itemwin.cxx   |4 -
 svx/source/tbxctrls/tbcontrl.cxx  |   22 +++---
 svx/source/tbxctrls/tbunocontroller.cxx   |9 --
 vcl/inc/unx/gtk/gtkgdi.hxx|1 
 vcl/source/control/spinfld.cxx|6 -
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   89 +-
 8 files changed, 76 insertions(+), 59 deletions(-)

New commits:
commit dfec380c3b56ee62c7d9cc1747af5663a0db81fb
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 27 16:48:30 2015 +0100

gtk3: use same arbitrary 0.2 and 0.8 ratios as gtk does

Change-Id: Ib0d04c00ff4689d53317dedbf67091596cc59fb0

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 663843a..0112ced 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -961,8 +961,8 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, 
ControlPart nPart, co
 break;
 case RENDER_TOOLBAR_SEPERATOR:
 gtk_render_line(context, cr,
-rControlRegion.GetWidth() / 2, 3,
-rControlRegion.GetWidth() / 2, 
rControlRegion.GetHeight() - 3 );
+rControlRegion.GetWidth() / 2, 
rControlRegion.GetHeight() * 0.2,
+rControlRegion.GetWidth() / 2, 
rControlRegion.GetHeight() * 0.8 );
 break;
 case RENDER_ARROW:
 gtk_render_arrow(context, cr,
commit cb1fda082cc30dba210f293ec6fea8a13363835e
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 27 16:44:11 2015 +0100

gtk3: render vertical toolbar seperators

Change-Id: I6c4e5291b24015087b3ac56e2e178dbf42bf193f

diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 2c8a8dc..1e52df4 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -70,6 +70,7 @@ private:
 static GtkStyleContext *mpHScrollbarStyle;
 static GtkStyleContext *mpToolbarStyle;
 static GtkStyleContext *mpToolButtonStyle;
+static GtkStyleContext *mpToolbarSeperatorStyle;
 static GtkStyleContext *mpCheckButtonStyle;
 static GtkStyleContext *mpMenuBarStyle;
 static GtkStyleContext *mpMenuStyle;
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 9f0ea76..663843a 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -25,6 +25,7 @@ GtkStyleContext* GtkSalGraphics::mpVScrollbarStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpHScrollbarStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpToolbarStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpToolButtonStyle = NULL;
+GtkStyleContext* GtkSalGraphics::mpToolbarSeperatorStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpCheckButtonStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpMenuBarStyle = NULL;
 GtkStyleContext* GtkSalGraphics::mpMenuStyle = NULL;
@@ -66,12 +67,13 @@ enum {
 RENDER_BACKGROUND_AND_FRAME = 1,
 RENDER_CHECK = 2,
 RENDER_BACKGROUND = 3,
-RENDER_LINE = 4,
-RENDER_ARROW = 5,
-RENDER_RADIO = 6,
-RENDER_SCROLLBAR = 7,
-RENDER_SPINBUTTON = 8,
-RENDER_COMBOBOX = 9,
+RENDER_MENU_SEPERATOR = 4,
+RENDER_TOOLBAR_SEPERATOR = 5,
+RENDER_ARROW = 6,
+RENDER_RADIO = 7,
+RENDER_SCROLLBAR = 8,
+RENDER_SPINBUTTON = 9,
+RENDER_COMBOBOX = 10,
 };
 
 static void PrepareComboboxStyle( GtkStyleContext *context,
@@ -861,7 +863,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, 
ControlPart nPart, co
 case PART_MENU_SEPARATOR:
 styleClass = GTK_STYLE_CLASS_SEPARATOR;
 context = mpMenuItemStyle;
-renderType = RENDER_LINE;
+renderType = RENDER_MENU_SEPERATOR;
 break;
 case PART_MENU_SUBMENU_ARROW:
 context = mpMenuStyle;
@@ -885,6 +887,10 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, 
ControlPart nPart, co
 ( (aValue.getTristateVal() == BUTTONVALUE_ON) ? 
GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL));
 context = mpToolButtonStyle;
 break;
+case PART_SEPARATOR_VERT:
+context = mpToolbarSeperatorStyle;
+renderType = RENDER_TOOLBAR_SEPERATOR;
+break;
 default:
 return false;
 }
@@ -948,11 +954,16 @@ bool GtkSalGraphics::drawNativeControl( ControlType 
nType, ControlPart nPart, co
 case RENDER_RADIO:
 PaintCheckOrRadio(context, cr, rControlRegion, nType);
 break;
-case RENDER_LINE:
+case RENDER_MENU_SEPERATOR:
 gtk_render_line(context, cr,
 3, rControlRegion.GetHeight() / 2,
 rControlRegion.GetWidth() - 3, 
rControlRegion.GetHeight() / 2);

[Bug 79641] LibreOffice 4.4 most annoying bugs

2015-04-27 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=79641
Bug 79641 depends on bug 87876, which changed state.

Bug 87876 Summary: Tools -> Options -> View tab crushed by new OpenGL Graphics 
Output strings
https://bugs.documentfoundation.org/show_bug.cgi?id=87876

   What|Removed |Added

 Status|RESOLVED|REOPENED
 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

2015-04-27 Thread Tor Lillqvist

 sw/source/core/draw/dflyobj.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4de9e22ce7f39936d1201fc35baac58445826819
Author: Tor Lillqvist 
Date:   Mon Apr 27 18:59:55 2015 +0300

We run into this assertion too often when using LOKit

So until somebody has the time to figure out what is really going on, just
don't assert when being used from LOKit.

Change-Id: I5c4a87b94e7bd7ffdbf90973387b61407b8e6c8d

diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 7713e3a..b4eb860 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "hintids.hxx"
+#include 
 #include 
 #include 
 #include 
@@ -467,7 +468,7 @@ void SwVirtFlyDrawObj::wrap_DoPaintObject(
 // if there's no viewport set, all fly-frames will be painted,
 // which is slow, wastes memory, and can cause other trouble.
 (void) rViewInformation; // suppress "unused parameter" warning
-assert(!rViewInformation.getViewport().isEmpty());
+assert(comphelper::LibreOfficeKit::isActive() || 
!rViewInformation.getViewport().isEmpty());
 if ( !pFlyFrm->IsFlyInCntFrm() )
 {
 // it is also necessary to restore the VCL MapMode from 
ViewInformation since e.g.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread David Tardon

 editeng/source/editeng/impedit3.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 89c92e533daf9ee597b858be8207dedcd1139643
Author: David Tardon 
Date:   Mon Apr 27 16:38:23 2015 +0200

rhbz#1215443 avoid null pointer dereference

Change-Id: I0a7986703a6997c756d583d0e46907691f807b16

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 9dca951..427f333 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3467,7 +3467,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, 
Rectangle aClipRect, Point aSt
 }
 }
 
-if ( GetStatus().DoOnlineSpelling() && 
!pPortion->GetNode()->GetWrongList()->empty() && pTextPortion->GetLen() )
+const WrongList* const pWrongList = 
pPortion->GetNode()->GetWrongList();
+if ( GetStatus().DoOnlineSpelling() && 
pWrongList && !pWrongList->empty() && pTextPortion->GetLen() )
 {
 {//#105750# adjust LinePos for 
superscript or subscript text
 short _nEsc = 
aTmpFont.GetEscapement();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/xtiledrenderable' - include/vcl sw/source vcl/win

2015-04-27 Thread László Németh

 include/vcl/sysdata.hxx   |2 ++
 sw/source/uibase/uno/unotxdoc.cxx |2 +-
 vcl/win/source/gdi/salvd.cxx  |4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e1fb63bb8ed7a9bd4dbe19be0d0da7245c4a2fb2
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Mon Apr 27 16:22:11 2015 +0200

Use HWND instead of HDC, according to XTiledRenderable

Change-Id: I2959ea8b1213d6dade1c2567365f177bf542e075

diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index a4fad69..a525f77 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -137,6 +137,7 @@ struct SystemGraphicsData
 unsigned long   nSize;  // size in bytes of this structure
 #if defined( WNT )
 HDC hDC;// handle to a device context
+HWNDhWnd;   // optional handle to a window
 #elif defined( MACOSX )
 CGContextRefrCGContext; // CoreGraphics graphic context
 #elif defined( ANDROID )
@@ -156,6 +157,7 @@ struct SystemGraphicsData
 : nSize( sizeof( SystemGraphicsData ) )
 #if defined( WNT )
 , hDC( 0 )
+, hWnd( 0 )
 #elif defined( MACOSX )
 , rCGContext( NULL )
 #elif defined( ANDROID )
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 189ef8c..23635e3 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3289,7 +3289,7 @@ void SAL_CALL SwXTextDocument::paintTile( const 
::css::uno::Any& Parent, ::sal_I
 #if defined WNT
 sal_Int64 nWindowHandle;
 Parent >>= nWindowHandle;
-aData.hDC = (HDC) nWindowHandle;
+aData.hWnd = (HWND) nWindowHandle;
 VirtualDevice aDevice(&aData, Size(1, 1), (sal_uInt16)32);
 paintTile( aDevice, nOutputWidth, nOutputHeight, nTilePosX, nTilePosY, 
nTileWidth, nTileHeight );
 #else
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index c76432d..340e160 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -79,7 +79,7 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( 
SalGraphics* pSGraphics,
 
 if( pData )
 {
-hDC = pData->hDC;
+hDC = (pData->hDC) ? pData->hDC : GetDC(pData->hWnd);
 hBmp = NULL;
 bOk = (hDC != NULL);
 if (bOk)
@@ -137,7 +137,7 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( 
SalGraphics* pSGraphics,
 pVDev->mpGraphics   = pVirGraphics;
 pVDev->mnBitCount   = nBitCount;
 pVDev->mbGraphics   = FALSE;
-pVDev->mbForeignDC  = (pData != NULL);
+pVDev->mbForeignDC  = (pData != NULL && pData->hDC != NULL );
 
 // insert VirDev in VirDevList
 pVDev->mpNext = pSalData->mpFirstVD;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - swext/mediawiki

2015-04-27 Thread Robert Antoni Buj Gelonch

 swext/mediawiki/src/filter/odt2mediawiki.xsl |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 363afdf0e937afb179af3819276c6023c48f2b49
Author: Robert Antoni Buj Gelonch 
Date:   Thu Apr 23 17:59:14 2015 +0200

tdf#75360 tdf#90474 line breaks in exporting to mediawiki

Change-Id: I1a5276600cf0dd00d02f6278c49dd16f51131130
Reviewed-on: https://gerrit.libreoffice.org/15496
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 44646b1..7198a1f 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -285,6 +285,7 @@
 


+   


 
@@ -293,6 +294,7 @@

 ==

+   

 

 
-   
+   



@@ -627,7 +629,7 @@
-->


-   
 
+   




@@ -665,12 +667,13 @@



-   
+   




-   
+   
+   



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

[Libreoffice-commits] core.git: swext/mediawiki

2015-04-27 Thread Robert Antoni Buj Gelonch

 swext/mediawiki/src/filter/odt2mediawiki.xsl |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit b32953d19825605ed5d919f515c355a11b9c1e87
Author: Robert Antoni Buj Gelonch 
Date:   Mon Apr 20 22:20:59 2015 +0200

tdf#75360 tdf#90474 line breaks in exporting to mediawiki

Change-Id: Icb44653a9286c8bfbe912f391f0492fe49498f58
Reviewed-on: https://gerrit.libreoffice.org/15449
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index b0bc0500..d8a9fba 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -285,6 +285,7 @@
 


+   


 
@@ -293,6 +294,7 @@

 ==

+   

 

 
-   
+   



@@ -801,7 +803,7 @@
-->


-   
 
+   




@@ -839,12 +841,13 @@



-   
+   




-   
+   
+   



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

[Libreoffice-commits] website.git: Branch 'update' - check.php

2015-04-27 Thread Christian Lohmaier

 check.php |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 18395c24fb4d4e171d8ec349c4e817db48f4d428
Author: Christian Lohmaier 
Date:   Mon Apr 27 16:09:41 2015 +0200

enable update to 4.3.7

diff --git a/check.php b/check.php
index 35af01a..f9873e4 100644
--- a/check.php
+++ b/check.php
@@ -324,6 +324,9 @@ $build_hash_to_version = array(
 # 4.3.6
 '9629686a67dd1f357477c13325e45a66f3452bb9' => '4.3.6.1',
 'd50a87b2e514536ed401c18000dad4660b6a169e' => '4.3.6.2', # Final
+# 4.3.7
+'f08731f5dacd79f6348052311f5b237b002d78da' => '4.3.7.1',
+'8a35821d8636a03b8bf4e15b48f59794652c68ba' => '4.3.7.2', # Final
 
 ##
 # 4.4.0 versions
@@ -353,11 +356,11 @@ $build_hash_to_version = array(
 #   where '' and '' will be substitued with the right value
 #   NOTE: '&' in the URL has to be escaped as &
 $update_map = array(
-'stable' => array('gitid'   => 
'd50a87b2e514536ed401c18000dad4660b6a169e',
-  'id'  => 'LibreOffice 4.3.6',
-  'version' => '4.3.6',
+'stable' => array('gitid'   => 
'8a35821d8636a03b8bf4e15b48f59794652c68ba',
+  'id'  => 'LibreOffice 4.3.7',
+  'version' => '4.3.7',
   'update_type' => 'text/html',
-  'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-still/?type=&lang=&version=4.3.6',
+  'update_src'  => 
'http://www.libreoffice.org/download/libreoffice-still/?type=&lang=&version=4.3.7',
   'substitute'  => true ),
 
 'latest' => array('gitid'   => 
'c4c7d32d0d49397cad38d62472b0bc8acff48dd6',
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread Katarina Behrens

 sw/source/uibase/misc/numberingtypelistbox.cxx |   18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 819547539ede5955b1afc23022eed5c1d88bde46
Author: Katarina Behrens 
Date:   Mon Apr 27 14:19:42 2015 +0200

De-uglify switch-case statement

horrible indent, almost like in yast2-network

Change-Id: I14670260e5904f82fbaec85e98c321d31dbb646e

diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx 
b/sw/source/uibase/misc/numberingtypelistbox.cxx
index e6eb6a8..33361a4 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -91,10 +91,20 @@ void SwNumberingTypeListBox::Reload(sal_uInt16 nTypeFlags)
 case  style::NumberingType::NUMBER_NONE:
 bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_NO_NUMBERING);
 nPos = 0;
- break;
-case  style::NumberingType::CHAR_SPECIAL:   bInsert = 0 != 
(nTypeFlags&INSERT_NUM_TYPE_BULLET); break;
-case  style::NumberingType::PAGE_DESCRIPTOR:bInsert = 0 != 
(nTypeFlags&INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING); break;
-case  style::NumberingType::BITMAP:bInsert = 0 != 
(nTypeFlags&INSERT_NUM_TYPE_BITMAP ); break;
+
+break;
+case  style::NumberingType::CHAR_SPECIAL:
+bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_BULLET);
+
+break;
+case  style::NumberingType::PAGE_DESCRIPTOR:
+bInsert = 0 != 
(nTypeFlags&INSERT_NUM_TYPE_PAGE_STYLE_NUMBERING);
+
+break;
+case  style::NumberingType::BITMAP:
+bInsert = 0 != (nTypeFlags&INSERT_NUM_TYPE_BITMAP );
+
+break;
 default:
 if (nValue >  style::NumberingType::CHARS_LOWER_LETTER_N)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: swext/mediawiki

2015-04-27 Thread Robert Antoni Buj Gelonch

 swext/mediawiki/src/filter/odt2mediawiki.xsl |  169 ---
 1 file changed, 126 insertions(+), 43 deletions(-)

New commits:
commit c4a8c792c7246939be04cff9a57dcc35f6418566
Author: Robert Antoni Buj Gelonch 
Date:   Mon Apr 27 00:21:38 2015 +0200

odt2mediawiki.xsl: vertical & horizontal align of a image

Change-Id: I45cdffe132a796ccf06023f4465a2633df1926f3
Reviewed-on: https://gerrit.libreoffice.org/15544
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index dab745b..b0bc0500 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -977,53 +977,38 @@



-   [[
-   
-   
+   
+   [[
+   
+   
+   
+   |thumb
+   
+
+   
+   
+   

-   |thumb|
-   
-   
-   alt="
-   
-   "|
-   
+
+
+|

-   ]]
+
+]]



-   [[
-   
-   
-   
+   
+   [[
+   
+   
+   
+   
 
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
|center
-   
-   

-   
|none
-   

-   
-   
-   
-   
|none
-   
-   
-   
-   
-   
-   
+   
+   
+   
+   
 


@@ -1031,8 +1016,106 @@

"

-   ]]
-   
+
+   ]]
+   
+
+   
+   
+
+   
+   
+   
+   
+   
+   
+   
+   
+   {{clear}}
+   
+   
+   
+   
+   
+   

+   
|center
+   

+   

+   
|none
+   

+   

+   
+   
+   
|none
+   
+   
+   
+   
+   
+

[Bug 75019] FILESAVE: Failed to cover Bookmark and Bookmark Link-Export to MediaWiki

2015-04-27 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75019

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|BSA EasyHack|BSA EasyHack
   |DifficultyBeginner  |DifficultyBeginner
   |target:5.0.0|target:5.0.0 target:4.4.4

-- 
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 75019] FILESAVE: Failed to cover Bookmark and Bookmark Link-Export to MediaWiki

2015-04-27 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75019

--- Comment #6 from Commit Notification 
 ---
Robert Antoni Buj Gelonch committed a patch related to this issue.
It has been pushed to "libreoffice-4-4":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=dc2f0921233e63162f6aacf16041d89e318aee35&h=libreoffice-4-4

tdf#75019 bookmarks in exporting to mediawiki

It will be available in 4.4.4.

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: swext/mediawiki

2015-04-27 Thread Robert Antoni Buj Gelonch

 swext/mediawiki/src/filter/odt2mediawiki.xsl |8 
 1 file changed, 8 insertions(+)

New commits:
commit 4f351515bc4efb72343941f9d97d43572788512a
Author: Robert Antoni Buj Gelonch 
Date:   Mon Apr 20 23:14:29 2015 +0200

tdf#75531 failed to convert the margins

Change-Id: I025c4c14bcae9c925809f44425fabb6bc3d66806
Reviewed-on: https://gerrit.libreoffice.org/15451
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 88354e3..dab745b 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -755,6 +755,14 @@



+   
+   
+   
+   
+   
+   
+   
+   



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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - swext/mediawiki

2015-04-27 Thread Robert Antoni Buj Gelonch

 swext/mediawiki/src/filter/odt2mediawiki.xsl |   56 ---
 1 file changed, 50 insertions(+), 6 deletions(-)

New commits:
commit dc2f0921233e63162f6aacf16041d89e318aee35
Author: Robert Antoni Buj Gelonch 
Date:   Fri Apr 24 12:19:51 2015 +0200

tdf#75019 bookmarks in exporting to mediawiki

Change-Id: Ia20fea0a7c265aedb11e0018c321395ee874fd1e
Reviewed-on: https://gerrit.libreoffice.org/15507
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index 1205536..44646b1 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -514,12 +514,37 @@



-   
-   [
-   
-
-   
-   ]
+   
+   
+   [[
+   
+   
+   
+   
+   
+   
+   
+   
+   |
+   
+   
+   
+   
+   
+   
+   
+   
+   ]]
+   
+
+
+   [
+   
+
+   
+   ]
+   
+   



@@ -891,6 +916,25 @@


 
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   {{anchor|
+   
+   }} 
+   
+   
+   
+

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

[Bug 75019] FILESAVE: Failed to cover Bookmark and Bookmark Link-Export to MediaWiki

2015-04-27 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75019

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|BSA EasyHack|BSA EasyHack
   |DifficultyBeginner  |DifficultyBeginner
   ||target:5.0.0

-- 
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 75019] FILESAVE: Failed to cover Bookmark and Bookmark Link-Export to MediaWiki

2015-04-27 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75019

--- Comment #5 from Commit Notification 
 ---
Robert Antoni Buj Gelonch committed a patch related to this issue.
It has been pushed to "master":

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

tdf#75019 bookmarks in exporting to mediawiki

It will be available in 5.0.0.

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: swext/mediawiki

2015-04-27 Thread Robert Antoni Buj Gelonch

 swext/mediawiki/src/filter/odt2mediawiki.xsl |   58 +++
 1 file changed, 51 insertions(+), 7 deletions(-)

New commits:
commit 26b9122e7861906337c260d233910ed5ebf19dfa
Author: Robert Antoni Buj Gelonch 
Date:   Thu Apr 23 00:17:00 2015 +0200

tdf#75019 bookmarks in exporting to mediawiki

Add support for exporting common bookmarks
Add support for going to a specific bookmark (including TOC)

Change-Id: I2775d8b03a5bd986ffcbdf7c95a1fbed755e3bd6
Reviewed-on: https://gerrit.libreoffice.org/15486
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/swext/mediawiki/src/filter/odt2mediawiki.xsl 
b/swext/mediawiki/src/filter/odt2mediawiki.xsl
index c9f5964..88354e3 100644
--- a/swext/mediawiki/src/filter/odt2mediawiki.xsl
+++ b/swext/mediawiki/src/filter/odt2mediawiki.xsl
@@ -658,12 +658,37 @@



-   
-   [
-   
-
-   
-   ]
+   
+   
+   [[
+   
+   
+   
+   
+   
+   
+   
+   
+   |
+   
+   
+   
+   
+   
+   
+   
+   
+   ]]
+   
+
+
+   [
+   
+
+   
+   ]
+   
+   



@@ -1124,7 +1149,26 @@


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

[Libreoffice-commits] core.git: officecfg/registry

2015-04-27 Thread Yousuf Philips

 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu   |4 ++--
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |6 
+++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit cc89e15a875f4644e32d92690e35f6a08ff5f7d7
Author: Yousuf Philips 
Date:   Mon Apr 27 03:51:18 2015 +0400

Clarifying which direction inserting rows/columns goes in

Also for consistency, 'Evenly' was replaced

Change-Id: Iaad8af6dbcf1d17b56245792216db91affea27aa
Reviewed-on: https://gerrit.libreoffice.org/15545
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 90f2367..103bc02 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1061,7 +1061,7 @@
   
   
 
-  Insert ~Rows
+  Insert ~Rows Above
 
 
   ~Rows
@@ -1072,7 +1072,7 @@
   
   
 
-  Insert Co~lumns
+  Insert Co~lumns Left
 
 
   Co~lumns
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 0778461..a712068 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1104,7 +1104,7 @@
   
   
 
-  Insert Row
+  Insert Row Below
 
 
   1
@@ -1120,7 +1120,7 @@
   
   
 
-  Insert Column
+  Insert Column Right
 
 
   1
@@ -1914,7 +1914,7 @@
   
   
 
-  ~Distribute Columns Evenly
+  ~Distribute Columns Equally
 
 
   1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - writerfilter/source

2015-04-27 Thread Miklos Vajna

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

New commits:
commit 8961fa8c1a72c81cee091f3e447a0f6cac7f6bea
Author: Miklos Vajna 
Date:   Mon Apr 27 14:45:29 2015 +0200

cp#1000125 DOCX import: fix non-zero para indent

This only affects libreoffice-4-3 and earlier, libreoffice-4-4 and newer
is unaffected.

The problem is that the document had this XML fragment:


  

  ...


  


The order of generated tokens for the left and firstLine attributes is
~random (but with the exact CPLinux config or on Windows, it's
"firstLine, left"), while it's always "left, firstLine" on newer
versions, since iterating over the keys of the boost::unordered_map has
been cleaned up.

When "left" is the later attribute, then the ParaFirstLineIndent
property should be set in the "left" handler only in case "firstLine"
did not set it already, so switch off overwriting.

Change-Id: Ifd0f6f7e1e85ac485be326d52b6db89f32d77357

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 44efb59..4784c16 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -439,7 +439,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 sal_Int32 nFirstLineIndent = 
m_pImpl->getCurrentNumberingProperty("FirstLineIndent");
 
 if (nFirstLineIndent != 0)
-
m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, 
uno::makeAny(nFirstLineIndent));
+
m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, 
uno::makeAny(nFirstLineIndent), /*bOverwrite=*/false);
 
 m_pImpl->GetTopContext()->Insert(
 PROP_PARA_LEFT_MARGIN, uno::makeAny( 
ConversionHelper::convertTwipToMM100(nIntValue ) ));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 3 commits - sd/qa svx/inc svx/source vcl/unx

2015-04-27 Thread Stephan Bergmann

 sd/qa/unit/import-tests.cxx|1 
 svx/inc/getallcharpropids.hxx  |   35 +
 svx/source/svdraw/svdedtv1.cxx |1 
 svx/source/table/cell.cxx  |3 --
 vcl/unx/gtk/a11y/atktextattributes.cxx |2 -
 5 files changed, 39 insertions(+), 3 deletions(-)

New commits:
commit 7a2f811a07b99e0b7ff7e1399311da2908301a97
Author: Stephan Bergmann 
Date:   Thu Mar 5 12:23:46 2015 +0100

Actually execute testPDFImportSkipImages

(cherry picked from commit b8ca219893a6e14bfea3cec5522532c144ad2fa6)
Conflicts:
sd/qa/unit/import-tests.cxx

Change-Id: Ie3dda6d7ea24031eadf86801867a94f95c11310e

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 7103e3f..024801b 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -130,6 +130,7 @@ public:
 CPPUNIT_TEST(testBnc862510_6);
 CPPUNIT_TEST(testBnc862510_7);
 CPPUNIT_TEST(testPDFImport);
+CPPUNIT_TEST(testPDFImportSkipImages);
 CPPUNIT_TEST(testBnc910045);
 
 CPPUNIT_TEST_SUITE_END();
commit d303e0dca437b563dff026296e3e3e724a218d22
Author: Stephan Bergmann 
Date:   Thu Feb 19 08:54:09 2015 +0100

loplugin:externandnotdefined

Change-Id: I94271681ea4ec7617eaf706fb443ebb9d1b0bc15
(cherry picked from commit cb3518f331a99ff9a3187286e9e2b695df1c0292)

diff --git a/svx/inc/getallcharpropids.hxx b/svx/inc/getallcharpropids.hxx
new file mode 100644
index 000..c52d41b
--- /dev/null
+++ b/svx/inc/getallcharpropids.hxx
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SVX_INC_GETALLCHARPROPIDS_HXX
+#define INCLUDED_SVX_INC_GETALLCHARPROPIDS_HXX
+
+#include 
+
+#include 
+
+#include 
+
+class SfxItemSet;
+
+std::vector GetAllCharPropIds(const SfxItemSet& rSet);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 62c4cff..4a3cb0f 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 
+#include "getallcharpropids.hxx"
 #include "svdglob.hxx"
 #include "svx/svditer.hxx"
 #include "svx/svdstr.hrc"
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 3468283..595f90a 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -42,6 +42,7 @@
 #include "svx/unoshtxt.hxx"
 #include "svx/svdmodel.hxx"
 
+#include "getallcharpropids.hxx"
 #include "tableundo.hxx"
 #include "cell.hxx"
 #include "svx/unoshprp.hxx"
@@ -139,8 +140,6 @@ SdrText* CellTextProvider::getText(sal_Int32 nIndex) const
 
 }
 
-extern std::vector GetAllCharPropIds(const SfxItemSet& rSet);
-
 namespace sdr
 {
 namespace properties
commit a008ddb4f5cdbb900b43a16f9e4e7cb2bdb1e25f
Author: Stephan Bergmann 
Date:   Thu Feb 5 15:29:22 2015 +0100

-Werror,-Wformat-security

Change-Id: I62ff8a172a9c4f361ef5fcb6d60bd9fd2e959c2d
(cherry picked from commit b8cf9b3359195f4f9f7e92f5db224a91cf994306)

diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx 
b/vcl/unx/gtk/a11y/atktextattributes.cxx
index bc286d0..ec09a2b 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -1235,7 +1235,7 @@ attribute_set_new_from_extended_attributes(
 
 pSet = attribute_set_prepend( pSet,
   atk_text_attribute_register( 
sPropertyName.getStr() ),
-  g_strdup_printf( sPropertyValue.getStr() 
) );
+  g_strdup_printf( "%s", 
sPropertyValue.getStr() ) );
 }
 while ( nIndex >= 0 && nIndex < sExtendedAttrs.getLength() );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75019] FILESAVE: Failed to cover Bookmark and Bookmark Link-Export to MediaWiki

2015-04-27 Thread bugzilla-daemon

https://bugs.documentfoundation.org/show_bug.cgi?id=75019

Robert Antoni Buj i Gelonch  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED
   Assignee|libreoffice-b...@lists.free |robert@gmail.com
   |desktop.org |

--- Comment #4 from Robert Antoni Buj i Gelonch  ---
I've sent to gerrit a patch which implements this RFE.

master branch:
https://gerrit.libreoffice.org/#/c/15486/

libreoffice-4-4 branch:
https://gerrit.libreoffice.org/#/c/15507/

libreoffice-4-3 branch:
https://gerrit.libreoffice.org/#/c/15509/

-- 
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: 2 commits - vcl/source vcl/unx

2015-04-27 Thread Caolán McNamara

 vcl/source/window/winproc.cxx |   62 +++--
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |  119 --
 2 files changed, 108 insertions(+), 73 deletions(-)

New commits:
commit fc1605e4dc88b6c563dc0712954f58d8bb6979a7
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 27 12:48:07 2015 +0100

don't dismiss floating windows on wheel, etc gestures outside area

so if you are not exactly over the active floating listbox menu
and use the scroll mouse then it still gets the scroll event
instead of popping down and delivering it to the underlying
window.

Change-Id: I6ab0b725af2a8adc712bfe4ec586dcd64a2efdd7

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 6cb1c90..139d771 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1376,17 +1376,6 @@ protected:
 
 public:
 
-struct WindowDescription
-{
-vcl::Window *m_pMouseWindow;
-bool m_bIsFloat;
-WindowDescription(vcl::Window *pMouseWindow, bool bIsFloat)
-: m_pMouseWindow(pMouseWindow)
-, m_bIsFloat(bIsFloat)
-{
-}
-};
-
 HandleGestureEventBase(vcl::Window *pWindow, const Point &rMousePos)
 : m_pSVData(ImplGetSVData())
 , m_pWindow(pWindow)
@@ -1394,10 +1383,9 @@ public:
 {
 }
 bool Setup();
-WindowDescription FindTarget();
-vcl::Window *Dispatch(const WindowDescription& rTarget);
+vcl::Window* FindTarget();
+vcl::Window* Dispatch(vcl::Window* pTarget);
 virtual bool CallCommand(vcl::Window *pWindow, const Point &rMousePos) = 0;
-void Teardown(const WindowDescription& rTarget);
 virtual ~HandleGestureEventBase() {}
 };
 
@@ -1414,10 +1402,9 @@ bool HandleGestureEventBase::Setup()
 return true;
 }
 
-HandleGestureEventBase::WindowDescription HandleGestureEventBase::FindTarget()
+vcl::Window* HandleGestureEventBase::FindTarget()
 {
 // first check any floating window ( eg. drop down listboxes)
-bool bIsFloat = false;
 vcl::Window *pMouseWindow = NULL;
 
 if (m_pSVData->maWinData.mpFirstFloat && 
!m_pSVData->maWinData.mpCaptureWin &&
@@ -1425,10 +1412,14 @@ HandleGestureEventBase::WindowDescription 
HandleGestureEventBase::FindTarget()
 {
 HitTest nHitTest = HITTEST_OUTSIDE;
 pMouseWindow = m_pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( 
m_pWindow, m_aMousePos, nHitTest );
+if (!pMouseWindow)
+pMouseWindow = m_pSVData->maWinData.mpFirstFloat;
 }
 // then try the window directly beneath the mouse
 if( !pMouseWindow )
+{
 pMouseWindow = m_pWindow->ImplFindWindow( m_aMousePos );
+}
 else
 {
 // transform coordinates to float window frame coordinates
@@ -1437,7 +1428,6 @@ HandleGestureEventBase::WindowDescription 
HandleGestureEventBase::FindTarget()
   pMouseWindow->AbsoluteScreenToOutputPixel(
m_pWindow->OutputToAbsoluteScreenPixel(
 m_pWindow->ScreenToOutputPixel( m_aMousePos ) ) ) ) );
-bIsFloat = true;
 }
 
 while (acceptableWheelScrollTarget(pMouseWindow))
@@ -1448,13 +1438,11 @@ HandleGestureEventBase::WindowDescription 
HandleGestureEventBase::FindTarget()
 pMouseWindow = pMouseWindow->GetParent();
 }
 
-return WindowDescription(pMouseWindow, bIsFloat);
+return pMouseWindow;
 }
 
-vcl::Window *HandleGestureEventBase::Dispatch(const WindowDescription& rTarget)
+vcl::Window *HandleGestureEventBase::Dispatch(vcl::Window* pMouseWindow)
 {
-vcl::Window *pMouseWindow = rTarget.m_pMouseWindow;
-
 vcl::Window *pDispatchedTo = NULL;
 
 if (acceptableWheelScrollTarget(pMouseWindow) && pMouseWindow->IsEnabled())
@@ -1493,23 +1481,6 @@ vcl::Window *HandleGestureEventBase::Dispatch(const 
WindowDescription& rTarget)
 return pDispatchedTo;
 }
 
-void HandleGestureEventBase::Teardown(const WindowDescription& rTarget)
-{
-// close floaters
-if (!rTarget.m_bIsFloat && m_pSVData->maWinData.mpFirstFloat)
-{
-FloatingWindow* pLastLevelFloat = 
m_pSVData->maWinData.mpFirstFloat->ImplFindLastLevelFloat();
-if( pLastLevelFloat )
-{
-sal_uLong nPopupFlags = pLastLevelFloat->GetPopupModeFlags();
-if ( nPopupFlags & FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE )
-{
-pLastLevelFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | 
FLOATWIN_POPUPMODEEND_CLOSEALL );
-}
-}
-}
-}
-
 class HandleWheelEvent : public HandleGestureEventBase
 {
 private:
@@ -1554,21 +1525,19 @@ bool HandleWheelEvent::HandleEvent(const 
SalWheelMouseEvent& rEvt)
 if (!Setup())
 return false;
 
-WindowDescription aTarget = FindTarget();
+vcl::Window *pMouseWindow = FindTarget();
 
 // avoid the problem that scrolling via wheel to this point brings a widget
 // under the mouse that also accepts wheel commands, so

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

2015-04-27 Thread Takeshi Abe

 starmath/inc/edit.hxx|   11 ++-
 starmath/source/edit.cxx |   32 ++--
 2 files changed, 20 insertions(+), 23 deletions(-)

New commits:
commit 950055bcb06c8edcd9062c71184f02bf8e0604e6
Author: Takeshi Abe 
Date:   Fri Apr 24 22:31:20 2015 +0900

use std::unique_ptr<> to simplify ctor and dtor

Change-Id: I317e7e2a9844a816bea93c805212e3ef2a1888bd
Reviewed-on: https://gerrit.libreoffice.org/15515
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 601b3b9..dfb24e9 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -25,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class SmDocShell;
 class SmViewShell;
@@ -53,10 +54,10 @@ class SmEditWindow : public vcl::Window, public 
DropTargetHelper
 SmEditAccessible *  pAccessible;
 
 SmCmdBoxWindow &rCmdBox;
-EditView   *pEditView;
-ScrollBar  *pHScrollBar,
-   *pVScrollBar;
-ScrollBarBox   *pScrollBox;
+std::unique_ptr pEditView;
+std::unique_ptr pHScrollBar;
+std::unique_ptr pVScrollBar;
+std::unique_ptr pScrollBox;
 IdleaModifyIdle,
 aCursorMoveIdle;
 ESelection  aOldSelection;
@@ -94,7 +95,7 @@ public:
 
 SmDocShell *GetDoc();
 SmViewShell *   GetView();
-EditView *  GetEditView()   { return pEditView; }
+EditView *  GetEditView();
 EditEngine *GetEditEngine();
 SfxItemPool *   GetEditEngineItemPool();
 
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index da0a420..34d4ecd 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -89,11 +89,7 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) :
 Window  (&rMyCmdBoxWin),
 DropTargetHelper( this ),
 pAccessible (0),
-rCmdBox (rMyCmdBoxWin),
-pEditView   (0),
-pHScrollBar (0),
-pVScrollBar (0),
-pScrollBox  (0)
+rCmdBox (rMyCmdBoxWin)
 {
 SetHelpId(HID_SMA_COMMAND_WIN_EDIT);
 SetMapMode(MAP_PIXEL);
@@ -141,13 +137,9 @@ SmEditWindow::~SmEditWindow()
 if (pEditEngine)
 {
 pEditEngine->SetStatusEventHdl( Link() );
-pEditEngine->RemoveView( pEditView );
+pEditEngine->RemoveView( pEditView.get() );
 }
-delete pEditView;
 }
-delete pHScrollBar;
-delete pVScrollBar;
-delete pScrollBox;
 }
 
 void SmEditWindow::StartCursorMove()
@@ -176,6 +168,10 @@ SmDocShell * SmEditWindow::GetDoc()
 return pView ? pView->GetDoc() : 0;
 }
 
+EditView * SmEditWindow::GetEditView()
+{
+return pEditView.get();
+}
 
 EditEngine * SmEditWindow::GetEditEngine()
 {
@@ -384,7 +380,7 @@ bool SmEditWindow::HandleWheelCommands( const CommandEvent 
&rCEvt )
 if (CommandWheelMode::ZOOM == pWData->GetMode())
 bCommandHandled = true; // no zooming in Command window
 else
-bCommandHandled = HandleScrollCommand( rCEvt, pHScrollBar, 
pVScrollBar);
+bCommandHandled = HandleScrollCommand( rCEvt, pHScrollBar.get(), 
pVScrollBar.get());
 }
 
 return bCommandHandled;
@@ -534,15 +530,15 @@ void SmEditWindow::CreateEditView()
 //! For example when the program is used by the document-converter
 if (!pEditView && pEditEngine)
 {
-pEditView = new EditView( pEditEngine, this );
-pEditEngine->InsertView( pEditView );
+pEditView.reset(new EditView( pEditEngine, this ));
+pEditEngine->InsertView( pEditView.get() );
 
 if (!pVScrollBar)
-pVScrollBar = new ScrollBar(this, WinBits(WB_VSCROLL));
+pVScrollBar.reset(new ScrollBar(this, WinBits(WB_VSCROLL)));
 if (!pHScrollBar)
-pHScrollBar = new ScrollBar(this, WinBits(WB_HSCROLL));
+pHScrollBar.reset(new ScrollBar(this, WinBits(WB_HSCROLL)));
 if (!pScrollBox)
-pScrollBox  = new ScrollBarBox(this);
+pScrollBox.reset(new ScrollBarBox(this));
 pVScrollBar->SetScrollHdl(LINK(this, SmEditWindow, ScrollHdl));
 pHScrollBar->SetScrollHdl(LINK(this, SmEditWindow, ScrollHdl));
 pVScrollBar->EnableDrag( true );
@@ -1096,9 +1092,9 @@ void SmEditWindow::DeleteEditView( SmViewShell & 
/*rView*/ )
 if (xEditEngine)
 {
 xEditEngine->SetStatusEventHdl( Link() );
-xEditEngine->RemoveView( pEditView );
+xEditEngine->RemoveView( pEditView.get() );
 }
-pEditView = 0;
+pEditView.reset();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread Michael Stahl

 sw/source/core/access/acccontext.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 84f10b5f154e130981de5826f83d63b5eadd33ac
Author: Michael Stahl 
Date:   Fri Apr 24 23:31:06 2015 +0200

sw: fix SwAccessibleParagraph crash on delete

It happens that SwAccessibleParagraph::getCharacterBounds() is called
from ATK with a clearly invalid pPortionData member; the SwTxtNode has
no text but there are portions.

This is because after a deletion both a POS_CHANGED and a
INVALID_CONTENT event are created for the same SwAccessibleParagraph,
and they are merged into one POS_CHANGED event by
SwAccessibleMap::AppendEvent(), but
SwAccessibleContext::InvalidatePosOrSize() returns early if the
paragraph happens to not be visible, skipping the invalidation.

(regression from 76c549eb01dcb7b5bf28a271ce00e386f3d388ba, which
 removed a Dispose() call; not sure if the Dispose() is needed here)

Change-Id: I985e9a439ee6c7024963eace876186f2247b9e03
(cherry picked from commit 104ed86c382b73505b477bf3024982dd27823023)
Reviewed-on: https://gerrit.libreoffice.org/15534
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/core/access/acccontext.cxx 
b/sw/source/core/access/acccontext.cxx
index 8021c19..9a09055 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1167,12 +1167,9 @@ void SwAccessibleContext::InvalidatePosOrSize( const 
SwRect& )
 FireVisibleDataEvent();
 }
 
-if( !bIsNewShowingState &&
-SwAccessibleChild( GetParent() ).IsVisibleChildrenOnly() )
-{
-return;
-}
-
+// note: InvalidatePosOrSize must call _InvalidateContent so that
+// SwAccessibleParagraph updates its portions, or dispose it
+// (see accmap.cxx: INVALID_CONTENT is contained in POS_CHANGED)
 _InvalidateContent( true );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread Michael Stahl

 sw/source/core/edit/eddel.cxx  |2 +-
 sw/source/core/edit/edglss.cxx |5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 8f570028b0871db99722cca76c0d1179e06c
Author: Michael Stahl 
Date:   Sat Apr 25 21:25:00 2015 +0200

rhbz#1205072: sw: resource mangement SNAFU caused by SwPaM copy ctor

SwPaM copy ctor has the surprising habit of linking the new one into the
old one's Ring.  If you copy a shell cursor, *this* epic fail happens:

==948== Thread 6 SelectionManager:
==948== Invalid free() / delete / delete[] / realloc()
==948==at 0x4A07CE9: free (in 
/usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so)
==948==by 0x222F542B: SwPaM::operator delete(void*, unsigned long) (in 
/libreoffice-4-3/instdir/program/libswlo.so)
==948==by 0x2239E20E: SwPaM::~SwPaM() (pam.cxx:422)
==948==by 0x22368630: CheckRange(SwCursor*) (crsrsh.cxx:111)
==948==by 0x2236DECC: SwCrsrShell::UpdateCrsr(unsigned short, bool) 
(crsrsh.cxx:1397)
==948==by 0x22369113: SwCrsrShell::EndAction(bool) (crsrsh.cxx:290)
==948==by 0x2268971F: SwEditShell::EndAllAction() (edws.cxx:87)
==948==by 0x2262BEF3: SwBaseLink::DataChanged(rtl::OUString const&, 
com::sun::star::uno::Any const&) (swbaslnk.cxx:274)
==948==by 0x2262C78E: SwBaseLink::SwapIn(bool, bool) (swbaslnk.cxx:411)
==948==by 0x227102EC: SwGrfNode::SwapIn(bool) (ndgrf.cxx:539)
==948==by 0x227121BC: SwGrfNode::MakeCopy(SwDoc*, SwNodeIndex const&) 
const (ndgrf.cxx:999)
==948==by 0x22610E4D: SwNodes::_CopyNodes(SwNodeRange const&, 
SwNodeIndex const&, bool, bool) const (nodes.cxx:1862)
==948==by 0x225B98E0: SwDoc::CopyWithFlyInFly(SwNodeRange const&, int, 
SwNodeIndex const&, SwPaM const*, bool, bool, bool) const (ndcopy.cxx:1336)
==948==by 0x224AC1FF: SwDoc::CopyLayoutFmt(SwFrmFmt const&, SwFmtAnchor 
const&, bool, bool) (doclay.cxx:446)
==948==by 0x2294D2D4: SwTxtFlyCnt::CopyFlyFmt(SwDoc*) (atrflyin.cxx:130)
==948==by 0x229A5B96: MakeTxtAttr(SwDoc&, SfxPoolItem&, int, int, 
CopyOrNew_t, SwTxtNode*) (thints.cxx:1060)
==948==by 0x229A64E6: SwTxtNode::InsertItem(SfxPoolItem&, int, int, 
unsigned short) (thints.cxx:1224)
==948==by 0x2298E536: SwTxtNode::CopyText(SwTxtNode*, SwIndex const&, 
SwIndex const&, int, bool) (ndtxt.cxx:1773)
==948==by 0x2298DC08: SwTxtNode::CopyText(SwTxtNode*, SwIndex const&, 
int, bool) (ndtxt.cxx:1555)
==948==by 0x225B4C9D: SwTxtNode::MakeCopy(SwDoc*, SwNodeIndex const&) 
const (ndcopy.cxx:286)
==948==by 0x22610E4D: SwNodes::_CopyNodes(SwNodeRange const&, 
SwNodeIndex const&, bool, bool) const (nodes.cxx:1862)
==948==by 0x223EF3C2: SwNodes::_Copy(SwNodeRange const&, SwNodeIndex 
const&, bool) const (ndarr.hxx:182)
==948==by 0x225B5D8D: SwTableNode::MakeCopy(SwDoc*, SwNodeIndex const&) 
const (ndcopy.cxx:475)
==948==by 0x22610ACA: SwNodes::_CopyNodes(SwNodeRange const&, 
SwNodeIndex const&, bool, bool) const (nodes.cxx:1790)
==948==by 0x223EF3C2: SwNodes::_Copy(SwNodeRange const&, SwNodeIndex 
const&, bool) const (ndarr.hxx:182)
==948==by 0x225CA663: SwSectionNode::MakeCopy(SwDoc*, SwNodeIndex 
const&) const (ndsect.cxx:1270)
==948==by 0x22610BFC: SwNodes::_CopyNodes(SwNodeRange const&, 
SwNodeIndex const&, bool, bool) const (nodes.cxx:1817)
==948==by 0x223EF3C2: SwNodes::_Copy(SwNodeRange const&, SwNodeIndex 
const&, bool) const (ndarr.hxx:182)
==948==by 0x225CA663: SwSectionNode::MakeCopy(SwDoc*, SwNodeIndex 
const&) const (ndsect.cxx:1270)
==948==by 0x22610BFC: SwNodes::_CopyNodes(SwNodeRange const&, 
SwNodeIndex const&, bool, bool) const (nodes.cxx:1817)
==948==by 0x223EF3C2: SwNodes::_Copy(SwNodeRange const&, SwNodeIndex 
const&, bool) const (ndarr.hxx:182)
==948==by 0x225CA663: SwSectionNode::MakeCopy(SwDoc*, SwNodeIndex 
const&) const (ndsect.cxx:1270)
==948==by 0x22610BFC: SwNodes::_CopyNodes(SwNodeRange const&, 
SwNodeIndex const&, bool, bool) const (nodes.cxx:1817)
==948==by 0x225B98E0: SwDoc::CopyWithFlyInFly(SwNodeRange const&, int, 
SwNodeIndex const&, SwPaM const*, bool, bool, bool) const (ndcopy.cxx:1336)
==948==by 0x225B8F15: SwDoc::CopyImpl(SwPaM&, SwPosition&, bool, bool, 
SwPaM*) const (ndcopy.cxx:1239)
==948==by 0x225B6EE0: SwDoc::CopyRange(SwPaM&, SwPosition&, bool) const 
(ndcopy.cxx:707)
==948==by 0x22667E69: SwEditShell::_CopySelToDoc(SwDoc*, SwNodeIndex*) 
(edglss.cxx:244)
==948==by 0x226C8400: SwFEShell::Copy(SwDoc*, rtl::OUString const*) 
(fecopy.cxx:214)
==948==by 0x22DBF72B: (anonymous 
namespace)::lclOverWriteDoc(SwWrtShell&, SwDoc&) (swdtflvr.cxx:373)
==948==by 0x22DBFBC6: 
SwTransferable::GetData(com::sun::star::datatransfer::DataFlavor const&, 
rtl::OUString const&) (swdtflvr.cxx:439)
==948==by 0x7CB36C7: 
TransferableHelper::getTransferData2(

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

2015-04-27 Thread Caolán McNamara

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cc4a4dacbdc731611486490db5894e4a3250e3f7
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 27 10:53:38 2015 +0100

gtk3: flat menus and can draw widgets at any size, etc

Change-Id: I02c09223048354c61ff84f9c4bcc01bdd4c11beb

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index c750644..9d82368 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1498,7 +1498,10 @@ static GtkWidget* gDumbContainer;
 void GtkData::initNWF()
 {
 ImplSVData* pSVData = ImplGetSVData();
+pSVData->maNWFData.mbFlatMenu = true;
 pSVData->maNWFData.mbCheckBoxNeedsErase = true;
+pSVData->maNWFData.mbCanDrawWidgetAnySize = true;
+pSVData->maNWFData.mbDDListBoxNoTextArea = true;
 }
 
 void GtkData::deInitNWF()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread Stephan Bergmann

 sfx2/source/doc/docfile.cxx |   20 +++-
 1 file changed, 15 insertions(+), 5 deletions(-)

New commits:
commit a199cad8376a5470c50125def2738b44b55ec018
Author: Stephan Bergmann 
Date:   Mon Apr 27 11:35:55 2015 +0200

tdf#65498, tdf#87545: Don't confuse logically r/o doc with physically r/o

b9ecec7c74687ed5a9470cffb7d02e0e6e83107e "Allow for editing of read-only
documents" introduced

 "A new state of 'IsOriginallyReadOnly' needed to be added to the medium, to
  keep track whether the medium was originally opened r/o (and is thus 
assumed
  to be physically r/o), as toggling SID_EDITDOC in the view also changes 
the
  open mode of the underlying medium.  Instead of trying to fully 
understand and
  disentangle that horrible mess, I just added yet another state to the 
mess..."

But that heuristic is apparently too simplistic, as it treats documents
originally opened "logically r/o" (via --view command line argument, or by
checking the corresponding checkbox in the Open dialog) as "physically r/o" 
too,
which leads to unexpected behavior when such documents are later switched 
into
r/w Edit mode.

An approach that hopefully works better overall is to set 
IsOriginallyReadOnly
only if the document originally is r/o as reported by OSL (for a document 
with a
file URL).

Change-Id: I32d5ec655d7556a70680aee55feda4c6eea7795f

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 8fff9b0..b7a1f6f 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1001,9 +1001,6 @@ void SfxMedium::LockOrigFileOnDemand( bool bLoading, bool 
bNoUI )
 bContentReadonly = IsReadonlyAccordingACL( 
aPhysPath.getStr() );
 }
 #endif
-
-if ( bContentReadonly )
-pImp->m_bOriginallyReadOnly = true;
 }
 
 // do further checks only if the file not readonly in fs
@@ -2466,6 +2463,18 @@ void SfxMedium::Init_Impl()
 }
 
 SetIsRemote_Impl();
+
+osl::DirectoryItem item;
+if (osl::DirectoryItem::get(GetName(), item) == osl::FileBase::E_None) {
+osl::FileStatus stat(osl_FileStatus_Mask_Attributes);
+if (item.getFileStatus(stat) == osl::FileBase::E_None
+&& stat.isValid(osl_FileStatus_Mask_Attributes))
+{
+if ((stat.getAttributes() & osl_File_Attribute_ReadOnly) != 0) {
+pImp->m_bOriginallyReadOnly = true;
+}
+}
+}
 }
 
 
@@ -2859,14 +2868,15 @@ SfxMedium::SfxMedium( const 
uno::Sequence& aArgs ) :
 }
 }
 
+bool readOnly = false;
 SFX_ITEMSET_ARG( pImp->m_pSet, pReadOnlyItem, SfxBoolItem, 
SID_DOC_READONLY, false );
 if ( pReadOnlyItem && pReadOnlyItem->GetValue() )
-pImp->m_bOriginallyReadOnly = true;
+readOnly = true;
 
 SFX_ITEMSET_ARG( pImp->m_pSet, pFileNameItem, SfxStringItem, 
SID_FILE_NAME, false );
 if (!pFileNameItem) throw uno::RuntimeException();
 pImp->m_aLogicName = pFileNameItem->GetValue();
-pImp->m_nStorOpenMode = pImp->m_bOriginallyReadOnly ? SFX_STREAM_READONLY 
: SFX_STREAM_READWRITE;
+pImp->m_nStorOpenMode = readOnly ? SFX_STREAM_READONLY : 
SFX_STREAM_READWRITE;
 Init_Impl();
 }
 
___
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' - 1a/aa4073407bf8db1110fb8e510580b66baa3003

2015-04-27 Thread Caolán McNamara

 1a/aa4073407bf8db1110fb8e510580b66baa3003 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 686e633fb07792a603cda279064383fbc9c17535
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 27 10:35:54 2015 +0100

Notes added by 'git notes add'

diff --git a/1a/aa4073407bf8db1110fb8e510580b66baa3003 
b/1a/aa4073407bf8db1110fb8e510580b66baa3003
new file mode 100644
index 000..ef63de2
--- /dev/null
+++ b/1a/aa4073407bf8db1110fb8e510580b66baa3003
@@ -0,0 +1 @@
+prefer: 9b41f59fa9857159cef70add9e2343dd1ab1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread Caolán McNamara

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

New commits:
commit c223fa317376817be7a7f71c4ce9eb0011bce070
Author: CaolÃ¡n McNamara 
Date:   Mon Apr 27 10:29:13 2015 +0100

gtk3: pull text high colors from view style

Change-Id: Id815f98db3f2db44861bf979aca4b0d24bce6589

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx 
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 7617890..c750644 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1151,14 +1151,6 @@ void GtkSalGraphics::updateSettings( AllSettings& 
rSettings )
 aStyleSet.SetWorkspaceColor( aBackColor );
 aStyleSet.SetCheckedColorSpecialCase( );
 
-// highlighting colors
-gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_SELECTED, 
&text_color);
-::Color aHighlightColor = getColor( text_color );
-gtk_style_context_get_color(pStyle, GTK_STATE_FLAG_SELECTED, &text_color);
-::Color aHighlightTextColor = getColor( text_color );
-aStyleSet.SetHighlightColor( aHighlightColor );
-aStyleSet.SetHighlightTextColor( aHighlightTextColor );
-
 // tooltip colors
 GdkRGBA tooltip_bg_color, tooltip_fg_color;
 gtk_style_context_save (pStyle);
@@ -1179,6 +1171,16 @@ void GtkSalGraphics::updateSettings( AllSettings& 
rSettings )
 gtk_widget_path_iter_add_class( pCPath, -1, GTK_STYLE_CLASS_VIEW );
 gtk_style_context_set_path( pCStyle, pCPath );
 gtk_widget_path_free( pCPath );
+
+// highlighting colors
+gtk_style_context_get_background_color(pCStyle, GTK_STATE_FLAG_SELECTED, 
&text_color);
+::Color aHighlightColor = getColor( text_color );
+gtk_style_context_get_color(pCStyle, GTK_STATE_FLAG_SELECTED, &text_color);
+::Color aHighlightTextColor = getColor( text_color );
+aStyleSet.SetHighlightColor( aHighlightColor );
+aStyleSet.SetHighlightTextColor( aHighlightTextColor );
+
+// field background color
 GdkRGBA field_background_color;
 gtk_style_context_get_background_color(pCStyle, GTK_STATE_FLAG_NORMAL, 
&field_background_color);
 g_object_unref( pCStyle );
@@ -1230,10 +1232,10 @@ void GtkSalGraphics::updateSettings( AllSettings& 
rSettings )
 }
 
 gtk_style_context_get_background_color( mpMenuItemStyle, 
GTK_STATE_FLAG_PRELIGHT, &background_color );
-aHighlightColor = getColor( background_color );
+::Color aHighlightColor = getColor( background_color );
 
 gtk_style_context_get_color( mpMenuItemStyle, GTK_STATE_FLAG_PRELIGHT, 
&color );
-aHighlightTextColor = getColor( color );
+::Color aHighlightTextColor = getColor( color );
 if( aHighlightColor == aHighlightTextColor )
 aHighlightTextColor = (aHighlightColor.GetLuminance() < 128) ? 
::Color( COL_WHITE ) : ::Color( COL_BLACK );
 aStyleSet.SetMenuHighlightColor( aHighlightColor );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread Takeshi Abe

 starmath/source/node.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b572cb948d33efc87f0d3d724f5ad62e7e00fe0b
Author: Takeshi Abe 
Date:   Mon Apr 27 17:20:00 2015 +0900

mark them as static

Change-Id: I7c62cce3708e52ca9af1731f453bbe8410b6f771

diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 7880913..70bc753 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2960,8 +2960,8 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, 
const SmDocShell &rDocShell
 const OUString& rTmp(GetText());
 if (rTmp.isEmpty())
 {
-const sal_Unicode cUppercaseAlpha = 0x0391;
-const sal_Unicode cUppercaseOmega = 0x03A9;
+static const sal_Unicode cUppercaseAlpha = 0x0391;
+static const sal_Unicode cUppercaseOmega = 0x03A9;
 sal_Unicode cChar = rTmp[0];
 // uppercase letters should be straight and lowercase letters 
italic
 bItalic = !(cUppercaseAlpha <= cChar && cChar <= 
cUppercaseOmega);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2015-04-27 Thread Olivier Hallot

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

New commits:
commit e695f645a4a31ec137ed6a445b7be3d4e3414774
Author: Olivier Hallot 
Date:   Sun Apr 26 13:19:28 2015 -0300

Updated core
Project: help  9094a1a35592418eb8b527a37a1d7d3f85fd4f96

tdf#61397 improve gluepoints help page

Add text as recomended by bug tdf#61397

Change-Id: Ic9f1b87fb94876b932004d0b337a1de2aa2541ca
Reviewed-on: https://gerrit.libreoffice.org/15543
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 8322ff8..9094a1a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8322ff882f06c6c92e4c9d9e4bf762e06a5a754c
+Subproject commit 9094a1a35592418eb8b527a37a1d7d3f85fd4f96
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-27 Thread Olivier Hallot

 source/text/simpress/guide/gluepoints.xhp |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 9094a1a35592418eb8b527a37a1d7d3f85fd4f96
Author: Olivier Hallot 
Date:   Sun Apr 26 13:19:28 2015 -0300

tdf#61397 improve gluepoints help page

Add text as recomended by bug tdf#61397

Change-Id: Ic9f1b87fb94876b932004d0b337a1de2aa2541ca
Reviewed-on: https://gerrit.libreoffice.org/15543
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/simpress/guide/gluepoints.xhp 
b/source/text/simpress/guide/gluepoints.xhp
index 4f5941a..ff57579 100644
--- a/source/text/simpress/guide/gluepoints.xhp
+++ b/source/text/simpress/guide/gluepoints.xhp
@@ -1,6 +1,6 @@
 
 
-   
+
 
- 
-   
+
+
 
 
 Using Gluepoints
@@ -35,9 +35,8 @@
 To add and edit gluepoints
 
 
-Do one of the following:
+Do one of the following to get existing glue points visible for all 
elements:
 
-
 
 
 Click the Glue Point icon on the Drawing 
toolbar.
@@ -46,11 +45,13 @@
 Choose Edit - Glue Points.
 
 
-
 
 Click the Insert Glue Point icon on the Gluepoints 
toolbar.
 
 
+Select element on slide where you want to add glue 
points.
+
+
 Click inside the shape where you want to add the new 
gluepoint.
 If the shape is filled, you can click anywhere inside the shape. If 
the shape is unfilled, you can click the border to insert a glue point. Once 
inserted, you can drag the glue point to another position inside the 
shape.
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Update: Gerrit Performance

2015-04-27 Thread Thorsten Behrens

Norbert Thiebaud wrote:
> Thanks to the diligent efforts of DavidO, we should now have ~all the
> performance regressions introduced in the last gerrit upgrade under
> control.
>
Thanks a lot to both of you for your efforts & midnight oil spent!

Cheers,

-- Thorsten


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

Re: minutes of ESC call ...

2015-04-27 Thread Thorsten Behrens

David Ostrovsky wrote:
> I've implemented OAuth extension point:
>
Thanks a lot David, you rock! :)

> Existing Google accounts must not be upgraded to Google+ accounts,
> to be used for Gerrit OAuth.
>
Umm - so most of us cannot use this?

Cheers,

-- Thorsten


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

Re: [Libreoffice-commits] you are wrong you stupid compiler, it would crash or not used unitialized

2015-04-27 Thread Stephan Bergmann


On 04/25/2015 02:25 AM, Markus Mohrhard wrote:

commit c39890d07dc857157756f0b6e57a2c8cbb3b4f54
Author: Markus Mohrhard 
Date:   Sat Apr 25 02:23:46 2015 +0200

 you are wrong you stupid compiler,it would crash or not used unitialized

 Change-Id: I7ca4399d7e6c83a480d5e508ac6ac711fe71644d

diff --git a/oox/source/export/chartexport.cxx 
b/oox/source/export/chartexport.cxx
index 80bcfba..72ed205 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1058,7 +1058,7 @@ void ChartExport::exportTitle( Reference< XShape > xShape 
)
  if( bVertical )
  sWritingMode = "wordArtVert";

-sal_Int32 nRotation;
+sal_Int32 nRotation = 0;
  xPropSet->getPropertyValue("TextRotation") >>= nRotation;

  pFS->singleElement( FSNS( XML_a, XML_bodyPr ),


note that when bool operator >>=(Any const &, T & value) returns false, 
value is left unchanged

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

57 matches

Mail list logo