date:20150319

LibreOffice Gerrit News for core on 2015-03-19

2015-03-19 Thread gerrit

Moin!

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

 First time contributors doing great things! 
+ Optimize 'Breeze' icon theme
  in https://gerrit.libreoffice.org/14900 from Andrew Dent
  about module icon-themes
+ tdf#88001 -- Default document view, force single page rather than automat
  in https://gerrit.libreoffice.org/14835 from V Stuart Foote
  about module officecfg, sw
+ When opening a ScMetricInputDlg, the value in it is selected.
  in https://gerrit.libreoffice.org/14881 from Qiwen Gao
  about module include, sc, vcl
+ SkipImages option for document import
  in https://gerrit.libreoffice.org/14733 from Németh László
  about module filter, framework, include, sfx2, svtools, sw
+ tdf#89405 DOC export: fix corrupted comment order
  in https://gerrit.libreoffice.org/14841 from Piet van Oostrum
  about module sw
 End of freshness 

+ tdf#30716 Engineering notation
  in https://gerrit.libreoffice.org/14886 from Laurent BP
  about module basic, svl
+ tdf#60060: DOCX export of section protection
  in https://gerrit.libreoffice.org/14895 from Eilidh McAdam
  about module sw


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

+ move the cairo resize hack into vcl
  in https://gerrit.libreoffice.org/14897 from Caolán McNamara
+ tdf#74591 : Changes shortcut key prior and next to PgUp and PgDn
  in https://gerrit.libreoffice.org/14788 from Rishabh Kumar
+ vcl/text: fix duplicate text in fontwork tdf#81876
  in https://gerrit.libreoffice.org/14850 from Pierre-Eric Pelloux-Prayer
+ CppCheck cleaning : unnecessary affectation
  in https://gerrit.libreoffice.org/14853 from Michaël Lefèvre
+ move the cairo resize hack into vcl
  in https://gerrit.libreoffice.org/14894 from Caolán McNamara
+ Icon files optimized
  in https://gerrit.libreoffice.org/14888 from Andrew Dent
+ tdf#89783: sal_uInt16 replacement by size_t
  in https://gerrit.libreoffice.org/14892 from Vasily Melenchuk
+ tdf#87234 - Addition of many large and small breeze icons
  in https://gerrit.libreoffice.org/14891 from Yousuf Philips
+ move IsCairoWorking to vclplug level and rename
  in https://gerrit.libreoffice.org/14893 from Caolán McNamara


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

+ Adjustable hidden content removal in e-mails
  in https://gerrit.libreoffice.org/14889 from Stefan Heinemann


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

+ embeddedobj: convert emboleobj.*.component to constructor syntax
  in https://gerrit.libreoffice.org/14687 from Chris Sherlock
+ sc: use constructor syntax in sc.component
  in https://gerrit.libreoffice.org/14750 from Chris Sherlock
+ Convert ScDocument to constructor syntax, remove sc_component_getFactory(
  in https://gerrit.libreoffice.org/14751 from Chris Sherlock
+ scaddins: use constructor syntax for date.component
  in https://gerrit.libreoffice.org/14707 from Chris Sherlock
+ scaddins: use constructor syntax for pricing.component
  in https://gerrit.libreoffice.org/14706 from Chris Sherlock
+ scaddins: use constructor syntax for analysis.component
  in https://gerrit.libreoffice.org/14708 from Chris Sherlock
+ package: use constructor syntax in xstor.component
  in https://gerrit.libreoffice.org/14757 from Chris Sherlock
+ xmlsecurity: use constructor syntax in xsec_xmlsec.component
  in https://gerrit.libreoffice.org/14758 from Chris Sherlock
+ BUG - tdf#38835 strip out non-trivial globals before main
  in https://gerrit.libreoffice.org/14830 from Karthick Prasad
+ Basic: scanner should'nt use 0xFF mask on characters
  in https://gerrit.libreoffice.org/14682 from Arnaud Versini
+ Convert OS = LINUX conditionals to GUIBASE = unx.
  in https://gerrit.libreoffice.org/14790 from Ryo ONODERA
+ fdo#83672 , fdo#67776 : Fixed shape rotation angle in xlsx import.
  in https://gerrit.libreoffice.org/13090 from Sushil Shinde
+ tdf#85491 : break parameter incorrectly set in .XLSX import.
  in https://gerrit.libreoffice.org/12213 from Sushil Shinde
+ more breeze icons
  in https://gerrit.libreoffice.org/13058 from Jonathan Riddell
+ fdo#86606 removal of direct formatting options from the context menu
  in https://gerrit.libreoffice.org/13196 from Yousuf Philips
+ fdo#87441-Sending document as Email removes invisible content - this shou
  in https://gerrit.libreoffice.org/14549 from Charu Tyagi
+ Drop MAC_OS_X_VERSION_... variables
  in https://gerrit.libreoffice.org/13212 from Douglas Mencken
+ fdo#63905: fix regression by using paper size set in printer properties
  in https://gerrit.libreoffice.org/13763 from Clément Lassieur
+ jpeg-turbo: OpenCL for decompression of jpegs.
  in https://gerrit.libreoffice.org/13315 from Jan Holesovsky
+ GPU Calc:Support string parameter in SUMIF an SUMIFS.
  in https://gerrit.libreoffice.org/12044 from Hao Chen
+ vcl: Reduce OpenGLX11CairoTextRender surface area to size of text bounds
  in https://gerrit.libreoffice.org/14148 from Chris

[Libreoffice-commits] core.git: comphelper/source cui/inc cui/source dbaccess/source desktop/source filter/qa hwpfilter/qa include/comphelper include/sfx2 include/unotest lotuswordpro/qa package/qa sc

2015-03-19 Thread Noel Grandin

 comphelper/source/misc/mimeconfighelper.cxx|   36 ++---
 cui/inc/pch/precompiled_cui.hxx|1 
 cui/source/customize/macropg.cxx   |1 
 cui/source/dialogs/about.cxx   |1 
 cui/source/options/optsave.cxx |8 +-
 dbaccess/source/ui/dlg/ConnectionHelper.cxx|2 
 desktop/source/app/dispatchwatcher.cxx |8 +-
 filter/qa/cppunit/filters-dxf-test.cxx |4 -
 filter/qa/cppunit/filters-eps-test.cxx |4 -
 filter/qa/cppunit/filters-met-test.cxx |4 -
 filter/qa/cppunit/filters-pcd-test.cxx |4 -
 filter/qa/cppunit/filters-pcx-test.cxx |4 -
 filter/qa/cppunit/filters-pict-test.cxx|4 -
 filter/qa/cppunit/filters-ppm-test.cxx |4 -
 filter/qa/cppunit/filters-psd-test.cxx |4 -
 filter/qa/cppunit/filters-ras-test.cxx |4 -
 filter/qa/cppunit/filters-tga-test.cxx |4 -
 filter/qa/cppunit/filters-tiff-test.cxx|4 -
 hwpfilter/qa/cppunit/test_hwpfilter.cxx|4 -
 include/comphelper/documentconstants.hxx   |   57 +++-
 include/comphelper/mimeconfighelper.hxx|6 +-
 include/sfx2/docfac.hxx|1 
 include/sfx2/docfilt.hxx   |   15 ++---
 include/sfx2/fcontnr.hxx   |   33 +--
 include/sfx2/filedlghelper.hxx |5 -
 include/sfx2/sfxdefs.hxx   |   29 --
 include/unotest/filters-test.hxx   |8 +-
 lotuswordpro/qa/cppunit/test_lotuswordpro.cxx  |4 -
 package/qa/cppunit/test_package.cxx|4 -
 sc/inc/scdll.hxx   |1 
 sc/qa/unit/filters-test.cxx|4 -
 sc/qa/unit/helper/qahelper.cxx |   14 ++---
 sc/qa/unit/helper/qahelper.hxx |   26 -
 sc/qa/unit/opencl-test.cxx |4 -
 sc/qa/unit/subsequent_export-test.cxx  |4 -
 sc/qa/unit/subsequent_filters-test.cxx |   12 ++--
 sc/source/ui/docshell/docsh.cxx|2 
 sd/inc/sddll.hxx   |1 
 sd/qa/unit/filters-test.cxx|6 +-
 sd/qa/unit/sdmodeltestbase.hxx |   20 +++
 sd/source/ui/func/fuinsfil.cxx |   26 -
 sd/source/ui/view/sdview4.cxx  |2 
 sfx2/source/appl/appopen.cxx   |4 -
 sfx2/source/appl/shutdownicon.cxx  |2 
 sfx2/source/bastyp/fltfnc.cxx  |   30 +-
 sfx2/source/dialog/filedlghelper.cxx   |   18 +++---
 sfx2/source/doc/docfile.cxx|5 -
 sfx2/source/doc/docfilt.cxx|   10 +--
 sfx2/source/doc/guisaveas.cxx  |   58 ++---
 sfx2/source/doc/objserv.cxx|2 
 sfx2/source/doc/objstor.cxx|   26 -
 sfx2/source/view/frmload.cxx   |4 -
 sfx2/source/view/viewfrm.cxx   |2 
 sot/qa/cppunit/test_sot.cxx|4 -
 starmath/qa/extras/mmlimport-test.cxx  |2 
 svx/source/unodraw/unoshap2.cxx|2 
 sw/inc/swdll.hxx   |1 
 sw/qa/core/filters-test.cxx|   30 +-
 sw/qa/core/uwriter.cxx |2 
 sw/source/core/doc/docglbl.cxx |2 
 sw/source/core/unocore/unocrsrhelper.cxx   |2 
 sw/source/ui/dbui/mmdocselectpage.cxx  |2 
 sw/source/ui/dbui/mmoutputpage.cxx |6 +-
 sw/source/ui/envelp/mailmrge.cxx   |4 -
 sw/source/uibase/dbui/dbmgr.cxx|2 
 sw/source/uibase/dochdl/gloshdl.cxx|2 
 sw/source/uibase/uiview/srcview.cxx|2 
 sw/source/uibase/uiview/view2.cxx  |4 -
 unotest/source/cpp/filters-test.cxx|4 -
 vcl/qa/cppunit/graphicfilter/filters-test.cxx  |4 -
 writerfilter/qa/cppunittests/rtftok/testrtftok.cxx |4 -
 writerperfect/qa/unit/WpftImportTestBase.cxx   |2 
 writerperfect/qa/unit/WpftImportTestBase.hxx   |2 
 73 files changed, 302 insertions(+), 331 deletions(-)

New commits:
commit 48bb2913a7459edb17a5f62c2f6e6fbc4f1051e2
Author: Noel Grandin n...@peralex.com
Date:   Wed Mar 18 13:03:28 2015 +0200

convert SFX_FILTER_ constants to enum class

Change-Id: I7e53cfc90cefd9da7d6ecd795b09214bd44b1613

diff --git a/comphelper/source/misc/mimeconfighelper.cxx 
b/comphelper/source/misc/mimeconfighelper.cxx
index

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

2015-03-19 Thread Tor Lillqvist

 include/sfx2/docfilt.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 366af3559aa8e5767486f76e4a281f703a77ccea
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Mar 19 09:34:16 2015 +0200

SFX_FILTER_STARTPRESENTATION is unused now

Change-Id: I0b82e6d582ad7fa7e860a6b00d48444c65439671

diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index dad0da5..976ffd6 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -32,8 +32,6 @@
 #include sfx2/dllapi.h
 #include tools/wldcrd.hxx
 
-#define SFX_FILTER_STARTPRESENTATION 0x2000L
-
 class SfxFilterContainer;
 class SotStorage;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

“It breaks your heart forever”

2015-03-19 Thread John Tye - Avaaz

Dear friends,

The Syrian air force just dropped chlorine gas bombs on children. Their little
bodies gasped for air on hospital stretchers as medics held back tears, and
watched as they suffocated to death.

But today there is a chance to stop these barrel bomb murders with a targeted
No Fly Zone.

The US, Turkey, UK, France and others are right now seriously considering a
safe zone in Northern Syria. Advisers close to President Obama support it, but
he is worried he won’t have public support. That’s where we come in.

Let’s tell him we don’t want a world that just watches as a dictator drops
chemical weapons on families in the night. We want action.

One humanitarian worker said ‘I wish the world could see what I have seen with
my eyes. It breaks your heart forever.’ Let's show that the world cares -- sign
to support a life-saving No Fly Zone:

https://secure.avaaz.org/en/syria_safe_zone_loc/?bnKZdjbv=55490

This is not the first time Assad has used chemical weapons on his own people.
But this attack comes just days after the UN Security Council passed a
resolution condemning the use of chlorine gas in Syria. The Council threatened
further action in case of violation -- that means now!

A safe zone, enforced by the US, Turkey, UK, France and other governments, is a
modest step that can de-escalate the conflict and help stop the slaughter of
civilians. It would not drag the west into a ground war. Experts say the Syrian
military won’t be able to successfully challenge a No Fly Zone.

As long as Assad has control over the airspace, he will think he can win this
brutal war by bombing communities into submission. But if we support the No Fly
Zone, it can stop now -- let’s show Obama we want him to protect civilians. Add
your voice now:

https://secure.avaaz.org/en/syria_safe_zone_loc/?bnKZdjbv=55490

The numbers are numbing -- over 210,000 killed, 50% of the population driven
from their homes, 36% of hospitals destroyed, and almost 4,000 schools smashed.
Our community has rallied for years to support Syrians struggling for survival.
Let’s do it again, now.

With hope,

John, Mais, Nick, Alice, Rewan, Wissam, Ricken and the rest of the Avaaz team

SOURCES

Fresh allegations of chlorine gas attacks in Syria (The Guardian)
http://www.theguardian.com/world/2015/mar/17/fresh-allegations-of-chlorine-gas-attacks-in-syria

Syria escalates barrel bomb attacks as world attention shifts (Yahoo News)
http://news.yahoo.com/syria-escalates-barrel-bomb-attacks-world-attention-shifts-025623788.html

Will U.S. and Turkey Create a Syria No-Fly Zone? (Bloomberg View)
http://www.bloombergview.com/articles/2014-12-01/will-us-and-turkey-create-a-syria-safe-zone

Syria: Barrage of Barrel Bombs (Human Rights Watch)
http://www.hrw.org/news/2014/07/30/syria-barrage-barrel-bombs

Syria: The Policy Cul-De-Sac (Atlantic Council)
http://www.atlanticcouncil.org/blogs/menasource/syria-the-policy-cul-de-sac
Avaaz.org is a 41-million-person global
campaign network that works to ensure that the views and values of the world's
people shape global decision-making. (Avaaz means voice or song in many
languages.) Avaaz members live in every nation of the world; our team is spread
across 18 countries on 6 continents and operates in 17 languages. Learn about
some of Avaaz's biggest campaigns here:
http://www.avaaz.org/en/highlights.php/?footer; or follow us on facebook here:
http://www.facebook.com/Avaaz or twitter here: http://twitter.com/AvaazThis
message was sent to libreoffice@lists.freedesktop.org. To change your email
address, language, or other information, contact us here:
http://www.avaaz.org/en/contact/?footerWant to leave this list? Send a message
to unsubscr...@avaaz.org, or click here:
https://secure.avaaz.org/act/?r=unsubcl=7002537615email=libreoffice@lists.freedesktop.orgv=55490lang=enTo
contact Avaaz, please do not reply to this email. Instead, write to us via the
form at http://www.avaaz.org/en/contact. You can also call us at
+1-888-922-8229 (US).

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

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

2015-03-19 Thread Caolán McNamara

 canvas/source/cairo/cairo_textlayout.cxx  |   43 +-
 canvas/source/cairo/cairo_win32_cairo.cxx |   38 --
 canvas/source/cairo/cairo_win32_cairo.hxx |2 -
 3 files changed, 42 insertions(+), 41 deletions(-)

New commits:
commit b517c251a733692f39d02f986e5010f214aea697
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Mar 19 15:59:56 2015 +

move ucs4toindex

Change-Id: I8ae441a68ba74422c607a8830325c3afa954ad92
Reviewed-on: https://gerrit.libreoffice.org/14908
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/canvas/source/cairo/cairo_textlayout.cxx 
b/canvas/source/cairo/cairo_textlayout.cxx
index 9b1fa47..936593a 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -325,6 +325,47 @@ namespace cairocanvas
 return true;
 }
 
+#ifdef CAIRO_HAS_WIN32_SURFACE
+namespace
+{
+/**
+ * cairo::ucs4toindex: Convert ucs4 char to glyph index
+ * @param ucs4 an ucs4 char
+ * @param hfont current font
+ *
+ * @return true if successful
+ **/
+unsigned long ucs4toindex(unsigned int ucs4, HFONT hfont)
+{
+wchar_t unicode[2];
+WORD glyph_index;
+HDC hdc = NULL;
+
+hdc = CreateCompatibleDC (NULL);
+
+if (!hdc) return 0;
+if (!SetGraphicsMode (hdc, GM_ADVANCED))
+{
+DeleteDC (hdc);
+return 0;
+}
+
+SelectObject (hdc, hfont);
+SetMapMode (hdc, MM_TEXT);
+
+unicode[0] = ucs4;
+unicode[1] = 0;
+if (GetGlyphIndicesW (hdc, unicode, 1, glyph_index, 0) == 
GDI_ERROR)
+{
+glyph_index = 0;
+}
+
+DeleteDC (hdc);
+return glyph_index;
+}
+}
+#endif
+
   /**
* TextLayout::draw
*
@@ -446,7 +487,7 @@ namespace cairocanvas
 #ifdef CAIRO_HAS_WIN32_SURFACE
 // Cairo requires standard glyph indexes (ETO_GLYPH_INDEX), 
while vcl/win/* uses ucs4 chars.
 // Convert to standard indexes
-aGlyph.index = cairo::ucs4toindex((unsigned int) aGlyph.index, 
rSysFontData.hFont);
+aGlyph.index = ucs4toindex((unsigned int) aGlyph.index, 
rSysFontData.hFont);
 #endif
 aGlyph.x = systemGlyph.x;
 aGlyph.y = systemGlyph.y;
diff --git a/canvas/source/cairo/cairo_win32_cairo.cxx 
b/canvas/source/cairo/cairo_win32_cairo.cxx
index a54c7e1..d6a4aba 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.cxx
@@ -249,44 +249,6 @@ namespace cairo
 return SurfaceSharedPtr();
 }
 
-
-/**
- * cairo::ucs4toindex: Convert ucs4 char to glyph index
- * @param ucs4 an ucs4 char
- * @param hfont current font
- *
- * @return true if successful
- **/
-unsigned long ucs4toindex(unsigned int ucs4, HFONT hfont)
-{
-wchar_t unicode[2];
-WORD glyph_index;
-HDC hdc = NULL;
-
-hdc = CreateCompatibleDC (NULL);
-
-if (!hdc) return 0;
-if (!SetGraphicsMode (hdc, GM_ADVANCED))
-{
-DeleteDC (hdc);
-return 0;
-}
-
-SelectObject (hdc, hfont);
-SetMapMode (hdc, MM_TEXT);
-
-unicode[0] = ucs4;
-unicode[1] = 0;
-if (GetGlyphIndicesW (hdc, unicode, 1, glyph_index, 0) == GDI_ERROR)
-{
-glyph_index = 0;
-}
-
-DeleteDC (hdc);
-return glyph_index;
-}
-
-
 }  // namespace cairo
 
 #endif   // CAIRO_HAS_WIN32_SURFACE
diff --git a/canvas/source/cairo/cairo_win32_cairo.hxx 
b/canvas/source/cairo/cairo_win32_cairo.hxx
index 50bd137..6df30f5 100644
--- a/canvas/source/cairo/cairo_win32_cairo.hxx
+++ b/canvas/source/cairo/cairo_win32_cairo.hxx
@@ -49,8 +49,6 @@ namespace cairo {
 
 int getDepth() const;
 };
-
-unsigned long ucs4toindex(unsigned int ucs4, HFONT hfont);
 }
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 4.4.3.0.0+ build fails (unit tests)

2015-03-19 Thread Norbert Thiebaud

On Thu, Mar 19, 2015 at 9:01 AM, Miklos Vajna vmik...@collabora.co.uk wrote:
 Hi Justin,

 On Thu, Mar 19, 2015 at 04:32:35PM +0300, Justin Luth justin_l...@sil.org 
 wrote:
 P.S.  I have not been able to figure out how to remove a file from a
 commit if I add it accidentally.  If I do a git commit -a and get an
 unintended file, how do I amend the commit to ignore the file?  (That
 is what happened here.)

 rm file, then git commit -a --amend

or

git rm file
git commit --amend

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

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/Module_vcl.mk

2015-03-19 Thread Kay Schenk

 vcl/Module_vcl.mk |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 1b4025b58e01bcc3151d2b32ed4a3a99c7329245
Author: Kay Schenk ksch...@apache.org
Date:   Thu Mar 19 21:37:55 2015 +

#126118# Fix malformed if statements in makefile.

diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 3779f68..6272197 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -38,17 +38,19 @@ $(eval $(call gb_Module_add_targets,vcl,\
 Library_desktop_detector \
 ))
 
-ifneq ($(ENABLE_GTK),)
+
+ifeq ($(ENABLE_GTK),TRUE)
 $(eval $(call gb_Module_add_targets,vcl,\
 Library_vclplug_gtk \
 ))
 endif
-ifneq ($(ENABLE_KDE),)
+
+ifeq ($(ENABLE_KDE),TRUE)
 $(eval $(call gb_Module_add_targets,vcl,\
 Library_vclplug_kde \
 ))
 endif
-ifneq ($(ENABLE_KDE4),)
+ifeq ($(ENABLE_KDE4),TRUE)
 $(eval $(call gb_Module_add_targets,vcl,\
 Library_vclplug_kde4 \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-19 Thread Bjoern Michaelsen

 sw/inc/calbck.hxx|  191 ++-
 sw/inc/switerator.hxx|   68 
 sw/source/core/access/accmap.cxx |2 
 sw/source/core/attr/calbck.cxx   |   26 +--
 sw/source/core/attr/cellatr.cxx  |2 
 sw/source/core/crsr/annotationmark.cxx   |2 
 sw/source/core/crsr/crstrvl.cxx  |2 
 sw/source/core/doc/DocumentFieldsManager.cxx |2 
 sw/source/core/doc/DocumentStatisticsManager.cxx |2 
 sw/source/core/doc/doc.cxx   |2 
 sw/source/core/doc/docdraw.cxx   |2 
 sw/source/core/doc/docfld.cxx|2 
 sw/source/core/doc/docfly.cxx|2 
 sw/source/core/doc/docglbl.cxx   |2 
 sw/source/core/doc/docnum.cxx|2 
 sw/source/core/doc/doctxm.cxx|2 
 sw/source/core/doc/fmtcol.cxx|2 
 sw/source/core/doc/htmltbl.cxx   |2 
 sw/source/core/doc/tblrwcl.cxx   |2 
 sw/source/core/docnode/ndtbl.cxx |2 
 sw/source/core/docnode/ndtbl1.cxx|2 
 sw/source/core/docnode/node.cxx  |2 
 sw/source/core/docnode/node2lay.cxx  |2 
 sw/source/core/docnode/section.cxx   |2 
 sw/source/core/docnode/swbaslnk.cxx  |2 
 sw/source/core/draw/dcontact.cxx |2 
 sw/source/core/edit/edfld.cxx|2 
 sw/source/core/edit/edfldexp.cxx |2 
 sw/source/core/edit/editsh.cxx   |2 
 sw/source/core/fields/authfld.cxx|2 
 sw/source/core/fields/dbfld.cxx  |2 
 sw/source/core/fields/ddefld.cxx |2 
 sw/source/core/fields/docufld.cxx|2 
 sw/source/core/fields/expfld.cxx |2 
 sw/source/core/fields/fldbas.cxx |2 
 sw/source/core/fields/fldlst.cxx |2 
 sw/source/core/fields/postithelper.cxx   |2 
 sw/source/core/fields/reffld.cxx |2 
 sw/source/core/fields/tblcalc.cxx|2 
 sw/source/core/frmedt/feshview.cxx   |2 
 sw/source/core/frmedt/tblsel.cxx |2 
 sw/source/core/layout/atrfrm.cxx |2 
 sw/source/core/layout/colfrm.cxx |2 
 sw/source/core/layout/findfrm.cxx|2 
 sw/source/core/layout/flowfrm.cxx|2 
 sw/source/core/layout/fly.cxx|2 
 sw/source/core/layout/flypos.cxx |2 
 sw/source/core/layout/frmtool.cxx|2 
 sw/source/core/layout/ftnfrm.cxx |2 
 sw/source/core/layout/movedfwdfrmsbyobjpos.cxx   |2 
 sw/source/core/layout/pagechg.cxx|2 
 sw/source/core/layout/pagedesc.cxx   |2 
 sw/source/core/layout/paintfrm.cxx   |2 
 sw/source/core/layout/softpagebreak.cxx  |2 
 sw/source/core/layout/tabfrm.cxx |2 
 sw/source/core/table/swnewtable.cxx  |2 
 sw/source/core/table/swtable.cxx |2 
 sw/source/core/text/EnhancedPDFExportHelper.cxx  |2 
 sw/source/core/text/itratr.cxx   |2 
 sw/source/core/text/porlay.cxx   |2 
 sw/source/core/text/txtdrop.cxx  |2 
 sw/source/core/text/txtfrm.cxx   |2 
 sw/source/core/tox/tox.cxx   |2 
 sw/source/core/txtnode/atrflyin.cxx  |2 
 sw/source/core/txtnode/atrftn.cxx|2 
 sw/source/core/txtnode/ndtxt.cxx |2 
 sw/source/core/undo/unattr.cxx   |2 
 sw/source/core/undo/untbl.cxx|2 
 sw/source/core/unocore/unocoll.cxx   |2 
 sw/source/core/unocore/unodraw.cxx   |2 
 sw/source/core/unocore/unofield.cxx  |2 
 sw/source/core/unocore/unoframe.cxx  |2 
 sw/source/core/unocore/unoobj2.cxx   |2 
 sw/source/core/unocore/unoportenum.cxx   |2 
 sw/source/core/unocore/unoredlines.cxx   |2 
 sw/source/core/unocore/unotbl.cxx|2 
 sw/source/core/view/vnew.cxx |2 
 sw/source/filter/ww8/ww8atr.cxx  |2 
 sw/source/filter/xml/xmltexti.cxx|2 
 sw/source/ui/fldui/fldpage.cxx   |2 
 sw/source/uibase/app/docsh.cxx   |2 
 sw/source/uibase/dochdl/swdtflvr.cxx |2 
 sw/source/uibase/docvw/PostItMgr.cxx |2 
 sw/source/uibase/shells/textfld.cxx  |2 
 sw/source/uibase/uno/unotxvw.cxx |2 
 85 files changed, 214

[Libreoffice-commits] core.git: translations

2015-03-19 Thread Andras Timar

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

New commits:
commit f54bc1365de88efc82ddfee86f4a24bc132d8e9c
Author: Andras Timar andras.ti...@collabora.com
Date:   Thu Mar 19 23:08:51 2015 +0100

Updated core
Project: translations  6a11450be8a19648f3f76d7b9a098a9ef7c4d76e

diff --git a/translations b/translations
index add7a7e..6a11450 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit add7a7e0967a3fc04666ba061d81d1ba9b326554
+Subproject commit 6a11450be8a19648f3f76d7b9a098a9ef7c4d76e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: source/sl

2015-03-19 Thread Andras Timar

 source/sl/basctl/uiconfig/basicide/ui.po   |   40 
 source/sl/cui/source/dialogs.po|   24 
 source/sl/cui/source/options.po|   45 
 source/sl/cui/uiconfig/ui.po   |  516 +-
 source/sl/dbaccess/source/ui/dlg.po|   10 
 source/sl/dbaccess/uiconfig/ui.po  |  359 -
 source/sl/desktop/uiconfig/ui.po   |4 
 source/sl/extensions/source/bibliography.po|   10 
 source/sl/extensions/source/scanner.po |  254 -
 source/sl/extensions/uiconfig.po   |  142 
 source/sl/filter/source/config/fragments/filters.po|  554 +-
 source/sl/filter/source/config/fragments/types.po  |   29 
 source/sl/filter/source/pdf.po |   20 
 source/sl/filter/uiconfig/ui.po|   27 
 source/sl/formula/source/core/resource.po  |  149 
 source/sl/fpicker/uiconfig/ui.po   |   13 
 source/sl/framework/source/classes.po  |4 
 source/sl/helpcontent2/source/text/sbasic/guide.po |   12 
 source/sl/helpcontent2/source/text/sbasic/shared/01.po |   20 
 source/sl/helpcontent2/source/text/scalc.po|   22 
 source/sl/helpcontent2/source/text/scalc/01.po | 2114 
++
 source/sl/helpcontent2/source/text/scalc/04.po |   16 
 source/sl/helpcontent2/source/text/scalc/05.po |  254 +
 source/sl/helpcontent2/source/text/scalc/guide.po  |   24 
 source/sl/helpcontent2/source/text/sdraw/guide.po  |8 
 source/sl/helpcontent2/source/text/shared/00.po|   36 
 source/sl/helpcontent2/source/text/shared/01.po|  324 -
 source/sl/helpcontent2/source/text/shared/02.po|   36 
 source/sl/helpcontent2/source/text/shared/explorer/database.po |   14 
 source/sl/helpcontent2/source/text/shared/guide.po |   50 
 source/sl/helpcontent2/source/text/shared/optionen.po  |   56 
 source/sl/helpcontent2/source/text/simpress/01.po  |   72 
 source/sl/helpcontent2/source/text/simpress/04.po  |   16 
 source/sl/helpcontent2/source/text/swriter.po  |   20 
 source/sl/helpcontent2/source/text/swriter/01.po   |  100 
 source/sl/helpcontent2/source/text/swriter/02.po   |   48 
 source/sl/helpcontent2/source/text/swriter/04.po   |   14 
 source/sl/helpcontent2/source/text/swriter/guide.po|   36 
 source/sl/helpcontent2/source/text/swriter/librelogo.po|   12 
 source/sl/officecfg/registry/data/org/openoffice/Office.po |   54 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po  |  455 +-
 source/sl/sc/source/ui/StatisticsDialogs.po|4 
 source/sl/sc/source/ui/drawfunc.po |   28 
 source/sl/sc/source/ui/src.po  |  861 +---
 source/sl/sc/uiconfig/scalc/ui.po  |  449 --
 source/sl/scp2/source/accessories.po   |   16 
 source/sl/scp2/source/impress.po   |   22 
 source/sl/scp2/source/ooo.po   |   44 
 source/sl/sd/source/core.po|  100 
 source/sl/sd/source/filter/html.po |  557 --
 source/sl/sd/source/ui/app.po  |   91 
 source/sl/sd/source/ui/dlg.po  |  460 --
 source/sl/sd/uiconfig/simpress/ui.po   |  485 ++
 source/sl/sfx2/source/dialog.po|   12 
 source/sl/sfx2/source/doc.po   |   12 
 source/sl/sfx2/source/sidebar.po   |   15 
 source/sl/sfx2/uiconfig/ui.po  |   32 
 source/sl/starmath/source.po   |   56 
 source/sl/starmath/uiconfig/smath/ui.po|   13 
 source/sl/svtools/uiconfig/ui.po   |  115 
 source/sl/svx/source/dialog.po |  590 +-
 source/sl/svx/source/engine3d.po   |  785 ---
 source/sl/svx/source/form.po   |   12 
 source/sl/svx/source/gallery2.po   |   12 
 source/sl/svx/source/sidebar/paragraph.po  |  512 --
 source/sl/svx/source/stbctrls.po   |4 
 source/sl/svx/source/tbxctrls.po   |  214 -
 source/sl/svx/uiconfig/ui.po   | 1535 ++-
 source/sl/sw/source/ui/app.po

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

2015-03-19 Thread Caolán McNamara

 comphelper/source/misc/mimeconfighelper.cxx |   10 --
 include/comphelper/mimeconfighelper.hxx |2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 944d1fd5ca97969bc2cf45376737813c588f6637
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Mar 19 10:21:05 2015 +

fix windows build and sal_Bool-bool

Change-Id: If88a5b1171ef0b586861dd071820bc993c4cf06e

diff --git a/comphelper/source/misc/mimeconfighelper.cxx 
b/comphelper/source/misc/mimeconfighelper.cxx
index 17269a3..361cc00 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -696,23 +696,21 @@ SfxFilterFlags MimeConfigurationHelper::GetFilterFlags( 
const OUString aFilterN
 return nFlags;
 }
 
-sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
+bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
 uno::Sequence beans::PropertyValue  aMediaDescr )
 {
-sal_Bool bResult = sal_False;
-
 OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, 
sal_False );
 if ( !aFilterName.isEmpty() )
 {
 SfxFilterFlags nFlags = GetFilterFlags( aFilterName );
 // check the OWN flag
-bResult = ( nFlags  SfxFilterFlags::OWN );
+return bool(nFlags  SfxFilterFlags::OWN);
 }
 
-return bResult;
+return false;
 }
-#endif
 
+#endif
 
 OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const 
OUString aServiceName, sal_Int32 nVersion )
 {
diff --git a/include/comphelper/mimeconfighelper.hxx 
b/include/comphelper/mimeconfighelper.hxx
index 5ba0eb9..4791109 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -115,7 +115,7 @@ public:
 #ifdef WNT
 SfxFilterFlags GetFilterFlags( const OUString aFilterName );
 
-sal_Bool AddFilterNameCheckOwnFile(
+bool AddFilterNameCheckOwnFile(
 ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  aMediaDescr );
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - configure.ac

2015-03-19 Thread Miklos Vajna

 configure.ac |   12 
 1 file changed, 12 insertions(+)

New commits:
commit be1e711aab64ec56f07fda40c4670c5415832a1c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Mar 19 10:08:26 2015 +0100

android: add a check for the installed memory in the machine

... and just error out with  16G and all symbols. Should help newcomers
who have e.g. 8GB of memory, build with dbgutil, but then unable to
complete the build as the linker never finishes.

Change-Id: I9f3ad5c6d76a18d6aa5b0b2d61aa115ed441b8e3

diff --git a/configure.ac b/configure.ac
index e8d4fe8..57fcdb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3858,6 +3858,18 @@ else
 fi
 AC_SUBST(ENABLE_SYMBOLS)
 
+if test -n $with_android_ndk -a \( -n $ENABLE_SYMBOLS -o -n 
$ENABLE_DEBUG -o -n $ENABLE_DBGUTIL \) -a $ENABLE_DEBUGINFO_FOR = all; 
then
+# Building on Android with full symbols: without enough memory the linker 
never finishes currently.
+AC_MSG_CHECKING([whether enough memory is available for linking])
+mem_size=$(grep -o 'MemTotal: *.\+ kB' /proc/meminfo | sed 's/MemTotal: 
*\(.\+\) kB/\1/')
+# Check for 15GB, as Linux reports a bit less than the physical memory 
size.
+if test -n $mem_size -a $mem_size -lt 15728640; then
+AC_MSG_ERROR([building with full symbols and less than 16GB of memory 
is not supported])
+else
+AC_MSG_RESULT([yes])
+fi
+fi
+
 # Debug information format for iOS. Running dsymutil takes a long time... you 
really need a separate
 # .dSYM only if running Instruments, I think. (Not for normal debugging in 
Xcode.) To enable a
 # separate .dSYM, either use --enable-release-build or change manually to 
DWARF with DSYM in Xcode.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-19 Thread Caolán McNamara

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

New commits:
commit 0597e4be3eb1be2987db28507055126bc5a26421
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Mar 19 10:25:39 2015 +

WaE: -Werror=maybe-uninitialized

Change-Id: I310099e8e12fb6440e98fbca97af512a4f872ac0

diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 78d1897..e759875e 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -998,7 +998,7 @@ void SfxFilterContainer::ReadSingleFilter_Impl(
 }
 else if ( lFilterProperties[nFilterProperty].Name == Flags )
 {
-sal_Int32 nTmp;
+sal_Int32 nTmp(0);
 lFilterProperties[nFilterProperty].Value = nTmp;
 nFlags = static_castSfxFilterFlags(nTmp);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-19 Thread Miklos Vajna

 sw/source/filter/ww8/docxsdrexport.cxx |8 +++-
 sw/source/filter/ww8/docxsdrexport.hxx |2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 5b55db59f93d526e7c2e192194aa562c640cce16
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Mar 19 09:16:16 2015 +0100

DocxSdrExport::Impl: use std::unique_ptr for m_pFlyFillAttrList

Change-Id: I134f375f3785beb05f320be67990d3b2d572d46f

diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index a642b17..0f0bc3a 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -140,7 +140,7 @@ struct DocxSdrExport::Impl
 bool m_bParagraphSdtOpen;
 bool m_bParagraphHasDrawing; ///Flag for checking drawing in a paragraph.
 bool m_bFlyFrameGraphic;
-sax_fastparser::FastAttributeList* m_pFlyFillAttrList;
+std::unique_ptrsax_fastparser::FastAttributeList m_pFlyFillAttrList;
 sax_fastparser::FastAttributeList* m_pFlyWrapAttrList;
 sax_fastparser::FastAttributeList* m_pBodyPrAttrList;
 sax_fastparser::FastAttributeList* m_pDashLineStyleAttr;
@@ -166,7 +166,6 @@ struct DocxSdrExport::Impl
   m_bParagraphSdtOpen(false),
   m_bParagraphHasDrawing(false),
   m_bFlyFrameGraphic(false),
-  m_pFlyFillAttrList(0),
   m_pFlyWrapAttrList(0),
   m_pBodyPrAttrList(0),
   m_pDashLineStyleAttr(0),
@@ -263,7 +262,7 @@ void DocxSdrExport::setParagraphHasDrawing(bool 
bParagraphHasDrawing)
 m_pImpl-m_bParagraphHasDrawing = bParagraphHasDrawing;
 }
 
-sax_fastparser::FastAttributeList* DocxSdrExport::getFlyFillAttrList()
+std::unique_ptrsax_fastparser::FastAttributeList 
DocxSdrExport::getFlyFillAttrList()
 {
 return m_pImpl-m_pFlyFillAttrList;
 }
@@ -1618,8 +1617,7 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame* 
pParentFrame, bool bTextBoxOnly
 m_pImpl-textFrameShadow(rFrmFmt);
 if (m_pImpl-m_pFlyFillAttrList)
 {
-sax_fastparser::XFastAttributeListRef 
xFlyFillAttrList(m_pImpl-m_pFlyFillAttrList);
-m_pImpl-m_pFlyFillAttrList = NULL;
+sax_fastparser::XFastAttributeListRef 
xFlyFillAttrList(m_pImpl-m_pFlyFillAttrList.release());
 pFS-singleElementNS(XML_v, XML_fill, xFlyFillAttrList);
 }
 if (m_pImpl-m_pDashLineStyleAttr)
diff --git a/sw/source/filter/ww8/docxsdrexport.hxx 
b/sw/source/filter/ww8/docxsdrexport.hxx
index da2d975..a086b2a 100644
--- a/sw/source/filter/ww8/docxsdrexport.hxx
+++ b/sw/source/filter/ww8/docxsdrexport.hxx
@@ -76,7 +76,7 @@ public:
 bool IsDMLAndVMLDrawingOpen();
 bool IsParagraphHasDrawing();
 void setParagraphHasDrawing(bool bParagraphHasDrawing);
-sax_fastparser::FastAttributeList* getFlyFillAttrList();
+std::unique_ptrsax_fastparser::FastAttributeList getFlyFillAttrList();
 sax_fastparser::FastAttributeList* getFlyWrapAttrList();
 void setFlyWrapAttrList(sax_fastparser::FastAttributeList* pAttrList);
 /// Attributes of wps:bodyPr, used during DML export of text frames.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/comphelper

2015-03-19 Thread Noel Grandin

 include/comphelper/mimeconfighelper.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit adef956348b9ad0420a482367f34ca1df81ab159
Author: Noel Grandin n...@peralex.com
Date:   Thu Mar 19 10:34:15 2015 +0200

fix windows build(2)

after my commit 48bb2913a7459edb17a5f62c2f6e6fbc4f1051e2
convert SFX_FILTER_ constants to enum class

Change-Id: I4e8e04bb5b9f2493281826fb156fee51cf40

diff --git a/include/comphelper/mimeconfighelper.hxx 
b/include/comphelper/mimeconfighelper.hxx
index 9f9d9fd..5ba0eb9 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -113,7 +113,7 @@ public:
 ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  aMediaDescr,
 ::com::sun::star::uno::Sequence 
::com::sun::star::beans::NamedValue  aObject );
 #ifdef WNT
-sal_Int32 GetFilterFlags( const OUString aFilterName );
+SfxFilterFlags GetFilterFlags( const OUString aFilterName );
 
 sal_Bool AddFilterNameCheckOwnFile(
 ::com::sun::star::uno::Sequence 
::com::sun::star::beans::PropertyValue  aMediaDescr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-19 Thread Noel Grandin

 comphelper/source/misc/mimeconfighelper.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4d2de5816378d119d78e81f60075c88baec8fef2
Author: Noel Grandin n...@peralex.com
Date:   Thu Mar 19 09:55:37 2015 +0200

fix windows build

after my commit 48bb2913a7459edb17a5f62c2f6e6fbc4f1051e2
convert SFX_FILTER_ constants to enum class

Change-Id: Ieaf524e076f5ecfe16b312a310cd6f5cb8bd637d

diff --git a/comphelper/source/misc/mimeconfighelper.cxx 
b/comphelper/source/misc/mimeconfighelper.cxx
index 806fc64..17269a3 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -671,9 +671,9 @@ OUString 
MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
 
 #ifdef WNT
 
-sal_Int32 MimeConfigurationHelper::GetFilterFlags( const OUString aFilterName 
)
+SfxFilterFlags MimeConfigurationHelper::GetFilterFlags( const OUString 
aFilterName )
 {
-sal_Int32 nFlags = 0;
+SfxFilterFlags nFlags = SfxFilterFlags::NONE;
 try
 {
 if ( !aFilterName.isEmpty() )
@@ -687,7 +687,7 @@ sal_Int32 MimeConfigurationHelper::GetFilterFlags( const 
OUString aFilterName )
 if ( aFilterAny = aData )
 {
 SequenceAsHashMap aFilterHM( aData );
-nFlags = aFilterHM.getUnpackedValueOrDefault( Flags, 
(sal_Int32)0 );
+nFlags = 
static_castSfxFilterFlags(aFilterHM.getUnpackedValueOrDefault( Flags, 
(sal_Int32)0 ));
 }
 }
 } catch( uno::Exception )
@@ -704,7 +704,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
 OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, 
sal_False );
 if ( !aFilterName.isEmpty() )
 {
-sal_Int32 nFlags = GetFilterFlags( aFilterName );
+SfxFilterFlags nFlags = GetFilterFlags( aFilterName );
 // check the OWN flag
 bResult = ( nFlags  SfxFilterFlags::OWN );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - libreofficekit/qa

2015-03-19 Thread Miklos Vajna

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 060c443e2b0b400a376f9e6ae48f178c6c8ec173
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Mar 19 10:43:46 2015 +0100

gtktiledviewer: remove unimplemented gtk-zoom-fit button

Change-Id: Iaecedd01d7e7bba90e49ddaa5f36859d9218242d

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 5b7fa65..755b3b2 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -73,10 +73,6 @@ void changeZoom( GtkWidget* pButton, gpointer /* pItem */ )
 {
 fZoom = 1;
 }
-else if ( strcmp(sName, gtk-zoom-fit) == 0)
-{
-// TODO -- will need access to lokdocview internals?
-}
 else if ( strcmp(sName, gtk-zoom-out) == 0)
 {
 for ( unsigned int i = 0; i  sizeof( fZooms ) / sizeof( fZooms[0] ); 
i++ )
@@ -287,10 +283,6 @@ int main( int argc, char* argv[] )
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoom1, -1);
 g_signal_connect( G_OBJECT(pZoom1), clicked, G_CALLBACK(changeZoom), 
NULL );
 
-GtkToolItem* pZoomFit = gtk_tool_button_new_from_stock( GTK_STOCK_ZOOM_FIT 
);
-gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoomFit, -1);
-g_signal_connect( G_OBJECT(pZoomFit), clicked, G_CALLBACK(changeZoom), 
NULL );
-
 GtkToolItem* pZoomOut = gtk_tool_button_new_from_stock( GTK_STOCK_ZOOM_OUT 
);
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pZoomOut, -1);
 g_signal_connect( G_OBJECT(pZoomOut), clicked, G_CALLBACK(changeZoom), 
NULL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cli_ure/source include/o3tl include/sal pyuno/source solenv/gcc-wrappers

2015-03-19 Thread Tor Lillqvist

 cli_ure/source/climaker/climaker_app.cxx  |8 
 cli_ure/source/climaker/climaker_emit.cxx |5 -
 include/o3tl/typed_flags_set.hxx  |   12 +++-
 include/sal/log.hxx   |   12 
 pyuno/source/module/pyuno_impl.hxx|2 +-
 solenv/gcc-wrappers/wrapper.cxx   |2 --
 6 files changed, 4 insertions(+), 37 deletions(-)

New commits:
commit a251fe4d48237a4d9c9530dafc7bbdce6028e9cf
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Mar 19 10:57:17 2015 +0200

We require MSVC2013 (_MSC_VER == 1800) now

Change-Id: Ice8504041f22e00f2e5010813d9dff1d2987c8d6

diff --git a/cli_ure/source/climaker/climaker_app.cxx 
b/cli_ure/source/climaker/climaker_app.cxx
index b8e3f0f..42381ad 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -630,20 +630,12 @@ SAL_IMPLEMENT_MAIN()
 
 if (g_verbose)
 {
-#if _MSC_VER  1700
-// Bogus: warning C4564: method 'CheckInvalidPathChars' of class 
'System::IO::Path' defines unsupported default parameter 'checkAdditional'
-#pragma warning (push)
-#pragma warning (disable: 4564)
-#endif
 ::System::Console::Write(
  saving assembly {0}{1}{2}...,
 output_dir,
 gcnew ::System::String(
 ::System::IO::Path::DirectorySeparatorChar, 1 ),
 output_file );
-#if _MSC_VER  1700
-#pragma warning (pop)
-#endif
 }
 assembly_builder-Save( output_file );
 if (g_verbose)
diff --git a/cli_ure/source/climaker/climaker_emit.cxx 
b/cli_ure/source/climaker/climaker_emit.cxx
index 6f0de95..8706c3c 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -876,11 +876,6 @@ Assembly ^ TypeEmitter::type_resolve(
  MethodAttributes::Virtual |
  MethodAttributes::NewSlot |
  MethodAttributes::HideBySig);
-//#if defined(_MSC_VER)  (_MSC_VER  1400)
-// MethodAttributes::Instance);
-//#else
-//   Instance);
-//#endif
 
 if (TypeClass_INTERFACE_METHOD == xMember-getTypeClass())
 {
diff --git a/include/o3tl/typed_flags_set.hxx b/include/o3tl/typed_flags_set.hxx
index 4b6e4f5..3e96003 100644
--- a/include/o3tl/typed_flags_set.hxx
+++ b/include/o3tl/typed_flags_set.hxx
@@ -58,15 +58,9 @@ struct is_typed_flags {
 
 operator E() { return static_castE(value_); }
 
-#if !defined _MSC_VER || _MSC_VER  1700
-explicit
-#endif
-operator typename underlying_typeE::type() { return value_; }
-
-#if !defined _MSC_VER || _MSC_VER  1700
-explicit
-#endif
-operator bool() { return value_ != 0; }
+explicit operator typename underlying_typeE::type() { return value_; 
}
+
+explicit operator bool() { return value_ != 0; }
 
 private:
 typename underlying_typeE::type value_;
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 563ed57..62cdb77 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -74,27 +74,18 @@ template typename T  inline StreamIgnore operator (
 SAL_UNUSED_PARAMETER StreamStart const , SAL_UNUSED_PARAMETER T const )
 {
 std::abort();
-#if defined _MSC_VER  _MSC_VER  1700
-return StreamIgnore();
-#endif
 }
 
 template typename T  inline StreamIgnore operator (
 SAL_UNUSED_PARAMETER StreamString const , SAL_UNUSED_PARAMETER T const )
 {
 std::abort();
-#if defined _MSC_VER  _MSC_VER  1700
-return StreamIgnore();
-#endif
 }
 
 template typename T  inline StreamIgnore operator (
 SAL_UNUSED_PARAMETER StreamIgnore const , SAL_UNUSED_PARAMETER T const )
 {
 std::abort();
-#if defined _MSC_VER  _MSC_VER  1700
-return StreamIgnore();
-#endif
 }
 
 template typename T  typename T::Result getResult(T const );
@@ -103,9 +94,6 @@ inline char const * unwrapStream(StreamString const  s) { 
return s.string; }
 
 inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const ) {
 std::abort();
-#if defined _MSC_VER  _MSC_VER  1700
-return 0;
-#endif
 }
 
 } }
diff --git a/pyuno/source/module/pyuno_impl.hxx 
b/pyuno/source/module/pyuno_impl.hxx
index 83fbda5..e066b73 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_PYUNO_SOURCE_MODULE_PYUNO_IMPL_HXX
 #define INCLUDED_PYUNO_SOURCE_MODULE_PYUNO_IMPL_HXX
 
-#if defined(_MSC_VER)  (_MSC_VER = 1600)
+#if defined(_MSC_VER)
 // Workaround for some horrible hypot() mess
 #include math.h
 #endif
diff --git a/solenv/gcc-wrappers/wrapper.cxx b/solenv/gcc-wrappers/wrapper.cxx
index 918a9b5..9dacb26 100644
--- a/solenv/gcc-wrappers/wrapper.cxx
+++ b/solenv/gcc-wrappers/wrapper.cxx
@@ -118,9 +118,7 @@ string processccargs(vectorstring rawargs) {
 }
 else if(*i == -g) {
 args.append(-Zi);
-#if _MSC_VER = 1800
 args.append( -FS);
-#endif
 }
 else

Re: Crash test update

2015-03-19 Thread Caolán McNamara

On Tue, 2015-03-17 at 10:40 +, Crashtest VM wrote:
 New crashtest update available at 
 http://dev-builds.libreoffice.org/crashtest/ea7f16bf0b5e195d65e51c624b0fb37980bf2b95/

The hundreds of presentation import failures should now be fixed with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=8a5069cbaacf8a78ee66d6d8f2a46daefe1bec56

C.

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

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

2015-03-19 Thread Noel Grandin

 desktop/source/app/dispatchwatcher.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8d6062a120a70f155e296c72a856cde2c5d142c
Author: Noel Grandin n...@peralex.com
Date:   Thu Mar 19 12:29:25 2015 +0200

fix android build

workaround template issue

Change-Id: Ifeb828685b3f63159249211aa32a90dcba2e5570

diff --git a/desktop/source/app/dispatchwatcher.cxx 
b/desktop/source/app/dispatchwatcher.cxx
index c61aef3..c243766 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -97,7 +97,7 @@ const SfxFilter* impl_lookupExportFilterForUrl( const 
rtl::OUString rUrl, const
 sQuery.append(:iflags=);
 
sQuery.append(OUString::number(static_castsal_Int32(SfxFilterFlags::EXPORT)));
 sQuery.append(:eflags=);
-
sQuery.append(OUString::number(static_castsal_Int32(SFX_FILTER_NOTINSTALLED)));
+sQuery.append(OUString::number(static_castint(SFX_FILTER_NOTINSTALLED)));
 
 const Reference XComponentContext  xContext( 
comphelper::getProcessComponentContext() );
 const Reference XContainerQuery  xFilterFactory(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/android

2015-03-19 Thread Michaël Lefèvre

 sal/android/uthash.h |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit b18bd0b774436ad2a85b95491a3efd02c249
Author: MichaÃ«l LefÃ¨vre lefevr...@yahoo.fr
Date:   Fri Mar 13 15:46:44 2015 +0100

CppCheck cleaning : scope reduction and printf format

Change-Id: I43ba76194ee135ffe2398267ed810cca116a1e43
Reviewed-on: https://gerrit.libreoffice.org/14854
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sal/android/uthash.h b/sal/android/uthash.h
index 0760469..fe9d13d 100644
--- a/sal/android/uthash.h
+++ b/sal/android/uthash.h
@@ -81,9 +81,9 @@ typedef unsigned int uint32_t;
 
 #define HASH_FIND(hh,head,keyptr,keylen,out)   
  \
 do {   
  \
-  unsigned _hf_bkt,_hf_hashv;  
  \
   out=NULL;
  \
   if (head) {  
  \
+ unsigned _hf_bkt,_hf_hashv;   
  \
  HASH_FCN(keyptr,keylen, (head)-hh.tbl-num_buckets, _hf_hashv, _hf_bkt); 
  \
  if (HASH_BLOOM_TEST((head)-hh.tbl, _hf_hashv)) { 
  \
HASH_FIND_IN_BKT((head)-hh.tbl, hh, (head)-hh.tbl-buckets[ _hf_bkt 
],  \
@@ -247,11 +247,11 @@ do {
 #define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0)
 #define HASH_FSCK(hh,head) 
  \
 do {   
  \
-unsigned _bkt_i;   
  \
-unsigned _count, _bkt_count;   
  \
-char *_prev;   
  \
-struct UT_hash_handle *_thh;   
  \
 if (head) {
  \
+unsigned _bkt_i;   
  \
+unsigned _count, _bkt_count;   
  \
+char *_prev;   
  \
+struct UT_hash_handle *_thh;   
  \
 _count = 0;
  \
 for( _bkt_i = 0; _bkt_i  (head)-hh.tbl-num_buckets; _bkt_i++) { 
  \
 _bkt_count = 0;
  \
@@ -268,12 +268,12 @@ do {
 }  
  \
 _count += _bkt_count;  
  \
 if ((head)-hh.tbl-buckets[_bkt_i].count !=  _bkt_count) {
  \
-   HASH_OOPS(invalid bucket count %d, actual %d\n,   
  \
+   HASH_OOPS(invalid bucket count %d, actual %u\n,   
  \
 (head)-hh.tbl-buckets[_bkt_i].count, _bkt_count);
  \
 }  
  \
 }  
  \
 if (_count != (head)-hh.tbl-num_items) { 
  \
-HASH_OOPS(invalid hh item count %d, actual %d\n, 
  \
+HASH_OOPS(invalid hh item count %d, actual %u\n, 
  \
 (head)-hh.tbl-num_items, _count );   
  \
 }  
  \
 /* traverse hh in app order; check next/prev integrity, count */   
  \
@@ -291,7 +291,7 @@ do {
   (head)-hh.tbl-hho) : NULL );   
  \
 }  
  \
 if (_count != (head)-hh.tbl-num_items) { 
  \
-HASH_OOPS(invalid app item count %d, actual %d\n,
  \
+HASH_OOPS(invalid app item count %d, actual %u\n,
  \
 (head)-hh.tbl-num_items, _count );   
  \
 }  
  \
 }  
  \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Summer of Code (March 17,2015)

2015-03-19 Thread Caolán McNamara

On Wed, 2015-03-18 at 21:04 +0200, Efe Gürkan YALAMAN wrote:
 
 Somewhere in the bugzilla I think Caolan mentioned it can be
 implemented as a tree-view because the options are in a tree structure
 and it would fit better then a simple table. Also it solves the
 dialog's usability issues too. I hope that will solve the
 accessibility problems too.

Yeah, I think that's the best approach, to try and use a tree in there.
(a SvTreeList I suppose) because the amount of elements in the list is
just crazy, 30,000+ IIRC. Ideally on-demand loaded, e.g. tree is
collapsed and just shows +com.sun.star, when you expand that, then only
then is the subtree inserted, and so on. So the full 30,000+ list isn't
actually in the widget, only the expanded portion.

C.


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

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

2015-03-19 Thread Michaël Lefèvre

 filter/source/config/cache/typedetection.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c83476ab28544c25ab72e7e51131ab481bcbcc5d
Author: MichaÃ«l LefÃ¨vre lefevr...@yahoo.fr
Date:   Fri Mar 13 16:34:28 2015 +0100

CppCheck cleaning : unnecessary assignment

Change-Id: I1e2562631f37befc75879a8095740835f050afb2
Reviewed-on: https://gerrit.libreoffice.org/14856
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index 15ba4d0..a9d1ebd 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -705,7 +705,6 @@ bool TypeDetection::impl_getPreselectionForType(
 WildCard aCheck(*pIt);
 if (aCheck.Matches(aParsedURL.Main))
 {
-bBreakDetection= true;
 bMatchByPattern= true;
 break;
 }
___
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' - stoc/source

2015-03-19 Thread Michael Stahl

 stoc/source/inspect/introspection.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c44a8dee64021e15fcd9ff2294176d27d665a5f4
Author: Michael Stahl mst...@redhat.com
Date:   Fri Mar 13 18:43:21 2015 +0100

stoc: must check *both* bDisposed and bInDispose

Implementation::inspect() was crashing with a null reflection_ in
CppunitTest_libreofficekit_tiledrendering because another thread
was disposing it.

Actually, why are there 2 bools for this and not one enum with 3 values?

Change-Id: Icd27145d3203e1f48a9841ee6251a50cb73f7988
(cherry picked from commit d19249c66d13c779a4a46f34e1d8094c74bbb20f)
Reviewed-on: https://gerrit.libreoffice.org/14860
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/stoc/source/inspect/introspection.cxx 
b/stoc/source/inspect/introspection.cxx
index bd76197..4805aa5 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1599,7 +1599,7 @@ css::uno::Referencecss::beans::XIntrospectionAccess 
Implementation::inspect(
 throw (css::uno::RuntimeException, std::exception)
 {
 osl::MutexGuard g(m_aMutex);
-if (rBHelper.bDisposed) {
+if (rBHelper.bDisposed || rBHelper.bInDispose) {
 throw css::lang::DisposedException(
 getImplementationName(), static_castOWeakObject *(this));
 }
___
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' - i18npool/source

2015-03-19 Thread Michael Stahl

 i18npool/source/search/textsearch.cxx |   25 +
 1 file changed, 21 insertions(+), 4 deletions(-)

New commits:
commit afae8d1e9eb37265bd356773caa77d6d8ac481bc
Author: Michael Stahl mst...@redhat.com
Date:   Tue Mar 10 23:19:18 2015 +0100

i18npool: fix spurious regex ^ matching in TextSearch::searchForward()

Thanks to Eike for finding this:

The anchors ^ and $ now anchor at the selection boundary because the
only text the regex matcher gets passed is the selected text. This in
two paragraphs

 aaa bbb aaa bbb
 aaa bbb aaa bbb

when the selection spans from the second aaa to the third bbb, for
^aaa finds the second aaa, where previously it found the third aaa at
the real paragraph start.

This may not be expected by the user, because the behavior of ^ is
described as Match at the beginning of a line (or paragraph in our
case), which the previous implementation did.

(regression from 806ced87cfe3da72df0d8e4faf5b82535fc7d1b7)

Unfortunately it's not obvious how to implement the same in
searchBackward().

Change-Id: I07f7a8476b672d9511fa74ca473c32eea427698f
(cherry picked from commit 9aae521b451269007f03527c83645b8b935eb419)
Reviewed-on: https://gerrit.libreoffice.org/14829
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/i18npool/source/search/textsearch.cxx 
b/i18npool/source/search/textsearch.cxx
index 959227df..094b554 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -242,13 +242,26 @@ SearchResult TextSearch::searchForward( const OUString 
searchStr, sal_Int32 sta
 in_str = xTranslit-transliterate( searchStr, startPos, endPos - 
startPos, offset );
 
 // JP 20.6.2001: also the start and end positions must be corrected!
-sal_Int32 const newStartPos =
+sal_Int32 newStartPos =
 (startPos == 0) ? 0 : FindPosInSeq_Impl( offset, startPos );
 
-sal_Int32 const newEndPos = (endPos  searchStr.getLength())
+sal_Int32 newEndPos = (endPos  searchStr.getLength())
 ? FindPosInSeq_Impl( offset, endPos )
 : in_str.getLength();
 
+sal_Int32 nExtraOffset = 0;
+if (pRegexMatcher  startPos  0)
+{
+// avoid matching ^ here - in_str omits a prefix of the searchStr
+// this is a really lame way to do it, but ICU only offers
+// useAnchoringBounds() to disable *both* bounds but what is needed
+// here is to disable only one bound and respect the other
+in_str = X + in_str;
+nExtraOffset = 1;
+newStartPos += nExtraOffset;
+newEndPos += nExtraOffset;
+}
+
 sres = (this-*fnForward)( in_str, newStartPos, newEndPos );
 
 // Map offsets back to untransliterated string.
@@ -260,14 +273,14 @@ SearchResult TextSearch::searchForward( const OUString 
searchStr, sal_Int32 sta
 const sal_Int32 nGroups = sres.startOffset.getLength();
 for ( sal_Int32 k = 0; k  nGroups; k++ )
 {
-const sal_Int32 nStart = sres.startOffset[k];
+const sal_Int32 nStart = sres.startOffset[k] - nExtraOffset;
 if (startPos  0 || nStart  0)
 sres.startOffset[k] = (nStart  nOffsets ? offset[nStart] 
: (offset[nOffsets - 1] + 1));
 // JP 20.6.2001: end is ever exclusive and then don't return
 //   the position of the next character - return 
the
 //   next position behind the last found character!
 //   a b c find b must return 2,3 and not 
2,4!!!
-const sal_Int32 nStop = sres.endOffset[k];
+const sal_Int32 nStop = sres.endOffset[k] - nExtraOffset;
 if (startPos  0 || nStop  0)
 sres.endOffset[k] = offset[(nStop = nOffsets ? nStop : 
nOffsets) - 1] + 1;
 }
@@ -345,6 +358,10 @@ SearchResult TextSearch::searchBackward( const OUString 
searchStr, sal_Int32 st
 sal_Int32 const newEndPos =
 (endPos == 0) ? 0 : FindPosInSeq_Impl( offset, endPos );
 
+// TODO: this would need nExtraOffset handling to avoid $ matching
+// if (pRegexMatcher  startPos  searchStr.getLength())
+// but that appears to be impossible with ICU regex
+
 sres = (this-*fnBackward)( in_str, newStartPos, newEndPos );
 
 // Map offsets back to untransliterated string.
___
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' - editeng/source

2015-03-19 Thread Michael Stahl

 editeng/source/misc/acorrcfg.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 32a466e6a95723f26d20a20e74d1f0e563d5dbca
Author: Michael Stahl mst...@redhat.com
Date:   Tue Mar 10 23:56:55 2015 +0100

tdf#89867: editeng: fix crash on shutdown after changing AutoCorrect options

Since commit 5bff4b016c4b44f4123e0e6a4fd4c0c4dc0cfa2d the
SvxAutoCorrCfg::pAutoCorrect is cleared by one terminate() listener but
then another terminate() listener calls Commit() on all modified
utl::ConfigItem and these two have a Commit() that does not clear the
modified flag so they are always modified.

Sadly there's no non-virtual Commit() wrapper that
calls ClearModified() on the base class...

Change-Id: I9ae220d78bb109c7bf0fdc544754a0686b357115
(cherry picked from commit d1698027e9f1c4a88b17da7357f257be3cfb7c1a)
Reviewed-on: https://gerrit.libreoffice.org/14828
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index dce7df4..9ca989c 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -321,6 +321,7 @@ void SvxBaseAutoCorrCfg::Commit()
 }
 }
 PutProperties(aNames, aValues);
+ClearModified();
 }
 
 void SvxBaseAutoCorrCfg::Notify( const SequenceOUString /* aPropertyNames 
*/)
@@ -640,6 +641,7 @@ void SvxSwAutoCorrCfg::Commit()
 }
 }
 PutProperties(aNames, aValues);
+ClearModified();
 }
 
 void SvxSwAutoCorrCfg::Notify( const SequenceOUString /* aPropertyNames */ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/LibreOfficeKit

2015-03-19 Thread Tor Lillqvist

 include/LibreOfficeKit/LibreOfficeKit.h |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2a9bd88e427c0646566ca988bb23e7dab25744c1
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Mar 19 13:58:12 2015 +0200

Indent parameter lists consistently.

Other inconsistencies in spacing and alignment remain, though.

Change-Id: I2b4f9e34781288c5146518be853d3831ec32e968

diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index f10e5e3..85f760c 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -136,14 +136,14 @@ struct _LibreOfficeKitDocumentClass
 
   /// @see lok::Document::setTextSelection
   void (*setTextSelection)(LibreOfficeKitDocument* pThis,
- int nType,
- int nX,
- int nY);
+   int nType,
+   int nX,
+   int nY);
   /// @see lok::Document::setGraphicSelection
   void (*setGraphicSelection)(LibreOfficeKitDocument* pThis,
- int nType,
- int nX,
- int nY);
+  int nType,
+  int nX,
+  int nY);
   /// @see lok::Document::resetSelection
   void (*resetSelection)(LibreOfficeKitDocument* pThis);
 #endif // LOK_USE_UNSTABLE_API
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-19 Thread Noel Grandin

 vcl/generic/glyphs/scrptrun.cxx |  155 +++-
 vcl/generic/glyphs/scrptrun.h   |   10 --
 2 files changed, 75 insertions(+), 90 deletions(-)

New commits:
commit b9880e49e5fbae377eca82e60b88cbbdca8bd5d2
Author: Noel Grandin n...@peralex.com
Date:   Wed Mar 11 13:55:51 2015 +0200

Speed up ScriptRun::getPairIndex

Noted as a hot spot in the callgrind of
test-files/loperf/091_fdo#39372.odt

The idea for the lookup tables is credited to mjayfrancis.

This takes it from 1.8 billion instructions to 1.1 billion instructions.

This change has been submitted upstream (along with other changes
to these source files that have not yet been pushed there)
in ICU ticket:
http://bugs.icu-project.org/trac/ticket/11577

Change-Id: I917bdea4263320f9e88207657b7f3140d95ae2b8
Reviewed-on: https://gerrit.libreoffice.org/14834
Tested-by: Jenkins c...@libreoffice.org
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/generic/glyphs/scrptrun.cxx
index cd7ce41..d6557d7 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/generic/glyphs/scrptrun.cxx
@@ -33,103 +33,98 @@
  *   created on: 10/17/2001
  *   created by: Eric R. Mader
  */
-
+/**
+  * This file is largely copied from the ICU project,
+  * under folder source/extra/scrptrun/scrptrun.cpp
+  */
 #include unicode/utypes.h
 #include unicode/uscript.h
 
 #include scrptrun.h
+#include algorithm
 
-#define ARRAY_SIZE(array) (sizeof array  / sizeof array[0])
-
-namespace vcl {
-
-const char ScriptRun::fgClassID=0;
-
-UChar32 ScriptRun::pairedChars[] = {
-0x0028, 0x0029, // ascii paired punctuation
-0x003c, 0x003e,
-0x005b, 0x005d,
-0x007b, 0x007d,
-0x00ab, 0x00bb, // guillemets
-0x2018, 0x2019, // general punctuation
-0x201c, 0x201d,
-0x2039, 0x203a,
-0x3008, 0x3009, // chinese paired punctuation
-0x300a, 0x300b,
-0x300c, 0x300d,
-0x300e, 0x300f,
-0x3010, 0x3011,
-0x3014, 0x3015,
-0x3016, 0x3017,
-0x3018, 0x3019,
-0x301a, 0x301b
-};
-
-const int32_t ScriptRun::pairedCharCount = ARRAY_SIZE(pairedChars);
-const int32_t ScriptRun::pairedCharPower = 1  highBit(pairedCharCount);
-const int32_t ScriptRun::pairedCharExtra = pairedCharCount - pairedCharPower;
+namespace {
 
-int8_t ScriptRun::highBit(int32_t value)
+struct PairIndices
 {
-if (value = 0) {
-return -32;
-}
-
-int8_t bit = 0;
-
-if (value = 1  16) {
-value = 16;
-bit += 16;
+int8_t ma00[0xff];
+int8_t ma20[0x7f];
+int8_t ma30[0x7f];
+
+PairIndices()
+{
+std::fill_n(ma00, 0xff, -1);
+std::fill_n(ma20, 0x7f, -1);
+std::fill_n(ma30, 0x7f, -1);
+
+// characters in the range 0x - 0x007e (inclusive)
+// ascii paired punctuation
+ma00[0x28] =  0;
+ma00[0x29] =  1;
+ma00[0x3c] =  2;
+ma00[0x3e] =  3;
+ma00[0x5b] =  4;
+ma00[0x5d] =  5;
+ma00[0x7b] =  6;
+ma00[0x7d] =  7;
+// guillemets
+ma00[0xab] =  8;
+ma00[0xbb] =  9;
+
+// characters in the range 0x2000 - 0x207e (inclusive)
+// general punctuation
+ma20[0x18] = 10;
+ma20[0x19] = 11;
+ma20[0x1c] = 12;
+ma20[0x1d] = 13;
+ma20[0x39] = 14;
+ma20[0x3a] = 15;
+
+// characters in the range 0x3000 - 0x307e (inclusive)
+// chinese paired punctuation
+ma30[0x08] = 16;
+ma30[0x09] = 17;
+ma30[0x0a] = 18;
+ma30[0x0b] = 19;
+ma30[0x0c] = 20;
+ma30[0x0d] = 21;
+ma30[0x0e] = 22;
+ma30[0x0f] = 23;
+ma30[0x10] = 24;
+ma30[0x11] = 25;
+ma30[0x14] = 26;
+ma30[0x15] = 27;
+ma30[0x16] = 28;
+ma30[0x17] = 29;
+ma30[0x18] = 30;
+ma30[0x19] = 31;
+ma30[0x1a] = 32;
+ma30[0x1b] = 33;
 }
 
-if (value = 1  8) {
-value = 8;
-bit += 8;
+inline int32_t getPairIndex(UChar32 ch) const
+{
+if (ch  0xff)
+return ma00[ch];
+if (ch = 0x2000  ch  0x207f)
+return ma20[ch - 0x2000];
+if (ch = 0x3000  ch  0x307f)
+return ma30[ch - 0x3000];
+return -1;
 }
 
-if (value = 1  4) {
-value = 4;
-bit += 4;
-}
-
-if (value = 1  2) {
-value = 2;
-bit += 2;
-}
-
-if (value = 1  1) {
-value = 1;
-bit += 1;
-}
+};
 
-return bit;
 }
 
-int32_t ScriptRun::getPairIndex(UChar32 ch)
-{
-int32_t probe = pairedCharPower;
-int32_t index = 0;
+static const PairIndices gPairIndices;
 
-if (ch = pairedChars[pairedCharExtra]) {
-index = pairedCharExtra;
-}
-
-while (probe  (1  0)) {
-probe = 1;
 
-if (ch = pairedChars[index + probe]) {

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

2015-03-19 Thread Adolfo Jayme Barrientos

 svx/source/stbctrls/stbctrls.src |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit d6e839e9e4ce5470c304dbe2b87dd8b0bb07db59
Author: Adolfo Jayme Barrientos fit...@ubuntu.com
Date:   Fri Mar 6 05:05:43 2015 -0600

Percentages should also be translatableâ¦

as they are not written the same way in all languages.

Change-Id: Ibc3a5963bf8bd737516a003618befd1de5f3f5ca
Reviewed-on: https://gerrit.libreoffice.org/14767
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index 3ad69cf..ac26b26 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -168,31 +168,31 @@ Menu RID_SVXMNU_ZOOM
 {
 Identifier = ZOOM_50 ;
 HelpId = HID_MNU_ZOOM_50 ;
-Text = 50% ;
+Text [ en-US ] = 50% ;
 };
 MenuItem
 {
 Identifier = ZOOM_75 ;
 HelpId = HID_MNU_ZOOM_75 ;
-text = 75% ;
+Text [ en-US ] = 75% ;
 };
 MenuItem
 {
 Identifier = ZOOM_100 ;
 HelpId = HID_MNU_ZOOM_100 ;
-Text = 100% ;
+Text [ en-US ] = 100% ;
 };
 MenuItem
 {
 Identifier = ZOOM_150 ;
 HelpId = HID_MNU_ZOOM_150 ;
-Text = 150% ;
+Text [ en-US ] = 150% ;
 };
 MenuItem
 {
 Identifier = ZOOM_200 ;
 HelpId = HID_MNU_ZOOM_200 ;
-Text = 200% ;
+Text [ en-US ] = 200% ;
 };
 };
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-03-19 Thread Caolán McNamara

 cui/source/options/optsave.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4582eabb00494b0e29a899e78084ebac895c64a8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Mar 19 11:13:44 2015 +

push build along a bit further

Change-Id: I6b662e8588153a9437615de0652e3169fc867b82

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 312aa12..2767ef9 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -403,9 +403,9 @@ void SfxSaveTabPage::Reset( const SfxItemSet* )
 sal_IntPtr nData = 
reinterpret_castsal_IntPtr(aDocTypeLB-GetEntryData(n));
 OUString sCommand;
 sCommand = matchByDocumentService=%1:iflags= +
-   
OUString::number(static_castsal_Int32(SfxFilterFlags::IMPORT|SfxFilterFlags::EXPORT))
 +
+   
OUString::number(static_castint(SfxFilterFlags::IMPORT|SfxFilterFlags::EXPORT))
 +
:eflags= +
-   
OUString::number(static_castsal_Int32(SfxFilterFlags::NOTINFILEDLG)) +
+   
OUString::number(static_castint(SfxFilterFlags::NOTINFILEDLG)) +
:default_first;
 OUString sReplace;
 switch(nData)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Payment from FS for fixing tdf#58723

2015-03-19 Thread Zeki Bildirici

Hi,

I've sponsored an issue on freedomsponsors.org for fixing
https://bugs.documentfoundation.org/show_bug.cgi?id=58723 . (see
https://freedomsponsors.org/issue/429/editing-partial-acceptance-or-rejection-of-the-changes)

Now i see tht the bug is fixed but there is no notification on the
report about the comit and i don't know who fixed it.

Not much, it is only USD.20 but i want to pay it -just consider having
some beers or coffee from me for this great enchancemet :)

If you know who fixed it, or you are the one please contact with me,
otherwise i'll donate the reward to TDF.

Thanks again.

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

1 2 3 >

1 - 100 of 285 matches

Mail list logo